diff options
| -rw-r--r-- | src/afl-fuzz.c | 8 | ||||
| -rwxr-xr-x | test/checkcommit.sh | 6 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/afl-fuzz.c b/src/afl-fuzz.c index cc22fd5c..550bd255 100644 --- a/src/afl-fuzz.c +++ b/src/afl-fuzz.c @@ -1051,9 +1051,9 @@ int main(int argc, char **argv_orig, char **envp) { } - show_stats(afl); + //show_stats(afl); - if (afl->not_on_tty) { + if (unlikely(afl->not_on_tty)) { ACTF("Entering queue cycle %llu.", afl->queue_cycle); fflush(stdout); @@ -1124,7 +1124,7 @@ int main(int argc, char **argv_orig, char **envp) { } - if (afl->queue_cur) show_stats(afl); + //if (afl->queue_cur) show_stats(afl); /* * ATTENTION - the following 10 lines were copied from a PR to Google's afl @@ -1149,12 +1149,12 @@ int main(int argc, char **argv_orig, char **envp) { } write_bitmap(afl); - write_stats_file(afl, 0, 0, 0); maybe_update_plot_file(afl, 0, 0); save_auto(afl); stop_fuzzing: + write_stats_file(afl, 0, 0, 0); afl->force_ui_update = 1; // ensure the screen is reprinted show_stats(afl); // print the screen one last time diff --git a/test/checkcommit.sh b/test/checkcommit.sh index e36a31a2..27d08d36 100755 --- a/test/checkcommit.sh +++ b/test/checkcommit.sh @@ -8,6 +8,7 @@ test -z "$1" -o -n "$4" && { echo "Switches to the defined commit ID, compiles with profiling and runs" echo "afl-fuzz on a defind target and input directory, saving timing," echo "fuzzer_stats and profiling output to \"<commit-id>.out\"" + echo "Honors CFLAGS and LDFLAGS" echo echo "Defaults:" echo " indir: \"$INDIR\"" @@ -21,8 +22,9 @@ test -n "$3" && CMDLINE=$3 git checkout "$C" || { echo "CHECKOUT FAIL $C" > $C.out ; exit 1 ; } export AFL_BENCH_JUST_ONE=1 -export CFLAGS="-O3 -funroll-loops -pg" -export LDFLAGS=-pg +test -z "$CFLAGS" && CFLAGS="-O3 -funroll-loops" +export CFLAGS="$CFLAGS -pg" +export LDFLAGS="$LDFLAGS -pg" make >/dev/null 2>&1 || echo ERROR: BUILD FAILURE test -x ./afl-fuzz || { echo "BUILD FAIL $C" > $C.out ; make clean ; exit 1 ; } |