[lmi-commits] [5963] Rectify data dependencies of certain test targets

[Greg Chicares]

Revision: 5963
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5963
Author:   chicares
Date:     2014-10-06 13:50:14 +0000 (Mon, 06 Oct 2014)
Log Message:
-----------
Rectify data dependencies of certain test targets

Modified Paths:
--------------
    lmi/trunk/ChangeLog
    lmi/trunk/main_cgi.cpp
    lmi/trunk/premium_tax_test.cpp
    lmi/trunk/workhorse.make

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2014-10-05 23:20:15 UTC (rev 5962)
+++ lmi/trunk/ChangeLog 2014-10-06 13:50:14 UTC (rev 5963)
@@ -34230,3 +34230,11 @@
 Remove the problem identified 20141005T2318Z, and a congener. See:
   http://lists.nongnu.org/archive/html/lmi/2014-10/msg00009.html
 
+20141006T1350Z <address@hidden> [533]
+
+  main_cgi.cpp
+  premium_tax_test.cpp
+  workhorse.make
+Rectify data dependencies of certain test targets. See:
+  http://lists.nongnu.org/archive/html/lmi/2014-10/msg00018.html
+

Modified: lmi/trunk/main_cgi.cpp
===================================================================
--- lmi/trunk/main_cgi.cpp      2014-10-05 23:20:15 UTC (rev 5962)
+++ lmi/trunk/main_cgi.cpp      2014-10-06 13:50:14 UTC (rev 5963)
@@ -42,6 +42,7 @@
 #include "configurable_settings.hpp"
 #include "illustrator.hpp"
 #include "input.hpp"
+#include "lmi.hpp"                      // is_antediluvian_fork()
 #include "main_common.hpp"
 #include "mc_enum_type_enums.hpp"       // mcenum_emission
 #include "miscellany.hpp"
@@ -490,7 +491,10 @@
     input["UseCurrentDeclaredRate"]          = "No";
 
     // Read input values.
-    input["ProductName"]                     = GetValue(data, "ProductName"    
                );
+    if(!is_antediluvian_fork())
+        {
+        input["ProductName"]                 = GetValue(data, "ProductName"    
                );
+        }
     input["IssueAge"]                        = GetValue(data, "IssueAge"       
                );
     input["RetirementAge"]                   = GetValue(data, "RetirementAge"  
                );
     input["Gender"]                          = GetValue(data, "Gender"         
                );

Modified: lmi/trunk/premium_tax_test.cpp
===================================================================
--- lmi/trunk/premium_tax_test.cpp      2014-10-05 23:20:15 UTC (rev 5962)
+++ lmi/trunk/premium_tax_test.cpp      2014-10-06 13:50:14 UTC (rev 5963)
@@ -31,6 +31,7 @@
 #include "database.hpp"
 #include "dbdict.hpp"
 #include "path_utility.hpp"             // initialize_filesystem()
+#include "product_data.hpp"
 #include "stratified_charges.hpp"
 #include "test_tools.hpp"
 
@@ -51,6 +52,9 @@
 void premium_tax_test::write_prerequisite_files()
 {
     DBDictionary::instance() .WriteSampleDBFile      ();
+    // product_database::initialize() requires a real '.product' file,
+    // even though it's not otherwise used in this TU.
+    product_data            ::WritePolFiles          ();
     stratified_charges      ::write_stratified_files ();
 }
 

Modified: lmi/trunk/workhorse.make
===================================================================
--- lmi/trunk/workhorse.make    2014-10-05 23:20:15 UTC (rev 5962)
+++ lmi/trunk/workhorse.make    2014-10-06 13:50:14 UTC (rev 5963)
@@ -1055,12 +1055,12 @@
 .PHONY: test
 test: $(test_targets)
 
-# Some test targets require 'sample.policy' to exist even though they
-# don't actually read its contents.
+# Some 'antediluvian' test targets require a '.policy' to exist even
+# though they don't actually read its contents.
 
-$(test_targets): sample.policy
+$(test_targets): eraseme.policy
 
-sample.policy:
+eraseme.policy:
        @$(TOUCH) $@
 
 
################################################################################