Run all tests with lots of encoding threads.

[dcpomatic.git] / test / threed_test.cc

diff --git a/test/threed_test.cc b/test/threed_test.cc
index f0ee13c9a0ea093a79556cf2b4dcda87c3515b5b..a2c0cfd7dcdf66655a7d0f42d71444f9e9ec76ad 100644 (file)
--- a/test/threed_test.cc
+++ b/test/threed_test.cc
@@ -49,7 +49,6 @@ BOOST_AUTO_TEST_CASE (threed_test1)
        BOOST_REQUIRE (!wait_for_jobs());
 
        c->video->set_frame_type (VIDEO_FRAME_TYPE_3D_LEFT_RIGHT);
-       c->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
 
        film->set_container (Ratio::from_id ("185"));
        film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
@@ -72,7 +71,6 @@ BOOST_AUTO_TEST_CASE (threed_test2)
        BOOST_REQUIRE (!wait_for_jobs());
 
        c->video->set_frame_type (VIDEO_FRAME_TYPE_3D_ALTERNATE);
-       c->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
 
        film->set_container (Ratio::from_id ("185"));
        film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
@@ -107,12 +105,10 @@ 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(private_data / "LEFT_TEST_DCP3D4K.mov"));
+       shared_ptr<FFmpegContent> L (new FFmpegContent(TestPaths::private_data / "LEFT_TEST_DCP3D4K.mov"));
        film->examine_and_add_content (L);
-       shared_ptr<FFmpegContent> R (new FFmpegContent(private_data / "RIGHT_TEST_DCP3D4K.mov"));
+       shared_ptr<FFmpegContent> R (new FFmpegContent(TestPaths::private_data / "RIGHT_TEST_DCP3D4K.mov"));
        film->examine_and_add_content (R);
        BOOST_REQUIRE (!wait_for_jobs());
 
@@ -124,18 +120,14 @@ 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(private_data / "boon_telly.mkv"));
+       shared_ptr<FFmpegContent> L (new FFmpegContent(TestPaths::private_data / "boon_telly.mkv"));
        film->examine_and_add_content (L);
-       shared_ptr<FFmpegContent> R (new FFmpegContent(private_data / "boon_telly.mkv"));
+       shared_ptr<FFmpegContent> R (new FFmpegContent(TestPaths::private_data / "boon_telly.mkv"));
        film->examine_and_add_content (R);
        BOOST_REQUIRE (!wait_for_jobs());
 
@@ -147,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)
@@ -188,7 +178,14 @@ BOOST_AUTO_TEST_CASE (threed_test7)
        JobManager* jm = JobManager::instance ();
        while (jm->work_to_do ()) {
                while (signal_manager->ui_idle()) {}
-               dcpomatic_sleep (1);
+               dcpomatic_sleep_seconds (1);
+       }
+
+       while (signal_manager->ui_idle ()) {}
+
+       std::cout << "Here's the jobs:\n";
+       BOOST_FOREACH (shared_ptr<Job> i, jm->_jobs) {
+               std::cout << i->name() << " " << i->status() << " " << i->is_new() << " " << i->running() << " " << i->finished() << " " << i->finished_ok() << " " << i->finished_in_error() << "\n";
        }
 
        BOOST_REQUIRE (jm->errors());