File tree 1 file changed +3
-9
lines changed
1 file changed +3
-9
lines changed Original file line number Diff line number Diff line change @@ -130,7 +130,6 @@ __shunit_reportGenerated=${SHUNIT_FALSE} # Is report generated.
130
130
__shunit_script=' ' # Filename of unittest script (standalone mode).
131
131
__shunit_skip=${SHUNIT_FALSE} # Is skipping enabled.
132
132
__shunit_suite=' ' # Suite of tests to execute.
133
- __shunit_clean=${SHUNIT_FALSE} # _shunit_cleanup() was already called.
134
133
135
134
# ANSI colors (populated by _shunit_configureColor()).
136
135
__shunit_ansi_none=' '
@@ -1006,22 +1005,17 @@ _shunit_cleanup() {
1006
1005
_shunit_error " unrecognized trap value (${_shunit_name_} )"
1007
1006
;;
1008
1007
esac
1008
+
1009
1009
if ${__SHUNIT_BUILTIN} [ " ${_shunit_name_} " != ' EXIT' ]; then
1010
1010
_shunit_warn " trapped and now handling the (${_shunit_name_} ) signal"
1011
- fi
1012
-
1013
- # Do our work.
1014
- if ${__SHUNIT_BUILTIN} [ ${__shunit_clean} -eq ${SHUNIT_FALSE} ]; then
1015
1011
# Ensure tear downs are only called once.
1016
- __shunit_clean=${SHUNIT_TRUE}
1017
-
1018
1012
tearDown || _shunit_warn ' tearDown() returned non-zero return code.'
1019
1013
oneTimeTearDown || \
1020
1014
_shunit_warn ' oneTimeTearDown() returned non-zero return code.'
1021
-
1022
- command rm -fr " ${__shunit_tmpDir} "
1023
1015
fi
1024
1016
1017
+ command rm -fr " ${__shunit_tmpDir} "
1018
+
1025
1019
if ${__SHUNIT_BUILTIN} [ " ${_shunit_name_} " != ' EXIT' ]; then
1026
1020
# Handle all non-EXIT signals.
1027
1021
trap - 0 # Disable EXIT trap.
You can’t perform that action at this time.
0 commit comments