Refactor headers

[wimlib] / tests / test-imagex-mount

diff --git a/tests/test-imagex-mount b/tests/test-imagex-mount
index 6e04673a71823822e5d2e2533ee7713a4f6a8beb..13b4e0cd77dbb4b69818710aeeb4288fd310c951 100755 (executable)
--- a/tests/test-imagex-mount
+++ b/tests/test-imagex-mount
@@ -24,7 +24,7 @@ cleanup() {
 
 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
@@ -36,7 +36,7 @@ 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
 }
 
 cleanup
@@ -54,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
@@ -209,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 ..
@@ -229,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 ..