aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2016-02-04 14:34:28 -0800
committerAnders Broman <a.broman58@gmail.com>2016-02-05 05:24:30 +0000
commit005f44c222c96c56e7742af9afefe44bd296f528 (patch)
tree778df341fbfbaa20e7ec6c9b257bda7f47d7493b
parent2efd7f93b1398d9e348bed142d282e1a2036241d (diff)
fuzz-test: Move the ASan message outside our loops.
Change-Id: I109a3e222358523de8f43c887bf7551e92fce135 Reviewed-on: https://code.wireshark.org/review/13714 Reviewed-by: Anders Broman <a.broman58@gmail.com>
-rwxr-xr-xtools/fuzz-test.sh10
1 files changed, 7 insertions, 3 deletions
diff --git a/tools/fuzz-test.sh b/tools/fuzz-test.sh
index 6ef9cebc8d..0a35a9198c 100755
--- a/tools/fuzz-test.sh
+++ b/tools/fuzz-test.sh
@@ -128,6 +128,13 @@ if [ $MIN_PLUGINS -gt 0 -a $PLUGIN_COUNT -lt $MIN_PLUGINS ] ; then
exit 1
fi
+if [ $ASAN -ne 0 ]; then
+ echo -n "ASan enabled. Virtual memory limit is "
+ ulimit -v
+else
+ echo -n "ASan disabled. Virtual memory limit is $MAX_VMEM"
+fi
+
HOWMANY="forever"
if [ $MAX_PASSES -gt 0 ]; then
HOWMANY="$MAX_PASSES passes"
@@ -208,9 +215,6 @@ while [ \( $PASS -lt $MAX_PASSES -o $MAX_PASSES -lt 1 \) -a $DONE -ne 1 ] ; do
# https://github.com/google/sanitizers/wiki/AddressSanitizer#ulimit--v
if [ $ASAN -eq 0 ]; then
ulimit -v $MAX_VMEM
- else
- echo -n "ASan enabled. Virtual memory limit is "
- ulimit -v
fi
"$RUNNER" $COMMON_ARGS $ARGS $TMP_DIR/$TMP_FILE \