On 24.05.2014 23:24, Max Reitz wrote:
This series enables qemu-iotests to be run in a build tree outside of
the source tree. It also makes the tests use the command for invoking
the Python interpreter specified through configure instead of always
using "/usr/bin/env python".
v4:
- Patch 1:
- fixed a comment ("assume that it truly as and always have to test"
-> "assume that it truly is and have to test", regarding calls from
the source tree signifying in-build trees)
- {pushd,popd} -q do not what I though they do; replaced it by a
redirection of their output to /dev/null
- purge $here from tests/qemu-iotests/common [Fam]
- Patch 2:
- use symlink() instead of ln -s in configure [Fam]
- Patch 3:
- dropped [Fam, Eric, Markus]
- Patch 4:
Of course here I meant the former patch 4, which is patch 3 in this
series due to the former patch 3 having been dropped.
Max
- $build_iotests is always set as of v3, therefore it may be always
used for sourcing common.env [Fam]
- With patch 3 dropped, there is no need to try to source
common.env.default anymore; instead, make the error message when
sourcing common.env failed clearer
v3:
- Patch 1:
- assume in-tree build when run from the source tree [Fam]
- if "./qemu", "./qemu-io" etc. exist, prefer them over automatic
detection
- 'for binary in "*-softmmu/qemu-system-*"' is not what we want, but
rather 'for binary in *-softmmu/qemu-system-*'
v2:
- Patch 1:
- added error handling for obtaining the original source tree path
name [Eric]
- for this, added a new function _init_error for emitting critical
errors during initialization of "check" (and employed it where
applicable)
- dropped superfluous doubles quotes in assignments (e.g.
OUTPUT_DIR="$PWD" -> OUTPUT_DIR=$PWD) [Eric]
- use [[ && ]] instead of [ -a ] [Eric]
- Patch 4:
- used _init_error
- Patch 5:
- dropped chmod +x for tests without +x [Fam]
git-backport-diff against v3:
Key:
[----] : patches are identical
[####] : number of functional differences between upstream/downstream patch
[down] : patch is downstream-only
The flags [FC] indicate (F)unctional and (C)ontextual differences, respectively
001/6:[0009] [FC] 'iotests: Allow out-of-tree run'
002/6:[0002] [FC] 'configure: Enable out-of-tree iotests'
003/6:[0014] [FC] 'iotests: Source common.env'
004/6:[----] [--] 'iotests: Use $PYTHON for Python scripts'
005/6:[----] [--] 'iotests: Drop Python version from 065's Shebang'
006/6:[----] [--] 'iotests: Fix 083 for out-of-tree builds'
Max Reitz (6):
iotests: Allow out-of-tree run
configure: Enable out-of-tree iotests
iotests: Source common.env
iotests: Use $PYTHON for Python scripts
iotests: Drop Python version from 065's Shebang
iotests: Fix 083 for out-of-tree builds
configure | 12 +++++
tests/qemu-iotests/031 | 8 +--
tests/qemu-iotests/036 | 6 +--
tests/qemu-iotests/039 | 18 +++----
tests/qemu-iotests/054 | 2 +-
tests/qemu-iotests/060 | 20 +++----
tests/qemu-iotests/061 | 24 ++++-----
tests/qemu-iotests/065 | 2 +-
tests/qemu-iotests/083 | 10 ++--
tests/qemu-iotests/check | 110 +++++++++++++++++++++++++++++++++------
tests/qemu-iotests/common | 11 ++--
tests/qemu-iotests/common.config | 2 +-
tests/qemu-iotests/common.rc | 8 +--
tests/qemu-iotests/iotests.py | 3 +-
14 files changed, 164 insertions(+), 72 deletions(-)
