Clean up after some more tests.

diff --git a/test/empty_caption_test.cc b/test/empty_caption_test.cc
index f0449a3ceebc96cff0553c74c61e5b0c1077b932..3673cce5d28ef6a3b1a6e96e5d95aa9027e73388 100644 (file)
--- a/test/empty_caption_test.cc
+++ b/test/empty_caption_test.cc
@@ -29,8 +29,10 @@
 
 BOOST_AUTO_TEST_CASE (check_for_no_empty_text_nodes_in_failure_case)
 {
+       Cleanup cl;
+
        auto content = content_factory("test/data/empty.srt");
-       auto film = new_test_film2 ("check_for_no_empty_text_nodes_in_failure_case", content);
+       auto film = new_test_film2("check_for_no_empty_text_nodes_in_failure_case", content, &cl);
        auto text = content[0]->text.front();
        text->set_type (TextType::CLOSED_CAPTION);
        text->set_dcp_track({"English", dcp::LanguageTag("en-GB")});
@@ -38,5 +40,7 @@ BOOST_AUTO_TEST_CASE (check_for_no_empty_text_nodes_in_failure_case)
        make_and_verify_dcp (film, {
                        dcp::VerificationNote::Code::MISSING_CPL_METADATA
                });
+
+       cl.run();
 }
 

diff --git a/test/player_test.cc b/test/player_test.cc
index 6db90f2dd8f6f6301961aba605254e88de633def..a72e5fc170debfd1eee9035bad3f8a3cdf39ce81 100644 (file)
--- a/test/player_test.cc
+++ b/test/player_test.cc
@@ -545,18 +545,22 @@ BOOST_AUTO_TEST_CASE (interleaved_subtitle_are_emitted_correctly)
 
 BOOST_AUTO_TEST_CASE(multiple_sound_files_bug)
 {
+       Cleanup cl;
+
        Config::instance()->set_log_types(Config::instance()->log_types() | LogEntry::TYPE_DEBUG_PLAYER);
 
        auto A = content_factory(TestPaths::private_data() / "kook" / "1.wav").front();
        auto B = content_factory(TestPaths::private_data() / "kook" / "2.wav").front();
        auto C = content_factory(TestPaths::private_data() / "kook" / "3.wav").front();
 
-       auto film = new_test_film2("multiple_sound_files_bug", { A, B, C });
+       auto film = new_test_film2("multiple_sound_files_bug", { A, B, C }, &cl);
        C->set_position(film, DCPTime(3840000));
 
        make_and_verify_dcp(film, { dcp::VerificationNote::Code::MISSING_CPL_METADATA });
 
        check_mxf_audio_file(TestPaths::private_data() / "kook" / "reference.mxf", dcp_file(film, "pcm_"));
+
+       cl.run();
 }
 
 

diff --git a/test/subtitle_font_id_test.cc b/test/subtitle_font_id_test.cc
index ef5ed0e8c3a56b424c9e475645bc21ee5f76de56..b4c28e53ef685be0127567f7a6a110df772dd25d 100644 (file)
--- a/test/subtitle_font_id_test.cc
+++ b/test/subtitle_font_id_test.cc
@@ -90,10 +90,14 @@ BOOST_AUTO_TEST_CASE(make_dcp_with_subs_from_interop_dcp)
 
 BOOST_AUTO_TEST_CASE(make_dcp_with_subs_from_smpte_dcp)
 {
+       Cleanup cl;
+
        auto dcp = make_shared<DCPContent>(TestPaths::private_data() / "JourneyToJah_TLR-1_F_EN-DE-FR_CH_51_2K_LOK_20140225_DGL_SMPTE_OV");
-       auto film = new_test_film2("make_dcp_with_subs_from_smpte_dcp", { dcp });
+       auto film = new_test_film2("make_dcp_with_subs_from_smpte_dcp", { dcp }, &cl);
        dcp->text.front()->set_use(true);
        make_and_verify_dcp(film);
+
+       cl.run();
 }