aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2011-09-03 09:44:42 -0400
committerTheodore Ts'o <tytso@mit.edu>2011-09-03 10:02:34 -0400
commitf305fd7f0c65391819f9813512714c932965a842 (patch)
treecab6d267b9d3ee351b9c0a2359b25192d7ed6b5c /tests
parentdd62d856062b184bcf8ea8a050bfb00fee0a92e3 (diff)
downloade2fsprogs-f305fd7f0c65391819f9813512714c932965a842.tar.gz
e2fsprogs-f305fd7f0c65391819f9813512714c932965a842.tar.xz
e2fsprogs-f305fd7f0c65391819f9813512714c932965a842.zip
tests: fix i_e2image so it works with valgrind
Since e2image can be optionally compiled out, we tested to see if e2image was built; but using "test -x $E2IMAGE" fails if e2image is something like "valgrind --simhints=lax-ioctls ../misc/e2image". Define and use $E2IMAGE_EXE, much like we have done with e2undo and resize2fs. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'tests')
-rw-r--r--tests/i_e2image/script5
-rw-r--r--tests/test_config1
2 files changed, 5 insertions, 1 deletions
diff --git a/tests/i_e2image/script b/tests/i_e2image/script
index 408eabec..9c6ae2af 100644
--- a/tests/i_e2image/script
+++ b/tests/i_e2image/script
@@ -1,5 +1,5 @@
printf "Create/convert raw and qcow2 disk images: "
-if test -x $E2IMAGE; then
+if test -x $E2IMAGE_EXE; then
ORIG_IMAGES="image1024.orig image2048.orig image4096.orig"
@@ -54,4 +54,7 @@ fi
rm -f _image.* $MD5_TMP >/dev/null 2>&1
+else #if test -x $E2IMAGE_EXE; then
+ rm -f $test_name.ok $test_name.failed
+ echo "skipped"
fi
diff --git a/tests/test_config b/tests/test_config
index 2d85e030..b0e3ee69 100644
--- a/tests/test_config
+++ b/tests/test_config
@@ -10,6 +10,7 @@ TUNE2FS="$USE_VALGRIND ../misc/tune2fs"
CHATTR="$USE_VALGRIND../misc/chattr"
LSATTR="$USE_VALGRIND ../misc/lsattr"
E2IMAGE="$USE_VALGRIND ../misc/e2image"
+E2IMAGE_EXE="../misc/e2image"
DEBUGFS="$USE_VALGRIND ../debugfs/debugfs"
TEST_BITS="../debugfs/debugfs"
RESIZE2FS_EXE="../resize/resize2fs"