X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=tests%2Ftest-imagex-mount;h=d5bfbcadb6912fbff212ec0887b60a3e0e675c9b;hb=962cca1a6f9e45827006a745be086b7af3b725aa;hp=e8da925a8ef791bd301a0e715099cc6ae6bff04c;hpb=3f6953ea3d4af2785d3bc6bf586c26a4e321d142;p=wimlib

diff --git a/tests/test-imagex-mount b/tests/test-imagex-mount
index e8da925a..d5bfbcad 100755
--- a/tests/test-imagex-mount
+++ b/tests/test-imagex-mount
@@ -8,36 +8,32 @@ srcdir="${srcdir:-.}/.."
 srcdir="$(cd $srcdir; pwd)"
 . "$srcdir/tests/tests-common.sh"
 
-if [ ! -r /dev/fuse ]; then
-	echo "WARNING: /dev/fuse is not readable."
-	echo "Skipping WIM mounting checks"
-	exit 0
-fi
-
-imagex() {
-	echo "imagex $@"
-	../imagex $@  > /dev/null
-}
+TEST_SUBDIR=tmpdir_test-imagex-mount
 
-imagex_info() {
-	echo "imagex info $@"
-	../imagex info "$@"
+skip_test() {
+	cd ..
+	cleanup
+	exit 77
 }
 
-imagex_mountrw() {
-	echo "imagex mountrw $@"
-	../imagex mountrw "$@"
+imagex_unmount() {
+	# Give the --lazy flag to work around a problem testing on Ubuntu and
+	# other OS's running Gnome, as they have a daemon
+	# "gvfs-gdu-volume-monitor" that apparently likes to randomly read
+	# filesystems that get mounted, thereby stopping them from being
+	# unmounted.
+	imagex unmount "$@" --lazy
 }
 
 cleanup() {
-	fusermount -u tmp &> /dev/null || true
-	fusermount -u tmp.mnt &> /dev/null || true
-	rm -rf dir* tmp* *.wim *.swm empty.wim tmp.orig tmp.mnt \
-			tmp.apply mount.log test.tar wimlib-staging*
+	fusermount -u $TEST_SUBDIR/tmp &> /dev/null || true
+	fusermount -u $TEST_SUBDIR/tmp.mnt &> /dev/null || true
+	rm -rf $TEST_SUBDIR
 }
+
 init() {
 	mkdir dir
-	cp $srcdir/src/*.c $srcdir/src/*.h dir
+	cp $srcdir/src/*.c dir
 	mkdir dir/subdir
 	echo 'hello' > dir/subdir/hello
 	echo 'hello' > dir/subdir/hello2
@@ -49,21 +45,18 @@ init() {
 	echo 'testing' > dir2/file
 	dd if=/dev/zero of=dir2/zeroes bs=4096 count=5
 	mkdir tmp.empty tmp.mnt tmp.apply tmp.orig
-	imagex capture tmp.empty empty.wim
+	imagex capture tmp.empty empty.wim --norpfix
 }
 
-error() {
-	echo "****************************************************************"
-	echo "                         Test failure                           "
-	while [ $# -gt 0 ]; do
-		echo $1
-		shift
-	done
-	echo "****************************************************************"
-	exit 1
-}
+if [ ! -r /dev/fuse ] || [ ! -w /dev/fuse ]; then
+	echo "WARNING: /dev/fuse is not readable and writable."
+	echo "Skipping WIM mounting checks"
+	skip_test
+fi
 
 cleanup
+mkdir $TEST_SUBDIR
+cd $TEST_SUBDIR
 init
 
 # imagex mount
@@ -76,8 +69,8 @@ for flag in "--compress=none" "--compress=maximum" "--compress=fast"; do
 	fi
 	mkdir tmp
 	if ! imagex mount dir.wim dir tmp; then
-		error "Failed to mount test WIM read-only" \
-		      "Please read any error messages above before reporting this test failure."\
+		error "Failed to mount test WIM read-only. " \
+		      "Please read any error messages above before reporting this test failure. "\
 		      "Perhaps you don't have FUSE installed, or the FUSE kernel module isn't" \
 		      "loaded, or you aren't a member of the FUSE group?"
 	fi
@@ -107,14 +100,14 @@ for flag in "--compress=none" "--compress=maximum" "--compress=fast"; do
 		error "Recursive diff of read-only mounted WIM with original directory failed"
 	fi
 	echo "Testing unmount of read-only filesystem"
-	if ! imagex unmount tmp; then
+	if ! imagex_unmount tmp; then
 		error "Unmounting read-only WIM failed"
 	fi
 	echo "Testing unmount of read-only filesystem with --commit given"
 	if ! imagex mount dir.wim dir tmp; then
 		error "Failed to re-mount WIM read-only"
 	fi
-	if ! imagex unmount tmp --commit; then
+	if ! imagex_unmount tmp --commit; then
 		error "Failed to unmount read-only WIM with --commit flag (should be ignored)"
 	fi
 	rm -rf tmp dir.wim
@@ -130,14 +123,14 @@ if ! imagex mountrw dir.wim dir tmp; then
 	error "Failed to mount test WIM read-write"
 fi
 echo "Testing unmounting WIM unmodified"
-if ! imagex unmount tmp; then
+if ! imagex_unmount tmp; then
 	error "Failed to unmount test WIM unmodified"
 fi
 echo "Testing unmounting WIM unmodified with --commit and --check"
 if ! imagex mountrw dir.wim dir tmp; then
 	error "Failed to re-mount test WIM read-write"
 fi
-if ! imagex unmount tmp --commit --check; then
+if ! imagex_unmount tmp --commit --check; then
 	error "Failed to unmount read-write mounted WIM with changes commited (no changes made)"
 fi
 echo "Testing removing file from mounted WIM"
@@ -178,10 +171,10 @@ if ! diff -q tmp/newdir/zeroes1 tmp/newdir/zeroes2; then
 	error "New files in mounted WIM not made correctly"
 fi
 echo "Unmounting WIM with changes committed and --check"
-if ! imagex unmount tmp --commit --check; then
+if ! imagex_unmount tmp --commit --check; then
 	error "Failed to unmount read-write mounted WIM"
 fi
-if test "`imagex_info dir.wim | grep Integrity | awk '{print $3}'`" != "yes"; then
+if test "`imagex info dir.wim | grep Integrity | awk '{print $3}'`" != "yes"; then
 	error "Integrity information was not included"
 fi
 rm -rf tmp
@@ -200,7 +193,7 @@ fi
 
 # Now do some tests using tar.
 do_tree_cmp() {
-	if ! ./tree-cmp $1 $2; then
+	if ! ../tree-cmp $1 $2; then
 		if [ -x /usr/bin/tree ]; then
 			echo "Dumping tree of applied image"
 			tree $2 --inodes -F -s --noreport
@@ -231,12 +224,12 @@ do_test() {
 	tar cf ../test.tar .
 	cd ..
 
-	if ! imagex_mountrw test.wim tmp.mnt; then
+	if ! imagex mountrw test.wim tmp.mnt --unix-data; then
 		error "Failed to mount WIM read-write"
 	fi
 
 	cd tmp.mnt
-	if ! tar xf ../test.tar --no-same-owner; then
+	if ! tar xf ../test.tar; then
 		error "Failed to untar archive on read-write mounted WIM"
 	fi
 	cd ..
@@ -251,7 +244,7 @@ do_test() {
 	fi
 
 	cd tmp.mnt
-	if ! tar xf ../test.tar --no-same-owner; then
+	if ! tar xf ../test.tar; then
 		error "Failed to untar archive on read-write mounted WIM"
 	fi
 	cd ..
@@ -261,7 +254,7 @@ do_test() {
 
 	# Unmount the WIM, apply it, and diff the original tree with the applied
 	# tree
-	if ! imagex unmount tmp.mnt --commit; then
+	if ! imagex_unmount tmp.mnt --commit; then
 		error "Failed to unmount WIM mounted read-write"
 	fi
 	if ! imagex apply test.wim tmp.apply; then
@@ -273,8 +266,10 @@ do_test() {
 
 . $srcdir/tests/common_tests.sh
 
-cleanup
 
 echo "**********************************************************"
 echo "                 WIM mount tests passed                   "
 echo "**********************************************************"
+
+cd ..
+cleanup