diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-05-17 23:30:44 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-05-20 21:56:28 +0200 |
| commit | 8fcd1dc3bdec69d4aa7bc76926993733952a10be (patch) | |
| tree | 343bb07f08b24d203fac5823bd0ca29557872bba | |
| parent | 60f3f8ff110d55e0d720784dd40c9bc62d342d2c (diff) | |
Run all tests with lots of encoding threads.
| m--------- | test/data | 0 | ||||
| -rw-r--r-- | test/digest_test.cc | 3 | ||||
| -rw-r--r-- | test/test.cc | 2 | ||||
| -rw-r--r-- | test/threed_test.cc | 8 |
4 files changed, 2 insertions, 11 deletions
diff --git a/test/data b/test/data -Subproject 3b21196b894bfbc096a5e90ee11dcf5f50bd4bf +Subproject ec3ae2986682bb2cb45f0ab65cb90cee7d160c1 diff --git a/test/digest_test.cc b/test/digest_test.cc index 68e443779..2911a43b3 100644 --- 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 9be0d4711..b6e017acd 100644 --- 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 266b7bf58..a2c0cfd7d 100644 --- 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) |