X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=tests%2Ftest-imagex-mount;h=e8da925a8ef791bd301a0e715099cc6ae6bff04c;hb=68fc532540f86fd40dcc5fe754e02cbf6b812fd9;hp=ee8501f195b0a8be15ffd41e6353d1f213c0d479;hpb=31f38a9a7a9ed5dc2c32bbb5fecd4050809a561c;p=wimlib

diff --git a/tests/test-imagex-mount b/tests/test-imagex-mount
index ee8501f1..e8da925a 100755
--- a/tests/test-imagex-mount
+++ b/tests/test-imagex-mount
@@ -1,11 +1,18 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 # Test WIM mounting
 
 set -e
-srcdir=${srcdir:-.}
-srcdir=`realpath $srcdir`
 cd tests
+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 $@"
@@ -19,11 +26,7 @@ imagex_info() {
 
 imagex_mountrw() {
 	echo "imagex mountrw $@"
-	../imagex mountrw --debug "$@" &> mount.log &
-	while ! mountpoint $2 >& /dev/null; do
-		sleep 0.01;
-	done
-	return 0
+	../imagex mountrw "$@"
 }
 
 cleanup() {
@@ -50,10 +53,13 @@ init() {
 }
 
 error() {
-	echo "**********************************************"
-	echo "                  Test failure                "
-	echo $*
-	echo "**********************************************"
+	echo "****************************************************************"
+	echo "                         Test failure                           "
+	while [ $# -gt 0 ]; do
+		echo $1
+		shift
+	done
+	echo "****************************************************************"
 	exit 1
 }
 
@@ -70,27 +76,30 @@ for flag in "--compress=none" "--compress=maximum" "--compress=fast"; do
 	fi
 	mkdir tmp
 	if ! imagex mount dir.wim dir tmp; then
-		error "Failde to mount test WIM read-only"
+		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"
@@ -135,10 +144,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"
@@ -155,7 +164,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"
@@ -182,10 +191,10 @@ 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
 
@@ -227,7 +236,7 @@ do_test() {
 	fi
 
 	cd tmp.mnt
-	if ! tar xf ../test.tar; then
+	if ! tar xf ../test.tar --no-same-owner; then
 		error "Failed to untar archive on read-write mounted WIM"
 	fi
 	cd ..
@@ -242,7 +251,7 @@ do_test() {
 	fi
 
 	cd tmp.mnt
-	if ! tar xf ../test.tar; then
+	if ! tar xf ../test.tar --no-same-owner; then
 		error "Failed to untar archive on read-write mounted WIM"
 	fi
 	cd ..