diff options
| author | Richard W.M. Jones <rjones@redhat.com> | 2012-11-13 13:46:47 +0000 |
|---|---|---|
| committer | Richard W.M. Jones <rjones@redhat.com> | 2012-11-13 15:26:29 +0000 |
| commit | ee5f18293b72779ea7387414cca5cd8c35230fc8 (patch) | |
| tree | 0fdaf1f35ec4511ce084f74b35cd0ea06334a356 | |
| parent | cb4284b9e331c5c27351dadf8fe776f137eff318 (diff) | |
| download | libguestfs-ee5f18293b72779ea7387414cca5cd8c35230fc8.tar.gz libguestfs-ee5f18293b72779ea7387414cca5cd8c35230fc8.tar.xz libguestfs-ee5f18293b72779ea7387414cca5cd8c35230fc8.zip | |
tests: Add 'make check-slow' rule to recursively run slow/long-running tests.
| -rw-r--r-- | Makefile.am | 10 | ||||
| -rw-r--r-- | src/guestfs.pod | 4 | ||||
| -rw-r--r-- | tests/bigdirs/Makefile.am | 12 |
3 files changed, 20 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index b97f59d0..cdf4dd5c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -298,7 +298,8 @@ extra-tests: valgrind-local-guests \ check-with-appliance \ check-with-upstream-qemu \ - check-with-upstream-libvirt + check-with-upstream-libvirt \ + check-slow check-valgrind: build-test-guests @for f in `grep -l '^$@:' $(SUBDIRS:%=%/Makefile.am)`; do \ @@ -313,6 +314,12 @@ check-valgrind-local-guests: $(MAKE) GUESTS="$$GUESTS" -C `dirname $$f` $@ || exit $$?; \ done +check-slow: build-test-guests + for f in `grep -l '^$@:' $(SUBDIRS:%=%/Makefile.am)`; do \ + echo $(MAKE) -C `dirname $$f` $@; \ + $(MAKE) -C `dirname $$f` $@ || exit $$?; \ + done + build-test-guests: $(MAKE) -C tests/guests check @@ -360,6 +367,7 @@ help: @echo "make check-with-appliance Test using appliance attach-method." @echo "make check-with-upstream-qemu Test using upstream qemu." @echo "make check-with-upstream-libvirt Test using upstream libvirt." + @echo "make check-slow Slow/long-running tests." @echo "make extra-tests Same as check-* (but not 'make check')" @echo "make syntax-check Check syntax and style problems in the code." @echo diff --git a/src/guestfs.pod b/src/guestfs.pod index f4223d2a..1e1fe416 100644 --- a/src/guestfs.pod +++ b/src/guestfs.pod @@ -3548,6 +3548,10 @@ but you can set this to another directory on the command line, eg: make check-with-upstream-libvirt LIBVIRTDIR=/usr/src/libvirt +=item C<make check-slow> + +Runs some slow/long-running tests which are not run by default. + =item C<make extra-tests> Equivalent to running all C<make check-*> rules diff --git a/tests/bigdirs/Makefile.am b/tests/bigdirs/Makefile.am index 7dbcbbb4..770d97d3 100644 --- a/tests/bigdirs/Makefile.am +++ b/tests/bigdirs/Makefile.am @@ -19,10 +19,12 @@ include $(top_srcdir)/subdir-rules.mk EXTRA_DIST = test-big-dirs.pl -# Don't run this test by default. It takes a very long time -# to run and is not especially informative. However we have to -# have an empty TESTS rule otherwise you can't run the test -# from the command line using 'make check TESTS=test-big-dirs.pl' +# Don't run this test by default. It takes a very long time to run +# and is not especially informative. However we have to have an empty +# TESTS rule otherwise you can't run the test from the command line +# using 'make TESTS=test-big-dirs.pl check' TESTS = - TESTS_ENVIRONMENT = $(top_builddir)/run --test + +check-slow: + $(MAKE) TESTS="test-big-dirs.pl" check |