diff mbox

qemu-iotests: make check-block.sh work on out-of-tree builds

Message ID 1450867341-11100-1-git-send-email-pbonzini@redhat.com
State New
Headers show

Commit Message

Paolo Bonzini Dec. 23, 2015, 10:42 a.m. UTC
Since check-block.sh, the "check" script has learnt to find the source
path.  On the other hand, it expects common.env to be in the build tree
(both changes made in commit 76c7560, "configure: Enable out-of-tree
iotests", 2014-05-24).  So, it is wrong to invoke "check" from the source
path like check-block.sh does.  Fix it.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 tests/check-block.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Max Reitz Dec. 23, 2015, 10:02 p.m. UTC | #1
On 23.12.2015 11:42, Paolo Bonzini wrote:
> Since check-block.sh, the "check" script has learnt to find the source
> path.  On the other hand, it expects common.env to be in the build tree
> (both changes made in commit 76c7560, "configure: Enable out-of-tree
> iotests", 2014-05-24).  So, it is wrong to invoke "check" from the source
> path like check-block.sh does.  Fix it.
> 
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  tests/check-block.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Assuming that this scripts belongs to the iotests which are maintained
by Kevin (and subsequently me) (it isn't covered by MAINTAINERS):

Thanks, applied to my block tree:

https://github.com/XanClic/qemu/commits/block

Max
diff mbox

Patch

diff --git a/tests/check-block.sh b/tests/check-block.sh
index b9d9c6a..a37797a 100755
--- a/tests/check-block.sh
+++ b/tests/check-block.sh
@@ -9,7 +9,7 @@  if [ ! -x $QEMU_PROG ]; then
     exit 1
 fi
 
-cd $SRC_PATH/tests/qemu-iotests
+cd tests/qemu-iotests
 
 ret=0
 ./check -T -nocache -raw || ret=1