X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=tests%2Ftest-imagex;h=466976737ce8d693a3ec020e815ddca418a259d5;hp=b6ed7694b37da8cc79c349f15e2754e15e6a1f8a;hb=a2993f836221de10e3f3e220d38aa4b72d367a61;hpb=08a55221fc6904ceaf4bd1c0532eb03e792d5420 diff --git a/tests/test-imagex b/tests/test-imagex index b6ed7694..46697673 100755 --- a/tests/test-imagex +++ b/tests/test-imagex @@ -5,7 +5,9 @@ set -e cd tests -. tests-common.sh +srcdir="${srcdir:-.}/.." +srcdir="$(cd $srcdir; pwd)" +. "$srcdir/tests/tests-common.sh" imagex() { echo "imagex $@" @@ -287,13 +289,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/lz.c`" != 1; then +if test "`get_link_count tmp/dir/lz77.c`" != 1; then error "Incorrect link count on extracted file" fi -if test "`get_link_count tmp/myname/lz.c`" != 1; then +if test "`get_link_count tmp/myname/lz77.c`" != 1; then error "Incorrect link count on extracted file" fi -if test "`get_inode_number tmp/myname/lz.c`" = "`get_inode_number tmp/dir/lz.c`"; then +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 @@ -304,13 +306,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/lz.c`" != 2; then +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/lz.c`" != 2; then +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/lz.c`" != "`get_inode_number tmp/dir/lz.c`"; then +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 @@ -486,7 +488,7 @@ 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 +for i in 1 2 3 4 5; do case $i in 1) cflag1="--compress=none";