X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=tests%2Ftestsuite.at;h=1aab6f72a275d856e467afca070b4888db98972c;hb=6d5cfeb757da524ed88bff55b2ee4e58b593641e;hp=78562875aa583ec2ea9ab28b610cc6f35ef42b3c;hpb=d28eee6b4f16d0fb847ee57771a42062259405b8;p=chaz%2Ftar

diff --git a/tests/testsuite.at b/tests/testsuite.at
index 7856287..1aab6f7 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -125,31 +125,31 @@ m4_define([AT_CHECK_UTIL],[
 ])
 
 m4_define([AT_XATTRS_UTILS_PREREQ],[
-  file=$( mktemp -p . )
+  file=$(TMPDIR=. mktemp fiXXXXXX)
   AT_CHECK_UTIL(setfattr -n user.test -v test $file,0)
   AT_CHECK_UTIL(getfattr $file,0)
 ])
 m4_define([AT_SELINUX_UTILS_PREREQ],[
-  file=$( mktemp -p . )
+  file=$(TMPDIR=. mktemp fiXXXXXX)
   AT_CHECK_UTIL(restorecon $file, 0)
   AT_CHECK_UTIL(chcon -h --user=unconfined_u $file,0)
   rm -rf $file
 ])
 m4_define([AT_ACLS_UTILS_PREREQ],[
-  file=$( mktemp -p . )
+  file=$(TMPDIR=. mktemp fiXXXXXX)
   AT_CHECK_UTIL(setfacl -m u:$UID:rwx $file,0)
   AT_CHECK_UTIL(getfacl $file,0)
   rm -rf $file
 ])
 m4_define([AT_CAPABILITIES_UTILS_PREREQ],[
-  file=$( mktemp -p . )
+  file=$(TMPDIR=. mktemp fiXXXXXX)
   AT_CHECK_UTIL(setcap "= cap_chown=ei" $file,0)
   AT_CHECK_UTIL(getcap $file,0)
   rm -rf $file
 ])
 m4_define([AT_XATTRS_PREREQ],[
   AT_XATTRS_UTILS_PREREQ
-  file=$( mktemp -p . )
+  file=$(TMPDIR=. mktemp fiXXXXXX)
   setfattr -n user.test -v ahoj $file
   # check whether tar fails to store xattrs
   err=$( tar --xattrs -cf /dev/null $file 2>&1 >/dev/null | wc -l )
@@ -159,7 +159,7 @@ m4_define([AT_XATTRS_PREREQ],[
 ])
 m4_define([AT_SELINUX_PREREQ],[
   AT_SELINUX_UTILS_PREREQ
-  file=$( mktemp -p . )
+  file=$(TMPDIR=. mktemp fiXXXXXX)
   err=$( tar --selinux -cf /dev/null $file 2>&1 >/dev/null | wc -l )
   if test "$err" != "0"; then
     AT_SKIP_TEST
@@ -167,7 +167,7 @@ m4_define([AT_SELINUX_PREREQ],[
 ])
 m4_define([AT_ACLS_PREREQ],[
   AT_ACLS_UTILS_PREREQ
-  file=$( mktemp -p . )
+  file=$(TMPDIR=. mktemp fiXXXXXX)
   setfacl -m u:$UID:rwx $file
   err=$( tar --acls -cf /dev/null $file 2>&1 >/dev/null | wc -l )
   if test "$err" != "0"; then
@@ -379,11 +379,24 @@ AT_BANNER([Removing files after archiving])
 m4_include([remfiles01.at])
 m4_include([remfiles02.at])
 m4_include([remfiles03.at])
-m4_include([remfiles04.at])
-m4_include([remfiles05.at])
-m4_include([remfiles06.at])
-m4_include([remfiles07.at])
-m4_include([remfiles08.at])
+m4_include([remfiles04a.at])
+m4_include([remfiles04b.at])
+m4_include([remfiles04c.at])
+m4_include([remfiles05a.at])
+m4_include([remfiles05b.at])
+m4_include([remfiles05c.at])
+m4_include([remfiles06a.at])
+m4_include([remfiles06b.at])
+m4_include([remfiles06c.at])
+m4_include([remfiles07a.at])
+m4_include([remfiles07b.at])
+m4_include([remfiles07c.at])
+m4_include([remfiles08a.at])
+m4_include([remfiles08b.at])
+m4_include([remfiles08c.at])
+m4_include([remfiles09a.at])
+m4_include([remfiles09b.at])
+m4_include([remfiles09c.at])
 
 AT_BANNER([Extended attributes])
 m4_include([xattr01.at])