From: Jim Meyering <jim@meyering.net>
Date: Sun, 2 Jun 2002 20:37:43 +0000 (+0000)
Subject: Adjust, now that we no longer report `removing all entries of directory ...'.
X-Git-Tag: FILEUTILS-4_1_9~137
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2ef6aec8cee6841eb4779d49ab35aadc928bd6d1;p=thirdparty%2Fcoreutils.git

Adjust, now that we no longer report `removing all entries of directory ...'.
---

diff --git a/tests/rm/r-2 b/tests/rm/r-2
index e87e9cf801..724c459ebb 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