Fix tests being broken by new config test.

diff --git a/test/config_test.cc b/test/config_test.cc
index 4ca3ba07ffb3b9168b48969ca972b5eef7c5e92a..0c5c86a4a77d4c41fbcb609c96bd91f72423ec13 100644 (file)
--- 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 46d987847693c97a353b1bfc609efbd27e4c9f01..94ae4fe106b65c930b7dfbeb41cd5b8f8c83f690 160000 (submodule)
--- a/test/data
+++ b/test/data
@@ -1 +1 @@
-Subproject commit 46d987847693c97a353b1bfc609efbd27e4c9f01
+Subproject commit 94ae4fe106b65c930b7dfbeb41cd5b8f8c83f690