X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=tests%2Ftest-imagex-mount;h=906a3d65c76e0cc0e40ce0518bef7613a1f85f12;hp=74cff3f7661adcb916a9a83ee46753ce3633a96b;hb=8eaff5673d8e133e72e20cf4409ab4c901831424;hpb=a3c53f0d3e2ea2267ca89caf100cd41adfabd556

diff --git a/tests/test-imagex-mount b/tests/test-imagex-mount
index 74cff3f7..906a3d65 100755
--- a/tests/test-imagex-mount
+++ b/tests/test-imagex-mount
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Test WIM mounting
 
@@ -6,6 +6,9 @@ set -e
 cd tests
 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."
@@ -13,31 +16,12 @@ if [ ! -r /dev/fuse ]; then
 	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
@@ -55,18 +39,9 @@ init() {
 	imagex capture tmp.empty empty.wim
 }
 
-error() {
-	echo "****************************************************************"
-	echo "                         Test failure                           "
-	while [ $# -gt 0 ]; do
-		echo $1
-		shift
-	done
-	echo "****************************************************************"
-	exit 1
-}
-
 cleanup
+mkdir $TEST_SUBDIR
+cd $TEST_SUBDIR
 init
 
 # imagex mount
@@ -79,30 +54,30 @@ 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
 	echo "Testing extracting file from mounted read-only WIM"
-	if ! cp tmp/lz.c lz.c; then
+	if ! cp tmp/lz77.c lz77.c; then
 		error "Failed to extract file from read-only mounted WIM"
 	fi
-	if ! diff -q dir/lz.c lz.c; then
+	if ! diff -q dir/lz77.c lz77.c; then
 		error "Extracted file does not match copy in mounted WIM"
 	fi
-	if ! diff -q tmp/lz.c dir/lz.c; then
+	if ! diff -q tmp/lz77.c dir/lz77.c; then
 		error "Extractef file does not match original"
 	fi
-	rm -f lz.c
+	rm -f lz77.c
 	echo "Testing modifying mounted read-only WIM (should fail)"
-	if rm tmp/lz.c; then
+	if rm tmp/lz77.c; then
 		error "Removing file from read-only mounted WIM didn't fail"
 	fi
 	if touch tmp/newfile; then
 		error "Creating file on read-only mounted WIM didn't fail"
 	fi
-	if echo 3 > tmp/lz.c; then
+	if echo 3 > tmp/lz77.c; then
 		error "Writing to file on read-only mounted WIM didn't fail"
 	fi
 	echo "Testing diff of mounted read-only WIM with original directory"
@@ -147,10 +122,10 @@ echo "Testing removing file from mounted WIM"
 if ! imagex mountrw dir.wim dir tmp; then
 	error "Failed to re-mount test WIM read-write"
 fi
-if ! rm tmp/lz.c; then
+if ! rm tmp/lz77.c; then
 	error "Failed to remove file from read-write mounted WIM"
 fi
-if test -f tmp/lz.c; then
+if test -f tmp/lz77.c; then
 	error "Removing file from read-write mounted WIM failed"
 fi
 echo "Testing making directory in mounted WIM"
@@ -167,7 +142,7 @@ fi
 if ! test -f tmp/newdir/empty_file; then
 	error "New empty file not created correctly in read-write mounted WIM"
 fi
-if ! test "`stat -c %s tmp/newdir/empty_file`" = 0; then
+if ! test "`get_file_size tmp/newdir/empty_file`" = 0; then
 	error "New empty file in read-write mounted WIM is not empty"
 fi
 echo "Testing making new non-empty file in mounted WIM"
@@ -184,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
@@ -194,16 +169,16 @@ fi
 if ! diff -q tmp/newdir/zeroes1 tmp/newdir/zeroes2; then
 	error "The new non-empty files we made in the read-write mounted WIM were not extracted correctly"
 fi
-if test `stat -c %s tmp/newdir/empty_file` != 0; then
+if test `get_file_size tmp/newdir/empty_file` != 0; then
 	error "The new empty file we made in the read-write mounted WIM was not extracted correctly"
 fi
-if test `stat -c %s tmp/newdir/zeroes1` != 4096; then
+if test `get_file_size tmp/newdir/zeroes1` != 4096; then
 	error "The new non-empty files we made in the read-write mounted WIM were not extracted correctly"
 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
@@ -234,7 +209,7 @@ 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
 
@@ -276,8 +251,10 @@ do_test() {
 
 . $srcdir/tests/common_tests.sh
 
-cleanup
 
 echo "**********************************************************"
 echo "                 WIM mount tests passed                   "
 echo "**********************************************************"
+
+cd ..
+cleanup