tests: Exit 77 on skipped tests rather than faking a pass

diff --git a/tests/test-imagex-mount b/tests/test-imagex-mount
index bbe931ffb9d9e009a082f9dc2f69e4131b82ebef..a75c4cd82dfd78c41c21dfed034a87af896c3a67 100755 (executable)
--- a/tests/test-imagex-mount
+++ b/tests/test-imagex-mount
@@ -10,11 +10,11 @@ srcdir="$(cd $srcdir; pwd)"
 
 TEST_SUBDIR=tmpdir_test-imagex-mount
 
 
 TEST_SUBDIR=tmpdir_test-imagex-mount
 

-if [ ! -r /dev/fuse ]; then
-       echo "WARNING: /dev/fuse is not readable."
-       echo "Skipping WIM mounting checks"
-       exit 0
-fi
+skip_test() {
+       cd ..
+       cleanup
+       exit 77
+}

 
 imagex_unmount() {
        # Give the --lazy flag to work around a problem testing on Ubuntu and
 
 imagex_unmount() {
        # Give the --lazy flag to work around a problem testing on Ubuntu and


@@ -48,6 +48,12 @@ init() {
        imagex capture tmp.empty empty.wim --norpfix
 }
 
        imagex capture tmp.empty empty.wim --norpfix
 }
 

+if [ ! -r /dev/fuse ]; then
+       echo "WARNING: /dev/fuse is not readable."
+       echo "Skipping WIM mounting checks"
+       skip_test
+fi
+

 cleanup
 mkdir $TEST_SUBDIR
 cd $TEST_SUBDIR
 cleanup
 mkdir $TEST_SUBDIR
 cd $TEST_SUBDIR

diff --git a/tests/test-imagex-ntfs b/tests/test-imagex-ntfs
index e1c8195e0d887fdf7c4db69faff0d3afc04fa7be..710098481ce6fe373a002bc65145f45b0aea37dd 100755 (executable)
--- a/tests/test-imagex-ntfs
+++ b/tests/test-imagex-ntfs
@@ -29,12 +29,18 @@ do_unmount() {
        fi
 }
 
        fi
 }
 

+skip_test() {
+       cd ..
+       cleanup
+       exit 77
+}
+

 __do_mount() {
        if ! ntfs-3g -o "no_def_opts,silent" $1 $2; then
                if [ $UID -ne 0 ] && [ "$3" = "nofail" ]; then
                        echo "WARNING: skipping NTFS tests because we aren't able to "
                        echo "mount a NTFS volume (perhaps ntfs-3g is not installed setuid root?)"
 __do_mount() {
        if ! ntfs-3g -o "no_def_opts,silent" $1 $2; then
                if [ $UID -ne 0 ] && [ "$3" = "nofail" ]; then
                        echo "WARNING: skipping NTFS tests because we aren't able to "
                        echo "mount a NTFS volume (perhaps ntfs-3g is not installed setuid root?)"

-                       exit 0
+                       skip_test

                else
                        error "Could not mount NTFS volume \"$1\" on \"$2\"!  Make sure ntfs-3g is "\
                              "installed, and that you are either running the tests as root or have ntfs-3g "\
                else
                        error "Could not mount NTFS volume \"$1\" on \"$2\"!  Make sure ntfs-3g is "\
                              "installed, and that you are either running the tests as root or have ntfs-3g "\