summaryrefslogtreecommitdiff
path: root/tests/mv/dir-file
diff options
context:
space:
mode:
Diffstat (limited to 'tests/mv/dir-file')
-rwxr-xr-xtests/mv/dir-file18
1 files changed, 4 insertions, 14 deletions
diff --git a/tests/mv/dir-file b/tests/mv/dir-file
index e9f00eb2f..61b7deaea 100755
--- a/tests/mv/dir-file
+++ b/tests/mv/dir-file
@@ -1,7 +1,7 @@
#!/bin/sh
# mv must fail when src and dest are mismatched directory/non-directory.
-# Copyright (C) 2000, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2000, 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,20 +21,10 @@ if test "$VERBOSE" = yes; then
mv --version
fi
-tmp=mv-mismatch-$$
-pwd=`pwd`
-trap 'cd "$pwd" && rm -rf $tmp' 0 1 2 3 15
+. $srcdir/../test-lib.sh
-framework_failure=0
-mkdir $tmp || framework_failure=1
-cd $tmp
-mkdir -p dir/file || framework_failure=1
-> file || framework_failure=1
-
-if test $framework_failure = 1; then
- echo 'failure in testing framework'
- exit 1
-fi
+mkdir -p dir/file || framework_failure
+> file || framework_failure
fail=0