diff --git a/fish/test-copy.sh b/fish/test-copy.sh index 6467a52ae..ca4885bfa 100755 --- a/fish/test-copy.sh +++ b/fish/test-copy.sh @@ -23,7 +23,7 @@ test -d /dev/fd || { echo "$0: Skipping this test because /dev/fd is missing." - exit 0 + exit 77 } set -e diff --git a/fish/test-edit.sh b/fish/test-edit.sh index a077ada67..b9acf457c 100755 --- a/fish/test-edit.sh +++ b/fish/test-edit.sh @@ -23,7 +23,7 @@ test -d /dev/fd || { echo "$0: Skipping this test because /dev/fd is missing." - exit 0 + exit 77 } set -e diff --git a/fish/test-mount-local.sh b/fish/test-mount-local.sh index c1b3f5501..ad62a925a 100755 --- a/fish/test-mount-local.sh +++ b/fish/test-mount-local.sh @@ -20,7 +20,7 @@ if [ -n "$SKIP_TEST_MOUNT_LOCAL_SH" ]; then echo "$0: skipping test because SKIP_TEST_MOUNT_LOCAL_SH is set." - exit 0 + exit 77 fi # Skip if no FUSE. @@ -28,7 +28,7 @@ fi test -w /dev/fuse || { echo "$0: Skipping this test" echo " because /dev/fuse is missing or not writable by the current user." - exit 0 + exit 77 } set -e diff --git a/fuse/test-fuse-umount-race.sh b/fuse/test-fuse-umount-race.sh index f6f65d6aa..6e1bfa812 100755 --- a/fuse/test-fuse-umount-race.sh +++ b/fuse/test-fuse-umount-race.sh @@ -25,12 +25,12 @@ set -e if [ -n "$SKIP_TEST_FUSE_SH" ]; then echo "$0: test skipped because environment variable is set." - exit 0 + exit 77 fi if [ ! -w /dev/fuse ]; then echo "SKIPPING guestmount test, because there is no /dev/fuse." - exit 0 + exit 77 fi if [ -z "$top_builddir" ]; then diff --git a/fuse/test-fuse.sh b/fuse/test-fuse.sh index 8dc658bbe..fccb556c7 100755 --- a/fuse/test-fuse.sh +++ b/fuse/test-fuse.sh @@ -22,17 +22,17 @@ set -e if [ -n "$SKIP_TEST_FUSE_SH" ]; then echo "$0: test skipped because environment variable is set." - exit 0 + exit 77 fi if [ ! -w /dev/fuse ]; then echo "SKIPPING guestmount test, because there is no /dev/fuse." - exit 0 + exit 77 fi if ! setfacl --help >/dev/null 2>&1; then echo "SKIPPING guestmount test, because setfacl is not installed." - exit 0 + exit 77 fi if [ -z "$top_builddir" ]; then diff --git a/gobject/run-live-tests b/gobject/run-live-tests index 11e8f7b07..e2deeb118 100755 --- a/gobject/run-live-tests +++ b/gobject/run-live-tests @@ -20,7 +20,7 @@ set -e if [ -z "$GJS" ]; then echo "GObject bind tests skipped: gjs is missing" - exit 0 + exit 77 fi ../run $GJS $srcdir/tests-misc.js 2>/dev/null diff --git a/gobject/run-tests b/gobject/run-tests index 55c489cfe..a4a769074 100755 --- a/gobject/run-tests +++ b/gobject/run-tests @@ -20,7 +20,7 @@ set -e if [ -z "$GJS" ]; then echo "GObject bind tests skipped: gjs is missing" - exit 0 + exit 77 fi ../run $GJS $srcdir/bindtests.js > bindtests.tmp diff --git a/ocaml/t/guestfs_500_mount_local.ml b/ocaml/t/guestfs_500_mount_local.ml index 570cefdb9..7573cd1dc 100644 --- a/ocaml/t/guestfs_500_mount_local.ml +++ b/ocaml/t/guestfs_500_mount_local.ml @@ -39,7 +39,7 @@ let rec main () = if value <> "" then ( printf "%s: test skipped because %s is set.\n" Sys.executable_name name; - exit 0 + exit 77 ) in diff --git a/sysprep/test-virt-sysprep-script.sh b/sysprep/test-virt-sysprep-script.sh index 09c42aff2..98ecb9669 100755 --- a/sysprep/test-virt-sysprep-script.sh +++ b/sysprep/test-virt-sysprep-script.sh @@ -22,12 +22,12 @@ set -e if [ -n "$SKIP_TEST_VIRT_SYSPREP_SCRIPT_SH" ]; then echo "$0: test skipped because environment variable is set." - exit 0 + exit 77 fi if [ ! -w /dev/fuse ]; then echo "$0: SKIPPING test, because there is no /dev/fuse." - exit 0 + exit 77 fi # Check that multiple scripts can run. diff --git a/tests/btrfs/test-btrfs-devices.sh b/tests/btrfs/test-btrfs-devices.sh index fb6beeba6..c950c6b8c 100755 --- a/tests/btrfs/test-btrfs-devices.sh +++ b/tests/btrfs/test-btrfs-devices.sh @@ -27,7 +27,7 @@ set -e # XXX Not a very good test. if ! btrfs --help >/dev/null 2>&1; then echo "$0: test skipped because no 'btrfs' utility" - exit 0 + exit 77 fi rm -f test[1234].img diff --git a/tests/btrfs/test-btrfs-subvolume-default.pl b/tests/btrfs/test-btrfs-subvolume-default.pl index 2c09ce2da..ae82aa1c8 100755 --- a/tests/btrfs/test-btrfs-subvolume-default.pl +++ b/tests/btrfs/test-btrfs-subvolume-default.pl @@ -39,7 +39,7 @@ $g->launch (); # If btrfs is not available, bail. unless (feature_available ($g, "btrfs")) { warn "$0: skipping test because btrfs is not available\n"; - exit 0; + exit 77; } $g->part_disk ("/dev/sda", "mbr"); diff --git a/tests/extra/test-upstream-qemu.sh b/tests/extra/test-upstream-qemu.sh index eb226805f..d8f16f4b6 100755 --- a/tests/extra/test-upstream-qemu.sh +++ b/tests/extra/test-upstream-qemu.sh @@ -20,13 +20,13 @@ set -e if [ ! -d "$QEMUDIR" ]; then echo "$0: \$QEMUDIR not a directory, tests against upstream qemu skipped" - exit 0 + exit 77 fi QEMU="$QEMUDIR/x86_64-softmmu/qemu-system-x86_64" if ! "$QEMU" --help >/dev/null 2>&1; then echo "$0: $QEMU not executable, tests against upstream qemu skipped" - exit 0 + exit 77 fi "$QEMU" --version diff --git a/tests/luks/test-luks-list.sh b/tests/luks/test-luks-list.sh index 80ff6e7af..f5984dac8 100755 --- a/tests/luks/test-luks-list.sh +++ b/tests/luks/test-luks-list.sh @@ -22,7 +22,7 @@ set -e [ -n "$SKIP_TEST_LUKS_SH" ] && { echo "test-luks-list.sh skipped (environment variable set)" - exit 0 + exit 77 } rm -f test1.img test.output diff --git a/tests/luks/test-luks.sh b/tests/luks/test-luks.sh index a9edca0ce..eee7295dc 100755 --- a/tests/luks/test-luks.sh +++ b/tests/luks/test-luks.sh @@ -22,7 +22,7 @@ set -e [ -n "$SKIP_TEST_LUKS_SH" ] && { echo "test-luks.sh skipped (environment variable set)" - exit 0 + exit 77 } rm -f test1.img diff --git a/tests/md/test-inspect-fstab-md.sh b/tests/md/test-inspect-fstab-md.sh index a64cbe090..bd29c310e 100755 --- a/tests/md/test-inspect-fstab-md.sh +++ b/tests/md/test-inspect-fstab-md.sh @@ -23,7 +23,7 @@ export LANG=C if [ -n "$SKIP_TEST_INSPECT_FSTAB_MD_SH" ]; then echo "$0: test skipped because environment variable is set." - exit 0 + exit 77 fi # The first test requires a new Augeas lens for parsing mdadm.conf. @@ -32,7 +32,7 @@ fi f=$(grep mdadm_conf.aug ../../appliance/supermin.d/hostfiles | head -1) if [ -z "$f" -o ! -f "$f" ]; then echo "$0: test skipped because Augeas mdadm.conf lens is not available." - exit 0 + exit 77 fi guestfish=../../fish/guestfish diff --git a/tests/md/test-list-filesystems.sh b/tests/md/test-list-filesystems.sh index f52afb009..642e0339f 100755 --- a/tests/md/test-list-filesystems.sh +++ b/tests/md/test-list-filesystems.sh @@ -22,7 +22,7 @@ set -e if [ -n "$SKIP_TEST_LIST_FILESYSTEMS_SH" ]; then echo "$0: test skipped because environment variable is set." - exit 0 + exit 77 fi rm -f test.output diff --git a/tests/md/test-mdadm.sh b/tests/md/test-mdadm.sh index 91fcca3d8..c72cd503f 100755 --- a/tests/md/test-mdadm.sh +++ b/tests/md/test-mdadm.sh @@ -22,7 +22,7 @@ set -e if [ -n "$SKIP_TEST_MDADM_SH" ]; then echo "$0: test skipped because environment variable is set." - exit 0 + exit 77 fi rm -f md-test1.img md-test2.img md-test3.img md-test4.img diff --git a/tests/ntfsclone/test-ntfsclone.sh b/tests/ntfsclone/test-ntfsclone.sh index 999cbfbfb..efed7d879 100755 --- a/tests/ntfsclone/test-ntfsclone.sh +++ b/tests/ntfsclone/test-ntfsclone.sh @@ -22,7 +22,7 @@ set -e if [ -n "$SKIP_TEST_NTFSCLONE_SH" ]; then echo "$0: test skipped because environment variable is set." - exit 0 + exit 77 fi rm -f test1.img backup1 backup2 @@ -32,7 +32,7 @@ guestfish=../../fish/guestfish # Skip if ntfs-3g is not supported by the appliance. if ! $guestfish add /dev/null : run : available "ntfs3g"; then echo "$0: skipped because ntfs-3g is not supported by the appliance" - exit 0 + exit 77 fi # Export the filesystems to the backup file. diff --git a/tests/protocol/test-launch-race.pl b/tests/protocol/test-launch-race.pl index 5a660ceeb..c2f529671 100755 --- a/tests/protocol/test-launch-race.pl +++ b/tests/protocol/test-launch-race.pl @@ -26,7 +26,7 @@ use POSIX; use Sys::Guestfs; # Allow this test to be skipped. -exit 0 if $ENV{SKIP_TEST_LAUNCH_RACE_PL}; +exit 77 if $ENV{SKIP_TEST_LAUNCH_RACE_PL}; # Use a temporary TMPDIR to ensure it's clean my $tmpdir = tempdir (CLEANUP => 1); diff --git a/tests/regressions/rhbz690819.sh b/tests/regressions/rhbz690819.sh index e3f9bb89c..4e79f4be7 100755 --- a/tests/regressions/rhbz690819.sh +++ b/tests/regressions/rhbz690819.sh @@ -29,7 +29,7 @@ # the mkfs fails. It's not clear how to solve this cleanly. XXX [ -n "$SKIP_TEST_RHBZ690819_SH" ] && { echo "$0 skipped (environment variable set)" - exit 0 + exit 77 } set -e @@ -37,7 +37,7 @@ export LANG=C if [ -n "$SKIP_TEST_RHBZ690819_SH" ]; then echo "$0: test skipped because environment variable is set." - exit 0 + exit 77 fi rm -f test.img