Add some more test cleanups.

3 files changed, 20 insertions, 2 deletions

diff --git a/test/ffmpeg_encoder_test.cc b/test/ffmpeg_encoder_test.cc
index c58689a02..8483330fd 100644
--- a/test/ffmpeg_encoder_test.cc
+++ b/test/ffmpeg_encoder_test.cc
@@ -475,18 +475,25 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_with_reels)
 /** Regression test for "Error during decoding: Butler finished" (#2097) */
 BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_regression_1)
 {
+	Cleanup cl;
+
 	auto content = content_factory(TestPaths::private_data() / "arrietty_JP-EN.mkv")[0];
 	auto film = new_test_film2 ("ffmpeg_encoder_prores_regression_1", { content });
 
 	auto job = make_shared<TranscodeJob>(film, TranscodeJob::ChangedBehaviour::IGNORE);
 	FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_regression_1.mov", ExportFormat::PRORES_HQ, false, true, false, 23);
 	encoder.go ();
+
+	cl.add("build/test/ffmpeg_encoder_prores_regression_1.mov");
+	cl.run();
 }
 
 
 /** Regression test for Butler video buffers reached 480 frames (audio is 0) (#2101) */
 BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_regression_2)
 {
+	Cleanup cl;
+
 	auto logs = dcpomatic_log->types();
 	dcpomatic_log->set_types(logs | LogEntry::TYPE_DEBUG_PLAYER);
 
@@ -498,5 +505,8 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_regression_2)
 	encoder.go ();
 
 	dcpomatic_log->set_types(logs);
+
+	cl.add("build/test/ffmpeg_encoder_prores_regression_2.mov");
+	cl.run();
 }
 
diff --git a/test/subtitle_font_id_change_test.cc b/test/subtitle_font_id_change_test.cc
index 57add5c63..378803828 100644
--- a/test/subtitle_font_id_change_test.cc
+++ b/test/subtitle_font_id_change_test.cc
@@ -129,7 +129,9 @@ BOOST_AUTO_TEST_CASE(subtitle_font_id_change_test3)
 
 BOOST_AUTO_TEST_CASE(subtitle_font_id_change_test4)
 {
-	auto film = new_test_film2("subtitle_font_id_change_test4");
+	Cleanup cl;
+
+	auto film = new_test_film2("subtitle_font_id_change_test4", {}, &cl);
 	boost::filesystem::remove(film->file("metadata.xml"));
 	boost::filesystem::copy_file("test/data/subtitle_font_id_change_test4.xml", film->file("metadata.xml"));
 
@@ -149,5 +151,7 @@ BOOST_AUTO_TEST_CASE(subtitle_font_id_change_test4)
 	BOOST_REQUIRE(!wait_for_jobs());
 
 	make_and_verify_dcp(film, { dcp::VerificationNote::Code::INVALID_STANDARD });
+
+	cl.run();
 }
 
diff --git a/test/subtitle_timing_test.cc b/test/subtitle_timing_test.cc
index eec4c0639..e5a4133ad 100644
--- a/test/subtitle_timing_test.cc
+++ b/test/subtitle_timing_test.cc
@@ -35,6 +35,8 @@
 
 BOOST_AUTO_TEST_CASE (test_subtitle_timing_with_frame_rate_change)
 {
+	Cleanup cl;
+
 	using boost::filesystem::path;
 
 	constexpr auto content_frame_rate = 29.976f;
@@ -44,7 +46,7 @@ BOOST_AUTO_TEST_CASE (test_subtitle_timing_with_frame_rate_change)
 	auto sub = content_factory("test/data/hour.srt")[0];
 	sub->text.front()->set_language(dcp::LanguageTag("en-GB"));
 
-	auto film = new_test_film2 (name, { picture, sub });
+	auto film = new_test_film2(name, { picture, sub }, &cl);
 	picture->set_video_frame_rate(film, content_frame_rate);
 	auto const dcp_frame_rate = film->video_frame_rate();
 
@@ -66,5 +68,7 @@ BOOST_AUTO_TEST_CASE (test_subtitle_timing_with_frame_rate_change)
 		BOOST_CHECK (error < (1.0f / dcp_frame_rate));
 		++index;
 	}
+
+	cl.run();
 }