On Wed, Dec 5, 2012 at 2:23 PM, Jordan Rose <[email protected]> wrote:
> Okay, lit just needs to reject this if it doesn't work. It's too easy to > write it by accident. I've gone ahead and fixed lit. > On Dec 5, 2012, at 14:18 , Richard Smith <[email protected]> > wrote: > > > Author: rsmith > > Date: Wed Dec 5 16:18:04 2012 > > New Revision: 169434 > > > > URL: http://llvm.org/viewvc/llvm-project?rev=169434&view=rev > > Log: > > Fix an egregiously broken test. This pattern doesn't work: > > > > RUN: a > > RUN: b || true > > > > lit expands it to a && b || true, and the || true applies to both > commands (thus ignoring failures in 'a')! This is PR10867 again. > > > > Modified: > > cfe/trunk/test/Modules/build-fail-notes.m > > > > Modified: cfe/trunk/test/Modules/build-fail-notes.m > > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/build-fail-notes.m?rev=169434&r1=169433&r2=169434&view=diff > > > ============================================================================== > > --- cfe/trunk/test/Modules/build-fail-notes.m (original) > > +++ cfe/trunk/test/Modules/build-fail-notes.m Wed Dec 5 16:18:04 2012 > > @@ -6,7 +6,7 @@ > > // CHECK: While building module 'DependsOnModule' imported from > > // CHECK: While building module 'Module' imported from > > // CHECK: error: expected ';' after top level declarator > > -// CHECK: note: expanded from {{macro 'getModuleVersion'|here}} > > +// CHECK: note: expanded from here > > // CHECK: fatal error: could not build module 'Module' > > // CHECK: fatal error: could not build module 'DependsOnModule' > > // CHECK-NOT: error: > > @@ -18,13 +18,13 @@ > > // CHECK-REDEF: In module 'Module' imported from > > // CHECK-REDEF: Module.h:15:12: note: previous definition is here > > > > -// RUN: %clang_cc1 -fmodule-cache-path %t -fmodules -F %S/Inputs > -DgetModuleVersion="epic fail" -serialize-diagnostic-file %t.diag %s 2>&1 > || true > > -// RUN: c-index-test -read-diagnostics %t.diag 2>&1 | FileCheck > -check-prefix=CHECK-SDIAG %s > > +// RUN: not %clang_cc1 -fmodule-cache-path %t -fmodules -F %S/Inputs > -DgetModuleVersion="epic fail" -serialize-diagnostic-file %t/tmp.diag %s > 2>&1 > > +// RUN: c-index-test -read-diagnostics %t/tmp.diag 2>&1 | FileCheck > -check-prefix=CHECK-SDIAG %s > > > > // CHECK-SDIAG: Module.h:9:13: error: expected ';' after top level > declarator > > // CHECK-SDIAG: build-fail-notes.m:4:32: note: while building module > 'DependsOnModule' imported from > > // CHECK-SDIAG: DependsOnModule.h:1:10: note: while building module > 'Module' imported from > > -// CHECK-SDIAG: note: expanded from {{macro 'getModuleVersion'|here}} > > +// CHECK-SDIAG: note: expanded from here > > // CHECK-SDIAG: warning: umbrella header does not include header > 'NotInModule.h' [-Wincomplete-umbrella] > > // CHECK-SDIAG: DependsOnModule.h:1:10: fatal: could not build module > 'Module' > > // CHECK-SDIAG: build-fail-notes.m:4:32: note: while building module > 'DependsOnModule' imported from > > > > > > _______________________________________________ > > cfe-commits mailing list > > [email protected] > > http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits > >
_______________________________________________ cfe-commits mailing list [email protected] http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
