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>

diff --git a/tools/fuzz-test.sh b/tools/fuzz-test.sh
index e4791eff45d27667b081ae97c125df70c4c5e130..581fceac090ed0d319283ae4b5029839f07ca274 100755 (executable)
--- 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

diff --git a/tshark.c b/tshark.c
index 75489e605d036d019979c547e1b91475196e71d3..df416007622c81e4235ebbc6b1f865df1171a0f6 100644 (file)
--- a/tshark.c
+++ b/tshark.c
@@ -1103,6 +1103,9 @@ main(int argc, char *argv[])
   g_string_free(comp_info_str, TRUE);
   g_string_free(runtime_info_str, TRUE);
 
+  /* Fail sometimes. Useful for testing fuzz scripts. */
+  /* if (g_random_int_range(0, 100) < 5) abort(); */
+
   /*
    * In order to have the -X opts assigned before the wslua machine starts
    * we need to call getopt_long before epan_init() gets called.