From: Eric Biggers <ebiggers3@gmail.com>
Date: Sat, 22 Sep 2012 15:16:35 +0000 (-0500)
Subject: test-imagex-ntfs: fix msg, mount without allow_other
X-Git-Tag: v1.0.4~56
X-Git-Url: https://wimlib.net/git/?p=wimlib;a=commitdiff_plain;h=4ba34093040be55a44a7707826a4912e594e5291

test-imagex-ntfs: fix msg, mount without allow_other
---

diff --git a/tests/test-imagex-capture_and_apply b/tests/test-imagex-capture_and_apply
index 5f1bc017..c15d8ab8 100755
--- a/tests/test-imagex-capture_and_apply
+++ b/tests/test-imagex-capture_and_apply
@@ -114,19 +114,23 @@ do_test() {
 	done
 }
 
-msg() {
+__msg() {
 	echo "--------------------------------------------------------------------"
-	echo "Testing image capture and application of directory containing $1"
+	echo $1
 	echo "--------------------------------------------------------------------"
 }
 
+msg() {
+	__msg "Testing image capture and application of directory containing $1"
+}
+
 cleanup
 init
 
 . $srcdir/tests/common_tests.sh
 
 # Make sure exclusion list works
-msg "Testing default capture configuration file"
+__msg "Testing default capture configuration file"
 touch in.dir/hiberfil.sys
 mkdir -p "in.dir/System Volume Information/subdir"
 imagex capture in.dir test.wim
diff --git a/tests/test-imagex-ntfs b/tests/test-imagex-ntfs
index dbfd10a7..412ac20a 100755
--- a/tests/test-imagex-ntfs
+++ b/tests/test-imagex-ntfs
@@ -31,7 +31,12 @@ do_unmount() {
 
 __do_mount() {
 	options="$3"
-	if ! ntfs-3g ${options:+-o $options} $1 $2; then
+	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."
 	fi
 }