aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorLucas Meneghel Rodrigues <lmr@redhat.com>2011-12-01 11:41:24 -0200
committerKevin Wolf <kwolf@redhat.com>2012-02-23 10:29:47 +0100
commitd305fd5dd89e3efbce715de764b98d4155d5a294 (patch)
treede0dfebb18d86750d459b434b9b8a3e215d4298a /tests
parentdf4b627efe3e10d70b5d955f437c256d11f52b2f (diff)
qemu-iotests: common.config: Allow use of arbitrary qemu* paths
Since we might want to test arbitrary qemu, qemu-img and qemu-io paths, allow users to specify environment variable values for QEMU_PROG, QEMU_IMG_PROG and QEMU_IO_PROG so the testsuite will use those values rather than find them on PATH. Obviously, if such env variables are not set prior to script execution, normal detection mechanism takes place. Signed-off-by: Lucas Meneghel Rodrigues <lmr@redhat.com> Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'tests')
-rw-r--r--tests/qemu-iotests/common.config12
1 files changed, 9 insertions, 3 deletions
diff --git a/tests/qemu-iotests/common.config b/tests/qemu-iotests/common.config
index d5a72affc..d07f43569 100644
--- a/tests/qemu-iotests/common.config
+++ b/tests/qemu-iotests/common.config
@@ -87,13 +87,19 @@ export BC_PROG="`set_prog_path bc`"
export PS_ALL_FLAGS="-ef"
-export QEMU_PROG="`set_prog_path qemu`"
+if [ -z "$QEMU_PROG" ]; then
+ export QEMU_PROG="`set_prog_path qemu`"
+fi
[ "$QEMU_PROG" = "" ] && _fatal "qemu not found"
-export QEMU_IMG_PROG="`set_prog_path qemu-img`"
+if [ -z "$QEMU_IMG_PROG" ]; then
+ export QEMU_IMG_PROG="`set_prog_path qemu-img`"
+fi
[ "$QEMU_IMG_PROG" = "" ] && _fatal "qemu-img not found"
-export QEMU_IO_PROG="`set_prog_path qemu-io`"
+if [ -z "$QEMU_IO_PROG" ]; then
+ export QEMU_IO_PROG="`set_prog_path qemu-io`"
+fi
[ "$QEMU_IO_PROG" = "" ] && _fatal "qemu-io not found"
export QEMU=$QEMU_PROG