diff options
Diffstat (limited to 'test')
| -rwxr-xr-x | test/run_and_catch_crashes | 20 | ||||
| -rwxr-xr-x | test/suite-decryption.sh | 2 |
2 files changed, 21 insertions, 1 deletions
diff --git a/test/run_and_catch_crashes b/test/run_and_catch_crashes new file mode 100755 index 0000000000..7cc4c20cf2 --- /dev/null +++ b/test/run_and_catch_crashes @@ -0,0 +1,20 @@ +#! /bin/sh +# +# Run the command we're passed in a subshell, so that said subshell will +# catch any signals from it and report it. +# +# This is done for commands that aren't the last command in the +# pipeline, as, given that the exit status of a pipeline is the exit +# status of the last command in the pipeline, there's no guarantee that +# the shell will bother to pick up the exit status of earlier commands +# in the pipeline. +# +# XXX - it might be useful to try to catch core dumps and, if we find +# one, fire up some tool to try to get a stack trace. That's rather +# platform-dependent - not all platforms create a core dump file named +# "core" in the current directory (OS X, for example, defaults to +# "/cores/core.{PID}"), and the name of the debugger and commands to +# pass to it are platform-dependent (and you might not even have one +# installed). +# +"$@" diff --git a/test/suite-decryption.sh b/test/suite-decryption.sh index 86931676b1..253c685117 100755 --- a/test/suite-decryption.sh +++ b/test/suite-decryption.sh @@ -77,7 +77,7 @@ decryption_step_80211_wpa_psk() { # WPA EAP (EAPOL Rekey) # Included in git sources test/captures/wpa-eap-tls.pcap.gz decryption_step_80211_wpa_eap() { - env $TS_DC_ENV $TSHARK $TS_DC_ARGS \ + ./run_and_catch_crashes env $TS_DC_ENV $TSHARK $TS_DC_ARGS \ -o "wlan.enable_decryption: TRUE" \ -r "$CAPTURE_DIR/wpa-eap-tls.pcap.gz" \ -Y "wlan.analysis.tk==7d9987daf5876249b6c773bf454a0da7" \ |