[lmi-commits] [5122] Handle missing testdecks more gracefully

[Greg Chicares]

Revision: 5122
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5122
Author:   chicares
Date:     2010-12-04 16:19:48 +0000 (Sat, 04 Dec 2010)
Log Message:
-----------
Handle missing testdecks more gracefully

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

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2010-12-03 18:24:00 UTC (rev 5121)
+++ lmi/trunk/ChangeLog 2010-12-04 16:19:48 UTC (rev 5122)
@@ -26890,3 +26890,13 @@
   install_msw.sh
 Support parallel builds.
 
+20101203T1824Z <address@hidden> [656]
+
+  workhorse.make
+Exclude testdeck change log from system testing.
+
+20101204T1619Z <address@hidden> [656]
+
+  workhorse.make
+Handle missing testdecks more gracefully.
+

Modified: lmi/trunk/workhorse.make
===================================================================
--- lmi/trunk/workhorse.make    2010-12-03 18:24:00 UTC (rev 5121)
+++ lmi/trunk/workhorse.make    2010-12-04 16:19:48 UTC (rev 5122)
@@ -1204,7 +1204,7 @@
        @cd $(touchstone_dir) && $(MD5SUM) $(notdir $^) > $@
 
 testdeck_suffixes    := cns ill ini mec
-test_result_suffixes := test test0 monthly_trace.* mec.xml
+test_result_suffixes := test test0 monthly_trace.* mec.tsv mec.xml
 
 system_test_analysis := $(test_dir)/analysis-$(yyyymmddhhmm)
 system_test_diffs    := $(test_dir)/diffs-$(yyyymmddhhmm)
@@ -1219,15 +1219,17 @@
 %.cns: dot_test_files = $(basename $(notdir $@)).*test
 %.ill: dot_test_files = $(basename $(notdir $@)).*test
 
-# Sort input files iff $(LS) supports '--sort=size'; otherwise, use
-# them unsorted. Parallel runs are slightly faster when the biggest
+# This must be a 'make' variable so that the targets it contains can
+# be made PHONY.
+#
+# Use $(wildcard) here because its convenient 'nullglob' semantics are
+# not portably available in the bourne shell.
+#
+# In the 'system_test' target, sort its contents iff $(LS) supports
+# '--sort=size': parallel runs are slightly faster when the biggest
 # jobs are started first.
 
-testdecks := \
-  $(shell \
-       $(LS) --sort=size $(addprefix $(test_dir)/*., $(testdeck_suffixes)) \
-    || $(LS)             $(addprefix $(test_dir)/*., $(testdeck_suffixes)) \
-  )
+testdecks := $(wildcard $(addprefix $(test_dir)/*., $(testdeck_suffixes)))
 
 # Naming the output files would be more natural, but that's infeasible
 # because $(test_emission) can be overridden implicitly in ways that a
@@ -1254,7 +1256,9 @@
 system_test: $(data_dir)/configurable_settings.xml $(touchstone_md5sums) 
install
        @$(ECHO) System test:
        @$(RM) --force $(addprefix $(test_dir)/*., $(test_result_suffixes))
-       @$(MAKE) --file=$(this_makefile) --directory=$(test_dir) $(testdecks)
+       @[ "$(strip $(testdecks))" != "" ] || ( $(ECHO) No testdecks. && false )
+       @testdecks=`$(LS) --sort=size $(testdecks) || $(ECHO) $(testdecks)` \
+         && $(MAKE) --file=$(this_makefile) --directory=$(test_dir) $$testdecks
        @$(SORT) --key=2 $(system_test_md5sums) --output=$(system_test_md5sums)
        @$(SORT) $(system_test_analysis) --output=$(system_test_analysis)
        @-< $(system_test_analysis) $(SED) \