X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fdcp_subtitle_test.cc;h=9b7b77279968f6afffa977c448a685ebb7989ed4;hb=e8800b7efc51b6e0c186a7bd733e014a3093a384;hp=fe95cbbfc13da7c4b079f6ef27619851c3953d4b;hpb=99cb0937e54340fa20c594aaa501276b8321cbf0;p=dcpomatic.git

diff --git a/test/dcp_subtitle_test.cc b/test/dcp_subtitle_test.cc
index fe95cbbfc..9b7b77279 100644
--- a/test/dcp_subtitle_test.cc
+++ b/test/dcp_subtitle_test.cc
@@ -96,7 +96,11 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_test)
 			dcp::VerificationNote::Code::MISSING_CPL_METADATA
 		});
 
-	check_dcp ("test/data/dcp_subtitle_test", film->dir(film->dcp_name()));
+	/* This test is concerned with the subtitles, so we'll ignore any
+	 * differences in sound between the DCP and the reference to avoid test
+	 * failures for unrelated reasons.
+	 */
+	check_dcp("test/data/dcp_subtitle_test", film->dir(film->dcp_name()), true);
 }
 
 
@@ -111,7 +115,7 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_within_dcp_test)
 	film->examine_and_add_content (content);
 	BOOST_REQUIRE (!wait_for_jobs ());
 
-	shared_ptr<DCPDecoder> decoder (new DCPDecoder (film, content, false, false, shared_ptr<DCPDecoder>()));
+	auto decoder = make_shared<DCPDecoder>(film, content, false, false, shared_ptr<DCPDecoder>());
 	decoder->only_text()->PlainStart.connect (bind (store, _1));
 
 	stored = optional<ContentStringText> ();
@@ -305,6 +309,7 @@ BOOST_AUTO_TEST_CASE(entity_from_dcp_source)
 
 	/* Remake with burn */
 	content->only_text()->set_burn(true);
+	boost::filesystem::remove_all(film->dir(film->dcp_name()));
 	make_and_verify_dcp (
 		film,
 		{