[zorg] r222356 - Limit the number of concurrent compilations on the sanitizer bootstrap bot.

[David Blaikie]

On Wed, Nov 19, 2014 at 5:55 AM, Evgeniy Stepanov <eugeni.stepanov at gmail.com
> wrote:

> Author: eugenis
> Date: Wed Nov 19 07:55:00 2014
> New Revision: 222356
>
> URL: http://llvm.org/viewvc/llvm-project?rev=222356&view=rev
> Log:
> Limit the number of concurrent compilations on the sanitizer bootstrap bot.
>

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?


>
> Also disable ASan instrumentation on the 3rd stage of the ASan bootstrap.
>
> Modified:
>     zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_bootstrap.sh
>
> 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=222356&r1=222355&r2=222356&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:55:00 2014
> @@ -116,8 +116,7 @@ if [ ! -d llvm_build2_msan ]; then
>  fi
>
>  CLANG_MSAN_PATH=$ROOT/llvm_build_msan/bin
> -CMAKE_STAGE3_COMMON_OPTIONS="${CMAKE_COMMON_OPTIONS}"
> -CMAKE_STAGE3_MSAN_OPTIONS="${CMAKE_STAGE3_COMMON_OPTIONS}
> -DCMAKE_C_COMPILER=${CLANG_MSAN_PATH}/clang
> -DCMAKE_CXX_COMPILER=${CLANG_MSAN_PATH}/clang++"
> +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"
>
>  (cd llvm_build2_msan && cmake ${CMAKE_STAGE3_MSAN_OPTIONS} $LLVM &&
> ninja) || \
>    echo @@@STEP_FAILURE@@@
> @@ -167,8 +166,7 @@ if [ ! -d llvm_build2_asan ]; then
>  fi
>
>  CLANG_ASAN_PATH=$ROOT/llvm_build_asan/bin
> -CMAKE_STAGE3_COMMON_OPTIONS="${CMAKE_STAGE2_COMMON_OPTIONS}"
> -CMAKE_STAGE3_ASAN_OPTIONS="${CMAKE_STAGE3_COMMON_OPTIONS}
> -DCMAKE_C_COMPILER=${CLANG_ASAN_PATH}/clang
> -DCMAKE_CXX_COMPILER=${CLANG_ASAN_PATH}/clang++"
> +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"
>
>  (cd llvm_build2_asan && cmake ${CMAKE_STAGE3_ASAN_OPTIONS} $LLVM &&
> ninja) || \
>    echo @@@STEP_FAILURE@@@
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20141119/3f72a756/attachment.html>