[lmi-commits] [6075] Run only with '--distribution' flag

[Greg Chicares]

Revision: 6075
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=6075
Author:   chicares
Date:     2014-12-15 13:53:46 +0000 (Mon, 15 Dec 2014)
Log Message:
-----------
Run only with '--distribution' flag

Modified Paths:
--------------
    lmi/trunk/ChangeLog
    lmi/trunk/wx_test_config_settings.cpp

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2014-12-15 12:55:33 UTC (rev 6074)
+++ lmi/trunk/ChangeLog 2014-12-15 13:53:46 UTC (rev 6075)
@@ -34900,3 +34900,9 @@
 Remove configuration file. See:
   http://lists.nongnu.org/archive/html/lmi/2014-12/msg00068.html
 
+20141215T1353Z <address@hidden> [516]
+
+  wx_test_config_settings.cpp
+Run only with '--distribution' flag. See:
+  http://lists.nongnu.org/archive/html/lmi/2014-12/msg00074.html
+

Modified: lmi/trunk/wx_test_config_settings.cpp
===================================================================
--- lmi/trunk/wx_test_config_settings.cpp       2014-12-15 12:55:33 UTC (rev 
6074)
+++ lmi/trunk/wx_test_config_settings.cpp       2014-12-15 13:53:46 UTC (rev 
6075)
@@ -65,11 +65,6 @@
     i.e. is c:/fop-0.20.5/fop, and not just the path.
  */
 
-// ERASE THIS BLOCK COMMENT WHEN IMPLEMENTATION COMPLETE. The block
-// comment below changes the original specification, and does not
-// yet describe the present code. Desired changes:
-//  - Run this test only when the '--distribution' option is given.
-
 /// Validate configurable-settings file for binary distributions.
 ///
 /// Run this test only when the '--distribution' option is given.
@@ -87,6 +82,11 @@
 
 LMI_WX_TEST_CASE(configurable_settings)
 {
+    if(!is_distribution_test())
+        {
+        return;
+        }
+
     LMI_ASSERT(fs::exists("/etc/opt/lmi/configurable_settings.xml"));
 
     configurable_settings const& settings = configurable_settings::instance();