[zorg] r231051 - Use an explicit LIBRARY_PATH of /usr/lib/x86_64-linux-gnu/x86_64 for the cfi tests.

[Peter Collingbourne]

Author: pcc
Date: Mon Mar  2 20:12:27 2015
New Revision: 231051

URL: http://llvm.org/viewvc/llvm-project?rev=231051&view=rev
Log:
Use an explicit LIBRARY_PATH of /usr/lib/x86_64-linux-gnu/x86_64 for the cfi tests.

Apparently gold, unlike GNU ld, does not search in this location by default,
which is where the libraries are installed on the bot.

Modified:
    zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_cmake.sh

Modified: zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_cmake.sh
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_cmake.sh?rev=231051&r1=231050&r2=231051&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_cmake.sh (original)
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_cmake.sh Mon Mar  2 20:12:27 2015
@@ -85,7 +85,7 @@ if [ "$PLATFORM" == "Linux" ]; then
     (cd clang_build && make -j$MAKE_JOBS check-tsan) || echo @@@STEP_FAILURE@@@
     (cd clang_build && make -j$MAKE_JOBS check-ubsan) || echo @@@STEP_WARNINGS@@@
     (cd clang_build && make -j$MAKE_JOBS check-dfsan) || echo @@@STEP_WARNINGS@@@
-    (cd clang_build && make -j$MAKE_JOBS check-cfi-and-supported) || echo @@@STEP_FAILURE@@@
+    (cd clang_build && LIBRARY_PATH=/usr/lib/x86_64-linux-gnu/x86_64 make -j$MAKE_JOBS check-cfi-and-supported) || echo @@@STEP_FAILURE@@@
   fi
 fi
 
@@ -141,7 +141,7 @@ fi
 
 if [ "$PLATFORM" == "Linux" -a "$ARCH" == "x86_64" ]; then
   echo @@@BUILD_STEP run 64-bit cfi unit tests@@@
-  (cd llvm_build64 && make -j$MAKE_JOBS check-cfi-and-supported) || echo @@@STEP_FAILURE@@@
+  (cd llvm_build64 && LIBRARY_PATH=/usr/lib/x86_64-linux-gnu/x86_64 make -j$MAKE_JOBS check-cfi-and-supported) || echo @@@STEP_FAILURE@@@
 fi
 
 echo @@@BUILD_STEP run sanitizer_common tests@@@
@@ -180,7 +180,7 @@ if [ "$PLATFORM" == "Linux" -a $HAVE_NIN
   (cd llvm_build_ninja && ninja check-lsan) || echo @@@STEP_FAILURE@@@
   (cd llvm_build_ninja && ninja check-ubsan) || echo @@@STEP_WARNINGS@@@
   (cd llvm_build_ninja && ninja check-dfsan) || echo @@@STEP_WARNINGS@@@
-  (cd llvm_build_ninja && ninja check-cfi-and-supported) || echo @@@STEP_FAILURE@@@
+  (cd llvm_build_ninja && LIBRARY_PATH=/usr/lib/x86_64-linux-gnu/x86_64 ninja check-cfi-and-supported) || echo @@@STEP_FAILURE@@@
 fi
 
 if [ $BUILD_ANDROID == 1 ] ; then