Re-organize code

[wimlib] / tests / test-imagex-mount

diff --git a/tests/test-imagex-mount b/tests/test-imagex-mount
index dcfb27d758488e5269438762ee6ad2a4fc15ea94..3be51a11b0247df12889d935805b00a243021e70 100755 (executable)
--- a/tests/test-imagex-mount
+++ b/tests/test-imagex-mount
@@ -1,10 +1,12 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Test WIM mounting
 
 set -e
-srcdir=`pwd`
 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."
@@ -84,24 +86,24 @@ for flag in "--compress=none" "--compress=maximum" "--compress=fast"; do
                      "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"
@@ -146,10 +148,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"
@@ -166,7 +168,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"
@@ -193,10 +195,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
 
@@ -238,7 +240,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 ..
@@ -253,7 +255,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 ..