Bumps for new asdcplib to fix #1325.

[dcpomatic.git] / test / ffmpeg_dcp_test.cc

diff --git a/test/ffmpeg_dcp_test.cc b/test/ffmpeg_dcp_test.cc
index 7cdecb22f32ce6a302db6492be27623e04b2b79e..4bd1e6e2f81c87dc9264cdbdc3b3d3183c575a52 100644 (file)
--- a/test/ffmpeg_dcp_test.cc
+++ b/test/ffmpeg_dcp_test.cc
@@ -41,10 +41,10 @@ BOOST_AUTO_TEST_CASE (ffmpeg_dcp_test)
 {
        shared_ptr<Film> film = new_test_film ("ffmpeg_dcp_test");
        film->set_name ("test_film2");
-       shared_ptr<FFmpegContent> c (new FFmpegContent (film, "test/data/test.mp4"));
+       shared_ptr<FFmpegContent> c (new FFmpegContent("test/data/test.mp4"));
        film->examine_and_add_content (c);
 
-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());
 
        c->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
 
@@ -53,7 +53,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_dcp_test)
        film->make_dcp ();
        film->write_metadata ();
 
-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());
 }
 
 /** Briefly test Film::cpls().  Requires the output from ffmpeg_dcp_test above */
@@ -61,6 +61,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_have_dcp_test)
 {
        boost::filesystem::path p = test_film_dir ("ffmpeg_dcp_test");
        shared_ptr<Film> film (new Film (p));
+       std::cout << "reading ffmpeg_dcp_test; cwd " << boost::filesystem::current_path() << " will look for " << film->directory().get_value_or("") << "\n";
        film->read_metadata ();
        BOOST_CHECK (!film->cpls().empty());