Commit 7d983531 authored by Peter Maydell's avatar Peter Maydell
Browse files

Revert "iotests: Use configured python" 



This reverts commit f915db07.

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: default avatarPeter Maydell <peter.maydell@linaro.org>
Message-id: 1400153676-30180-1-git-send-email-peter.maydell@linaro.org
Acked-by: default avatarKevin Wolf <kwolf@redhat.com>
parent f30d56e7

configure

+0 −6
Original line number Diff line number Diff line
@@ -4768,12 +4768,6 @@ if test "$gcov" = "yes" ; then 
  echo "GCOV=$gcov_tool" >> $config_host_mak

fi



iotests_common_env="tests/qemu-iotests/common.env"



echo "# Automatically generated by configure - do not modify" > $iotests_common_env

echo >> $iotests_common_env

echo "PYTHON='$python'" >> $iotests_common_env



# use included Linux headers

if test "$linux" = "yes" ; then

  mkdir -p linux-headers

tests/qemu-iotests/031

+4 −5
Original line number Diff line number Diff line
@@ -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

tests/qemu-iotests/036

+3 −4
Original line number Diff line number Diff line
@@ -38,7 +38,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
@@ -54,15 +53,15 @@ IMGOPTS="compat=1.1" 
echo === Create image with unknown autoclear feature bit ===

echo

_make_test_img 64M

$PYTHON qcow2.py "$TEST_IMG" set-feature-bit autoclear 63

$PYTHON qcow2.py "$TEST_IMG" dump-header

./qcow2.py "$TEST_IMG" set-feature-bit autoclear 63

./qcow2.py "$TEST_IMG" dump-header



echo

echo === Repair image ===

echo

_check_test_img -r all



$PYTHON qcow2.py "$TEST_IMG" dump-header

./qcow2.py "$TEST_IMG" dump-header



# success, all done

echo "*** done"

tests/qemu-iotests/039

+9 −10
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ _cleanup() 
trap "_cleanup; exit \$status" 0 1 2 3 15



# get standard environment, filters and checks

. ./common.env

. ./common.rc

. ./common.filter
@@ -59,7 +58,7 @@ _make_test_img $size 
$QEMU_IO -c "write -P 0x5a 0 512" "$TEST_IMG" | _filter_qemu_io



# The dirty bit must not be set

$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features

./qcow2.py "$TEST_IMG" dump-header | grep incompatible_features

_check_test_img



echo
@@ -74,7 +73,7 @@ $QEMU_IO -c "write -P 0x5a 0 512" -c "abort" "$TEST_IMG" | _filter_qemu_io 
ulimit -c "$old_ulimit"



# The dirty bit must be set

$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features

./qcow2.py "$TEST_IMG" dump-header | grep incompatible_features

_check_test_img



echo
@@ -83,7 +82,7 @@ echo "== Read-only access must still work ==" 
$QEMU_IO -r -c "read -P 0x5a 0 512" "$TEST_IMG" | _filter_qemu_io



# The dirty bit must be set

$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features

./qcow2.py "$TEST_IMG" dump-header | grep incompatible_features



echo

echo "== Repairing the image file must succeed =="
@@ -91,7 +90,7 @@ echo "== Repairing the image file must succeed ==" 
_check_test_img -r all



# The dirty bit must not be set

$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features

./qcow2.py "$TEST_IMG" dump-header | grep incompatible_features



echo

echo "== Data should still be accessible after repair =="
@@ -110,12 +109,12 @@ $QEMU_IO -c "write -P 0x5a 0 512" -c "abort" "$TEST_IMG" | _filter_qemu_io 
ulimit -c "$old_ulimit"



# The dirty bit must be set

$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features

./qcow2.py "$TEST_IMG" dump-header | grep incompatible_features



$QEMU_IO -c "write 0 512" "$TEST_IMG" | _filter_qemu_io



# The dirty bit must not be set

$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features

./qcow2.py "$TEST_IMG" dump-header | grep incompatible_features



echo

echo "== Creating an image file with lazy_refcounts=off =="
@@ -129,7 +128,7 @@ $QEMU_IO -c "write -P 0x5a 0 512" -c "abort" "$TEST_IMG" | _filter_qemu_io 
ulimit -c "$old_ulimit"



# The dirty bit must not be set since lazy_refcounts=off

$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features

./qcow2.py "$TEST_IMG" dump-header | grep incompatible_features

_check_test_img



echo
@@ -145,8 +144,8 @@ $QEMU_IO -c "write 0 512" "$TEST_IMG" | _filter_qemu_io 
$QEMU_IMG commit "$TEST_IMG"



# The dirty bit must not be set

$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features

$PYTHON qcow2.py "$TEST_IMG".base dump-header | grep incompatible_features

./qcow2.py "$TEST_IMG" dump-header | grep incompatible_features

./qcow2.py "$TEST_IMG".base dump-header | grep incompatible_features



_check_test_img

TEST_IMG="$TEST_IMG".base _check_test_img

tests/qemu-iotests/054

+1 −2
Original line number Diff line number Diff line
@@ -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
@@ -50,7 +49,7 @@ _make_test_img $((1024*1024))T 
echo

echo "creating too large image (1 EB) using qcow2.py"

_make_test_img 4G

$PYTHON qcow2.py "$TEST_IMG" set-header size $((1024 ** 6))

./qcow2.py "$TEST_IMG" set-header size $((1024 ** 6))

_check_test_img



# success, all done