[zorg] r272178 - [powerpc] Add ability to bypass scudo tests

[Bill Seurer via llvm-commits]

Author: seurer
Date: Wed Jun  8 12:40:20 2016
New Revision: 272178

URL: http://llvm.org/viewvc/llvm-project?rev=272178&view=rev
Log:
[powerpc] Add ability to bypass scudo tests

The check-scudo target is not available on all targets.


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=272178&r1=272177&r2=272178&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_cmake.sh (original)
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_cmake.sh Wed Jun  8 12:40:20 2016
@@ -178,6 +178,7 @@ HAVE_NINJA=${HAVE_NINJA:-1}
 SKIP_MSAN=${SKIP_MSAN:-1}
 SKIP_LSAN=${SKIP_LSAN:-1}
 SKIP_DFSAN=${SKIP_DFSAN:-1}
+SKIP_SCUDO=${SKIP_SCUDO:-1}
 if [ "$PLATFORM" == "Linux" -a $HAVE_NINJA == 1 ]; then
   echo @@@BUILD_STEP build with ninja@@@
   if [ ! -d llvm_build_ninja ]; then
@@ -196,8 +197,10 @@ if [ "$PLATFORM" == "Linux" -a $HAVE_NIN
   (cd llvm_build_ninja && ninja check-tsan) || echo @@@STEP_FAILURE@@@
   echo @@@BUILD_STEP ninja check-ubsan@@@
   (cd llvm_build_ninja && ninja check-ubsan) || echo @@@STEP_FAILURE@@@
-  echo @@@BUILD_STEP ninja check-scudo@@@
-  (cd llvm_build_ninja && ninja check-scudo) || echo @@@STEP_FAILURE@@@
+  if [ "$SKIP_SCUDO" != 1 ]; then
+    echo @@@BUILD_STEP ninja check-scudo@@@
+    (cd llvm_build_ninja && ninja check-scudo) || echo @@@STEP_FAILURE@@@
+  fi
   if [ "$SKIP_MSAN" != 1 ]; then
     echo @@@BUILD_STEP ninja check-msan@@@
     (cd llvm_build_ninja && ninja check-msan) || 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=272178&r1=272177&r2=272178&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_selector.py (original)
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_selector.py Wed Jun  8 12:40:20 2016
@@ -24,8 +24,8 @@ BOT_ASSIGNMENT = {
 }
 
 BOT_ADDITIONAL_ENV = {
-    '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-ppc64le-linux': { 'HAVE_NINJA': '1', 'CHECK_LIBCXX': '0', 'CHECK_LLD': '0', 'SKIP_MSAN': '1', 'SKIP_LSAN': '1', 'SKIP_DFSAN': '1', 'SKIP_SCUDO': '1' },
+    'sanitizer-ppc64be-linux': { 'HAVE_NINJA': '1', 'CHECK_LIBCXX': '0', 'CHECK_LLD': '0', 'SKIP_SCUDO': '1' },
     'sanitizer-x86_64-linux': { 'HAVE_NINJA' : '1', 'BUILD_ANDROID' : '1', 'RUN_ANDROID' : '1' },
     'sanitizer-x86_64-linux-bootstrap': {},
     'sanitizer-x86_64-linux-fast': {},