summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2002-06-02 20:37:43 +0000
committerJim Meyering <jim@meyering.net>2002-06-02 20:37:43 +0000
commit2ef6aec8cee6841eb4779d49ab35aadc928bd6d1 (patch)
tree49c582e3cde4e27cfdabbd4424290567d2707b63 /tests
parentd38d008a1d6046a136d4dbbc2ad7fb683de81c96 (diff)
downloadcoreutils-2ef6aec8cee6841eb4779d49ab35aadc928bd6d1.tar.xz
Adjust, now that we no longer report `removing all entries of directory ...'.
Diffstat (limited to 'tests')
-rwxr-xr-xtests/rm/r-213
1 files changed, 6 insertions, 7 deletions
diff --git a/tests/rm/r-2 b/tests/rm/r-2
index e87e9cf80..724c459eb 100755
--- a/tests/rm/r-2
+++ b/tests/rm/r-2
@@ -21,13 +21,11 @@ mkdir t t/a t/a/b || framework_failure=1
> t/a/b/g || framework_failure=1
# FIXME: if this fails, it's a framework failure
-cat <<EOF | sort > t/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'
+cat <<\EOF | sort > t/E || framework_failure=1
+removed directory: `t/a'
+removed directory: `t/a/b'
+removed `t/a/b/g'
+removed `t/a/f'
EOF
if test $framework_failure = 1; then
@@ -46,5 +44,6 @@ fi
# Compare expected and actual output.
cmp t/E t/O || fail=1
+test $fail = 1 && diff t/E t/O 2> /dev/null
(exit $fail); exit