From 33173e867aa45b7f88551551da51e36875582813 Mon Sep 17 00:00:00 2001
From: Jim Meyering <jim@meyering.net>
Date: Thu, 6 Sep 2007 23:05:16 +0200
Subject: Convert tests/mv, too.

* tests/other-fs-tmpdir: Before, all callers would exit 77 upon failure to
find the required dir.  Now, exit 77 in this script so callers don't have to.
Adjust callers.
---
 tests/mv/hard-verbose | 25 +++++--------------------
 1 file changed, 5 insertions(+), 20 deletions(-)

(limited to 'tests/mv/hard-verbose')

diff --git a/tests/mv/hard-verbose b/tests/mv/hard-verbose
index 0faa7df94..13ca23f16 100755
--- a/tests/mv/hard-verbose
+++ b/tests/mv/hard-verbose
@@ -1,7 +1,7 @@
 #!/bin/sh
 # ensure that mv's --verbose options works even in this unusual case
 
-# Copyright (C) 2006 Free Software Foundation, Inc.
+# Copyright (C) 2006-2007 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
@@ -21,25 +21,11 @@ if test "$VERBOSE" = yes; then
   mv --version
 fi
 
-. $srcdir/../envvar-check
 . $srcdir/../lang-default
+. $srcdir/../test-lib.sh
 
-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
+touch x || framework_failure
+ln x y || framework_failure
 
 fail=0
 
@@ -48,7 +34,6 @@ cat <<\EOF > exp || fail=1
 removed `x'
 EOF
 
-cmp out exp || fail=1
-test $fail = 1 && diff out exp 2> /dev/null
+compare out exp || fail=1
 
 (exit $fail); exit $fail
-- 
cgit v1.2.3-54-g00ecf