X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fthreed_test.cc;h=473cc00d310df716601daf77b3255d92fef5818c;hb=736745c86cefc6d5d4d8098799efc86f0f639061;hp=6d0524d7250d5f04f76fd501c349521f1f9271f4;hpb=11c07c6fd98620c859c7d3dcf6a4bbf6a05e567e;p=dcpomatic.git

diff --git a/test/threed_test.cc b/test/threed_test.cc
index 6d0524d72..473cc00d3 100644
--- 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,7 +188,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());
@@ -201,4 +208,8 @@ BOOST_AUTO_TEST_CASE (threed_test7)
 	}
 	BOOST_REQUIRE (failed);
 	BOOST_CHECK_EQUAL (failed->error_summary(), "The content file test/data/red_24.mp4 is set as 3D but does not appear to contain 3D images.  Please set it to 2D.  You can still make a 3D DCP from this content by ticking the 3D option in the DCP video tab.");
+
+	while (signal_manager->ui_idle ()) {}
+
+	JobManager::drop ();
 }