encoding.c: avoid UBSAN warning in convert_string()

[wimlib] / tests / test-imagex-mount

diff --git a/tests/test-imagex-mount b/tests/test-imagex-mount
index ecb05eaca72ecb1bbdc9bdb8e49bdd3fb9f35fe8..3c050d7fe0e8fe61eae31dc92df192cef85263ab 100755 (executable)
--- a/tests/test-imagex-mount
+++ b/tests/test-imagex-mount
@@ -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-mount
 
@@ -128,7 +128,7 @@ if ! wimmountrw dir.wim dir tmp.mnt; then
        error "Failed to re-mount test WIM read-write"
 fi
 if ! imagex_unmount tmp.mnt --commit --check; then
-       error "Failed to unmount read-write mounted WIM with changes commited (no changes made)"
+       error "Failed to unmount read-write mounted WIM with changes committed (no changes made)"
 fi
 echo "Testing removing file from mounted WIM"
 if ! wimmountrw dir.wim dir tmp.mnt; then
@@ -171,7 +171,7 @@ echo "Unmounting WIM with changes committed and --check"
 if ! imagex_unmount tmp.mnt --commit --check; then
        error "Failed to unmount read-write mounted WIM"
 fi
-if test "`wiminfo dir.wim | grep Integrity | awk '{print $3}'`" != "yes"; then
+if ! wiminfo dir.wim | grep -q Integrity; then
        error "Integrity information was not included"
 fi
 if ! wimapply dir.wim tmp.apply; then