tests: factor 350 fail=0 initializations into test-lib.sh

[platform/upstream/coreutils.git] / tests / mv / into-self-2

diff --git a/tests/mv/into-self-2 b/tests/mv/into-self-2
index 11fddf2..3c3e7e2 100755 (executable)
--- a/tests/mv/into-self-2
+++ b/tests/mv/into-self-2
@@ -3,11 +3,11 @@
 # Consider the case where SRC and DEST are on different
 # partitions and DEST is a symlink to SRC.
 
-# Copyright (C) 1998, 1999, 200 Free Software Foundation, Inc.
+# Copyright (C) 1998-2000, 2006-2009 Free Software Foundation, Inc.
 
-# This program is free software; you can redistribute it and/or modify
+# 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
+# the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 
 # This program is distributed in the hope that it will be useful,
@@ -16,42 +16,23 @@
 # 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.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 if test "$VERBOSE" = yes; then
   set -x
   mv --version
 fi
 
-. $srcdir/../other-fs-tmpdir
-. $srcdir/../envvar-check
-
-if test -z "$other_partition_tmpdir"; then
-  exit 77
-fi
+. $srcdir/test-lib.sh
+cleanup_() { rm -rf "$other_partition_tmpdir"; }
+. "$abs_srcdir/other-fs-tmpdir"
 
 file="$other_partition_tmpdir/file"
 symlink=symlink
 
-fail=0
-
-trap 'rm -fr out out2 exp $file $symlink $other_partition_tmpdir; exit $fail' \
-  0 1 2 3 15
-
-framework_failure=0
-rm -f $file $symlink || framework_failure=1
-echo whatever > $file || framework_failure=1
-ln -s $file $symlink || framework_failure=1
-
-if test $framework_failure = 1; then
-  echo 'failure in testing framework'
-  exit 1
-fi
 
-# Make sure we get English translations.
-. $srcdir/../lang-default
+echo whatever > $file || framework_failure
+ln -s $file $symlink || framework_failure
 
 # This mv command should exit nonzero.
 mv $symlink $file > out 2>&1 && fail=1
@@ -70,7 +51,6 @@ XXX: `ZZZ' and `YYY' are the same file
 EOF
 #'
 
-cmp out2 exp || fail=1
-test $fail = 1 && diff out2 exp 2> /dev/null
+compare out2 exp || fail=1
 
-exit $fail
+Exit $fail