tests: Reformat TESTS_ENVIRONMENT so all use a standard format.

No functional change.
This commit is contained in:
Richard W.M. Jones
2012-06-28 13:49:32 +01:00
parent 2f1a602c4b
commit 27efd99ddb
7 changed files with 9 additions and 16 deletions

View File

@@ -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.

View File

@@ -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 \

View File

@@ -56,8 +56,7 @@ endif
$(TESTS): $(test_prereq)
TESTS_ENVIRONMENT = \
$(top_builddir)/run --test
TESTS_ENVIRONMENT = $(top_builddir)/run --test
INSTALLDIRS = site

4
run.in
View File

@@ -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).
#----------------------------------------------------------------------

View File

@@ -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)

View File

@@ -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)

View File

@@ -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)