Run all tests with lots of encoding threads.

diff --git a/test/data b/test/data
index 3b21196b894bfbc096a5e90ee11dcf5f50bd4bf9..ec3ae2986682bb2cb45f0ab65cb90cee7d160c1f 160000 (submodule)
--- a/test/data
+++ b/test/data
@@ -1 +1 @@
-Subproject commit 3b21196b894bfbc096a5e90ee11dcf5f50bd4bf9
+Subproject commit ec3ae2986682bb2cb45f0ab65cb90cee7d160c1f

diff --git a/test/digest_test.cc b/test/digest_test.cc
index 68e443779c1228330b1f35615e8f9bec804d8718..2911a43b3c201dbf37f6dbad4ec47c1319feea7b 100644 (file)
--- a/test/digest_test.cc
+++ b/test/digest_test.cc
@@ -72,10 +72,9 @@ BOOST_AUTO_TEST_CASE (digest_test)
        film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
        BOOST_REQUIRE (!wait_for_jobs());
 
-       Config::instance()->set_master_encoding_threads (4);
+       BOOST_CHECK (Config::instance()->master_encoding_threads() > 1);
        film->make_dcp ();
        BOOST_REQUIRE (!wait_for_jobs());
-       Config::instance()->set_master_encoding_threads (1);
 
        dcp::DCP dcp (film->dir (film->dcp_name ()));
        dcp.read ();

diff --git a/test/test.cc b/test/test.cc
index 9be0d4711a3382af07508876864ecb6f0bdcc4e8..b6e017acdb3a4a4a5fefbb16db61500f2a945393 100644 (file)
--- a/test/test.cc
+++ b/test/test.cc
@@ -77,7 +77,7 @@ boost::filesystem::path TestPaths::xsd = boost::filesystem::canonical(boost::fil
 void
 setup_test_config ()
 {
-       Config::instance()->set_master_encoding_threads (1);
+       Config::instance()->set_master_encoding_threads (boost::thread::hardware_concurrency());
        Config::instance()->set_server_encoding_threads (1);
        Config::instance()->set_server_port_base (61921);
        Config::instance()->set_default_isdcf_metadata (ISDCFMetadata ());

diff --git a/test/threed_test.cc b/test/threed_test.cc
index 266b7bf58d7811c9d60529540f86884b716aa833..a2c0cfd7dcdf66655a7d0f42d71444f9e9ec76ad 100644 (file)
--- a/test/threed_test.cc
+++ b/test/threed_test.cc
@@ -105,8 +105,6 @@ BOOST_AUTO_TEST_CASE (threed_test3)
 
 BOOST_AUTO_TEST_CASE (threed_test4)
 {
-       Config::instance()->set_master_encoding_threads (8);
-
        shared_ptr<Film> film = new_test_film2 ("threed_test4");
        shared_ptr<FFmpegContent> L (new FFmpegContent(TestPaths::private_data / "LEFT_TEST_DCP3D4K.mov"));
        film->examine_and_add_content (L);
@@ -122,14 +120,10 @@ BOOST_AUTO_TEST_CASE (threed_test4)
        film->write_metadata ();
 
        BOOST_REQUIRE (!wait_for_jobs ());
-
-       Config::instance()->set_master_encoding_threads (8);
 }
 
 BOOST_AUTO_TEST_CASE (threed_test5)
 {
-       Config::instance()->set_master_encoding_threads (8);
-
        shared_ptr<Film> film = new_test_film2 ("threed_test5");
        shared_ptr<FFmpegContent> L (new FFmpegContent(TestPaths::private_data / "boon_telly.mkv"));
        film->examine_and_add_content (L);
@@ -145,8 +139,6 @@ BOOST_AUTO_TEST_CASE (threed_test5)
        film->write_metadata ();
 
        BOOST_REQUIRE (!wait_for_jobs ());
-
-       Config::instance()->set_master_encoding_threads (1);
 }
 
 BOOST_AUTO_TEST_CASE (threed_test6)