X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=tests%2Ftest-imagex;h=2c729cb4b468d4077e153d6f4bfc7542af3a30da;hp=9a7f4f0949b2a98735b7228a51191fe9b48934e9;hb=2441b3b94cf77a5193550682695dfaf930466764;hpb=200bd141bea66770dd9845a95f2403d59956b931

diff --git a/tests/test-imagex b/tests/test-imagex
index 9a7f4f09..2c729cb4 100755
--- a/tests/test-imagex
+++ b/tests/test-imagex
@@ -9,7 +9,7 @@ cd tests
 
 imagex() {
 	echo "imagex $@"
-	../imagex $@
+	../imagex $@ 
 }
 
 cleanup() {
@@ -19,6 +19,8 @@ cleanup() {
 	rm -rf dir* tmp* *.wim *.swm
 }
 trap cleanup exit
+fusermount -u tmp || true
+rm -rf tmp || true
 
 # Make test directory
 mkdir dir
@@ -258,12 +260,14 @@ echo "Testing appending non-existent file (should generate errors)"
 if imagex append SOME_NONEXISTENT_FILE dir.wim; then
 	error "Incorrectly succeeded to append non-existent file to WIM"
 fi
-echo "Testing appending directory containing unreadable file (should generate errors)"
-mkdir -p dir3
-touch dir3/file
-chmod -r dir3/file
-if imagex append dir3 dir.wim; then
-	error "Incorrectly succeeded in capturing directory with unreadable file"
+if [ `id -u` != 0 ]; then
+	echo "Testing appending directory containing unreadable file (should generate errors)"
+	mkdir -p dir3
+	echo 1 > dir3/file
+	chmod -r dir3/file
+	if imagex append dir3 dir.wim; then
+		error "Incorrectly succeeded in capturing directory with unreadable file"
+	fi
 fi
 rm -rf dir3 dir.wim
 
@@ -359,7 +363,7 @@ fi
 if test "`stat -c %i tmp/subdir/hello`" = "`stat -c %i tmp/subdir/hello2`"; then
 	error "Incorrect inode number"
 fi
-if ! test -L tmp/subdir/hello || ! test -L tmp/subdir/hello2; then
+if ! test -L tmp/subdir/hello -o -L tmp/subdir/hello2 -o -L tmp/subdir/hellolink; then
 	error "Expected symlinks, but found non-symlinks"
 fi
 rm -rf dir.wim tmp
@@ -608,5 +612,5 @@ if imagex export dir.wim all new.wim --boot; then
 fi
 
 echo "**********************************************************"
-echo "                     All tests passed                     "
+echo "                 Basic imagex tests passed                "
 echo "**********************************************************"