diff --git a/build-fuzz-corpus-multiple-restarts.sh b/build-fuzz-corpus-multiple-restarts.sh index 929f9710..eb76f010 100755 --- a/build-fuzz-corpus-multiple-restarts.sh +++ b/build-fuzz-corpus-multiple-restarts.sh @@ -6,7 +6,7 @@ NORMAL_RESTARTS=10 mv "fuzz/corpus/fuzz_$1" "fuzz/corpus/fuzz_$1_pre_fresh_blood" || true for i in $(seq 1 $NORMAL_RESTARTS); do mv "fuzz/corpus/fuzz_$1_restart_${i}"/* "fuzz/corpus/fuzz_$1_pre_fresh_blood" || true - echo "RESTART ${i}" + echo "$(date): RESTART ${i}" mkdir "fuzz/corpus/fuzz_$1" cargo fuzz run --all-features "fuzz_$1" "fuzz/corpus/fuzz_$1" -- \ -dict=fuzz/fuzz.dict -max_len="$2" -fork="$ncpus" \ @@ -16,12 +16,15 @@ for i in $(seq 1 $NORMAL_RESTARTS); do done mv "fuzz/corpus/fuzz_$1_restart_dictionaryless"/* "fuzz/corpus/fuzz_$1_pre_fresh_blood" || true -echo "DICTIONARY-LESS RESTART" +echo "$(date): DICTIONARY-LESS RESTART" cargo fuzz run --all-features "fuzz_$1" "fuzz/corpus/fuzz_$1" -- \ -max_len="$2" -fork="$ncpus" -max_total_time=5100 -runs=100000000 +echo "$(date): MERGING CORPORA" for i in $(seq 1 $NORMAL_RESTARTS); do mv "fuzz/corpus/fuzz_$1_restart_${i}"/* "fuzz/corpus/fuzz_$1" rmdir "fuzz/corpus/fuzz_$1_restart_${i}" done +echo "$(date): RUNNING WITH MERGED CORPUS" ./fuzz-until-converged.sh "$1" "$2" +echo "$(date): DONE BUILDING FUZZ CORPUS AT SIZE $2" \ No newline at end of file diff --git a/build-fuzz-corpus-multiple-sizes.sh b/build-fuzz-corpus-multiple-sizes.sh index 88bfc49b..268d306a 100755 --- a/build-fuzz-corpus-multiple-sizes.sh +++ b/build-fuzz-corpus-multiple-sizes.sh @@ -2,9 +2,11 @@ set -euxo pipefail mkdir "fuzz/corpus/fuzz_$1_recombination_sources" || true for size in "${@:2}"; do + echo "$(date): STARTING ON SIZE $size" rm -rf "fuzz/corpus/fuzz_$1_pre_fresh_blood" || true mv "fuzz/corpus/fuzz_$1/*" "fuzz/corpus/fuzz_$1_recombination_sources" || true ./build-fuzz-corpus-multiple-restarts.sh "$1" "$size" find "fuzz/corpus/fuzz_$1_recombination_sources" -type -f -size "-${size}c" -exec mv '{}' "fuzz/corpus/fuzz_$1" ';' ./fuzz-until-converged.sh "$1" "$size" -done \ No newline at end of file +done +echo "$(date): FINISHED" \ No newline at end of file