Fix in write_wim_resource(), and add test cases

[wimlib] / tests / test-imagex

diff --git a/tests/test-imagex b/tests/test-imagex
index a0b88a9658e948c7f452d972622aae07ed15621a..36e02534fcdade96b336bd79be1d6170795d79a1 100755 (executable)
--- a/tests/test-imagex
+++ b/tests/test-imagex
@@ -4,6 +4,7 @@
 # tests every aspect of wimlib comprehensively.
 
 set -e
+srcdir=${srcdir:-.}
 srcdir=`realpath $srcdir`
 cd tests
 
@@ -611,6 +612,46 @@ if imagex export dir.wim all new.wim --boot; then
        error "Successfully exported multiple images with --boot but with no bootable images"
 fi
 
+# Test exporting an image to another WIM, then applying it.
+# We try with 5 different combinations of compression types to make sure we go
+# through all paths in the resource-handling code.
+for i in `seq 1 3`; do
+       case $i in 
+       1)
+               cflag1="--compress=none";
+               cflag2="--compress=none";
+               ;;
+       2)
+               cflag1="--compress=xpress";
+               cflag2="--compress=xpress";
+               ;;
+       3)
+               cflag1="--compress=xpress"
+               cflag2="--compress=lzx"
+               ;;
+       4)
+               cflag1="--compress=none"
+               cflag2="--compress=xpress"
+               ;;
+       5)
+               cflag1="--compress=xpress"
+               cflag2="--compress=none"
+               ;;
+       esac
+       echo "Testing exporting then applying an image (\"$cflag1\" => \"$cflag2\")"
+       rm -rf dir.wim new.wim tmp tmp2
+       imagex capture dir dir.wim $cflag1
+       imagex capture dir2 dir2.wim $cflag2
+       imagex export dir.wim dir dir2.wim
+       imagex apply dir.wim dir tmp
+       if ! imagex apply dir2.wim dir tmp2; then
+               error "Failed to apply image that was exported to a WIM"
+       fi
+       if ! diff -r tmp tmp2; then
+               error "Image that was exported to a WIM was not applied correctly"
+       fi
+done
+
 echo "**********************************************************"
 echo "                 Basic imagex tests passed                "
 echo "**********************************************************"