>From eaf1513b2307edd2a3f9d7c52f3038a25049fc91 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 14 Dec 2014 21:51:12 +0100 Subject: [PATCH] Only run configurable settings test in distribution testing mode. This tests check that the configuration values have the values they are supposed to have in binary distributions and so should be only run when testing those. --- wx_test_config_settings.cpp | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/wx_test_config_settings.cpp b/wx_test_config_settings.cpp index 554ed55..4d96e61 100644 --- a/wx_test_config_settings.cpp +++ b/wx_test_config_settings.cpp @@ -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(); -- 1.7.9