summaryrefslogtreecommitdiff
path: root/tests/rm
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2000-05-20 08:42:44 +0000
committerJim Meyering <jim@meyering.net>2000-05-20 08:42:44 +0000
commitabd2b295f2fb91decd4bc5503df3c370f8d4df57 (patch)
treea0c0f2b028b11c5aa3ed70f6949296bc5378ccfb /tests/rm
parent396069fce5d92da041cde4da12527192786fe798 (diff)
downloadcoreutils-abd2b295f2fb91decd4bc5503df3c370f8d4df57.tar.xz
Clean up.
Diffstat (limited to 'tests/rm')
-rwxr-xr-xtests/rm/r-246
1 files changed, 26 insertions, 20 deletions
diff --git a/tests/rm/r-2 b/tests/rm/r-2
index fcb83fd27..e33a69d7c 100755
--- a/tests/rm/r-2
+++ b/tests/rm/r-2
@@ -1,19 +1,22 @@
#!/bin/sh
-test=r-2
-
-: ${TMPDIR=.}
-
if test "$VERBOSE" = yes; then
rm --version
set -x
fi
-tmp=$TMPDIR/t-rm.$$
+pwd=`pwd`
+tmp=r2-$$
+trap 'status=$?; cd $pwd; rm -rf $tmp && exit $status' 0
+trap 'exit $?' 1 2 13 15
+
+framework_failure=0
+mkdir $tmp || framework_failure=1
+cd $tmp
-mkdir $tmp $tmp/a $tmp/a/b
-> $tmp/a/f
-> $tmp/a/b/g
+mkdir t t/a t/a/b || framework_failure=1
+> t/a/f || framework_failure=1
+> t/a/b/g || framework_failure=1
LANGUAGE=C
export LANGUAGE
@@ -21,27 +24,30 @@ LC_ALL=C
export LC_ALL
# FIXME: if this fails, it's a framework failure
-cat <<EOF | sort > $tmp/$test.E
-removing all entries of directory $tmp/a
-removing all entries of directory $tmp/a/b
-removing $tmp/a/b/g
-removing the directory itself: $tmp/a/b
-removing $tmp/a/f
-removing the directory itself: $tmp/a
+cat <<EOF | sort > t/$test.E || framework_failure=1
+removing all entries of directory t/a
+removing all entries of directory t/a/b
+removing t/a/b/g
+removing the directory itself: t/a/b
+removing t/a/f
+removing the directory itself: t/a
EOF
+if test $framework_failure = 1; then
+ echo 'failure in testing framework'
+ exit 1
+fi
+
# Note that both the expected output (above) and the actual output lines
# are sorted, because directory entries may be processed in arbitrary order.
fail=0
-rm --verbose -r $tmp/a | sort > $tmp/$test.O || fail=1
+rm --verbose -r t/a | sort > t/$test.O || fail=1
-if test -d $tmp/a; then
+if test -d t/a; then
fail=1
fi
# Compare expected and actual output.
-cmp $tmp/$test.E $tmp/$test.O || fail=1
-
-rm -rf $tmp
+cmp t/$test.E t/$test.O || fail=1
exit $fail