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

diff --git a/tests/test-imagex-capture_and_apply b/tests/test-imagex-capture_and_apply
index 1dfc9431..e7b56e35 100755
--- a/tests/test-imagex-capture_and_apply
+++ b/tests/test-imagex-capture_and_apply
@@ -14,39 +14,10 @@ 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)"
@@ -126,8 +97,10 @@ msg() {
 	__msg "Testing image capture and application of directory containing $1"
 }
 
-cleanup
-init
+default_cleanup
+mkdir $TEST_SUBDIR
+cd $TEST_SUBDIR
+mkdir in.dir out.dir
 
 . $srcdir/tests/common_tests.sh
 
@@ -140,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