test-imagex-ntfs: Use lazy unmount

[wimlib] / tests / test-imagex-capture_and_apply

diff --git a/tests/test-imagex-capture_and_apply b/tests/test-imagex-capture_and_apply
index 5f1bc017e3a840ed8c1031a49ba82fe4d4e68de6..db3fcbe69e501d81fc595672907bc696c50890bb 100755 (executable)
--- a/tests/test-imagex-capture_and_apply
+++ b/tests/test-imagex-capture_and_apply
@@ -9,8 +9,7 @@
 # Also, test if the capture configuration file works correctly.
 
 set -e
-srcdir=${srcdir:-.}
-srcdir=`realpath $srcdir`
+srcdir=`pwd`
 cd tests
 
 imagex() {
@@ -80,7 +79,7 @@ do_test() {
 
                # Can we split the WIM, apply the split WIM, join the split WIM,
                # and apply the joined WIM, and get the same results every time?
-               if ! imagex split test.wim test.swm 0.01M; then
+               if ! imagex split test.wim test.swm 0.01; then
                        error "Failed to split WIM"
                fi
                if ! imagex apply test.swm 1 out.dir --ref "test*.swm" ; then
@@ -114,19 +113,23 @@ do_test() {
        done
 }
 
-msg() {
+__msg() {
        echo "--------------------------------------------------------------------"
-       echo "Testing image capture and application of directory containing $1"
+       echo $1
        echo "--------------------------------------------------------------------"
 }
 
+msg() {
+       __msg "Testing image capture and application of directory containing $1"
+}
+
 cleanup
 init
 
 . $srcdir/tests/common_tests.sh
 
 # Make sure exclusion list works
-msg "Testing default capture configuration file"
+__msg "Testing default capture configuration file"
 touch in.dir/hiberfil.sys
 mkdir -p "in.dir/System Volume Information/subdir"
 imagex capture in.dir test.wim