aboutsummaryrefslogtreecommitdiff
path: root/tests/qemu-iotests/083
diff options
context:
space:
mode:
authorMax Reitz <mreitz@redhat.com>2014-05-03 16:47:08 +0200
committerStefan Hajnoczi <stefanha@redhat.com>2014-05-09 13:32:16 +0200
commitf915db07ef9c368ea6db6430256de064fdd1525f (patch)
tree965256d297818a60b5327455a2fba089ba65b322 /tests/qemu-iotests/083
parent65f33bc0020112e7be7b8966495cd5efa2d0ab15 (diff)
iotests: Use configured python
Currently, QEMU's iotests rely on /usr/bin/env to start the correct Python (that is, at least Python 2.4, but not 3). On systems where Python 3 is the default, the user has no clean way of making the iotests use the correct binary. This commit makes the iotests use the Python selected by configure. Signed-off-by: Max Reitz <mreitz@redhat.com> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'tests/qemu-iotests/083')
-rwxr-xr-xtests/qemu-iotests/0833
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/qemu-iotests/083 b/tests/qemu-iotests/083
index f764534782..6a52c96bba 100755
--- a/tests/qemu-iotests/083
+++ b/tests/qemu-iotests/083
@@ -29,6 +29,7 @@ tmp=/tmp/$$
status=1 # failure is the default!
# get standard environment, filters and checks
+. ./common.env
. ./common.rc
. ./common.filter
@@ -81,7 +82,7 @@ EOF
nbd_url="nbd:127.0.0.1:$port:exportname=foo"
fi
- ./nbd-fault-injector.py $extra_args "127.0.0.1:$port" "$TEST_DIR/nbd-fault-injector.conf" 2>&1 >/dev/null &
+ $PYTHON nbd-fault-injector.py $extra_args "127.0.0.1:$port" "$TEST_DIR/nbd-fault-injector.conf" 2>&1 >/dev/null &
wait_for_tcp_port "127.0.0.1:$port"
$QEMU_IO -c "read 0 512" "$nbd_url" 2>&1 | _filter_qemu_io | filter_nbd