X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fsrt_subtitle_test.cc;h=0c1f0716166eff0c0a1a9265ab1e736bb3195563;hb=3da1444d87452ad78fd3445f564fd3d75a6162d8;hp=31a082015e0d9f4de66d78034cebd81d9fcbda1e;hpb=254b3044d72de6b033d7c584f5abd2b9aa70aad5;p=dcpomatic.git

diff --git a/test/srt_subtitle_test.cc b/test/srt_subtitle_test.cc
index 31a082015..0c1f07161 100644
--- a/test/srt_subtitle_test.cc
+++ b/test/srt_subtitle_test.cc
@@ -49,12 +49,12 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test)
 	film->set_interop (false);
 	shared_ptr<StringTextFileContent> content (new StringTextFileContent("test/data/subrip2.srt"));
 	film->examine_and_add_content (content);
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 
 	content->only_text()->set_use (true);
 	content->only_text()->set_burn (false);
 	film->make_dcp ();
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 
 	/* Should be blank video with a subtitle MXF */
 	check_dcp ("test/data/srt_subtitle_test", film->dir (film->dcp_name ()));
@@ -71,15 +71,15 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test2)
 	film->set_interop (false);
 	shared_ptr<StringTextFileContent> content (new StringTextFileContent ("test/data/subrip2.srt"));
 	film->examine_and_add_content (content);
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 
 	content->only_text()->set_use (true);
 	content->only_text()->set_burn (false);
 	/* Use test/data/subrip2.srt as if it were a font file  */
-	content->only_text()->fonts().front()->set_file (FontFiles::NORMAL, "test/data/subrip2.srt");
+	content->only_text()->fonts().front()->set_file("test/data/subrip2.srt");
 
 	film->make_dcp ();
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 
 	/* Should be blank video with a subtitle MXF */
 	check_dcp ("test/data/srt_subtitle_test2", film->dir (film->dcp_name ()));
@@ -106,13 +106,13 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test3)
 	film->set_audio_channels (6);
 	shared_ptr<StringTextFileContent> content (new StringTextFileContent(private_data / "Ankoemmling_short.srt"));
 	film->examine_and_add_content (content);
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 
 	content->only_text()->set_use (true);
 	content->only_text()->set_burn (false);
 
 	film->make_dcp ();
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 
 	check_subtitle_file (film, private_data / "Ankoemmling_short.xml");
 }
@@ -129,9 +129,9 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test4)
 	content->only_text()->set_use (true);
 	content->only_text()->set_burn (false);
 	film->examine_and_add_content (content);
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 	film->make_dcp ();
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 
 	/* Should be blank video with MXF subtitles */
 	check_dcp ("test/data/xml_subtitle_test", film->dir (film->dcp_name ()));
@@ -151,10 +151,10 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test5)
 	content->only_text()->set_burn (false);
 	film->examine_and_add_content (content);
 	film->examine_and_add_content (content);
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 	content->set_position (film, DCPTime());
 	film->make_dcp ();
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 	film->write_metadata ();
 
 	check_dcp ("test/data/xml_subtitle_test2", film->dir (film->dcp_name ()));