projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2ac0a4e
)
Make sure that ffmpeg_dcp_test always completes.
author
Carl Hetherington
<cth@carlh.net>
Mon, 21 Jan 2019 10:58:04 +0000
(10:58 +0000)
committer
Carl Hetherington
<cth@carlh.net>
Mon, 21 Jan 2019 10:58:04 +0000
(10:58 +0000)
test/ffmpeg_dcp_test.cc
patch
|
blob
|
history
diff --git
a/test/ffmpeg_dcp_test.cc
b/test/ffmpeg_dcp_test.cc
index 4b2388bcde3486ca71dd998a8d32157b807b1b38..d5a766d6a3234967a4cf390a0e569abf18d8455e 100644
(file)
--- 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);
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")));
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 ();
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 */
}
/** Briefly test Film::cpls(). Requires the output from ffmpeg_dcp_test above */