X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=tests%2Ftest-imagex-update_and_extract;h=ddeea3ff474d2d7a21f491c8465e5afc95f43a79;hb=088dff37aa334c218e1cac96cc847f5dd14f7124;hp=745c98f6a7196c508a9b37baf6e80e8adf5c9435;hpb=3868ce60370c9c62f040c63cd9135791becb2ed9;p=wimlib diff --git a/tests/test-imagex-update_and_extract b/tests/test-imagex-update_and_extract index 745c98f6..ddeea3ff 100755 --- a/tests/test-imagex-update_and_extract +++ b/tests/test-imagex-update_and_extract @@ -6,7 +6,7 @@ set -e cd tests srcdir="${srcdir:-.}/.." srcdir="$(cd $srcdir; pwd)" -. "$srcdir/tests/tests-common.sh" +. "$srcdir/tests/test_utils.sh" TEST_SUBDIR=tmpdir_test-imagex-update_and_extract @@ -24,7 +24,7 @@ fail() { msg "TEST FAILED (See above)" } -trap fail exit +trap fail EXIT prepare_empty_wim() { rm -rf in.dir @@ -285,7 +285,7 @@ WIMLIB_IMAGEX_IGNORE_CASE=1 wimextract test.wim 1 @pathlist --dest-dir=out.dir - echo "**********************************************************" echo " wimupdate/extract tests passed " echo "**********************************************************" -trap exit +trap EXIT cd .. default_cleanup