Add my pre-commit git script (with checkAPI/hf/encoding args...) Need to copy in...

[metze/wireshark/wip.git] / tools / randpkt-test.sh

diff --git a/tools/randpkt-test.sh b/tools/randpkt-test.sh
index c263848d1c78ee0b147f841bce994dfeb561e3fd..0eceaa7e40462e96d9334c666acdaf31e9069970 100755 (executable)
--- a/tools/randpkt-test.sh
+++ b/tools/randpkt-test.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# $Id: randpkt-test.sh 18577 2006-06-26 19:49:27Z gerald $
+# $Id$
 
 # Randpkt testing script for TShark
 #
@@ -8,28 +8,9 @@
 # content.  It runs TShark on each generated file and checks for errors.
 # The files are processed repeatedly until an error is found.
 
-# Tweak the following to your liking.
-TSHARK=./tshark
-RANDPKT=./randpkt
+TEST_TYPE="randpkt"
+. `dirname $0`/test-common.sh || exit 1
 
-# This needs to point to a 'date' that supports %s.
-DATE=/bin/date
-BASE_NAME=rand-`$DATE +%Y-%m-%d`-$$
-
-# Temporary file directory and names.
-# (had problems with this on cygwin, tried TMP_DIR=./ which worked)
-TMP_DIR=/tmp
-TMP_FILE=$BASE_NAME.pcap
-ERR_FILE=$BASE_NAME.err
-
-# Loop this many times (< 1 loops forever)
-MAX_PASSES=0
-
-# These may be set to your liking
-# Stop the child process, if it's running longer than x seconds
-MAX_CPU_TIME=900
-# Stop the child process, if it's using more than y * 1024 bytes
-MAX_VMEM=500000
 # Trigger an abort if a dissector finds a bug.
 # Uncomment to disable
 WIRESHARK_ABORT_ON_DISSECTOR_BUG="True"
@@ -46,11 +27,6 @@ while getopts ":d:p:t:" OPTCHAR ; do
 done
 shift $(($OPTIND - 1))
 
-# set some limits to the child processes, e.g. stop it if it's running longer then MAX_CPU_TIME seconds
-# (ulimit is not supported well on cygwin and probably other platforms, e.g. cygwin shows some warnings)
-ulimit -S -t $MAX_CPU_TIME -v $MAX_VMEM
-ulimit -c unlimited
-
 ### usually you won't have to change anything below this line ###
 
 # TShark arguments (you won't have to change these)
@@ -58,7 +34,7 @@ ulimit -c unlimited
 # V Print a view of the details of the packet rather than a one-line summary of the packet
 # x Cause TShark to print a hex and ASCII dump of the packet data after printing the summary or details
 # r Read packet data from the following infile
-TSHARK_ARGS="-nVxr"
+declare -a TSHARK_ARGS=("-nVxr" "-nr")
 RANDPKT_ARGS="-b 2000 -c 5000"
 
 NOTFOUND=0
@@ -76,46 +52,56 @@ HOWMANY="forever"
 if [ $MAX_PASSES -gt 0 ]; then
     HOWMANY="$MAX_PASSES passes"
 fi
-echo "Running $TSHARK with args: $TSHARK_ARGS ($HOWMANY)"
+echo -n "Running $TSHARK with args: "
+printf "\"%s\" " "${TSHARK_ARGS[@]}"
+echo "($HOWMANY)"
 echo "Running $RANDPKT with args: $RANDPKT_ARGS"
 echo ""
 
-# Not yet - properly handle empty filenames
-#trap "rm $TMP_DIR/$TMP_FILE $TMP_DIR/$RAND_FILE; exit 1" 1 2 15
+trap "MAX_PASSES=1; echo 'Caught signal'" HUP INT TERM
+
 
 # Iterate over our capture files.
 PASS=0
 while [ $PASS -lt $MAX_PASSES -o $MAX_PASSES -lt 1 ] ; do
-    PASS=`expr $PASS + 1`
+    let PASS=$PASS+1
     echo "Pass $PASS:"
 
     for PKT_TYPE in $PKT_TYPES ; do
-       echo -n "    $PKT_TYPE: "
+        if [ $PASS -gt $MAX_PASSES -a $MAX_PASSES -ge 1 ] ; then
+            break # We caught a signal
+        fi
+        echo -n "    $PKT_TYPE: "
 
-       DISSECTOR_BUG=0
+        DISSECTOR_BUG=0
 
-       "$RANDPKT" $RANDPKT_ARGS -t $PKT_TYPE $TMP_DIR/$TMP_FILE \
+        "$RANDPKT" $RANDPKT_ARGS -t $PKT_TYPE $TMP_DIR/$TMP_FILE \
             > /dev/null 2>&1
 
-       "$TSHARK" $TSHARK_ARGS $TMP_DIR/$TMP_FILE \
-               > /dev/null 2> $TMP_DIR/$ERR_FILE
-       RETVAL=$?
-       grep -i "dissector bug" $TMP_DIR/$ERR_FILE \
-           > /dev/null 2>&1 && DISSECTOR_BUG=1
-       if [ $RETVAL -ne 0 -o $DISSECTOR_BUG -ne 0 ] ; then
-           RAND_FILE="rand-`$DATE +%Y-%m-%d`-$$.pcap"
-            echo ""
-           echo " ERROR"
-           echo -e "Processing failed.  Capture info follows:\n"
-           mv $TMP_DIR/$TMP_FILE $TMP_DIR/$RAND_FILE
-           echo "  Output file: $TMP_DIR/$RAND_FILE"
-           if [ $DISSECTOR_BUG -ne 0 ] ; then
-               echo -e "stderr follows:\n"
-               cat $TMP_DIR/$ERR_FILE
-           fi
-           exit 1
-       fi
-       echo " OK"
+       for ARGS in "${TSHARK_ARGS[@]}" ; do
+            echo -n "($ARGS) "
+           echo -e "Command and args: $TSHARK $ARGS\n" > $TMP_DIR/$ERR_FILE
+
+            # Run in a child process with limits, e.g. stop it if it's running
+            # longer then MAX_CPU_TIME seconds. (ulimit may not be supported
+            # well on some platforms, particularly cygwin.)
+            (
+                ulimit -S -t $MAX_CPU_TIME -v $MAX_VMEM -s $MAX_STACK
+                ulimit -c unlimited
+                "$TSHARK" $ARGS $TMP_DIR/$TMP_FILE \
+                    > /dev/null 2>> $TMP_DIR/$ERR_FILE
+            )
+            RETVAL=$?
+           if [ $RETVAL -ne 0 ] ; then break ; fi
+        done
+        grep -i "dissector bug" $TMP_DIR/$ERR_FILE \
+            > /dev/null 2>&1 && DISSECTOR_BUG=1
+
+        if [ $RETVAL -ne 0 -o $DISSECTOR_BUG -ne 0 ] ; then
+
+            exit_error
+        fi
+        echo " OK"
         rm -f $TMP_DIR/$TMP_FILE $TMP_DIR/$ERR_FILE
     done
 done