Cleanup imagex.c

[wimlib] / tests / test-imagex-capture_and_apply

diff --git a/tests/test-imagex-capture_and_apply b/tests/test-imagex-capture_and_apply
index 0a53aee0bf3c93887273b35d2c2f66c95b0d9d73..08fe6f623c3b6bf4b0a7faaef4b6cb4b02021c6f 100755 (executable)
--- a/tests/test-imagex-capture_and_apply
+++ b/tests/test-imagex-capture_and_apply
@@ -80,7 +80,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 +114,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
 
-. common_tests.sh
+. $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