summaryrefslogtreecommitdiff
path: root/tests/mv/childproof
diff options
context:
space:
mode:
Diffstat (limited to 'tests/mv/childproof')
-rwxr-xr-xtests/mv/childproof21
1 files changed, 4 insertions, 17 deletions
diff --git a/tests/mv/childproof b/tests/mv/childproof
index e35afb6b4..6d93974a4 100755
--- a/tests/mv/childproof
+++ b/tests/mv/childproof
@@ -25,26 +25,13 @@ if test "$VERBOSE" = yes; then
ln --version
fi
-. $srcdir/../envvar-check
. $srcdir/../lang-default
PRIV_CHECK_ARG=require-non-root . $srcdir/../priv-check
+. $srcdir/../test-lib.sh
-pwd=`pwd`
-tmp=childproof.$$
-trap 'status=$?; cd "$pwd" && rm -rf $tmp && exit $status' 0
-trap '(exit $?); exit' 1 2 13 15
-
-framework_failure=0
-mkdir $tmp || framework_failure=1
-cd $tmp || framework_failure=1
-mkdir a b c || framework_failure=1
-echo a > a/f || framework_failure=1
-echo b > b/f || framework_failure=1
-
-if test $framework_failure = 1; then
- echo 'failure in testing framework' 1>&2
- (exit 1); exit 1
-fi
+mkdir a b c || framework_failure
+echo a > a/f || framework_failure
+echo b > b/f || framework_failure
fail=0