From: Jim Meyering <jim@meyering.net>
Date: Mon, 4 Sep 2000 08:03:56 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: FILEUTILS-4_0z~53
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=fbc1b0b06f63810b660084a1f66b09b4dd2a09db;p=thirdparty%2Fcoreutils.git

*** empty log message ***
---

diff --git a/tests/mv/part-symlink b/tests/mv/part-symlink
index 098fe76287..8077bdfacf 100755
--- a/tests/mv/part-symlink
+++ b/tests/mv/part-symlink
@@ -90,15 +90,15 @@ for copy in cp mv; do
 	  echo $copy_status $copy $options $args
 
 	  # Normalize the program name in the error output,
+	  # remove any site-dependent part of other-partition file name,
 	  # and put brackets around the output.
-	  test -s .err &&
-	    cp --backup .err /tmp
 	  test -s .err && {
 	    echo '[' | tr -d '\012'
 	    sed 's/^[^:][^:]*\(..\):/\1:/;s,'$other_partition_tmpdir/,, .err
 	    echo ']' | tr -d '\012'
 	    }
 	  # Strip off all but the file names.
+	  # Remove any site-dependent part of each file name.
 	  ls="`ls -lG --ignore=.err . \
 	      | sed \
 		  -e '/^total /d' \
@@ -116,9 +116,11 @@ for copy in cp mv; do
 	  # If the command failed, then it must not have changed the files.
 	  if test $copy_status != 0; then
 	    for f in $actual_args; do
+	      test -f $f ||
+		{ echo "$copy FAILED but removed $f"; continue; }
 	      case "`cat $f`" in
 		"$contents") ;;
-		*) echo $copy FAILED;;
+		*) echo "$copy FAILED but modified $f";;
 	      esac
 	    done
 	  fi