3cb5a4c2064d4cf4d8cbdca75a84615a6c56fb7c from master; use j2c_uuid and pcm_uuid for picture/sound MXF filenames.

1 files changed, 7 insertions, 2 deletions

diff --git a/test/ffmpeg_dcp_test.cc b/test/ffmpeg_dcp_test.cc
index 559277e51..add1cb425 100644
--- a/test/ffmpeg_dcp_test.cc
+++ b/test/ffmpeg_dcp_test.cc
@@ -25,6 +25,7 @@
 
 #include <boost/test/unit_test.hpp>
 #include <boost/filesystem.hpp>
+#include <boost/algorithm/string.hpp>
 #include "lib/film.h"
 #include "lib/ffmpeg_content.h"
 #include "lib/ratio.h"
@@ -61,7 +62,11 @@ BOOST_AUTO_TEST_CASE (ffmpeg_have_dcp_test)
 	BOOST_CHECK (!f->cpls().empty());
 
 	p /= f->dcp_name();
-	p /= f->video_mxf_filename();
-	boost::filesystem::remove (p);
+	for (boost::filesystem::directory_iterator i = boost::filesystem::directory_iterator (p); i != boost::filesystem::directory_iterator(); ++i) {
+		if (boost::algorithm::starts_with (i->path().string(), "j2c")) {
+			p /= i->path ();
+			boost::filesystem::remove (p);
+		}
+	}
 	BOOST_CHECK (f->cpls().empty());
 }