LZMS: decompression optimizations

[wimlib] / tests / test-imagex

diff --git a/tests/test-imagex b/tests/test-imagex
index 4694d3dc3de7ff3d82a79b0e38ee230a084b25a7..070aca365f5933e2983df2da42d55ed8ae341e66 100755 (executable)
--- 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
 
 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
 
        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 ! 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
        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
        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
        error "Boot flag was changed even though the change command was supposed to fail"
 fi
 rm -rf dir.wim tmp


@@ -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 ! 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
        error "Boot flag on bootable WIM not set correctly"
 fi
 rm -rf dir.wim tmp


@@ -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 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)"
        error "Bootable image not set correctly"
 fi
 echo "Testing appending non-directory (should generate errors)"


@@ -282,23 +282,6 @@ if test "`get_inode_number tmp/myname/write.c`" = "`get_inode_number tmp/dir/wri
        error "Incorrect inode number"
 fi
 rm -rf tmp
        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/write.c`" != 2; then
-       error "Incorrect link count on extracted file"
-fi
-if test "`get_link_count tmp/myname/write.c`" != 2; then
-       error "Incorrect link count on extracted file"
-fi
-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

 
 echo "Testing application of single image containing identical files"
 if ! imagex apply dir.wim 1 tmp; then
 
 echo "Testing application of single image containing identical files"
 if ! imagex apply dir.wim 1 tmp; then


@@ -318,43 +301,6 @@ if test "`get_inode_number tmp/subdir/hello`" != "`get_inode_number tmp/subdir/h
 fi
 rm -rf tmp
 
 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"
 # imagex split, imagex join
 
 echo "Creating random files to test WIM splitting on"