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

diff --git a/tests/test-imagex-capture_and_apply b/tests/test-imagex-capture_and_apply
index 0a53aee0..e7b56e35 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,42 +9,15 @@
 # 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 $@"
-	../imagex "$@" > /dev/null
-}
-
-imagex_info() {
-	echo "imagex info $@"
-	../imagex info "$@"
-}
-
-init() {
-	mkdir in.dir out.dir
-}
-
-cleanup() {
-	rm -rf in.dir out.dir test*.wim test*.swm
-}
-
-error() {
-	echo "****************************************************************"
-	echo "                         Test failure                           "
-	echo $*
-	echo "****************************************************************"
-	exit 1
-}
-
-wim_ctype() {
-	../imagex info $1 | grep Compression | awk '{print $2}'
-}
+TEST_SUBDIR=tmpdir_test-imagex-capture_and_apply
 
 do_tree_cmp() {
-	if ! ./tree-cmp in.dir out.dir; then
+	if ! ../tree-cmp in.dir out.dir; then
 		if [ -x /usr/bin/tree ]; then
 			echo "Dumping tree of applied image"
 			echo "(Note: compression type was $ctype)"
@@ -80,7 +53,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 +87,25 @@ do_test() {
 	done
 }
 
-msg() {
+__msg() {
 	echo "--------------------------------------------------------------------"
-	echo "Testing image capture and application of directory containing $1"
+	echo $1
 	echo "--------------------------------------------------------------------"
 }
 
-cleanup
-init
+msg() {
+	__msg "Testing image capture and application of directory containing $1"
+}
+
+default_cleanup
+mkdir $TEST_SUBDIR
+cd $TEST_SUBDIR
+mkdir in.dir out.dir
 
-. 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
@@ -134,10 +113,10 @@ imagex apply test.wim out.dir
 if [ -e out.dir/hiberfil.sys -o -e "out.dir/System Volume Information" ]; then
 	error "Files were not excluded from capture as expected"
 fi
-rm -rf out.dir/* in.dir/*
-
-cleanup
 
 echo "**********************************************************"
 echo "          imagex capture/apply tests passed               "
 echo "**********************************************************"
+
+cd ..
+default_cleanup