summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorJim Meyering <meyering@redhat.com>2008-06-13 22:26:15 +0200
committerJim Meyering <meyering@redhat.com>2008-06-13 22:45:50 +0200
commit6c79825ce98ac84879c95befd372200ac17e9dad (patch)
tree161310b3cc818aade4186ce40dd77820651603d4 /tests
parent3808eccbbf7086f1289fe391fe861ec1966645d6 (diff)
downloadcoreutils-6c79825ce98ac84879c95befd372200ac17e9dad.tar.xz
skip (don't fail) root-only tests for common set-up failures
Address 2 of 4 failures reported by Jarod Wilson in http://bugzilla.redhat.com/442352. More details here: http://thread.gmane.org/gmane.comp.gnu.coreutils.bugs/13803 * tests/cp/cp-a-selinux: Skip the test if "mkfs -t ext2" fails. * tests/rm/fail-2eperm: Skip the test if "rm" is not accessible.
Diffstat (limited to 'tests')
-rwxr-xr-xtests/cp/cp-a-selinux3
-rwxr-xr-xtests/rm/fail-2eperm3
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/cp/cp-a-selinux b/tests/cp/cp-a-selinux
index feb66f9ac..03d515399 100755
--- a/tests/cp/cp-a-selinux
+++ b/tests/cp/cp-a-selinux
@@ -33,7 +33,8 @@ cleanup_() { cd /; umount "$cwd/mnt"; }
dd if=/dev/zero of=blob bs=8192 count=200 > /dev/null 2>&1 \
|| framework_failure
mkdir mnt || framework_failure
-mkfs -t ext2 -F blob || framework_failure
+mkfs -t ext2 -F blob ||
+ skip_test_ "failed to create an ext2 file system"
# This context is special: it works even when mcstransd isn't running.
ctx=root:object_r:tmp_t:s0
diff --git a/tests/rm/fail-2eperm b/tests/rm/fail-2eperm
index 132e22cec..6cc66ef80 100755
--- a/tests/rm/fail-2eperm
+++ b/tests/rm/fail-2eperm
@@ -39,8 +39,7 @@ fail=0
rm_version=`setuidgid $NON_ROOT_USERNAME env PATH="$PATH" rm --version|sed -n '1s/.* //p'`
case $rm_version in
$PACKAGE_VERSION) ;;
- *) echo "$0: cannot access just-built rm as user $NON_ROOT_USERNAME" 1>&2
- fail=1 ;;
+ *) skip_test_ "cannot access just-built rm as user $NON_ROOT_USERNAME";;
esac
setuidgid $NON_ROOT_USERNAME env PATH="$PATH" rm -rf a 2> out-t && fail=1