[zorg] r233039 - sanitizer-x86_64-linux: disable cfi and Android tests that are temporarily broken for a long time now

[Alexey Samsonov]

Author: samsonov
Date: Mon Mar 23 18:34:51 2015
New Revision: 233039

URL: http://llvm.org/viewvc/llvm-project?rev=233039&view=rev
Log:
sanitizer-x86_64-linux: disable cfi and Android tests that are temporarily broken for a long time now

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

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=233039&r1=233038&r2=233039&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_cmake.sh (original)
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_cmake.sh Mon Mar 23 18:34:51 2015
@@ -85,7 +85,8 @@ 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 && LIBRARY_PATH=/usr/lib/x86_64-linux-gnu/x86_64 make -j$MAKE_JOBS check-cfi-and-supported) || echo @@@STEP_FAILURE@@@
+    # FIXME: Reenable once cfi tests reliably work on the bot.
+    #(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
 
@@ -139,10 +140,11 @@ if [ "$PLATFORM" == "Linux" -a "$ARCH" =
   (cd llvm_build64 && make -j$MAKE_JOBS check-lsan) || echo @@@STEP_FAILURE@@@
 fi
 
-if [ "$PLATFORM" == "Linux" -a "$ARCH" == "x86_64" ]; then
-  echo @@@BUILD_STEP run 64-bit cfi unit tests@@@
-  (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
+# FIXME: Reenable once cfi tests reliably work on the bot.
+#if [ "$PLATFORM" == "Linux" -a "$ARCH" == "x86_64" ]; then
+#  echo @@@BUILD_STEP run 64-bit cfi unit tests@@@
+#  (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@@@
 (cd llvm_build64 && make -j$MAKE_JOBS check-sanitizer) || echo @@@STEP_FAILURE@@@

Modified: zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_selector.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_selector.py?rev=233039&r1=233038&r2=233039&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_selector.py (original)
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_selector.py Mon Mar 23 18:34:51 2015
@@ -26,7 +26,7 @@ BOT_ASSIGNMENT = {
 BOT_ADDITIONAL_ENV = {
     'sanitizer-ppc64le-linux': { 'HAVE_NINJA': '0' },
     'sanitizer-ppc64-linux1': { 'HAVE_NINJA': '0' },
-    'sanitizer-x86_64-linux': { 'BUILD_ANDROID' : '1', 'RUN_ANDROID' : '1', 'HAVE_NINJA' : '1' },
+    'sanitizer-x86_64-linux': { 'HAVE_NINJA' : '1' },
     'sanitizer-x86_64-linux-bootstrap': {},
     'sanitizer-x86_64-linux-fast': {},
     'sanitizer-x86_64-linux-autoconf': { 'CHECK_TSAN': '1' },