diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-05-15 12:34:36 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-05-15 13:41:19 +0100 |
| commit | 7d983531c6a17f38ad66908216b1d51923a9664c (patch) | |
| tree | cb2007f573a331ecfab1e0e3dfd20909569c375a /tests/qemu-iotests/031 | |
| parent | f30d56e7d63fe2f536511bffa13306bec2e01c37 (diff) | |
| download | hqemu-7d983531c6a17f38ad66908216b1d51923a9664c.zip hqemu-7d983531c6a17f38ad66908216b1d51923a9664c.tar.gz | |
Revert "iotests: Use configured python"
This reverts commit f915db07ef9c368ea6db6430256de064fdd1525f.
This commit is broken because it does not account for the
build tree and the source tree being different, and can cause
build failures for out-of-tree builds. Revert it until we can
identify a better solution to the problem.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 1400153676-30180-1-git-send-email-peter.maydell@linaro.org
Acked-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'tests/qemu-iotests/031')
| -rwxr-xr-x | tests/qemu-iotests/031 | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/tests/qemu-iotests/031 b/tests/qemu-iotests/031 index 5aefb88..1d920ea 100755 --- a/tests/qemu-iotests/031 +++ b/tests/qemu-iotests/031 @@ -35,7 +35,6 @@ _cleanup() trap "_cleanup; exit \$status" 0 1 2 3 15 # get standard environment, filters and checks -. ./common.env . ./common.rc . ./common.filter . ./common.pattern @@ -57,22 +56,22 @@ for IMGOPTS in "compat=0.10" "compat=1.1"; do echo === Create image with unknown header extension === echo _make_test_img 64M - $PYTHON qcow2.py "$TEST_IMG" add-header-ext 0x12345678 "This is a test header extension" - $PYTHON qcow2.py "$TEST_IMG" dump-header + ./qcow2.py "$TEST_IMG" add-header-ext 0x12345678 "This is a test header extension" + ./qcow2.py "$TEST_IMG" dump-header _check_test_img echo echo === Rewrite header with no backing file === echo $QEMU_IMG rebase -u -b "" "$TEST_IMG" - $PYTHON qcow2.py "$TEST_IMG" dump-header + ./qcow2.py "$TEST_IMG" dump-header _check_test_img echo echo === Add a backing file and format === echo $QEMU_IMG rebase -u -b "/some/backing/file/path" -F host_device "$TEST_IMG" - $PYTHON qcow2.py "$TEST_IMG" dump-header + ./qcow2.py "$TEST_IMG" dump-header done # success, all done |
