s4-selftest: show the test summary at the end of 'make test' in the build farm

[amitay/samba.git] / source4 / selftest / config.mk

diff --git a/source4/selftest/config.mk b/source4/selftest/config.mk
index 0adbb6651dee7baa4c7d6a82c73f830e7658ac35..0020d40878451cff2cad4a2ce1beb7d190949ad9 100644 (file)
--- a/source4/selftest/config.mk
+++ b/source4/selftest/config.mk
@@ -20,19 +20,20 @@ FORMAT_TEST = $(PERL) $(selftestdir)/format-subunit.pl --prefix=${selftest_prefi
 FORMAT_TEST_OUTPUT = $(FILTER_XFAIL) | $(FORMAT_TEST)
 
 test-subunit:: everything
-       $(SELFTEST) --socket-wrapper $(TESTS) $(ST_TOUCH)
+       $(ST_RM) $(SELFTEST) --socket-wrapper $(TESTS) $(ST_TOUCH)
        $(ST_DONE_TEST)
 
 slowtest:: everything
-       $(SELFTEST) $(DEFAULT_TEST_OPTIONS) $(TESTS) $(ST_TOUCH) | $(FORMAT_TEST_OUTPUT) --immediate 
+       $(ST_RM) $(SELFTEST) $(DEFAULT_TEST_OPTIONS) $(TESTS) $(ST_TOUCH) | $(FORMAT_TEST_OUTPUT) --immediate
        $(ST_DONE_TEST)
 
 ifeq ($(RUN_FROM_BUILD_FARM),yes)
 test:: everything
        $(ST_RM) $(SELFTEST) $(SELFTEST_NOSLOW_OPTS) $(DEFAULT_TEST_OPTIONS) $(TESTS) $(ST_TOUCH) | $(FILTER_XFAIL) --strip-passed-output
        $(ST_DONE_TEST)
+       test -f st/summary && cat st/summary
 else
-test:: everything
+test:: 
        $(ST_RM) $(SELFTEST) $(SELFTEST_NOSLOW_OPTS) $(DEFAULT_TEST_OPTIONS) $(TESTS) $(ST_TOUCH) | $(FORMAT_TEST_OUTPUT) --immediate 
        $(ST_DONE_TEST)
 endif