Recover test config after config_test.cc runs.

4 files changed, 25 insertions, 13 deletions

diff --git a/test/config_test.cc b/test/config_test.cc
index 25e8c7d9d..dad545a48 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>
 
@@ -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 ();
 }
diff --git a/test/data b/test/data
-Subproject 4e9eb33fcd08820325f40446e089e10928fe3c5
+Subproject 22ba7b14571926f6c3fd860df57ad2146d9ba40
diff --git a/test/test.cc b/test/test.cc
index 76678b74b..551f64dbd 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -69,6 +69,23 @@ using boost::dynamic_pointer_cast;
 
 boost::filesystem::path private_data = boost::filesystem::path ("..") / boost::filesystem::path ("dcpomatic-test-private");
 
+void
+setup_test_config ()
+{
+	Config::instance()->set_master_encoding_threads (1);
+	Config::instance()->set_server_encoding_threads (1);
+	Config::instance()->set_server_port_base (61921);
+	Config::instance()->set_default_isdcf_metadata (ISDCFMetadata ());
+	Config::instance()->set_default_container (Ratio::from_id ("185"));
+	Config::instance()->set_default_dcp_content_type (static_cast<DCPContentType*> (0));
+	Config::instance()->set_default_audio_delay (0);
+	Config::instance()->set_default_j2k_bandwidth (100000000);
+	Config::instance()->set_default_interop (false);
+	Config::instance()->set_default_still_length (10);
+	Config::instance()->set_log_types (LogEntry::TYPE_GENERAL | LogEntry::TYPE_WARNING | LogEntry::TYPE_ERROR);
+	Config::instance()->set_automatic_audio_analysis (false);
+}
+
 class TestSignalManager : public SignalManager
 {
 public:
@@ -84,19 +101,7 @@ struct TestConfig
 	TestConfig ()
 	{
 		dcpomatic_setup ();
-
-		Config::instance()->set_master_encoding_threads (1);
-		Config::instance()->set_server_encoding_threads (1);
-		Config::instance()->set_server_port_base (61921);
-		Config::instance()->set_default_isdcf_metadata (ISDCFMetadata ());
-		Config::instance()->set_default_container (Ratio::from_id ("185"));
-		Config::instance()->set_default_dcp_content_type (static_cast<DCPContentType*> (0));
-		Config::instance()->set_default_audio_delay (0);
-		Config::instance()->set_default_j2k_bandwidth (100000000);
-		Config::instance()->set_default_interop (false);
-		Config::instance()->set_default_still_length (10);
-		Config::instance()->set_log_types (LogEntry::TYPE_GENERAL | LogEntry::TYPE_WARNING | LogEntry::TYPE_ERROR);
-		Config::instance()->set_automatic_audio_analysis (false);
+		setup_test_config ();
 
 		EncodeServerFinder::instance()->stop ();
 
diff --git a/test/test.h b/test/test.h
index 96e850510..ff5a2a34e 100644
--- a/test/test.h
+++ b/test/test.h
@@ -26,6 +26,7 @@ class Image;
 extern boost::filesystem::path private_data;
 
 extern bool wait_for_jobs ();
+extern void setup_test_config ();
 extern boost::shared_ptr<Film> new_test_film (std::string);
 extern boost::shared_ptr<Film> new_test_film2 (std::string);
 extern void check_dcp (boost::filesystem::path, boost::filesystem::path);