Adjust expected output for changed format of `rm --verbose'.

diff --git a/tests/rm/r-1 b/tests/rm/r-1
index cc58feb..3162690 100755 (executable)
--- a/tests/rm/r-1
+++ b/tests/rm/r-1
@@ -21,9 +21,11 @@ mkdir $tmp/a $tmp/a/a || test_failure=1
 > $tmp/b || test_failure=1
 
 cat <<EOF > $tmp/$test.E || test_failure=1
-$tmp/a
-$tmp/a/a
-$tmp/b
+removing any entries of directory $tmp/a
+removing any entries of directory $tmp/a/a
+removing the directory itself: $tmp/a/a
+removing the directory itself: $tmp/a
+removing non-directory $tmp/b
 EOF
 
 if test $test_failure = 1; then
@@ -31,6 +33,11 @@ if test $test_failure = 1; then
   exit 1
 fi
 
+LANGUAGE=C
+export LANGUAGE
+LANG=C
+export LANG
+
 fail=0
 $RM --verbose -r $tmp/a $tmp/b > $tmp/$test.O || fail=1
 

diff --git a/tests/rm/r-2 b/tests/rm/r-2
index 5c284d0..8fb5e86 100755 (executable)
--- a/tests/rm/r-2
+++ b/tests/rm/r-2
@@ -16,6 +16,21 @@ mkdir $tmp $tmp/a $tmp/a/b
 > $tmp/a/f
 > $tmp/a/b/g
 
+# FIXME: if this fails, it's a framework failure
+cat <<EOF > $tmp/$test.E
+removing any entries of directory $tmp/a
+removing any entries of directory $tmp/a/b
+removing non-directory $tmp/a/b/g
+removing the directory itself: $tmp/a/b
+removing non-directory $tmp/a/f
+removing the directory itself: $tmp/a
+EOF
+
+LANGUAGE=C
+export LANGUAGE
+LANG=C
+export LANG
+
 fail=0
 $RM --verbose -r $tmp/a > $tmp/$test.O || fail=1
 
@@ -23,16 +38,9 @@ if test -d $tmp/a; then
   fail=1
 fi
 
-cat <<EOF > $tmp/$test.E
-$tmp/a
-$tmp/a/b
-$tmp/a/b/g
-$tmp/a/f
-EOF
-
 # Compare expected and actual output.
 cmp $tmp/$test.E $tmp/$test.O || fail=1
 
-rm -rf $tmp
+#rm -rf $tmp
 
 exit $fail