Move benchmark seeds to a subdirectory.

Unifies layout for easier use by the A/B testing tool.
google · Oct 21, 2017 · d5521b1 · d5521b1
1 parent 6419282
commit d5521b1
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 11 deletions.
diff --git a/engine-comparison/dispatcher.sh b/engine-comparison/dispatcher.sh
@@ -97,7 +97,6 @@ build_benchmark() {
 
   echo "BENCHMARK=${benchmark}" > "${SEND_DIR}/benchmark.cfg"
 
-  # TODO: ensure all seeds are in $BENCHMARK/seeds
   if [[ -d "${WORK}/FTS/${benchmark}/seeds" ]]; then
     cp -r "${WORK}/FTS/${benchmark}/seeds" "${SEND_DIR}"
   fi

diff --git a/lcms-2017-03-21/seed → lcms-2017-03-21/seeds/seed b/lcms-2017-03-21/seed → lcms-2017-03-21/seeds/seed
diff --git a/lcms-2017-03-21/test-libfuzzer.sh b/lcms-2017-03-21/test-libfuzzer.sh
@@ -6,8 +6,6 @@ set -x
 rm -rf $CORPUS
 mkdir $CORPUS
 
-cp $SCRIPT_DIR/seed $CORPUS
-
-[ -e $EXECUTABLE_NAME_BASE ] && ./$EXECUTABLE_NAME_BASE -artifact_prefix=$CORPUS/ -jobs=$JOBS -workers=$JOBS $CORPUS
+[ -e $EXECUTABLE_NAME_BASE ] && ./$EXECUTABLE_NAME_BASE -artifact_prefix=$CORPUS/ -jobs=$JOBS -workers=$JOBS $CORPUS $SCRIPT_DIR/seeds
 grep 'ERROR: AddressSanitizer: heap-buffer-overflow' fuzz-0.log || exit 1
 
diff --git a/libarchive-2017-01-04/seed → libarchive-2017-01-04/seeds/seed b/libarchive-2017-01-04/seed → libarchive-2017-01-04/seeds/seed
diff --git a/libarchive-2017-01-04/test-libfuzzer.sh b/libarchive-2017-01-04/test-libfuzzer.sh
@@ -7,8 +7,6 @@ set -x
 rm -rf $CORPUS
 mkdir $CORPUS
 
-cp $SCRIPT_DIR/seed $CORPUS
-
-[ -e $EXECUTABLE_NAME_BASE ] && ./$EXECUTABLE_NAME_BASE -artifact_prefix=$CORPUS/ -jobs=$JOBS -workers=$JOBS -max_len=1000 $CORPUS
+[ -e $EXECUTABLE_NAME_BASE ] && ./$EXECUTABLE_NAME_BASE -artifact_prefix=$CORPUS/ -jobs=$JOBS -workers=$JOBS -max_len=1000 $CORPUS $SCRIPT_DIR/seeds
 grep 'ERROR: AddressSanitizer: heap-buffer-overflow' fuzz-0.log || exit 1
 
diff --git a/libjpeg-turbo-07-2017/seed.jpg → libjpeg-turbo-07-2017/seeds/seed.jpg b/libjpeg-turbo-07-2017/seed.jpg → libjpeg-turbo-07-2017/seeds/seed.jpg
diff --git a/libjpeg-turbo-07-2017/test-libfuzzer.sh b/libjpeg-turbo-07-2017/test-libfuzzer.sh
@@ -5,7 +5,6 @@
 set -x
 rm -rf $CORPUS
 mkdir $CORPUS
-cp $SCRIPT_DIR/seed.jpg $CORPUS
 
 rm fuzz-*.log
 
@@ -14,7 +13,7 @@ test_source_location() {
   echo "test_source_location: $SRC_LOC"
   rm -f *.log
   [ -e $EXECUTABLE_NAME_BASE ] && \
-    ./$EXECUTABLE_NAME_BASE -artifact_prefix=$CORPUS/ -exit_on_src_pos=$SRC_LOC -jobs=$JOBS -workers=$JOBS -print_pcs=1 $CORPUS
+    ./$EXECUTABLE_NAME_BASE -artifact_prefix=$CORPUS/ -exit_on_src_pos=$SRC_LOC -jobs=$JOBS -workers=$JOBS -print_pcs=1 $CORPUS $SCRIPT_DIR/seeds
   grep "INFO: found line matching '$SRC_LOC'" fuzz-*.log || exit 1
 }
 

diff --git a/libpng-1.2.56/seed.png → libpng-1.2.56/seeds/seed.png b/libpng-1.2.56/seed.png → libpng-1.2.56/seeds/seed.png
diff --git a/libpng-1.2.56/test-libfuzzer.sh b/libpng-1.2.56/test-libfuzzer.sh
@@ -8,15 +8,14 @@ mkdir $CORPUS
 
 # seed.png was generated by this command:
 # onvert -background white -size 80x label:"X" -trim +repage seed.png
-cp $SCRIPT_DIR/seed.png $CORPUS
 
 test_source_location() {
   SRC_LOC="$1"
   echo "test_source_location: $SRC_LOC"
   rm -f *.log
   # This target has a 2Gb malloc oom, so we have to use rss_limit_mb=3000
   [ -e $EXECUTABLE_NAME_BASE-lf ] && \
-    ./$EXECUTABLE_NAME_BASE-lf -close_fd_mask=3 -artifact_prefix=$CORPUS/ -exit_on_src_pos=$SRC_LOC  -runs=100000000 -jobs=$JOBS -workers=$JOBS $CORPUS -rss_limit_mb=3000
+    ./$EXECUTABLE_NAME_BASE-lf -close_fd_mask=3 -artifact_prefix=$CORPUS/ -exit_on_src_pos=$SRC_LOC  -runs=100000000 -jobs=$JOBS -workers=$JOBS $CORPUS $SCRIPT_DIR/seeds -rss_limit_mb=3000
   grep "INFO: found line matching '$SRC_LOC'" fuzz-*.log || exit 1
 }