[zorg] r259101 - [powerpc] Alow skipping unsupported sanitizers

[Bill Seurer via llvm-commits]

Author: seurer
Date: Thu Jan 28 16:33:57 2016
New Revision: 259101

URL: http://llvm.org/viewvc/llvm-project?rev=259101&view=rev
Log:
[powerpc] Alow skipping unsupported sanitizers

The HAVE_NINJA option for the sanitizer buildbots triggers 
"make check-xyz" for all the sanitizers.  Some of them are not 
supported on powerpc64 so I added a way to skip those.


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=259101&r1=259100&r2=259101&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_cmake.sh (original)
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_cmake.sh Thu Jan 28 16:33:57 2016
@@ -175,6 +175,9 @@ echo @@@BUILD_STEP test standalone compi
 (cd compiler_rt_build && make -j$MAKE_JOBS check-all) || echo @@@STEP_FAILURE@@@
 
 HAVE_NINJA=${HAVE_NINJA:-1}
+SKIP_MSAN=${SKIP_MSAN:-1}
+SKIP_LSAN=${SKIP_LSAN:-1}
+SKIP_DFSAN=${SKIP_DFSAN:-1}
 if [ "$PLATFORM" == "Linux" -a $HAVE_NINJA == 1 ]; then
   echo @@@BUILD_STEP build with ninja@@@
   if [ ! -d llvm_build_ninja ]; then
@@ -191,14 +194,20 @@ if [ "$PLATFORM" == "Linux" -a $HAVE_NIN
   (cd llvm_build_ninja && ninja check-sanitizer) || echo @@@STEP_FAILURE@@@
   echo @@@BUILD_STEP ninja check-tsan@@@
   (cd llvm_build_ninja && ninja check-tsan) || echo @@@STEP_FAILURE@@@
-  echo @@@BUILD_STEP ninja check-msan@@@
-  (cd llvm_build_ninja && ninja check-msan) || echo @@@STEP_FAILURE@@@
-  echo @@@BUILD_STEP ninja check-lsan@@@
-  (cd llvm_build_ninja && ninja check-lsan) || echo @@@STEP_FAILURE@@@
   echo @@@BUILD_STEP ninja check-ubsan@@@
   (cd llvm_build_ninja && ninja check-ubsan) || echo @@@STEP_FAILURE@@@
-  echo @@@BUILD_STEP ninja check-dfsan@@@
-  (cd llvm_build_ninja && ninja check-dfsan) || echo @@@STEP_WARNINGS@@@
+  if [ "$SKIP_MSAN" != 1 ]; then
+    echo @@@BUILD_STEP ninja check-msan@@@
+    (cd llvm_build_ninja && ninja check-msan) || echo @@@STEP_FAILURE@@@
+  fi
+  if [ "$SKIP_LSAN" != 1 ]; then
+    echo @@@BUILD_STEP ninja check-lsan@@@
+    (cd llvm_build_ninja && ninja check-lsan) || echo @@@STEP_FAILURE@@@
+  fi
+  if [ "$SKIP_DFSAN" != 1 ]; then
+    echo @@@BUILD_STEP ninja check-dfsan@@@
+    (cd llvm_build_ninja && ninja check-dfsan) || echo @@@STEP_WARNINGS@@@
+  fi
   # FIXME: Reenable once cfi tests reliably work on the bot.
   # (cd llvm_build_ninja && LIBRARY_PATH=/usr/lib/x86_64-linux-gnu/x86_64 ninja check-cfi-and-supported) || echo @@@STEP_FAILURE@@@
 fi

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=259101&r1=259100&r2=259101&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_selector.py (original)
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_selector.py Thu Jan 28 16:33:57 2016
@@ -24,7 +24,7 @@ BOT_ASSIGNMENT = {
 }
 
 BOT_ADDITIONAL_ENV = {
-    'sanitizer-ppc64le-linux': { 'HAVE_NINJA': '1', 'CHECK_LIBCXX': '0', 'CHECK_LLD': '0' },
+    'sanitizer-ppc64le-linux': { 'HAVE_NINJA': '1', 'CHECK_LIBCXX': '0', 'CHECK_LLD': '0', 'SKIP_MSAN': '1', 'SKIP_LSAN': '1', 'SKIP_DFSAN': '1' },
     'sanitizer-ppc64be-linux': { 'HAVE_NINJA': '1', 'CHECK_LIBCXX': '0', 'CHECK_LLD': '0' },
     'sanitizer-x86_64-linux': { 'HAVE_NINJA' : '1', 'BUILD_ANDROID' : '1', 'RUN_ANDROID' : '1' },
     'sanitizer-x86_64-linux-bootstrap': {},