summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2019-01-21 10:58:04 +0000
committerCarl Hetherington <cth@carlh.net>2019-01-21 10:58:04 +0000
commit54bb8ec390c86f333ed4fb6e383b348035253f14 (patch)
treeb00ceceb1fd02f507abafac17d3b7d6d1a56c3f7
parent2ac0a4eb4629b9bb683f44589d0d2a4d53c7f137 (diff)
Make sure that ffmpeg_dcp_test always completes.
-rw-r--r--test/ffmpeg_dcp_test.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/ffmpeg_dcp_test.cc b/test/ffmpeg_dcp_test.cc
index 4b2388bcd..d5a766d6a 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<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 */