From: Carl Hetherington <cth@carlh.net>
Date: Wed, 24 Feb 2021 18:53:30 +0000 (+0100)
Subject: Fix tests being broken by new config test.
X-Git-Tag: v2.15.132
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=2393c78685ce37a291b6ef9a3911dd2cf6e20eed

Fix tests being broken by new config test.
---

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