X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fffmpeg_dcp_test.cc;h=78847e40b9450464dc8bea3924051e79774fa4f3;hb=13f302149a2a2846d801689e3d194af3249ed0b7;hp=4b2388bcde3486ca71dd998a8d32157b807b1b38;hpb=254b3044d72de6b033d7c584f5abd2b9aa70aad5;p=dcpomatic.git diff --git a/test/ffmpeg_dcp_test.cc b/test/ffmpeg_dcp_test.cc index 4b2388bcd..78847e40b 100644 --- a/test/ffmpeg_dcp_test.cc +++ b/test/ffmpeg_dcp_test.cc @@ -44,7 +44,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_dcp_test) shared_ptr 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,11 +53,11 @@ 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 */ -BOOST_AUTO_TEST_CASE (ffmpeg_have_dcp_test) +BOOST_AUTO_TEST_CASE (ffmpeg_have_dcp_test, * boost::unit_test::depends_on("ffmpeg_dcp_test")) { boost::filesystem::path p = test_film_dir ("ffmpeg_dcp_test"); shared_ptr film (new Film (p));