[lld] r187381 - Fix test failure introduced in r187271 by enabling pipefail.

Rui Ueyama ruiu at google.com
Mon Jul 29 14:50:33 PDT 2013


Author: ruiu
Date: Mon Jul 29 16:50:33 2013
New Revision: 187381

URL: http://llvm.org/viewvc/llvm-project?rev=187381&view=rev
Log:
Fix test failure introduced in r187271 by enabling pipefail.

Modified:
    lld/trunk/lib/Passes/LayoutPass.cpp
    lld/trunk/test/layout-error-test.objtxt

Modified: lld/trunk/lib/Passes/LayoutPass.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/Passes/LayoutPass.cpp?rev=187381&r1=187380&r2=187381&view=diff
==============================================================================
--- lld/trunk/lib/Passes/LayoutPass.cpp (original)
+++ lld/trunk/lib/Passes/LayoutPass.cpp Mon Jul 29 16:50:33 2013
@@ -433,7 +433,7 @@ void showCycleDetectedError(AtomToAtomT
     }
     atom = followOnNexts[atom];
   } while (atom != start);
-  llvm_unreachable("Cycle detected");
+  llvm::report_fatal_error("Cycle detected");
 }
 
 /// Exit if there's a cycle in a followon chain reachable from the

Modified: lld/trunk/test/layout-error-test.objtxt
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/layout-error-test.objtxt?rev=187381&r1=187380&r2=187381&view=diff
==============================================================================
--- lld/trunk/test/layout-error-test.objtxt (original)
+++ lld/trunk/test/layout-error-test.objtxt Mon Jul 29 16:50:33 2013
@@ -1,6 +1,7 @@
 # REQUIRES: debug
-# RUN: lld -core --add-pass layout -mllvm -debug-only=LayoutPass %s 2>&1 \
-# RUN:   | FileCheck %s -check-prefix=CHECK
+# RUN: not lld -core --add-pass layout -mllvm -debug-only=LayoutPass \
+# RUN:   %s 2> %t.err
+# RUN:   FileCheck %s -check-prefix=CHECK < %t.err
 
 ---
 defined-atoms:





More information about the llvm-commits mailing list