From 9ca5a267466f7b1b83a906b1f3b8b1b953222f21 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 20 Dec 2007 15:54:00 +0100
Subject: r26546: Rather than having a gazillion targets, add output format
 variable for 'make test'. (This used to be commit
 bd5217906c12c36df9769fc32aee77d9c1805bf2)

---
 source4/selftest/config.mk | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'source4/selftest/config.mk')

diff --git a/source4/selftest/config.mk b/source4/selftest/config.mk
index 72bc10cf56..ab04c60a11 100644
--- a/source4/selftest/config.mk
+++ b/source4/selftest/config.mk
@@ -1,12 +1,12 @@
+TEST_FORMAT = plain
+
 SELFTEST = $(LIB_PATH_VAR)=$(builddir)/bin/shared $(PERL) $(srcdir)/selftest/selftest.pl --prefix=${selftest_prefix} \
     --builddir=$(builddir) --srcdir=$(srcdir) \
     --expected-failures=$(srcdir)/samba4-knownfail \
+	--format=$(TEST_FORMAT) \
     --exclude=$(srcdir)/samba4-skip --testlist="./selftest/samba4_tests.sh|" \
     $(TEST_OPTIONS) 
 
-htmltest: everything
-	$(SELFTEST) $(DEFAULT_TEST_OPTIONS) --format=html $(TESTS)
-
 test: everything
 	$(SELFTEST) $(DEFAULT_TEST_OPTIONS) --immediate $(TESTS)
 
@@ -28,9 +28,6 @@ test-noswrap: everything
 quicktest: all
 	$(SELFTEST) --quick --socket-wrapper --immediate $(TESTS)
 
-htmlquicktest: all
-	$(SELFTEST) --quick --socket-wrapper --format=html --immediate $(TESTS)
-
 quicktestone: all
 	$(SELFTEST) --quick --socket-wrapper --one $(TESTS)
 
-- 
cgit