diff options
| author | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2016-05-12 22:42:50 -0400 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2016-05-13 03:58:51 +0000 |
| commit | d12561f61a2569f9dab3c1415efc14075afe2b71 (patch) | |
| tree | 22d3b43467b7ce7824598d35f105c408f281b52a | |
| parent | 6be20bbfb00d166f71c7c56a09e6eb34fbcbbccc (diff) | |
Move the Valgrind size check after the capinfos check of the file.
That way if we pass a file that doesn't exist to the fuzz-test script we won't
get errors from 'ls' complaining that the file doesn't exist.
Change-Id: I33f4bd692775e6d3f990adaaa37b7530d343fe52
Reviewed-on: https://code.wireshark.org/review/15410
Reviewed-by: Anders Broman <a.broman58@gmail.com>
| -rwxr-xr-x | tools/fuzz-test.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/fuzz-test.sh b/tools/fuzz-test.sh index 581fceac09..6336dac3ea 100755 --- a/tools/fuzz-test.sh +++ b/tools/fuzz-test.sh @@ -168,11 +168,6 @@ while [ \( $PASS -lt $MAX_PASSES -o $MAX_PASSES -lt 1 \) -a $DONE -ne 1 ] ; do fi echo -n " $CF: " - if [ $VALGRIND -eq 1 -a `ls -s $CF | cut -d' ' -f1` -gt 8000 ]; then - echo "Too big for valgrind" - continue - fi - "$CAPINFOS" "$CF" > /dev/null 2> $TMP_DIR/$ERR_FILE RETVAL=$? if [ $RETVAL -eq 1 ] ; then @@ -184,6 +179,11 @@ while [ \( $PASS -lt $MAX_PASSES -o $MAX_PASSES -lt 1 \) -a $DONE -ne 1 ] ; do ws_exit_error fi + if [ $VALGRIND -eq 1 -a `ls -s $CF | cut -d' ' -f1` -gt 8000 ]; then + echo "Too big for valgrind" + continue + fi + DISSECTOR_BUG=0 VG_ERR_CNT=0 |