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/check | |
| parent | f30d56e7d63fe2f536511bffa13306bec2e01c37 (diff) | |
| download | qemu-7d983531c6a17f38ad66908216b1d51923a9664c.zip | |
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/check')
| -rwxr-xr-x | tests/qemu-iotests/check | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check index ca2ee43d3b..e2ed5a95f8 100755 --- a/tests/qemu-iotests/check +++ b/tests/qemu-iotests/check @@ -34,13 +34,6 @@ timestamp=${TIMESTAMP:=false} # generic initialization iam=check -# we need common.env -if ! . ./common.env -then - echo "$iam: failed to source common.env" - exit 1 -fi - # we need common.config if ! . ./common.config then @@ -222,16 +215,9 @@ do start=`_wallclock` $timestamp && echo -n " ["`date "+%T"`"]" - - if [ "$(head -n 1 $seq)" == "#!/usr/bin/env python" ]; then - run_command="$PYTHON $seq" - else - [ ! -x $seq ] && chmod u+x $seq # ensure we can run it - run_command="./$seq" - fi - + [ ! -x $seq ] && chmod u+x $seq # ensure we can run it MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(($RANDOM % 255 + 1))} \ - $run_command >$tmp.out 2>&1 + ./$seq >$tmp.out 2>&1 sts=$? $timestamp && _timestamp stop=`_wallclock` |