X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=tests%2Ftest-imagex-mount;h=13b4e0cd77dbb4b69818710aeeb4288fd310c951;hp=3be51a11b0247df12889d935805b00a243021e70;hb=e8c3ca2d1d0cac3d64985b45a9f654d2029a7518;hpb=40beb80283a2df7af88c8359ca41adb814585e9a

diff --git a/tests/test-imagex-mount b/tests/test-imagex-mount
index 3be51a11..13b4e0cd 100755
--- a/tests/test-imagex-mount
+++ b/tests/test-imagex-mount
@@ -8,40 +8,23 @@ srcdir="${srcdir:-.}/.."
 srcdir="$(cd $srcdir; pwd)"
 . "$srcdir/tests/tests-common.sh"
 
+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
 
-imagex() {
-	echo "imagex $@"
-	../imagex $@  > /dev/null
-}
-
-imagex_info() {
-	echo "imagex info $@"
-	../imagex info "$@"
-}
-
-imagex_mountrw() {
-	echo "imagex mountrw $@"
-	../imagex mountrw --debug "$@" &> mount.log &
-	while ! mountpoint $2 >& /dev/null; do
-		sleep 0.01;
-	done
-	return 0
-}
-
 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
@@ -53,21 +36,12 @@ 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
-}
-
-error() {
-	echo "****************************************************************"
-	echo "                         Test failure                           "
-	while [ $# -gt 0 ]; do
-		echo $1
-		shift
-	done
-	echo "****************************************************************"
-	exit 1
+	imagex capture tmp.empty empty.wim --norpfix
 }
 
 cleanup
+mkdir $TEST_SUBDIR
+cd $TEST_SUBDIR
 init
 
 # imagex mount
@@ -80,8 +54,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
@@ -185,7 +159,7 @@ echo "Unmounting WIM with changes committed and --check"
 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
@@ -204,7 +178,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
@@ -235,12 +209,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 ..
@@ -255,7 +229,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 ..
@@ -277,8 +251,10 @@ do_test() {
 
 . $srcdir/tests/common_tests.sh
 
-cleanup
 
 echo "**********************************************************"
 echo "                 WIM mount tests passed                   "
 echo "**********************************************************"
+
+cd ..
+cleanup