Author: jelmer Date: 2007-12-20 15:54:00 +0000 (Thu, 20 Dec 2007) New Revision: 26546
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26546 Log: Rather than having a gazillion targets, add output format variable for 'make test'. Modified: branches/SAMBA_4_0/ branches/SAMBA_4_0/source/selftest/config.mk Changeset: Property changes on: branches/SAMBA_4_0 ___________________________________________________________________ Name: bzr:revision-info ...skipped... Name: bzr:revision-id:v3-trunk0 ...skipped... Modified: branches/SAMBA_4_0/source/selftest/config.mk =================================================================== --- branches/SAMBA_4_0/source/selftest/config.mk 2007-12-20 15:53:56 UTC (rev 26545) +++ branches/SAMBA_4_0/source/selftest/config.mk 2007-12-20 15:54:00 UTC (rev 26546) @@ -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 @@ 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)