[zorg] r237277 - [fuzzer bot] use the test corpuses stored in git

Kostya Serebryany kcc at google.com
Wed May 13 11:52:13 PDT 2015


Author: kcc
Date: Wed May 13 13:52:13 2015
New Revision: 237277

URL: http://llvm.org/viewvc/llvm-project?rev=237277&view=rev
Log:
[fuzzer bot] use the test corpuses stored in git

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=237277&r1=237276&r2=237277&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_fuzzer.sh (original)
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_fuzzer.sh Wed May 13 13:52:13 2015
@@ -19,9 +19,10 @@ LLVM=$ROOT/llvm
 # No assertions. Need to clean up the existing assertion failures first.
 # Also, the Fuzzer does not provide reproducers on assertion failures yet.
 CMAKE_COMMON_OPTIONS="-GNinja -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_ASSERTIONS=OFF -DLLVM_PARALLEL_LINK_JOBS=3"
-CLANG_FORMAT_CORPUS=$ROOT/clang-format-corpus
-CLANG_CORPUS=$ROOT/clang-corpus
-CLANG_TOKENS_CORPUS=$ROOT/clang-tokens-corpus
+CORPUS_ROOT=$ROOT/fuzzing-with-sanitizers/llvm
+CLANG_FORMAT_CORPUS=$CORPUS_ROOT/clang-format/C1
+CLANG_CORPUS=$CORPUS_ROOT/clang/C1
+CLANG_TOKENS_CORPUS=$CORPUS_ROOT/clang/TOK1
 TOKENS_FILE=$LLVM/lib/Fuzzer/cxx_fuzzer_tokens.txt
 
 if [ "$BUILDBOT_CLOBBER" != "" ]; then
@@ -84,20 +85,24 @@ echo @@@BUILD_STEP stage2/asan build cla
 
 (cd ${STAGE2_ASAN_DIR} && ninja clang-format-fuzzer clang-fuzzer) || echo @@@STEP_FAILURE@@@
 
+echo @@@BUILD_STEP pull test corpuses @@@
+
+(cd $CORPUS_ROOT && git pull --no-edit)
+
 echo @@@BUILD_STEP stage2/asan run clang-format-fuzzer@@@
 
-(${STAGE2_ASAN_DIR}/bin/clang-format-fuzzer -jobs=32 -workers=8 -runs=131072 -use_counters=1 $CLANG_FORMAT_CORPUS) || \
+(${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@@@
 # 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=32 -workers=8 -runs=131072 -use_counters=1 $CLANG_CORPUS) || \
+(ASAN_OPTIONS=$ASAN_OPTIONS:detect_leaks=0 ${STAGE2_ASAN_DIR}/bin/clang-fuzzer -jobs=32 -workers=8 -runs=131072 $CLANG_CORPUS) || \
   echo @@@STEP_WARNINGS@@@
 
 echo @@@BUILD_STEP stage2/asan run clang-fuzzer with tokens@@@
-(ASAN_OPTIONS=$ASAN_OPTIONS:detect_leaks=0 ${STAGE2_ASAN_DIR}/bin/clang-fuzzer -jobs=32 -workers=8 -runs=131072 -use_counters=1 -tokens=$TOKENS_FILE $CLANG_TOKENS_CORPUS) || \
+(ASAN_OPTIONS=$ASAN_OPTIONS:detect_leaks=0 ${STAGE2_ASAN_DIR}/bin/clang-fuzzer -jobs=32 -workers=8 -runs=131072 -tokens=$TOKENS_FILE $CLANG_TOKENS_CORPUS) || \
   echo @@@STEP_WARNINGS@@@
 
 # Stage 3 / AddressSanitizer + assertions
@@ -116,15 +121,19 @@ 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 -use_counters=1 $CLANG_FORMAT_CORPUS) || \
+(${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 -use_counters=1 $CLANG_CORPUS) || \
+(${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 -use_counters=1 -tokens=$TOKENS_FILE $CLANG_TOKENS_CORPUS) || \
+(${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 push corpus updates@@@
+$(LLVM)/lib/Fuzzer/pull_and_push_fuzz_corpus.sh $CLANG_FORMAT_CORPUS
+$(LLVM)/lib/Fuzzer/pull_and_push_fuzz_corpus.sh $CLANG_CORPUS
+$(LLVM)/lib/Fuzzer/pull_and_push_fuzz_corpus.sh $CLANG_TOKENS_CORPUS
 





More information about the llvm-commits mailing list