[zorg] r246572 - [fuzzer bot] enable more fuzzers in the build with assertions, disable the no assertions build

[Kostya Serebryany via llvm-commits]

Author: kcc
Date: Tue Sep  1 13:53:27 2015
New Revision: 246572

URL: http://llvm.org/viewvc/llvm-project?rev=246572&view=rev
Log:
[fuzzer bot] enable more fuzzers in the build with assertions, disable the no assertions build 

Modified:
    zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_fuzzer.sh

Modified: zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_fuzzer.sh
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_fuzzer.sh?rev=246572&r1=246571&r2=246572&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_fuzzer.sh (original)
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_fuzzer.sh Tue Sep  1 13:53:27 2015
@@ -58,12 +58,14 @@ echo @@@BUILD_STEP build clang@@@
 
 build_stage1_clang
 
+echo @@@BUILD_STEP pull test corpuses @@@
+(cd $CORPUS_ROOT && git pull --no-edit)
 
 # Stage 2 / AddressSanitizer
 
-echo @@@BUILD_STEP stage2/asan check-fuzzer@@@
+#echo @@@BUILD_STEP stage2/asan check-fuzzer@@@
 
-mkdir -p ${STAGE2_ASAN_DIR}
+#mkdir -p ${STAGE2_ASAN_DIR}
 
 # TODO(smatveev): merge this with build_stage2()
 clang_path=$ROOT/${STAGE1_DIR}/bin
@@ -77,32 +79,28 @@ cmake_stage2_asan_options=" \
 common_stage2_variables
 export ASAN_SYMBOLIZER_PATH="${llvm_symbolizer_path}"
 
-(cd ${STAGE2_ASAN_DIR} && cmake ${cmake_stage2_asan_options} $LLVM) || \
-  echo @@@STEP_FAILURE@@@
-
-(cd ${STAGE2_ASAN_DIR} && ninja check-fuzzer) || echo @@@STEP_FAILURE@@@
-
-echo @@@BUILD_STEP stage2/asan build clang-format-fuzzer and clang-fuzzer@@@
+#(cd ${STAGE2_ASAN_DIR} && cmake ${cmake_stage2_asan_options} $LLVM) || \
+#  echo @@@STEP_FAILURE@@@
 
-(cd ${STAGE2_ASAN_DIR} && ninja clang-format-fuzzer clang-fuzzer) || echo @@@STEP_FAILURE@@@
+#(cd ${STAGE2_ASAN_DIR} && ninja check-fuzzer) || echo @@@STEP_FAILURE@@@
 
-echo @@@BUILD_STEP pull test corpuses @@@
+#echo @@@BUILD_STEP stage2/asan build clang-format-fuzzer and clang-fuzzer@@@
 
-(cd $CORPUS_ROOT && git pull --no-edit)
+#(cd ${STAGE2_ASAN_DIR} && ninja clang-format-fuzzer clang-fuzzer) || echo @@@STEP_FAILURE@@@
 
-echo @@@BUILD_STEP stage2/asan run clang-format-fuzzer@@@
+#echo @@@BUILD_STEP stage2/asan run clang-format-fuzzer@@@
 
 #(${STAGE2_ASAN_DIR}/bin/clang-format-fuzzer -jobs=32 -workers=8 -runs=131072 $CLANG_FORMAT_CORPUS) || \
 #  echo @@@STEP_WARNINGS@@@
 
-echo @@@BUILD_STEP stage2/asan run clang-fuzzer@@@
+#echo @@@BUILD_STEP stage2/asan run clang-fuzzer@@@
 # leak detection is disabled until assertions from
 # https://llvm.org/bugs/show_bug.cgi?id=23057#c4 are fixed.
 # See also https://llvm.org/bugs/show_bug.cgi?id=23057#c12
 #(ASAN_OPTIONS=$ASAN_OPTIONS:detect_leaks=0 ${STAGE2_ASAN_DIR}/bin/clang-fuzzer -jobs=8 -workers=8 -runs=131072 $CLANG_CORPUS) || \
 #  echo @@@STEP_WARNINGS@@@
 
-echo @@@BUILD_STEP stage2/asan run clang-fuzzer with tokens@@@
+#echo @@@BUILD_STEP stage2/asan run clang-fuzzer with tokens@@@
 #(ASAN_OPTIONS=$ASAN_OPTIONS:detect_leaks=0 ${STAGE2_ASAN_DIR}/bin/clang-fuzzer -jobs=8 -workers=8 -runs=131072 -tokens=$TOKENS_FILE $CLANG_TOKENS_CORPUS) || \
 #  echo @@@STEP_WARNINGS@@@
 
@@ -122,16 +120,16 @@ echo @@@BUILD_STEP stage2/asan+assertion
 
 echo @@@BUILD_STEP stage2/asan+assertions run clang-format-fuzzer@@@
 
-#(${STAGE2_ASAN_ASSERTIONS_DIR}/bin/clang-format-fuzzer -jobs=8 -workers=8 -runs=131072 $CLANG_FORMAT_CORPUS) || \
-#  echo @@@STEP_WARNINGS@@@
+(${STAGE2_ASAN_ASSERTIONS_DIR}/bin/clang-format-fuzzer -jobs=8 -workers=8 -runs=131072 $CLANG_FORMAT_CORPUS) || \
+  echo @@@STEP_WARNINGS@@@
 
 echo @@@BUILD_STEP stage2/asan+assertions run clang-fuzzer@@@
-#(${STAGE2_ASAN_ASSERTIONS_DIR}/bin/clang-fuzzer -jobs=8 -workers=8 -runs=131072 $CLANG_CORPUS) || \
-#  echo @@@STEP_WARNINGS@@@
+(${STAGE2_ASAN_ASSERTIONS_DIR}/bin/clang-fuzzer -jobs=8 -workers=8 -runs=131072 $CLANG_CORPUS) || \
+  echo @@@STEP_WARNINGS@@@
 
 echo @@@BUILD_STEP stage2/asan+assertions run clang-fuzzer with tokens@@@
-#(${STAGE2_ASAN_ASSERTIONS_DIR}/bin/clang-fuzzer -jobs=8 -workers=8 -runs=131072 -tokens=$TOKENS_FILE $CLANG_TOKENS_CORPUS) || \
-#  echo @@@STEP_WARNINGS@@@
+(${STAGE2_ASAN_ASSERTIONS_DIR}/bin/clang-fuzzer -jobs=8 -workers=8 -runs=131072 -tokens=$TOKENS_FILE $CLANG_TOKENS_CORPUS) || \
+  echo @@@STEP_WARNINGS@@@
 
 echo @@@BUILD_STEP stage2/asan+assertions run llvm-as-fuzzer@@@
 (${STAGE2_ASAN_ASSERTIONS_DIR}/bin/llvm-as-fuzzer -jobs=8 -workers=8 -runs=10000000 -only_ascii=1 $LLVM_AS_CORPUS) || \