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

[wimlib] / tests / test-imagex-ntfs

diff --git a/tests/test-imagex-ntfs b/tests/test-imagex-ntfs
index ff67985af49911524a5ff7736980476b19ee3215..710098481ce6fe373a002bc65145f45b0aea37dd 100755 (executable)
--- a/tests/test-imagex-ntfs
+++ b/tests/test-imagex-ntfs
@@ -29,17 +29,23 @@ do_unmount() {
        fi
 }
 
+skip_test() {
+       cd ..
+       cleanup
+       exit 77
+}
+
 __do_mount() {
-       options="$3"
-       if [ -z "$options" ]; then
-               options="no_def_opts,silent"
-       else
-               options="$options,no_def_opts,silent"
-       fi
-       if ! ntfs-3g -o $options $1 $2; then
-               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 "\
-                     "installed setuid root, so that we can mount a NTFS volume."
+       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?)"
+                       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 "\
+                             "installed setuid root, so that we can mount a NTFS volume."
+               fi
        fi
 }
 
@@ -61,7 +67,7 @@ init() {
        mkdir in.mnt out.mnt
        do_mkntfs in.ntfs
        do_mkntfs out.ntfs
-       do_mount in.ntfs in.mnt
+       do_mount in.ntfs in.mnt nofail
 }
 
 cleanup() {