always create $tmpdir in tests

kyz · Feb 19, 2023 · 526df93 · 526df93
1 parent e315591
commit 526df93
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 19 deletions.
diff --git a/cabextract/test/large-files.test b/cabextract/test/large-files.test
@@ -3,15 +3,6 @@
 # because it takes a long time and needs 12GB of temporary space
 . test/testcase
 
-tmpdir=`mktemp -d`
-
-trap cleanup2 0 1 2
-cleanup2() {
-    cd /
-    rm -rf $tmpdir
-    cleanup
-}
-
 # extract large-files.cab
 "$cabextract" -q -d $tmpdir cabs/large-files-cab.cab
 

diff --git a/cabextract/test/symlinks.test b/cabextract/test/symlinks.test
@@ -8,13 +8,6 @@
 
 set -e # every command is a test!
 
-tmpdir=`mktemp -d`
-trap cleanup2 0 1 2
-cleanup2() {
-    rm -rf $tmpdir
-    cleanup
-}
-
 # set up a symlinked file and symlinked directory
 # extract $tmpdir/plain.c and $tmpdir/1/2/3/4.c
 # check they did NOT get written to $tmpdir/other.c and $tmpdir/other/4.c
@@ -60,4 +53,4 @@ read H < $tmpdir/fake/dest/plain.c
 read W < $tmpdir/fake/dest/1/2/3/4.c
 [ "$H" = "hello" -a "$W" = "world" ]
 
-exit 0
+exit 0
diff --git a/cabextract/test/testcase.in b/cabextract/test/testcase.in
@@ -1,10 +1,11 @@
 cabextract="@abs_top_builddir@/cabextract@EXEEXT@"
 cd "@abs_srcdir@"
 
-status=`mktemp`
+tmpdir=`mktemp -d`
+status=$tmpdir/status
 expected=$status.expected
 actual=$status.actual
-echo success >$status
+echo success >$status || exit 1
 
 trap cleanup 0 1 2
 cleanup() {