From 2393c78685ce37a291b6ef9a3911dd2cf6e20eed Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 24 Feb 2021 19:53:30 +0100 Subject: [PATCH] Fix tests being broken by new config test. --- test/config_test.cc | 5 +++++ test/data | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/test/config_test.cc b/test/config_test.cc index 4ca3ba07f..0c5c86a4a 100644 --- a/test/config_test.cc +++ b/test/config_test.cc @@ -102,5 +102,10 @@ BOOST_AUTO_TEST_CASE (config_write_utf8_test) Config::instance()->write(); check_file ("test/data/utf8_config.xml", "build/test/config.xml"); + + /* This test has called Config::set_defaults(), so take us back + to the config that we want for our tests. + */ + setup_test_config (); } diff --git a/test/data b/test/data index 46d987847..94ae4fe10 160000 --- a/test/data +++ b/test/data @@ -1 +1 @@ -Subproject commit 46d987847693c97a353b1bfc609efbd27e4c9f01 +Subproject commit 94ae4fe106b65c930b7dfbeb41cd5b8f8c83f690 -- 2.30.2