diff options
| -rw-r--r-- | haskell/Makefile.am | 4 | ||||
| -rw-r--r-- | ocaml/Makefile.am | 4 | ||||
| -rw-r--r-- | perl/Makefile.am | 3 | ||||
| -rw-r--r-- | run.in | 4 | ||||
| -rw-r--r-- | tests/c-api/Makefile.am | 3 | ||||
| -rw-r--r-- | tests/charsets/Makefile.am | 4 | ||||
| -rw-r--r-- | tests/lvm/Makefile.am | 3 |
7 files changed, 9 insertions, 16 deletions
diff --git a/haskell/Makefile.am b/haskell/Makefile.am index 866b85e5..26d76c57 100644 --- a/haskell/Makefile.am +++ b/haskell/Makefile.am @@ -27,9 +27,7 @@ EXTRA_DIST = $(generator_built) *.hs run-bindtests if HAVE_HASKELL -TESTS_ENVIRONMENT = \ - $(top_builddir)/run --test \ - $(VG) +TESTS_ENVIRONMENT = $(top_builddir)/run --test $(VG) # Don't run the bindtests: they don't build since the addition of optargs. # Haskell bindings are incomplete. diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am index ac0106d4..9a06d5a5 100644 --- a/ocaml/Makefile.am +++ b/ocaml/Makefile.am @@ -80,9 +80,7 @@ html/index.html: $(srcdir)/guestfs*.mli $(srcdir)/guestfs*.ml -$(OCAMLDOC) -d html -html $^ endif -TESTS_ENVIRONMENT = \ - $(top_builddir)/run --test \ - $(VG) +TESTS_ENVIRONMENT = $(top_builddir)/run --test $(VG) test_progs = \ t/guestfs_005_load \ diff --git a/perl/Makefile.am b/perl/Makefile.am index bca7b0bf..b0f9b5c9 100644 --- a/perl/Makefile.am +++ b/perl/Makefile.am @@ -56,8 +56,7 @@ endif $(TESTS): $(test_prereq) -TESTS_ENVIRONMENT = \ - $(top_builddir)/run --test +TESTS_ENVIRONMENT = $(top_builddir)/run --test INSTALLDIRS = site @@ -28,7 +28,9 @@ # script from anywhere (eg. $HOME/bin/run) if you wish. # # The script can also be used to make the output of tests shorter: -# TESTS_ENVIRONMENT = ... $(top_builddir)/run --test +# TESTS_ENVIRONMENT = ... $(top_builddir)/run --test [$(VG)] +# (Use the optional $(VG) when the tests must also be run under +# valgrind). #---------------------------------------------------------------------- diff --git a/tests/c-api/Makefile.am b/tests/c-api/Makefile.am index 04cd52c1..65fc9f24 100644 --- a/tests/c-api/Makefile.am +++ b/tests/c-api/Makefile.am @@ -61,8 +61,7 @@ EXTRA_DIST += test-add-libvirt-dom.c TESTS_ENVIRONMENT = \ SKIP_TEST_COMMAND=$(shell ldd test-command | grep -sq 'not a dynamic executable' || echo 1) \ SKIP_TEST_COMMAND_LINES=$(shell ldd test-command | grep -sq 'not a dynamic executable' || echo 1) \ - $(top_builddir)/run --test \ - $(VG) + $(top_builddir)/run --test $(VG) #SKIP_TEST_CHECKSUM_8=$(shell if test `find ../initramfs -name squashfs.ko | wc -l` -eq 0; then echo 1; fi) diff --git a/tests/charsets/Makefile.am b/tests/charsets/Makefile.am index 6be0dd02..c1600244 100644 --- a/tests/charsets/Makefile.am +++ b/tests/charsets/Makefile.am @@ -20,9 +20,7 @@ include $(top_srcdir)/subdir-rules.mk TESTS = \ test-charset-fidelity -TESTS_ENVIRONMENT = \ - $(top_builddir)/run --test \ - $(VG) +TESTS_ENVIRONMENT = $(top_builddir)/run --test $(VG) check_PROGRAMS = $(TESTS) diff --git a/tests/lvm/Makefile.am b/tests/lvm/Makefile.am index 75029773..231cc545 100644 --- a/tests/lvm/Makefile.am +++ b/tests/lvm/Makefile.am @@ -21,8 +21,7 @@ TESTS = \ test-lvm-filtering.sh \ test-lvm-mapping.pl -TESTS_ENVIRONMENT = \ - $(top_builddir)/run --test +TESTS_ENVIRONMENT = $(top_builddir)/run --test EXTRA_DIST = \ $(TESTS) |