Git/testssl.sh
1
0
Fork 0
mirror of https://github.com/drwetter/testssl.sh.git synced 2025-01-06 00:39:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.9dev' into mass_testing_command_line_error

Browse Source
This commit is contained in:
David Cooper 2017-05-30 16:52:55 -04:00
commit 28dadbfb19
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
t/01_badssl.com.t → t/31_badssl.com.t
View File

0
t/02_http.t → t/32_http.t
View File

7
testssl.sh
View File

@ -101,6 +101,7 @@ fi
# make sure that temporary files are cleaned up after use in ANY case # make sure that temporary files are cleaned up after use in ANY case
trap "cleanup" QUIT EXIT trap "cleanup" QUIT EXIT
trap "child_error" USR1
readonly VERSION="2.9dev" readonly VERSION="2.9dev"
readonly SWCONTACT="dirk aet testssl dot sh" readonly SWCONTACT="dirk aet testssl dot sh"
@ -11180,6 +11181,7 @@ EOF
HTMLHEADER=false HTMLHEADER=false
JSONHEADER=false JSONHEADER=false
#' Fix syntax highlight on sublime #' Fix syntax highlight on sublime
"$CHILD_MASS_TESTING" && kill -s USR1 $PPID
exit $1 exit $1
} }
@ -11391,6 +11393,11 @@ cleanup () {
grep -q xtrace <<< "$SHELLOPTS" && ! "$DEBUG_ALLINONE" && exec 2>&42 42>&- grep -q xtrace <<< "$SHELLOPTS" && ! "$DEBUG_ALLINONE" && exec 2>&42 42>&-
} }
child_error() {
cleanup
exit 1
}
fatal() { fatal() {
outln outln
prln_magenta "Fatal error: $1" >&2 prln_magenta "Fatal error: $1" >&2