[zorg] r222353 - Allow on-demand origin tracking on the msan bot.

[Evgeniy Stepanov]

Author: eugenis
Date: Wed Nov 19 07:24:30 2014
New Revision: 222353

URL: http://llvm.org/viewvc/llvm-project?rev=222353&view=rev
Log:
Allow on-demand origin tracking on the msan bot.

Modified:
    zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_bootstrap.sh
    zorg/trunk/zorg/buildbot/commands/AnnotatedCommand.py

Modified: zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_bootstrap.sh
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_bootstrap.sh?rev=222353&r1=222352&r2=222353&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_bootstrap.sh (original)
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_bootstrap.sh Wed Nov 19 07:24:30 2014
@@ -17,6 +17,11 @@ if [ "$BUILDBOT_CLOBBER" != "" ]; then
   rm -rf llvm_build0
 fi
 
+MEMORY_SANITIZER_KIND="Memory"
+if [ "$BUILDBOT_MSAN_ORIGINS" != "" ]; then
+    MEMORY_SANITIZER_KIND="MemoryWithOrigins"
+fi
+
 # CMake does not notice that the compiler itself has changed.
 # Anyway, incremental builds of stage2 and stage3 compilers don't make sense.
 # Clobber the build trees.
@@ -69,7 +74,7 @@ fi
 LIBCXX_INST=${LIBCXX}/inst
 (cd libcxx_build_msan && \
   cmake ${CMAKE_STAGE2_COMMON_OPTIONS} \
-    -DLLVM_USE_SANITIZER=Memory \
+    -DLLVM_USE_SANITIZER=${MEMORY_SANITIZER_KIND} \
     -DLIBCXX_CXX_ABI=libstdc++ \
     -DLIBCXX_LIBSUPCXX_INCLUDE_PATHS="/usr/local/include/c++/4.9.1;/usr/local/include/c++/4.9.1/x86_64-unknown-linux-gnu" \
     -DCMAKE_INSTALL_PREFIX=${LIBCXX_INST} \
@@ -86,7 +91,7 @@ MSAN_LINK_FLAGS="-lc++ -Wl,--rpath=${LIB
 
 (cd llvm_build_msan && \
  cmake ${CMAKE_STAGE2_COMMON_OPTIONS} \
-   -DLLVM_USE_SANITIZER=Memory \
+   -DLLVM_USE_SANITIZER=${MEMORY_SANITIZER_KIND} \
    -DCMAKE_C_FLAGS="${MSAN_INCLUDE_FLAGS}" \
    -DCMAKE_CXX_FLAGS="${MSAN_INCLUDE_FLAGS}" \
    -DCMAKE_EXE_LINKER_FLAGS="${MSAN_LINK_FLAGS}" \

Modified: zorg/trunk/zorg/buildbot/commands/AnnotatedCommand.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/commands/AnnotatedCommand.py?rev=222353&r1=222352&r2=222353&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/commands/AnnotatedCommand.py (original)
+++ zorg/trunk/zorg/buildbot/commands/AnnotatedCommand.py Wed Nov 19 07:24:30 2014
@@ -385,6 +385,7 @@ class AnnotatedCommand(ProcessLogShellSt
         'BUILDBOT_REVISION': WithProperties('%(revision:-None)s'),
         'BUILDBOT_SCHEDULER': WithProperties('%(scheduler:-None)s'),
         'BUILDBOT_SLAVENAME': WithProperties('%(slavename:-None)s'),
+        'BUILDBOT_MSAN_ORIGINS': WithProperties('%(msan_origins:-None)s'),
     }
     # Apply the passed in environment on top.
     old_env = kwargs.get('env')