summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--THANKS1
-rwxr-xr-xtests/cp/cp-a-selinux3
-rwxr-xr-xtests/rm/fail-2eperm3
3 files changed, 4 insertions, 3 deletions
diff --git a/THANKS b/THANKS
index e1d2089a0..3e5443ba9 100644
--- a/THANKS
+++ b/THANKS
@@ -240,6 +240,7 @@ Jan Moringen jan.moringen@uni-bielefeld.de
Jan Nieuwenhuizen janneke@gnu.org
Janos Farkas chexum@shadow.banki.hu
Jarkko Hietaniemi jhi@epsilon.hut.fi
+Jarod Wilson jwilson@redhat.com
Jean Charles Delepine delepine@u-picardie.fr
Jeff Moore jbm@mordor.com
Jeff Sheinberg jeff@bsrd.net
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