From a669dfdabb3fa1be2e1367d53a797d495e7bd5c9 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Wed, 12 Sep 2007 14:52:26 +0200 Subject: More misc, test-related changes. (some to allow running tests as root) --- tests/rm/v-slash | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) (limited to 'tests/rm/v-slash') diff --git a/tests/rm/v-slash b/tests/rm/v-slash index ad20d5141..7e1fb3d47 100755 --- a/tests/rm/v-slash +++ b/tests/rm/v-slash @@ -21,21 +21,10 @@ if test "$VERBOSE" = yes; then rm --version fi -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 -mkdir a || framework_failure=1 -touch a/x || framework_failure=1 - -if test $framework_failure = 1; then - echo "$0: failure in testing framework" 1>&2 - (exit 1); exit 1 -fi +. $srcdir/../test-lib.sh + +mkdir a || framework_failure +touch a/x || framework_failure fail=0 @@ -45,7 +34,6 @@ removed `a/x' removed directory: `a' 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