X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=tests%2Ftest-imagex;h=070aca365f5933e2983df2da42d55ed8ae341e66;hp=902e0f977769364dbab76f6509f52381148d6ec2;hb=855b49ef85d274588a2848d9c69974f9b88d343a;hpb=f586dc75b589bbbb7fb62347bc6bc7aa63f71171 diff --git a/tests/test-imagex b/tests/test-imagex index 902e0f97..070aca36 100755 --- a/tests/test-imagex +++ b/tests/test-imagex @@ -78,7 +78,7 @@ fi echo "Testing capture of WIM with default boot flag" imagex capture dir dir.wim -if ! test "`imagex info dir.wim | grep Boot | awk '{print $3}'`" = "0"; then +if ! test "`imagex info dir.wim | grep '^Boot Index' | awk '{print $3}'`" = "0"; then error "WIM boot flag not set correctly" fi @@ -86,21 +86,21 @@ echo "Testing changing image bootable flag" if ! imagex info dir.wim 1 --boot; then error "Failed to change bootable image" fi -if ! test "`imagex info dir.wim | grep Boot | awk '{print $3}'`" = "1"; then +if ! test "`imagex info dir.wim | grep '^Boot Index' | awk '{print $3}'`" = "1"; then error "Bootable image not changed correctly" fi echo "Testing changing image bootable flag" if ! imagex info dir.wim 0 --boot; then error "Failed to reset bootable image" fi -if ! test "`imagex info dir.wim | grep Boot | awk '{print $3}'`" = "0"; then +if ! test "`imagex info dir.wim | grep '^Boot Index' | awk '{print $3}'`" = "0"; then error "Bootable image not reset correctly" fi echo "Testing changing image bootable flag to invalid image (this should generate errors)" if imagex info dir.wim 2 --boot; then error "Succeeded in changing bootable image to invalid number" fi -if ! test "`imagex info dir.wim | grep Boot | awk '{print $3}'`" = "0"; then +if ! test "`imagex info dir.wim | grep '^Boot Index' | awk '{print $3}'`" = "0"; then error "Boot flag was changed even though the change command was supposed to fail" fi rm -rf dir.wim tmp @@ -132,7 +132,7 @@ if ! imagex info --extract-xml=dir.xml dir.wim; then error "Failed to extract WIM XML data" fi echo "Testing printing WIM metadata" -if ! imagex info --metadata dir.wim > /dev/null; then +if ! imagex dir --detailed dir.wim > /dev/null; then error "Failed to print WIM metadata" fi rm -rf dir.wim tmp dir.xml @@ -141,7 +141,7 @@ echo "Testing capture of bootable WIM" if ! imagex capture dir dir.wim --boot; then error "Failed to capture bootable WIM" fi -if ! test "`imagex info dir.wim | grep Boot | awk '{print $3}'`" = "1"; then +if ! test "`imagex info dir.wim | grep '^Boot Index' | awk '{print $3}'`" = "1"; then error "Boot flag on bootable WIM not set correctly" fi rm -rf dir.wim tmp @@ -190,7 +190,7 @@ if ! test "`imagex info dir.wim | grep Integrity | awk '{print $3}'`" = "yes"; t error "Integrity table not set correctly on image append" fi echo "Testing appending WIM image with no integrity check" -if ! imagex append dir2 dir.wim "newname3"; then +if ! imagex append dir2 dir.wim "newname3" --nocheck; then error "Appending WIM image failed" fi if ! test "`imagex info dir.wim | grep Integrity | awk '{print $3}'`" = "no"; then @@ -235,7 +235,7 @@ fi if ! test "`imagex info dir.wim | grep Integrity | awk '{print $3}'`" = "yes"; then error "Integrity check not found" fi -if ! test "`imagex info dir.wim | grep Boot | awk '{print $3}'`" = "1"; then +if ! test "`imagex info dir.wim | grep '^Boot Index' | awk '{print $3}'`" = "1"; then error "Bootable image not set correctly" fi echo "Testing appending non-directory (should generate errors)" @@ -272,30 +272,13 @@ fi if ! diff -q -r tmp/dir tmp/myname || ! diff -q -r dir tmp/dir; then error "Recursive diff of applied WIM with original directory failed" fi -if test "`get_link_count tmp/dir/lz77.c`" != 1; then +if test "`get_link_count tmp/dir/write.c`" != 1; then error "Incorrect link count on extracted file" fi -if test "`get_link_count tmp/myname/lz77.c`" != 1; then +if test "`get_link_count tmp/myname/write.c`" != 1; then error "Incorrect link count on extracted file" fi -if test "`get_inode_number tmp/myname/lz77.c`" = "`get_inode_number tmp/dir/lz77.c`"; then - error "Incorrect inode number" -fi -rm -rf tmp -echo "Testing application of multiple images with hardlinks" -if ! imagex apply dir.wim all tmp --hardlink; then - error "Failed to apply multiple images with cross-image hardlinks" -fi -if ! diff -q -r tmp/dir tmp/myname || ! diff -q -r dir tmp/dir; then - error "Recursive diff of applied WIM with original directory failed" -fi -if test "`get_link_count tmp/dir/lz77.c`" != 2; then - error "Incorrect link count on extracted file" -fi -if test "`get_link_count tmp/myname/lz77.c`" != 2; then - error "Incorrect link count on extracted file" -fi -if test "`get_inode_number tmp/myname/lz77.c`" != "`get_inode_number tmp/dir/lz77.c`"; then +if test "`get_inode_number tmp/myname/write.c`" = "`get_inode_number tmp/dir/write.c`"; then error "Incorrect inode number" fi rm -rf tmp @@ -318,43 +301,6 @@ if test "`get_inode_number tmp/subdir/hello`" != "`get_inode_number tmp/subdir/h fi rm -rf tmp -echo "Testing application of single image containing identical files with hardlinks" -if ! imagex apply dir.wim 1 tmp --hardlink; then - error "Failed to apply WIM" -fi -if test "`get_link_count tmp/subdir/hello`" != 3; then - error "Incorrect link count on extracted file" -fi -if test "`get_link_count tmp/subdir/hello2`" != 3; then - error "Incorrect link count on extracted file" -fi -if test "`get_inode_number tmp/subdir/hello`" != "`get_inode_number tmp/subdir/hello2`"; then - error "Hard link set does not share inode number" -fi -if test "`get_inode_number tmp/subdir/hello`" != "`get_inode_number tmp/subdir/hellolink`"; then - error "Hard link set does not share inode number" -fi -rm -rf tmp - -echo "Testing application of single image containing identical files with symlinks" -if ! imagex apply dir.wim 1 tmp --symlink; then - error "Failed to apply WIM" -fi -if test "`get_link_count tmp/subdir/hello`" != 1; then - error "Incorrect link count on extracted file" -fi -if test "`get_link_count tmp/subdir/hello2`" != 1; then - error "Incorrect link count on extracted file" -fi -if test "`get_inode_number tmp/subdir/hello`" = "`get_inode_number tmp/subdir/hello2`"; then - error "Incorrect inode number" -fi -if ! test -L tmp/subdir/hello -o -L tmp/subdir/hello2 -o -L tmp/subdir/hellolink; then - error "Expected symlinks, but found non-symlinks" -fi -rm -rf dir.wim tmp - - # imagex split, imagex join echo "Creating random files to test WIM splitting on" @@ -386,7 +332,7 @@ for flag in "--compress=none" "--compress=maximum" "--compress=fast"; do fi # Unsupported, should fail - if imagex info tmp.swm --boot 0; then + if imagex info tmp.swm --boot 1; then error "Should not have been able to change boot index of split WIM" fi echo "Joining the split WIMs and applying the result" @@ -429,7 +375,7 @@ if test "`imagex info new.wim | grep 'Image Count' | awk '{print $3}'`" != 2; th error "Exporting single image to existing WIM wasn't done correctly" fi echo "Testing export of single image to existing WIM using wrong compression type" -if imagex export dir.wim dir2 new.wim newname --compress=maximum; then +if imagex export dir.wim dir2 new.wim newname --compress=xpress; then error "Successfully exported image using wrong compression type" fi rm -f new.wim