diff options
| author | Richard W.M. Jones <rjones@redhat.com> | 2012-09-15 13:47:39 +0100 |
|---|---|---|
| committer | Richard W.M. Jones <rjones@redhat.com> | 2012-09-15 14:41:06 +0100 |
| commit | 509dd90c43afed75b861b7d82ebe8739d3500d54 (patch) | |
| tree | a24ecbaffca06f79cae8b5c135254c78c9e921d5 /tests | |
| parent | eeb0c598ec8caa50998336713ed4e62902e0a74d (diff) | |
| download | libguestfs-509dd90c43afed75b861b7d82ebe8739d3500d54.tar.gz libguestfs-509dd90c43afed75b861b7d82ebe8739d3500d54.tar.xz libguestfs-509dd90c43afed75b861b7d82ebe8739d3500d54.zip | |
extra-tests: The upstream qemu test now reruns all the extra tests.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/extra/Makefile.am | 17 | ||||
| -rwxr-xr-x | tests/extra/qemu-wrapper.sh (renamed from tests/extra/test-upstream-qemu-wrapper.sh) | 0 | ||||
| -rwxr-xr-x | tests/extra/test-with-upstream-qemu.sh (renamed from tests/extra/test-upstream-qemu.sh) | 5 |
3 files changed, 12 insertions, 10 deletions
diff --git a/tests/extra/Makefile.am b/tests/extra/Makefile.am index 59a38e27..e52c5953 100644 --- a/tests/extra/Makefile.am +++ b/tests/extra/Makefile.am @@ -73,7 +73,7 @@ random_guests := \ LIBVIRT_DEFAULT_URI="$(libvirt_uri)" \ $(abs_top_builddir)/run $(srcdir)/pick-guests.pl 5) -extra-tests: \ +extra-tests-non-recursive: \ test-guests \ test-prerequisites \ test-c-api \ @@ -86,8 +86,11 @@ extra-tests: \ test-ocaml \ test-resize \ test-sparsify \ - test-mount-local \ - test-upstream-qemu + test-mount-local + +extra-tests: \ + extra-tests-non-recursive \ + extra-tests-with-upstream-qemu test-guests: $(MAKE) -C ../guests check @@ -189,8 +192,8 @@ test-ocaml: $(MAKE) -C ../../ocaml VG="$(VG)" check # When running the extra tests, if directory $HOME/d/qemu exists then -# we will try to run the basic tests using the version of qemu from -# that directory. eg. That might be qemu from git. +# we will rerun the extra-tests using the version of qemu from that +# directory. eg. That might be qemu from git. # # The directory name can be overridden using: # make extra-tests QEMUDIR=/path/to/other/qemu @@ -200,5 +203,5 @@ export QEMUDIR export abs_srcdir export MAKE -test-upstream-qemu: - ./test-upstream-qemu.sh +extra-tests-with-upstream-qemu: + ./test-with-upstream-qemu.sh diff --git a/tests/extra/test-upstream-qemu-wrapper.sh b/tests/extra/qemu-wrapper.sh index bec2bc0b..bec2bc0b 100755 --- a/tests/extra/test-upstream-qemu-wrapper.sh +++ b/tests/extra/qemu-wrapper.sh diff --git a/tests/extra/test-upstream-qemu.sh b/tests/extra/test-with-upstream-qemu.sh index 70e0c034..58036332 100755 --- a/tests/extra/test-upstream-qemu.sh +++ b/tests/extra/test-with-upstream-qemu.sh @@ -32,7 +32,7 @@ fi "$upstream_qemu" --version -LIBGUESTFS_QEMU=$abs_srcdir/test-upstream-qemu-wrapper.sh +LIBGUESTFS_QEMU=$abs_srcdir/qemu-wrapper.sh if [ ! -f "$LIBGUESTFS_QEMU" ]; then echo "$0: internal error: \$LIBGUESTFS_QEMU not a file" @@ -42,5 +42,4 @@ fi export LIBGUESTFS_QEMU export upstream_qemu -$MAKE -C ../.. quickcheck -$MAKE -C ../c-api check +exec $MAKE extra-tests-non-recursive |