From b563caea32a9ad86137e6e367c2c422ae6dcab7e Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 26 May 2015 09:42:02 +0100 Subject: [PATCH] Test fix-up. --- test/ffmpeg_dcp_test.cc | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/test/ffmpeg_dcp_test.cc b/test/ffmpeg_dcp_test.cc index add1cb425..1aa41967a 100644 --- 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()); } -- 2.30.2