##// END OF EJS Templates
Cleaned up trap handling in run-tests, too.
Thomas Arendsen Hein -
r835:9de3535c default
parent child Browse files
Show More
@@ -27,11 +27,11 b' failed=0'
27 HGTMP=""
27 HGTMP=""
28 cleanup_exit() {
28 cleanup_exit() {
29 rm -rf "$HGTMP"
29 rm -rf "$HGTMP"
30 exit $1
31 }
30 }
32
31
33 # Remove temporary files even if we get interrupted
32 # Remove temporary files even if we get interrupted
34 trap "cleanup_exit 255" TERM KILL INT QUIT ABRT
33 trap "cleanup_exit" 0 # normal exit
34 trap "exit 255" 1 2 3 6 15 # HUP INT QUIT ABRT TERM
35
35
36 HGTMP="${TMPDIR-/tmp}/hgtests.$RANDOM.$RANDOM.$RANDOM.$$"
36 HGTMP="${TMPDIR-/tmp}/hgtests.$RANDOM.$RANDOM.$RANDOM.$$"
37 (umask 077 && mkdir "$HGTMP") || {
37 (umask 077 && mkdir "$HGTMP") || {
@@ -61,7 +61,7 b' then'
61 chmod 755 "$INST/bin/hg"
61 chmod 755 "$INST/bin/hg"
62 else
62 else
63 cat tests/install.err
63 cat tests/install.err
64 cleanup_exit 1
64 exit 1
65 fi
65 fi
66 cd "$TESTDIR"
66 cd "$TESTDIR"
67
67
@@ -126,6 +126,6 b' echo'
126 echo "Ran $tests tests, $failed failed."
126 echo "Ran $tests tests, $failed failed."
127
127
128 if [ $failed -gt 0 ] ; then
128 if [ $failed -gt 0 ] ; then
129 cleanup_exit 1
129 exit 1
130 fi
130 fi
131 cleanup_exit 0
131 exit 0
General Comments 0
You need to be logged in to leave comments. Login now