Reduce the disk space needed when running tests.v2.15.124

1 files changed, 20 insertions, 1 deletions

diff --git a/test/test.cc b/test/test.cc
index 6c811221d..292b4e1d9 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -176,12 +176,15 @@ new_test_film (string name)
 }
 
 shared_ptr<Film>
-new_test_film2 (string name)
+new_test_film2 (string name, Cleanup* cleanup)
 {
 	auto p = test_film_dir (name);
 	if (boost::filesystem::exists (p)) {
 		boost::filesystem::remove_all (p);
 	}
+	if (cleanup) {
+		cleanup->add (p);
+	}
 
 	auto film = make_shared<Film>(p);
 	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
@@ -811,3 +814,19 @@ operator<< (std::ostream&s, VideoFrameType f)
 	return s;
 }
 
+
+void
+Cleanup::add (boost::filesystem::path path)
+{
+	_paths.push_back (path);
+}
+
+
+void
+Cleanup::run ()
+{
+	boost::system::error_code ec;
+	for (auto i: _paths) {
+		boost::filesystem::remove_all (i, ec);
+	}
+}