From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 14 Apr 2005 20:35:14 +0000 (+0000)
Subject: Ignore chatter about when files are removed,
X-Git-Tag: CPPI-1_12~992
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b6820a451d2a9751cc88b9cfc3f71914eeca968a;p=thirdparty%2Fcoreutils.git

Ignore chatter about when files are removed,
since POSIX doesn't require rename to fail across file systems.
---

diff --git a/tests/mv/mv-special-1 b/tests/mv/mv-special-1
index f7cf403284..7c7d05c22b 100755
--- a/tests/mv/mv-special-1
+++ b/tests/mv/mv-special-1
@@ -50,11 +50,15 @@ test -d $dir && fail=1
 ls $other_partition_tmpdir/$null > /dev/null || fail=1
 test -d $other_partition_tmpdir/$dir/a/b/c || fail=1
 
-sed "s,$other_partition_tmpdir,XXX," out | sort > out2
+# POSIX says rename (A, B) can succeed if A and B are on different file systems,
+# so ignore chatter about when files are removed and copied rather than renamed.
+sed "
+  /^removed /d
+  s,$other_partition_tmpdir,XXX,
+" out | sort > out2
 
 cat <<EOF | sort > exp
 \`$null' -> \`XXX/$null'
-removed \`$null'
 \`$dir' -> \`XXX/$dir'
 \`$dir/a' -> \`XXX/$dir/a'
 \`$dir/a/b' -> \`XXX/$dir/a/b'
@@ -64,15 +68,6 @@ removed \`$null'
 \`$dir/d/e' -> \`XXX/$dir/d/e'
 \`$dir/d/e/f' -> \`XXX/$dir/d/e/f'
 \`$dir/d/e/f/file2' -> \`XXX/$dir/d/e/f/file2'
-removed directory: \`$dir'
-removed \`$dir/a/b/c/file1'
-removed \`$dir/d/e/f/file2'
-removed directory: \`$dir/a'
-removed directory: \`$dir/a/b'
-removed directory: \`$dir/a/b/c'
-removed directory: \`$dir/d'
-removed directory: \`$dir/d/e'
-removed directory: \`$dir/d/e/f'
 EOF
 
 cmp out2 exp || fail=1