1 files changed, 5 insertions, 6 deletions
diff --git a/tests/rm/r-1 b/tests/rm/r-1
index 7c21557db..53fce735f 100755
--- a/tests/rm/r-1
+++ b/tests/rm/r-1
@@ -2,19 +2,18 @@
 
 test=r-1
 
-# TMPDIR should be an absolute dir for this test.
-# FIXME: enforce it
-: ${TMPDIR=/tmp}
-
 if test "$VERBOSE" = yes; then
   set -x
   rm --version
 fi
 
 pwd=`pwd`
-tmp=$TMPDIR/t-rm.$$
+
+# $tmp should be an absolute dir for this test.
+tmp=$pwd/`echo "$0"|sed 's,.*/,,'`.tmp
+
 trap 'status=$?; cd $pwd; rm -rf $tmp && exit $status' 0
-trap 'exit $?' 1 2 13 15
+trap '(exit $?); exit' 1 2 13 15
 
 framework_failure=0