tests: Add ./run --test option.

This option, when added via
  TESTS_ENVIRONMENT = [...] $(top_builddir)/run --test
allows us to run the tests and only print the full output (including
debugging etc) when the test fails.

14 files changed, 16 insertions, 18 deletions

diff --git a/tests/btrfs/Makefile.am b/tests/btrfs/Makefile.am
index 6d789ba7..89f683c4 100644
--- a/tests/btrfs/Makefile.am
+++ b/tests/btrfs/Makefile.am
@@ -25,7 +25,7 @@ random_val := $(shell awk 'BEGIN{srand(); print 1+int(255*rand())}' < /dev/null)
 
 TESTS_ENVIRONMENT = \
 	MALLOC_PERTURB_=$(random_val) \
-	$(top_builddir)/run
+	$(top_builddir)/run --test
 
 EXTRA_DIST = \
 	$(TESTS)
diff --git a/tests/c-api/Makefile.am b/tests/c-api/Makefile.am
index 8888b739..04cd52c1 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) \
-	LIBGUESTFS_PATH=$(top_builddir)/appliance \
-	TMPDIR=$(top_builddir) \
+	$(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 d18cb61a..401f47f5 100644
--- a/tests/charsets/Makefile.am
+++ b/tests/charsets/Makefile.am
@@ -24,8 +24,7 @@ random_val := $(shell awk 'BEGIN{srand(); print 1+int(255*rand())}' < /dev/null)
 
 TESTS_ENVIRONMENT = \
 	MALLOC_PERTURB_=$(random_val) \
-	LIBGUESTFS_PATH=$(top_builddir)/appliance \
-	TMPDIR=$(top_builddir) \
+	$(top_builddir)/run --test \
 	$(VG)
 
 check_PROGRAMS = $(TESTS)
diff --git a/tests/disks/Makefile.am b/tests/disks/Makefile.am
index da68fd50..d1b57349 100644
--- a/tests/disks/Makefile.am
+++ b/tests/disks/Makefile.am
@@ -24,7 +24,7 @@ random_val := $(shell awk 'BEGIN{srand(); print 1+int(255*rand())}' < /dev/null)
 
 TESTS_ENVIRONMENT = \
 	MALLOC_PERTURB_=$(random_val) \
-	$(top_builddir)/run
+	$(top_builddir)/run --test
 
 EXTRA_DIST = \
 	$(TESTS)
diff --git a/tests/guests/Makefile.am b/tests/guests/Makefile.am
index 3e5aea03..77ce61ba 100644
--- a/tests/guests/Makefile.am
+++ b/tests/guests/Makefile.am
@@ -49,7 +49,7 @@ fedora.img: guest-aux/make-fedora-img.pl \
 	TMPDIR=$(top_builddir) \
 	SRCDIR=$(srcdir) \
 	LAYOUT=partitions \
-	../../run $<
+	../../run --test $<
 
 # Make a (dummy) Fedora image using md devices
 fedora-md1.img fedora-md2.img: stamp-fedora-md.img
@@ -61,7 +61,7 @@ stamp-fedora-md.img: guest-aux/make-fedora-img.pl \
 	TMPDIR=$(top_builddir) \
 	SRCDIR=$(srcdir) \
 	LAYOUT=partitions-md \
-	../../run $<
+	../../run --test $<
 	touch $@
 
 guest-aux/fedora-name.db: guest-aux/fedora-name.db.txt
diff --git a/tests/luks/Makefile.am b/tests/luks/Makefile.am
index fdbbb1b6..cafef0ba 100644
--- a/tests/luks/Makefile.am
+++ b/tests/luks/Makefile.am
@@ -25,7 +25,7 @@ random_val := $(shell awk 'BEGIN{srand(); print 1+int(255*rand())}' < /dev/null)
 
 TESTS_ENVIRONMENT = \
 	MALLOC_PERTURB_=$(random_val) \
-	$(top_builddir)/run
+	$(top_builddir)/run --test
 
 EXTRA_DIST = \
 	$(TESTS)
diff --git a/tests/lvm/Makefile.am b/tests/lvm/Makefile.am
index 7e89baba..3242e17c 100644
--- a/tests/lvm/Makefile.am
+++ b/tests/lvm/Makefile.am
@@ -25,7 +25,7 @@ random_val := $(shell awk 'BEGIN{srand(); print 1+int(255*rand())}' < /dev/null)
 
 TESTS_ENVIRONMENT = \
 	MALLOC_PERTURB_=$(random_val) \
-	$(top_builddir)/run
+	$(top_builddir)/run --test
 
 EXTRA_DIST = \
 	$(TESTS)
diff --git a/tests/md/Makefile.am b/tests/md/Makefile.am
index 06352da6..2b4e7a10 100644
--- a/tests/md/Makefile.am
+++ b/tests/md/Makefile.am
@@ -28,7 +28,7 @@ random_val := $(shell awk 'BEGIN{srand(); print 1+int(255*rand())}' < /dev/null)
 
 TESTS_ENVIRONMENT = \
 	MALLOC_PERTURB_=$(random_val) \
-	$(top_builddir)/run
+	$(top_builddir)/run --test
 
 EXTRA_DIST = \
-	$(TESTS)
\ No newline at end of file
+	$(TESTS)
diff --git a/tests/ntfsclone/Makefile.am b/tests/ntfsclone/Makefile.am
index 637b247a..fcce8100 100644
--- a/tests/ntfsclone/Makefile.am
+++ b/tests/ntfsclone/Makefile.am
@@ -24,7 +24,7 @@ random_val := $(shell awk 'BEGIN{srand(); print 1+int(255*rand())}' < /dev/null)
 
 TESTS_ENVIRONMENT = \
 	MALLOC_PERTURB_=$(random_val) \
-	$(top_builddir)/run
+	$(top_builddir)/run --test
 
 EXTRA_DIST = \
 	$(TESTS)
diff --git a/tests/protocol/Makefile.am b/tests/protocol/Makefile.am
index 6e0f03f4..671b2626 100644
--- a/tests/protocol/Makefile.am
+++ b/tests/protocol/Makefile.am
@@ -30,7 +30,7 @@ random_val := $(shell awk 'BEGIN{srand(); print 1+int(255*rand())}' < /dev/null)
 
 TESTS_ENVIRONMENT = \
 	MALLOC_PERTURB_=$(random_val) \
-	$(top_builddir)/run
+	$(top_builddir)/run --test
 
 EXTRA_DIST = \
 	$(TESTS)
diff --git a/tests/qemu/Makefile.am b/tests/qemu/Makefile.am
index 128296d3..af2061dc 100644
--- a/tests/qemu/Makefile.am
+++ b/tests/qemu/Makefile.am
@@ -29,7 +29,7 @@ random_val := $(shell awk 'BEGIN{srand(); print 1+int(255*rand())}' < /dev/null)
 
 TESTS_ENVIRONMENT = \
 	MALLOC_PERTURB_=$(random_val) \
-	$(top_builddir)/run
+	$(top_builddir)/run --test
 
 EXTRA_DIST = \
 	$(TESTS)
diff --git a/tests/regressions/Makefile.am b/tests/regressions/Makefile.am
index 3027cd8e..22a364cc 100644
--- a/tests/regressions/Makefile.am
+++ b/tests/regressions/Makefile.am
@@ -39,7 +39,7 @@ random_val := $(shell awk 'BEGIN{srand(); print 1+int(255*rand())}' < /dev/null)
 TESTS_ENVIRONMENT = \
 	MALLOC_PERTURB_=$(random_val) \
 	NOEXEC_CHECK="$(top_builddir)/src/.libs/libguestfs.so $(top_builddir)/daemon/guestfsd" \
-	$(top_builddir)/run
+	$(top_builddir)/run --test
 
 check_PROGRAMS = \
 	rhbz501893 \
diff --git a/tests/selinux/Makefile.am b/tests/selinux/Makefile.am
index 29ee7fdc..47fdde54 100644
--- a/tests/selinux/Makefile.am
+++ b/tests/selinux/Makefile.am
@@ -34,7 +34,7 @@ random_val := $(shell awk 'BEGIN{srand(); print 1+int(255*rand())}' < /dev/null)
 
 TESTS_ENVIRONMENT = \
 	MALLOC_PERTURB_=$(random_val) \
-	$(top_builddir)/run
+	$(top_builddir)/run --test
 
 EXTRA_DIST = \
 	run-test.pl \
diff --git a/tests/xml/Makefile.am b/tests/xml/Makefile.am
index f5638fcb..04f9e685 100644
--- a/tests/xml/Makefile.am
+++ b/tests/xml/Makefile.am
@@ -40,7 +40,7 @@ TESTS_ENVIRONMENT = \
 	MALLOC_PERTURB_=$(random_val) \
 	abs_srcdir=$(abs_srcdir) \
 	LD_PRELOAD=.libs/libfakevirtxml.so \
-	$(top_builddir)/run
+	$(top_builddir)/run --test
 
 endif