X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=tests%2Ftest-imagex-capture_and_apply;h=1dfc9431568662f92613753be8ba9e58b1bd30a4;hb=82e0045e9a93baed16ca1fa1bbe5accfcf11cf6c;hp=0a53aee0bf3c93887273b35d2c2f66c95b0d9d73;hpb=54193a504d8dcf1e2dfae727c76cd1b44884518b;p=wimlib

diff --git a/tests/test-imagex-capture_and_apply b/tests/test-imagex-capture_and_apply
index 0a53aee0..1dfc9431 100755
--- a/tests/test-imagex-capture_and_apply
+++ b/tests/test-imagex-capture_and_apply
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Test capturing and applying a WIM image in the normal (non-NTFS) capture mode
 #
@@ -9,9 +9,11 @@
 # Also, test if the capture configuration file works correctly.
 
 set -e
-srcdir=${srcdir:-.}
-srcdir=`realpath $srcdir`
 cd tests
+srcdir="${srcdir:-.}/.."
+srcdir="$(cd $srcdir; pwd)"
+. "$srcdir/tests/tests-common.sh"
+
 
 imagex() {
 	echo "imagex $@"
@@ -80,7 +82,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 +116,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