diff options
| author | Gerald Combs <gerald@wireshark.org> | 2013-01-26 20:36:57 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2013-01-26 20:36:57 +0000 |
| commit | 3c66ac4b83bebd3d93b86074db48f6597cdb94cd (patch) | |
| tree | fe534fd19064e0c800cb5862b132c1bbff19596d /tools/test-common.sh | |
| parent | 1cb988eb4cb6086467d344077ba9aabb0df01f8b (diff) | |
| download | wireshark-3c66ac4b83bebd3d93b86074db48f6597cdb94cd.tar.gz | |
Forward-port r47305 from trunk-1.8:
------------------------------------------------------------------------
r47305 | gerald | 2013-01-26 12:12:52 -0800 (Sat, 26 Jan 2013) | 6 lines
Changed paths:
M /trunk-1.8/tools/fuzz-test.sh
Instead of setting resource limits on the fuzz-test.sh process itself,
set limits on the TShark subprocess. This should hopefully take care
of the strange fuzz failures we've seen lately.
Reduce the maximum CPU time to 5 minutes while we're at it.
------------------------------------------------------------------------
svn path=/trunk/; revision=47307
Diffstat (limited to 'tools/test-common.sh')
| -rwxr-xr-x | tools/test-common.sh | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/tools/test-common.sh b/tools/test-common.sh index c1391a4959..ee56b6e0ee 100755 --- a/tools/test-common.sh +++ b/tools/test-common.sh @@ -30,7 +30,7 @@ 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 +MAX_CPU_TIME=300 # Stop the child process if it's using more than y * 1024 bytes MAX_VMEM=500000 # Stop the child process if its stack is larger than than z * 1024 bytes @@ -53,12 +53,6 @@ if [ "$BIN_DIR" = "." ]; then export WIRESHARK_RUN_FROM_BUILD_DIRECTORY=1 fi -# 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 -s $MAX_STACK -ulimit -c unlimited - - ############################################################################## ### Set up environment variables for fuzz testing ### ############################################################################## |