* tests/mv/hard-verbose: New file. Test for the above fix.

* tests/mv/Makefile.am (TESTS): Add hard-verbose.

diff --git a/ChangeLog b/ChangeLog
index 436bec2b31b8d0b69208e83231ee57e1eb611b13..698f7cd7473207883c1d12f31e05543bb6d9de27 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-09-24  Jim Meyering  <jim@meyering.net>
 
+       * tests/mv/hard-verbose: New file.  Test for the above fix.
+       * tests/mv/Makefile.am (TESTS): Add hard-verbose.
+
        * tests/help-version (sync_args): Don't call sync, since it spins up
        disks that I've deliberately caused to spin down (but not unmounted).
 

diff --git a/tests/mv/Makefile.am b/tests/mv/Makefile.am
index 01db2285cec8ba9a6fef0346485bb758fdfbaf93..d17151de0e3ab9e6ba33f00e94d92c7a244b2fb7 100644 (file)
--- a/tests/mv/Makefile.am
+++ b/tests/mv/Makefile.am
@@ -22,6 +22,7 @@ AUTOMAKE_OPTIONS = 1.3 gnits
 
 XFAIL_TESTS = acl
 TESTS = \
+  hard-verbose \
   backup-dir \
   dir2dir \
   no-target-dir \

diff --git a/tests/mv/hard-verbose b/tests/mv/hard-verbose
new file mode 100755 (executable)
index 0000000..b46492e
--- /dev/null
+++ b/tests/mv/hard-verbose
@@ -0,0 +1,56 @@
+#!/bin/sh
+# ensure that mv's --verbose options works even in this unusual case
+
+# Copyright (C) 2006 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
+
+if test "$VERBOSE" = yes; then
+  set -x
+  mv --version
+fi
+
+. $srcdir/../envvar-check
+. $srcdir/../lang-default
+
+pwd=`pwd`
+t0=`echo "$0"|sed 's,.*/,,'`.tmp; tmp=$t0/$$
+trap 'status=$?; cd $pwd; chmod -R u+rwx $t0; rm -rf $t0 && exit $status' 0
+trap '(exit $?); exit $?' 1 2 13 15
+
+framework_failure=0
+mkdir -p $tmp || framework_failure=1
+cd $tmp || framework_failure=1
+
+touch x || framework_failure=1
+ln x y || framework_failure=1
+
+if test $framework_failure = 1; then
+  echo "$0: failure in testing framework" 1>&2
+  (exit 1); exit 1
+fi
+
+fail=0
+
+mv --verbose x y > out || fail=1
+cat <<\EOF > exp || fail=1
+removed `x'
+EOF
+
+cmp out exp || fail=1
+test $fail = 1 && diff out exp 2> /dev/null
+
+(exit $fail); exit $fail