X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=tests%2Ftest-imagex;h=fe931321a760476b63d0d89c3b5793c46f089a02;hp=78a08182f19f0efdad95420c8e57b438010abaa7;hb=89698ed953532a5ccbeca5414cc10873aa33af71;hpb=3868ce60370c9c62f040c63cd9135791becb2ed9 diff --git a/tests/test-imagex b/tests/test-imagex index 78a08182..fe931321 100755 --- a/tests/test-imagex +++ b/tests/test-imagex @@ -152,7 +152,7 @@ echo "Testing capture of WIM with integrity table" if ! wimcapture dir dir.wim --check; then error "Failed to capture WIM with integrity table" fi -if ! test "`wiminfo dir.wim | grep Integrity | awk '{print $3}'`" = "yes"; then +if ! wiminfo dir.wim | grep -q Integrity; then error "Integrity table on WIM not made" fi if ! wimapply --check dir.wim tmp; then @@ -186,14 +186,14 @@ echo "Testing appending WIM image with integrity check" if ! wimappend dir2 dir.wim "newname2" --check; then error "Appending WIM image failed" fi -if ! test "`wiminfo dir.wim | grep Integrity | awk '{print $3}'`" = "yes"; then +if ! wiminfo dir.wim | grep -q Integrity; then error "Integrity table not set correctly on image append" fi echo "Testing appending WIM image with no integrity check" if ! wimappend dir2 dir.wim "newname3" --nocheck; then error "Appending WIM image failed" fi -if ! test "`wiminfo dir.wim | grep Integrity | awk '{print $3}'`" = "no"; then +if wiminfo dir.wim | grep -q Integrity; then error "WIM integrity table not removed" fi # 5 images at this point @@ -232,7 +232,7 @@ echo "Testing appending directory to empty WIM and making it bootable" if ! wimappend dir dir.wim "myname" "mydesc" --check --boot; then error "Couldn't append named, described, bootable image to empty WIM with integrity check" fi -if ! test "`wiminfo dir.wim | grep Integrity | awk '{print $3}'`" = "yes"; then +if ! wiminfo dir.wim | grep -q Integrity; then error "Integrity check not found" fi if ! test "`wiminfo dir.wim | grep '^Boot Index' | awk '{print $3}'`" = "1"; then