sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-26 21:57:41 +03:00
Code

Remove extension from format-subunit.

Browse Source
This commit is contained in:
Jelmer Vernooij 2010-03-28 21:42:34 +02:00
parent 9ecc30837b
commit b607f99688
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
selftest/format-subunit.pl → selftest/format-subunit
View File

4
source3/Makefile.in
View File

@ -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=$*

4
source4/selftest/config.mk
View File

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