More misc, test-related changes. (some to allow running tests as root)

1 files changed, 7 insertions, 21 deletions

diff --git a/tests/rm/rm5 b/tests/rm/rm5
index d7d72f40f..c3243233e 100755
--- a/tests/rm/rm5
+++ b/tests/rm/rm5
@@ -1,7 +1,7 @@
 #!/bin/sh
 # a basic test of rm -ri
 
-# Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2002-2004, 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,36 +21,23 @@ if test "$VERBOSE" = yes; then
   rm --version
 fi
 
-. $srcdir/../envvar-check
 . $srcdir/../lang-default
-PRIV_CHECK_ARG=require-non-root . $srcdir/../priv-check
+. $srcdir/../test-lib.sh
+skip_if_root_
 
-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 -p d/e || framework_failure=1
-cat <<EOF > in || framework_failure=1
+mkdir -p d/e || framework_failure
+cat <<EOF > in || framework_failure
 y
 y
 y
 EOF
 
-cat <<\EOF > exp || framework_failure=1
+cat <<\EOF > exp || framework_failure
 rm: descend into directory `d'
 rm: remove directory `d/e'
 rm: remove directory `d'
 EOF
 
-if test $framework_failure = 1; then
-  echo "$0: failure in testing framework" 1>&2
-  (exit 1); exit 1
-fi
-
 fail=0
 
 rm -ir d < in > out 2>&1 || fail=1
@@ -66,7 +53,6 @@ mv o2 out
 # Make sure it's been removed.
 test -d d && fail=1
 
-cmp out exp || fail=1
-test $fail = 1 && diff -u out exp 2> /dev/null
+compare out exp || fail=1
 
 (exit $fail); exit $fail