On 14 May 2014 23:47, Max Reitz <mre...@redhat.com> wrote: > On 14.05.2014 16:26, Peter Maydell wrote: >> >> Before we write common.env to the tests/qemu-iotests directory, ensure >> that it exists. This fixes out-of-tree builds from clean. >> >> Signed-off-by: Peter Maydell <peter.mayd...@linaro.org> >> --- >> If somebody would like to review this I'll apply it to master as >> a buildfix... >> >> configure | 1 + >> 1 file changed, 1 insertion(+) >> >> diff --git a/configure b/configure >> index 6adfa72..c4e43ed 100755 >> --- a/configure >> +++ b/configure >> @@ -4770,6 +4770,7 @@ fi >> iotests_common_env="tests/qemu-iotests/common.env" >> +mkdir -p "$(dirname "$iotests_common_env")" >> echo "# Automatically generated by configure - do not modify" > >> $iotests_common_env >> echo >> $iotests_common_env >> echo "PYTHON='$python'" >> $iotests_common_env > > > If we do this, we'd have a commen.env which we cannot use, as all the tests > are still in the original source tree.
OK, this is busted then. We need to revert your original patch; when we've figured out how to do it properly we can apply a corrected version. > I'd rather use "$source_path/tests/qemu_iotests/common.env" instead, or, if > that is unacceptable as it modifies the original source tree (which is > probably not desired when doing an out-of-tree build), write common.env only > if this is an in-tree build. You're correct, we must not write to the original source tree. We mustn't behave differently on in-tree and out-of-tree builds either. thanks -- PMM