Add ConfigRestorer and use it instead of setup_test_config() directly.

[dcpomatic.git] / test / test.cc

diff --git a/test/test.cc b/test/test.cc
index b40d5eed6e9eaa96abb86655a6db677085ebf110..d1677a107cf4f25af2f6f33e9a9d05374778dfc1 100644 (file)
--- a/test/test.cc
+++ b/test/test.cc
@@ -99,10 +99,10 @@ boost::filesystem::path TestPaths::xsd ()
 }
 
 
-void
+static void
 setup_test_config ()
 {
-       Config::instance()->set_master_encoding_threads (boost::thread::hardware_concurrency());
+       Config::instance()->set_master_encoding_threads (boost::thread::hardware_concurrency() / 2);
        Config::instance()->set_server_encoding_threads (1);
        Config::instance()->set_server_port_base (61921);
        Config::instance()->set_default_container (Ratio::from_id ("185"));
@@ -914,3 +914,10 @@ check_int_close (std::pair<int, int> a, std::pair<int, int> b, int d)
        check_int_close (a.first, b.first, d);
        check_int_close (a.second, b.second, d);
 }
+
+
+ConfigRestorer::~ConfigRestorer()
+{
+       setup_test_config();
+}
+