[lmi-commits] [5948] Support automated testing of new custom IO

[Greg Chicares]

Revision: 5948
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5948
Author:   chicares
Date:     2014-09-30 11:03:24 +0000 (Tue, 30 Sep 2014)
Log Message:
-----------
Support automated testing of new custom IO

Modified Paths:
--------------
    lmi/trunk/GNUmakefile
    lmi/trunk/main_cli.cpp
    lmi/trunk/test_coding_rules.cpp
    lmi/trunk/workhorse.make

Modified: lmi/trunk/GNUmakefile
===================================================================
--- lmi/trunk/GNUmakefile       2014-09-25 00:03:42 UTC (rev 5947)
+++ lmi/trunk/GNUmakefile       2014-09-30 11:03:24 UTC (rev 5948)
@@ -338,7 +338,7 @@
        @$(RM) --force BOM
        @$(RM) --force BOY
        @[ -f md5sums ] \
-         && <md5sums $(SED) -e'/\.test$$\|\.test0$$\|\.tsv$$\|\.xml$$/d' \
+         && <md5sums $(SED) 
-e'/\.test$$\|\.test0$$\|\.test1$$\|\.tsv$$\|\.xml$$/d' \
          | $(MD5SUM) --check --quiet || true
        @for z in $(build_directory)/*.d; do [ -s $$z ]         || echo $$z; 
done;
        @for z in $(build_directory)/*.o; do [ -f $${z%%.o}.d ] || echo $$z; 
done;

Modified: lmi/trunk/main_cli.cpp
===================================================================
--- lmi/trunk/main_cli.cpp      2014-09-25 00:03:42 UTC (rev 5947)
+++ lmi/trunk/main_cli.cpp      2014-09-30 11:03:24 UTC (rev 5948)
@@ -311,7 +311,7 @@
                 LMI_ASSERT(NULL != getopt_long.optarg);
                 std::string const s(getopt_long.optarg);
                 std::string const e = fs::extension(s);
-                if(".cns" == e || ".ill" == e || ".ini" == e)
+                if(".cns" == e || ".ill" == e || ".ini" == e || ".inix" == e)
                     {
                     illustrator_names.push_back(getopt_long.optarg);
                     }

Modified: lmi/trunk/test_coding_rules.cpp
===================================================================
--- lmi/trunk/test_coding_rules.cpp     2014-09-25 00:03:42 UTC (rev 5947)
+++ lmi/trunk/test_coding_rules.cpp     2014-09-30 11:03:24 UTC (rev 5948)
@@ -214,6 +214,7 @@
         : ".ill"        == extension() ? e_xml_input
         : ".gpt"        == extension() ? e_xml_input
         : ".mec"        == extension() ? e_xml_input
+        : ".inix"       == extension() ? e_xml_input
         : ".database"   == extension() ? e_xml_other
         : ".funds"      == extension() ? e_xml_other
         : ".policy"     == extension() ? e_xml_other

Modified: lmi/trunk/workhorse.make
===================================================================
--- lmi/trunk/workhorse.make    2014-09-25 00:03:42 UTC (rev 5947)
+++ lmi/trunk/workhorse.make    2014-09-30 11:03:24 UTC (rev 5948)
@@ -1248,8 +1248,8 @@
        @cd $(touchstone_dir) && $(MD5SUM) $(notdir $^) > $@
        @$(SORT) --key=2 --output=$@ $@
 
-testdeck_suffixes    := cns ill ini mec gpt
-test_result_suffixes := test test0 monthly_trace.* mec.tsv mec.xml gpt.tsv 
gpt.xml
+testdeck_suffixes    := cns ill ini inix mec gpt
+test_result_suffixes := test test0 test1 monthly_trace.* mec.tsv mec.xml 
gpt.tsv gpt.xml
 
 # These files summarize system-test results and their differences from
 # results saved in $(touchstone_dir). Datestamps are embedded in their
@@ -1263,11 +1263,12 @@
 system_test_md5sums  := $(test_dir)/md5sums-$(yyyymmddhhmm)
 system_test_md5sums2 := $(test_dir)/md5sums
 
-%.cns: test_emission := emit_quietly,emit_test_data
-%.ill: test_emission := emit_quietly,emit_test_data
-%.ini: test_emission := emit_quietly,emit_custom_0
-%.mec: test_emission := emit_quietly,emit_test_data
-%.gpt: test_emission := emit_quietly,emit_test_data
+%.cns:  test_emission := emit_quietly,emit_test_data
+%.ill:  test_emission := emit_quietly,emit_test_data
+%.ini:  test_emission := emit_quietly,emit_custom_0
+%.inix: test_emission := emit_quietly,emit_custom_1
+%.mec:  test_emission := emit_quietly,emit_test_data
+%.gpt:  test_emission := emit_quietly,emit_test_data
 
 dot_test_files =
 %.cns: dot_test_files = $(basename $(notdir $@)).*test