X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fconfig_test.cc;h=14cceb6a0df30100849a9565e733fbec032902fd;hb=b950f49fa893e71545eaf9c0abe8a453d42a4340;hp=25e8c7d9dc6953ba03c4a43e7fd07813ff19fa71;hpb=ad59559fdd19f89852eebd94299691e6091ff02f;p=dcpomatic.git

diff --git a/test/config_test.cc b/test/config_test.cc
index 25e8c7d9d..14cceb6a0 100644
--- a/test/config_test.cc
+++ b/test/config_test.cc
@@ -19,6 +19,7 @@
 */
 
 #include "lib/config.h"
+#include "test.h"
 #include <boost/test/unit_test.hpp>
 #include <fstream>
 
@@ -30,7 +31,7 @@ rewrite_bad_config ()
 	boost::system::error_code ec;
 	boost::filesystem::remove ("build/test/config.xml", ec);
 
-	Config::test_path = "build/test";
+	Config::override_path = "build/test";
 	ofstream f ("build/test/config.xml");
 	f << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
 	  << "<Config>\n"
@@ -87,4 +88,9 @@ BOOST_AUTO_TEST_CASE (config_backup_test)
 	BOOST_CHECK (boost::filesystem::exists ("build/test/config.xml.2"));
 	BOOST_CHECK (boost::filesystem::exists ("build/test/config.xml.3"));
 	BOOST_CHECK (boost::filesystem::exists ("build/test/config.xml.4"));
+
+	/* This test has called Config::set_defaults(), so take us back
+	   to the config that we want for our tests.
+	*/
+	setup_test_config ();
 }