diff options
author | Jim Meyering <jim@meyering.net> | 1998-01-24 08:43:46 +0000 |
---|---|---|
committer | Jim Meyering <jim@meyering.net> | 1998-01-24 08:43:46 +0000 |
commit | 8a0550a816fdcb48e1785281d3d9195521c85b1f (patch) | |
tree | af3056e5e4247e990e1a9f8f5fb5f80322dbe830 /tests | |
parent | 663d8b143c40624e89fe99bc539678136c672645 (diff) | |
download | coreutils-8a0550a816fdcb48e1785281d3d9195521c85b1f.tar.xz |
Adjust expected output for changed format of `rm --verbose'.
Diffstat (limited to 'tests')
-rwxr-xr-x | tests/rm/r-1 | 13 | ||||
-rwxr-xr-x | tests/rm/r-2 | 24 |
2 files changed, 26 insertions, 11 deletions
diff --git a/tests/rm/r-1 b/tests/rm/r-1 index cc58feb5c..3162690cc 100755 --- 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 5c284d0b1..8fb5e864f 100755 --- 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 |