<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Wed, Nov 19, 2014 at 5:55 AM, Evgeniy Stepanov <span dir="ltr"><<a href="mailto:eugeni.stepanov@gmail.com" target="_blank">eugeni.stepanov@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: eugenis<br>
Date: Wed Nov 19 07:55:00 2014<br>
New Revision: 222356<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=222356&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=222356&view=rev</a><br>
Log:<br>
Limit the number of concurrent compilations on the sanitizer bootstrap bot.<br></blockquote><div><br></div><div>Shouldn't this parameter come down from the buildmaster/buildbot configuration, so this can be configured to use a different number of concurrent compilations depending on the machine it runs on?</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
Also disable ASan instrumentation on the 3rd stage of the ASan bootstrap.<br>
<br>
Modified:<br>
zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_bootstrap.sh<br>
<br>
Modified: zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_bootstrap.sh<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_bootstrap.sh?rev=222356&r1=222355&r2=222356&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_bootstrap.sh?rev=222356&r1=222355&r2=222356&view=diff</a><br>
==============================================================================<br>
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_bootstrap.sh (original)<br>
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_bootstrap.sh Wed Nov 19 07:55:00 2014<br>
@@ -116,8 +116,7 @@ if [ ! -d llvm_build2_msan ]; then<br>
fi<br>
<br>
CLANG_MSAN_PATH=$ROOT/llvm_build_msan/bin<br>
-CMAKE_STAGE3_COMMON_OPTIONS="${CMAKE_COMMON_OPTIONS}"<br>
-CMAKE_STAGE3_MSAN_OPTIONS="${CMAKE_STAGE3_COMMON_OPTIONS} -DCMAKE_C_COMPILER=${CLANG_MSAN_PATH}/clang -DCMAKE_CXX_COMPILER=${CLANG_MSAN_PATH}/clang++"<br>
+CMAKE_STAGE3_MSAN_OPTIONS="${CMAKE_COMMON_OPTIONS} -DCMAKE_C_COMPILER=${CLANG_MSAN_PATH}/clang -DCMAKE_CXX_COMPILER=${CLANG_MSAN_PATH}/clang++ -DLLVM_PARALLEL_COMPILE_JOBS=15"<br>
<br>
(cd llvm_build2_msan && cmake ${CMAKE_STAGE3_MSAN_OPTIONS} $LLVM && ninja) || \<br>
echo @@@STEP_FAILURE@@@<br>
@@ -167,8 +166,7 @@ if [ ! -d llvm_build2_asan ]; then<br>
fi<br>
<br>
CLANG_ASAN_PATH=$ROOT/llvm_build_asan/bin<br>
-CMAKE_STAGE3_COMMON_OPTIONS="${CMAKE_STAGE2_COMMON_OPTIONS}"<br>
-CMAKE_STAGE3_ASAN_OPTIONS="${CMAKE_STAGE3_COMMON_OPTIONS} -DCMAKE_C_COMPILER=${CLANG_ASAN_PATH}/clang -DCMAKE_CXX_COMPILER=${CLANG_ASAN_PATH}/clang++"<br>
+CMAKE_STAGE3_ASAN_OPTIONS="${CMAKE_COMMON_OPTIONS} -DCMAKE_C_COMPILER=${CLANG_ASAN_PATH}/clang -DCMAKE_CXX_COMPILER=${CLANG_ASAN_PATH}/clang++ -DLLVM_PARALLEL_COMPILE_JOBS=10"<br>
<br>
(cd llvm_build2_asan && cmake ${CMAKE_STAGE3_ASAN_OPTIONS} $LLVM && ninja) || \<br>
echo @@@STEP_FAILURE@@@<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div></div>