tests fixes

[wimlib] / tests / test-imagex-mount

diff --git a/tests/test-imagex-mount b/tests/test-imagex-mount
index 74cff3f7661adcb916a9a83ee46753ce3633a96b..276dcbb5ad19824fd5e628d2e186339a57ba6ecf 100755 (executable)
--- a/tests/test-imagex-mount
+++ b/tests/test-imagex-mount
@@ -1,11 +1,10 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Test WIM mounting
 
 set -e
 cd tests
-srcdir="${srcdir:-.}/.."
-srcdir="$(cd $srcdir; pwd)"
+. tests-common.sh
 
 if [ ! -r /dev/fuse ]; then
        echo "WARNING: /dev/fuse is not readable."
@@ -167,7 +166,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"
@@ -194,10 +193,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
 
@@ -239,7 +238,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 ..
@@ -254,7 +253,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 ..