diff options
| -rwxr-xr-x | selftest/format-subunit (renamed from selftest/format-subunit.pl) | 0 | ||||
| -rw-r--r-- | source3/Makefile.in | 4 | ||||
| -rw-r--r-- | source4/selftest/config.mk | 4 |
3 files changed, 2 insertions, 6 deletions
diff --git a/selftest/format-subunit.pl b/selftest/format-subunit index 472f51a815..472f51a815 100755 --- a/selftest/format-subunit.pl +++ b/selftest/format-subunit diff --git a/source3/Makefile.in b/source3/Makefile.in index 3d5a618993..9913806fe7 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -3237,7 +3237,6 @@ valgrindtest:: all torture timelimit VALGRIND="valgrind -q --num-callers=30 --log-file=${selftest_prefix}/valgrind.log" \ PERL="$(PERL)" $(srcdir)/script/tests/selftest.sh ${selftest_prefix} all ${TEST_EXTRA_ARGS} -SELFTEST_FORMAT = plain selftestdir = ../selftest S3_LD_LIBPATH_OVERRIDE = $(LIB_PATH_VAR)="$(builddir)/bin:$$$(LIB_PATH_VAR)" @@ -3254,8 +3253,7 @@ selftest:: all torture timelimit --socket-wrapper $(TESTS) | \ $(PERL) $(selftestdir)/filter-subunit.pl \ --expected-failures=$(srcdir)/selftest/knownfail | \ - $(PERL) $(selftestdir)/format-subunit.pl --format=$(SELFTEST_FORMAT) \ - --immediate + $(PERL) $(selftestdir)/format-subunit --immediate selftest-%: $(MAKE) selftest TESTS=$* diff --git a/source4/selftest/config.mk b/source4/selftest/config.mk index 04d42d279c..4359585e9e 100644 --- a/source4/selftest/config.mk +++ b/source4/selftest/config.mk @@ -1,5 +1,3 @@ -TEST_FORMAT = plain - SELFTEST = $(LD_LIBPATH_OVERRIDE) PYTHON=$(PYTHON) \ $(PERL) $(selftestdir)/selftest.pl --prefix=${selftest_prefix} \ --builddir=$(builddir) --srcdir=$(srcdir) \ @@ -16,7 +14,7 @@ ST_DONE_TEST = @test -f $(selftest_prefix)/st_done || { echo "SELFTEST FAILED"; SELFTEST_NOSLOW_OPTS = --exclude=$(srcdir)/selftest/slow SELFTEST_QUICK_OPTS = $(SELFTEST_NOSLOW_OPTS) --quick --include=$(srcdir)/selftest/quick FILTER_XFAIL = $(PERL) $(selftestdir)/filter-subunit.pl --expected-failures=$(srcdir)/selftest/knownfail -SUBUNIT_FORMATTER ?= $(PERL) $(selftestdir)/format-subunit.pl --prefix=${selftest_prefix} --format=$(TEST_FORMAT) --immediate +SUBUNIT_FORMATTER ?= $(PERL) $(selftestdir)/format-subunit --prefix=${selftest_prefix} --immediate FORMAT_TEST_OUTPUT = $(FILTER_XFAIL) | $(SUBUNIT_FORMATTER) test-subunit:: everything |