diff --git a/Makefile.am b/Makefile.am index f323584a7..4196b93ec 100644 --- a/Makefile.am +++ b/Makefile.am @@ -328,16 +328,6 @@ quickcheck: # Non-standard tests. -extra-tests: - $(MAKE) -j1 \ - check-valgrind \ - check-valgrind-local-guests \ - check-direct \ - check-valgrind-direct \ - check-with-upstream-qemu \ - check-with-upstream-libvirt \ - check-slow - check-valgrind: build-test-guests @errors=0; \ for f in `grep -l '^$@:' $(SUBDIRS:%=%/Makefile.am)`; do \ @@ -436,14 +426,13 @@ help: @echo "make check Run the standard tests" @echo "make -k check ... and display all errors at once." @echo - @echo "make extra-tests Runs all of the following tests:" - @echo " make check-valgrind Run a subset of the tests under valgrind." - @echo " make check-valgrind-local-guests Test under valgrind using local guests." - @echo " make check-direct Test using direct backend." - @echo " make check-valgrind-direct Test valgrind + direct backend." - @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 check-valgrind Run a subset of the tests under valgrind." + @echo "make check-valgrind-local-guests Test under valgrind using local guests." + @echo "make check-direct Test using direct backend." + @echo "make check-valgrind-direct Test valgrind + direct backend." + @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 @echo "make syntax-check -j1 -k Check syntax and style problems in the code." @echo "make print-subdirs Print subdirectories." diff --git a/README b/README index c5e59ec7c..3ebaeb4ea 100644 --- a/README +++ b/README @@ -236,13 +236,6 @@ Also: runs a subset of the test suite under valgrind (requires valgrind to be installed obviously). - make extra-tests - -runs check-valgrind + even more tests, but these require that you have -some libvirt guests installed, that these guests' disks are accessible -by the current user, and these tests may fail for other reasons which -are not necessarily because of real problems. - make help lists all 'make' targets. diff --git a/contrib/README b/contrib/README index c3b3293e9..bee683e11 100644 --- a/contrib/README +++ b/contrib/README @@ -17,7 +17,7 @@ intro/ "Slides" for an intro to libguestfs. This is a short (10-15 make-check-on-installed.pl This Perl script allows you to run the test suite (ie. 'make - check', 'make extra-tests' etc) on an installed RPM. This is + check', etc) on an installed RPM. This is useful for adding another layer of testing to packages before we release them. Note that a checked out copy of the source from git is required. Read the top of the file before using. diff --git a/contrib/make-check-on-installed.pl b/contrib/make-check-on-installed.pl index c6ca63ff4..d2337e800 100755 --- a/contrib/make-check-on-installed.pl +++ b/contrib/make-check-on-installed.pl @@ -37,7 +37,8 @@ # If the script runs successfully, then run the test suite as normal: # # make check -# make extra-tests +# +# (other make check-* rules can also be used here). # # To switch back to running the test suite on the locally built # version, do: diff --git a/src/guestfs.pod b/src/guestfs.pod index 1185972d8..66ed2ed6f 100644 --- a/src/guestfs.pod +++ b/src/guestfs.pod @@ -3919,11 +3919,6 @@ Runs some slow/long-running tests which are not run by default. Any C in the tree that has a C target will be run by this rule. -=item C - -Equivalent to running all C rules -(but not C). - =back =head2 DAEMON CUSTOM PRINTF FORMATTERS