Test fix-up.

diff --git a/test/ffmpeg_dcp_test.cc b/test/ffmpeg_dcp_test.cc
index add1cb425640950924a130577523df3dd29a33f1..1aa41967abe502c2772d94267db9d410cc42cb07 100644 (file)
--- a/test/ffmpeg_dcp_test.cc
+++ b/test/ffmpeg_dcp_test.cc
@@ -62,11 +62,14 @@ BOOST_AUTO_TEST_CASE (ffmpeg_have_dcp_test)
        BOOST_CHECK (!f->cpls().empty());
 
        p /= f->dcp_name();
-       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::filesystem::directory_iterator i = boost::filesystem::directory_iterator (p);
+       while (i != boost::filesystem::directory_iterator() && !boost::algorithm::starts_with (i->path().leaf().string(), "j2c")) {
+               ++i;
        }
+
+       if (i != boost::filesystem::directory_iterator ()) {
+               boost::filesystem::remove (i->path ());
+       }
+       
        BOOST_CHECK (f->cpls().empty());
 }