summaryrefslogtreecommitdiff
path: root/tests/mv
diff options
context:
space:
mode:
authorJim Meyering <meyering@redhat.com>2009-10-29 14:40:40 +0100
committerJim Meyering <meyering@redhat.com>2009-10-29 16:51:07 +0100
commit39da66f979c206946e5593dbd432e88905a9e383 (patch)
treeab796006220074433a99f012d6a67f3b759b6768 /tests/mv
parent22776f84cba4102306a36cd06ea4c54282432423 (diff)
downloadcoreutils-39da66f979c206946e5593dbd432e88905a9e383.tar.xz
tests: don't let a fail=1 env. setting induce unwarranted test failure
* cfg.mk (sc_fail_is_initialized): New rule. Fix the offenders: * tests/cp/acl: Set fail=0 * tests/cp/backup-is-src: Likewise. * tests/cp/file-perm-race: Likewise. * tests/cp/reflink-auto: Likewise. * tests/cp/same-file: Likewise. * tests/ln/backup-1: Likewise. * tests/misc/su-fail: Likewise. * tests/misc/truncate-owned-by-other: Likewise. * tests/mkdir/p-3: Likewise. * tests/mkdir/selinux: Likewise. * tests/mkdir/special-1: Likewise. * tests/mv/acl: Likewise. * tests/mv/backup-is-src: Likewise. * tests/mv/diag: Likewise. * tests/mv/force: Likewise. * tests/mv/hard-link-1: Likewise. * tests/mv/into-self-3: Likewise. * tests/mv/sticky-to-xpart: Likewise. * tests/touch/now-owned-by-other: Likewise.
Diffstat (limited to 'tests/mv')
-rwxr-xr-xtests/mv/acl1
-rwxr-xr-xtests/mv/backup-is-src1
-rwxr-xr-xtests/mv/diag1
-rwxr-xr-xtests/mv/force1
-rwxr-xr-xtests/mv/hard-link-11
-rwxr-xr-xtests/mv/into-self-31
-rwxr-xr-xtests/mv/sticky-to-xpart2
7 files changed, 8 insertions, 0 deletions
diff --git a/tests/mv/acl b/tests/mv/acl
index 5ad8de052..e9fb62679 100755
--- a/tests/mv/acl
+++ b/tests/mv/acl
@@ -48,6 +48,7 @@ acl1=`getfacl file` || skip_partition=.
test $skip_partition != none &&
skip_test_ "'$skip' is not on a suitable file system for this test"
+fail=0
# move the access acl of a file
mv file "$other_partition_tmpdir" || fail=1
acl2=`cd "$other_partition_tmpdir" && getfacl file` || framework_failure
diff --git a/tests/mv/backup-is-src b/tests/mv/backup-is-src
index df6561baf..7d80078f2 100755
--- a/tests/mv/backup-is-src
+++ b/tests/mv/backup-is-src
@@ -32,6 +32,7 @@ rm -f "$a" "$a2" || framework_failure
echo a > "$a" || framework_failure
echo a2 > "$a2" || framework_failure
+fail=0
# This mv command should exit nonzero.
mv --b=simple "$a2" "$a" > out 2>&1 && fail=1
diff --git a/tests/mv/diag b/tests/mv/diag
index 6e28fa463..75904d626 100755
--- a/tests/mv/diag
+++ b/tests/mv/diag
@@ -28,6 +28,7 @@ touch f1 || framework_failure
touch f2 || framework_failure
touch d || framework_failure
+fail=0
# These mv commands should all exit nonzero.
# Too few args. This first one did fail, but with an incorrect diagnostic
diff --git a/tests/mv/force b/tests/mv/force
index 88851ac59..df4397050 100755
--- a/tests/mv/force
+++ b/tests/mv/force
@@ -29,6 +29,7 @@ ff2=mvforce2
echo force-contents > $ff || framework_failure
ln $ff $ff2 || framework_failure
+fail=0
# This mv command should exit nonzero.
mv $ff $ff > out 2>&1 && fail=1
diff --git a/tests/mv/hard-link-1 b/tests/mv/hard-link-1
index 2df2cf3ff..d626f3cc0 100755
--- a/tests/mv/hard-link-1
+++ b/tests/mv/hard-link-1
@@ -32,6 +32,7 @@ mkdir $dir || framework_failure
> $dir/a || framework_failure
ln $dir/a $dir/b || framework_failure
+fail=0
mv $dir "$other_partition_tmpdir" || fail=1
# Display inode numbers, one per line.
diff --git a/tests/mv/into-self-3 b/tests/mv/into-self-3
index b9fa41af4..e5a4f8d30 100755
--- a/tests/mv/into-self-3
+++ b/tests/mv/into-self-3
@@ -28,6 +28,7 @@ dir2=is3-dir2
mkdir $dir1 $dir2 || framework_failure
+fail=0
# This mv command should exit nonzero.
mv $dir1 $dir2 $dir2 > out 2>&1 && fail=1
diff --git a/tests/mv/sticky-to-xpart b/tests/mv/sticky-to-xpart
index f0f9f95e3..f8855a21f 100755
--- a/tests/mv/sticky-to-xpart
+++ b/tests/mv/sticky-to-xpart
@@ -43,6 +43,8 @@ chown "$NON_ROOT_USERNAME" "$other_partition_tmpdir" || framework_failure
# We have to allow $NON_ROOT_USERNAME access to ".".
chmod go+x . || framework_failure
+fail=0
+
# Ensure that $NON_ROOT_USERNAME can access the required version of mv.
version=`setuidgid $NON_ROOT_USERNAME env PATH="$PATH" mv --version|sed -n '1s/.* //p'`
case $version in