diff options
| author | Gerald Combs <gerald@wireshark.org> | 2016-03-11 17:01:29 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2016-03-14 15:54:26 +0000 |
| commit | d877dcc1c40d6d231778a27eeabb2f525aa8c03a (patch) | |
| tree | 71aeb74bfa1eab253f1d5608bdd2d0418279616c /tools/fuzz-test.sh | |
| parent | 54798eee3b5b93b0324fe865e33ab21935e51cca (diff) | |
| download | wireshark-d877dcc1c40d6d231778a27eeabb2f525aa8c03a.tar.gz | |
Parallelize fuzz-test.sh
Run each "argument" test (e.g. "-nVxr" and "-nr") simultaneously in
the background. This should speed up our tests without reducing the
amount of fuzzing that we do.
Change-Id: I737d1dc09b31e07910d56632bec62da0f35fe222
Reviewed-on: https://code.wireshark.org/review/14432
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'tools/fuzz-test.sh')
| -rwxr-xr-x | tools/fuzz-test.sh | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/tools/fuzz-test.sh b/tools/fuzz-test.sh index e4791eff45..581fceac09 100755 --- a/tools/fuzz-test.sh +++ b/tools/fuzz-test.sh @@ -197,6 +197,8 @@ while [ \( $PASS -lt $MAX_PASSES -o $MAX_PASSES -lt 1 \) -a $DONE -ne 1 ] ; do fi fi + RUNNER_PIDS= + RUNNER_ERR_FILES= for ARGS in "${RUNNER_ARGS[@]}" ; do if [ $DONE -eq 1 ]; then break # We caught a signal @@ -210,6 +212,7 @@ while [ \( $PASS -lt $MAX_PASSES -o $MAX_PASSES -lt 1 \) -a $DONE -ne 1 ] ; do ( ulimit -S -t $MAX_CPU_TIME -s $MAX_STACK ulimit -c unlimited + SUBSHELL_PID=$($SHELL -c 'echo $PPID') # Don't enable ulimit -v when using ASAN. See # https://github.com/google/sanitizers/wiki/AddressSanitizer#ulimit--v @@ -218,9 +221,17 @@ while [ \( $PASS -lt $MAX_PASSES -o $MAX_PASSES -lt 1 \) -a $DONE -ne 1 ] ; do fi "$RUNNER" $COMMON_ARGS $ARGS $TMP_DIR/$TMP_FILE \ - > /dev/null 2>> $TMP_DIR/$ERR_FILE - ) + > /dev/null 2>> $TMP_DIR/$ERR_FILE.$SUBSHELL_PID + ) & + RUNNER_PID=$! + RUNNER_PIDS="$RUNNER_PIDS $RUNNER_PID" + RUNNER_ERR_FILES="$RUNNER_ERR_FILES $TMP_DIR/$ERR_FILE.$RUNNER_PID" + done + + for RUNNER_PID in $RUNNER_PIDS ; do + wait $RUNNER_PID RETVAL=$? + mv $TMP_DIR/$ERR_FILE.$RUNNER_PID $TMP_DIR/$ERR_FILE # Uncomment the next two lines to enable dissector bug # checking. @@ -243,6 +254,7 @@ while [ \( $PASS -lt $MAX_PASSES -o $MAX_PASSES -lt 1 \) -a $DONE -ne 1 ] ; do fi if [ $DONE -ne 1 -a \( $RETVAL -ne 0 -o $DISSECTOR_BUG -ne 0 -o $VG_ERR_CNT -ne 0 \) ] ; then + rm -f $RUNNER_ERR_FILES ws_exit_error fi done |