Move private_data into TestPaths

[dcpomatic.git] / test / threed_test.cc

diff --git a/test/threed_test.cc b/test/threed_test.cc
index 559cc48766e0c2f789f2333a8b1fab07d4cdb610..473cc00d310df716601daf77b3255d92fef5818c 100644 (file)
--- a/test/threed_test.cc
+++ b/test/threed_test.cc
@@ -110,9 +110,9 @@ 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());
 
@@ -133,9 +133,9 @@ 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());
 
@@ -188,11 +188,16 @@ 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());
        shared_ptr<Job> failed;
        BOOST_FOREACH (shared_ptr<Job> i, jm->_jobs) {