From ae4ea9fadca8e98341fedd543417bf6a204b2005 Mon Sep 17 00:00:00 2001
From: Eric Biggers <ebiggers3@gmail.com>
Date: Sat, 18 May 2013 11:15:51 -0500
Subject: [PATCH] tests: Exit 77 on skipped tests rather than faking a pass

---
 tests/test-imagex-mount | 16 +++++++++++-----
 tests/test-imagex-ntfs  |  8 +++++++-
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/tests/test-imagex-mount b/tests/test-imagex-mount
index bbe931ff..a75c4cd8 100755
--- a/tests/test-imagex-mount
+++ b/tests/test-imagex-mount
@@ -10,11 +10,11 @@ srcdir="$(cd $srcdir; pwd)"
 
 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
@@ -48,6 +48,12 @@ init() {
 	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
diff --git a/tests/test-imagex-ntfs b/tests/test-imagex-ntfs
index e1c8195e..71009848 100755
--- a/tests/test-imagex-ntfs
+++ b/tests/test-imagex-ntfs
@@ -29,12 +29,18 @@ do_unmount() {
 	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?)"
-			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 "\
-- 
2.43.0