[lmi-commits] [5100] Specify missing prerequisites of 'test' targets

[Greg Chicares]

Revision: 5100
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5100
Author:   chicares
Date:     2010-09-17 15:03:06 +0000 (Fri, 17 Sep 2010)
Log Message:
-----------
Specify missing prerequisites of 'test' targets

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

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2010-09-16 00:39:58 UTC (rev 5099)
+++ lmi/trunk/ChangeLog 2010-09-17 15:03:06 UTC (rev 5100)
@@ -26761,3 +26761,8 @@
   input_xml_io.cpp
 Accommodate deficient admin-system extracts.
 
+20100917T1502Z <address@hidden> [656]
+
+  workhorse.make
+Specify missing prerequisites of 'test' targets.
+

Modified: lmi/trunk/workhorse.make
===================================================================
--- lmi/trunk/workhorse.make    2010-09-16 00:39:58 UTC (rev 5099)
+++ lmi/trunk/workhorse.make    2010-09-17 15:03:06 UTC (rev 5100)
@@ -1026,20 +1026,35 @@
 
 # Test data.
 
-sample.cns: $(addprefix $(src_dir)/,sample.cns)
-sample.ill: $(addprefix $(src_dir)/,sample.ill)
-
 test_data := \
   sample.cns \
   sample.ill \
 
 $(test_data):
-       @$(CP) --preserve --update $(addprefix $(src_dir)/,$@) .
+       @$(CP) --preserve --update $(src_dir)/$@ .
 
 
################################################################################
 
+# Configurable settings.
+
+# If this file:
+#   /etc/opt/lmi/configurable_settings.xml
+# exists, it overrides files with the same name in other directories.
+# Developers may have reason to prefer that it not exist; therefore,
+# local copies are provided for as needed.
+
+configurable_settings.xml:
+       @$(CP) --preserve --update $(bin_dir)/$@ .
+
+$(data_dir)/configurable_settings.xml:
+       @$(CP) --preserve --update $(bin_dir)/$(notdir $@) $(data_dir)/.
+
+################################################################################
+
 # Unit tests.
 
+$(unit_test_targets): configurable_settings.xml
+
 .PHONY: unit_tests
 unit_tests: $(test_data) $(unit_test_targets) run_unit_tests
 
@@ -1076,8 +1091,12 @@
 
 # Test command-line interface.
 
+cli_subtargets := cli_tests_init cli_selftest $(addprefix 
cli_test-,$(test_data))
+
+$(cli_subtargets): $(data_dir)/configurable_settings.xml
+
 .PHONY: cli_tests
-cli_tests: cli_tests_init cli_selftest $(addprefix cli_test-,$(test_data))
+cli_tests: $(cli_subtargets)
 
 .PHONY: cli_tests_init
 cli_tests_init:
@@ -1133,6 +1152,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)
        @$(ECHO) Test common gateway interface:
@@ -1170,7 +1191,7 @@
 system_test_md5sums  := $(test_dir)/md5sums-$(yyyymmddhhmm)
 
 .PHONY: system_test
-system_test: install
+system_test: $(data_dir)/configurable_settings.xml install
        @$(ECHO) System test:
        @-cd $(test_dir); \
          $(foreach z, $(addprefix *., $(test_result_suffixes)), $(RM) --force 
$z;)