[lmi-commits] [5101] Run tests seriatim iff they write to stdout

[Greg Chicares]

Revision: 5101
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5101
Author:   chicares
Date:     2010-09-17 20:55:19 +0000 (Fri, 17 Sep 2010)
Log Message:
-----------
Run tests seriatim iff they write to stdout

Modified Paths:
--------------
    lmi/trunk/ChangeLog
    lmi/trunk/diagnostics.sed
    lmi/trunk/workhorse.make

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2010-09-17 15:03:06 UTC (rev 5100)
+++ lmi/trunk/ChangeLog 2010-09-17 20:55:19 UTC (rev 5101)
@@ -26761,8 +26761,14 @@
   input_xml_io.cpp
 Accommodate deficient admin-system extracts.
 
-20100917T1502Z <address@hidden> [656]
+20100917T1503Z <address@hidden> [656]
 
   workhorse.make
 Specify missing prerequisites of 'test' targets.
 
+20100917T2055Z <address@hidden> [656]
+
+  diagnostics.sed
+  workhorse.make
+Run tests seriatim iff they write to stdout.
+

Modified: lmi/trunk/diagnostics.sed
===================================================================
--- lmi/trunk/diagnostics.sed   2010-09-17 15:03:06 UTC (rev 5100)
+++ lmi/trunk/diagnostics.sed   2010-09-17 20:55:19 UTC (rev 5101)
@@ -45,6 +45,7 @@
 /not remade because of errors\./d
 /^These files are more recent than/d
 /Built [0-9].*T[0-9].*Z\.$/d
+/^make.*\[[0-9]*\]: warning: -jN forced in submake: disabling jobserver 
mode.$/d
 /^make.*\[[0-9]*\]: \*\*\* \[.*\] Error [0-9]*$/d
 /^make.*\[[0-9]*\]: \[.*\] Error [0-9]* (ignored)$/d
   # Delete expected output from gnu cpp.

Modified: lmi/trunk/workhorse.make
===================================================================
--- lmi/trunk/workhorse.make    2010-09-17 15:03:06 UTC (rev 5100)
+++ lmi/trunk/workhorse.make    2010-09-17 20:55:19 UTC (rev 5101)
@@ -1053,11 +1053,19 @@
 
 # Unit tests.
 
-$(unit_test_targets): configurable_settings.xml
+# Use '--jobs=1' to force tests to run in series: running them in
+# parallel would scramble their output.
+#
+# Ignore the "disabling jobserver mode" warning.
 
 .PHONY: unit_tests
-unit_tests: $(test_data) $(unit_test_targets) run_unit_tests
+unit_tests: $(test_data)
+       @-$(MAKE) --file=$(this_makefile) build_unit_tests
+       @ $(MAKE) --file=$(this_makefile) --jobs=1 run_unit_tests
 
+.PHONY: build_unit_tests
+build_unit_tests: configurable_settings.xml $(unit_test_targets)
+
 .PHONY: unit_tests_not_built
 unit_tests_not_built:
        @$(ECHO) "List of unit-test targets that did not build successfully:"
@@ -1095,8 +1103,14 @@
 
 $(cli_subtargets): $(data_dir)/configurable_settings.xml
 
+# Use '--jobs=1' to force tests to run in series: running them in
+# parallel would scramble their output.
+#
+# Ignore the "disabling jobserver mode" warning.
+
 .PHONY: cli_tests
-cli_tests: $(cli_subtargets)
+cli_tests: $(test_data) antediluvian_cli$(EXEEXT) lmi_cli_shared$(EXEEXT)
+       @$(MAKE) --file=$(this_makefile) --jobs=1 $(cli_subtargets)
 
 .PHONY: cli_tests_init
 cli_tests_init:
@@ -1108,7 +1122,7 @@
 self_test_options := --accept --data_path=$(data_dir) --selftest
 
 .PHONY: cli_selftest
-cli_selftest: antediluvian_cli$(EXEEXT) lmi_cli_shared$(EXEEXT)
+cli_selftest:
        @./antediluvian_cli$(EXEEXT) $(self_test_options) > /dev/null
        @./antediluvian_cli$(EXEEXT) $(self_test_options)
        @./lmi_cli_shared$(EXEEXT) $(self_test_options) > /dev/null
@@ -1121,7 +1135,7 @@
 cli_test-sample.cns: special_emission := emit_composite_only
 
 .PHONY: cli_test-%
-cli_test-%: $(test_data) lmi_cli_shared$(EXEEXT)
+cli_test-%:
        @$(ECHO) Test $*:
        @./lmi_cli_shared$(EXEEXT) \
          --accept \
@@ -1152,10 +1166,8 @@
 # MSYS !! The initial ';' in several $(SED) commands works around a
 # problem caused by MSYS.
 
-antediluvian_cgi$(EXEEXT): configurable_settings.xml
-
 .PHONY: cgi_tests
-cgi_tests: $(test_data) antediluvian_cgi$(EXEEXT)
+cgi_tests: $(test_data) configurable_settings.xml antediluvian_cgi$(EXEEXT)
        @$(ECHO) Test common gateway interface:
        @./antediluvian_cgi$(EXEEXT) --write_content_string > /dev/null
        @./antediluvian_cgi$(EXEEXT) --enable_test <cgi.test.in >cgi.touchstone