diff options
| -rw-r--r-- | test/ffmpeg_dcp_test.cc | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/test/ffmpeg_dcp_test.cc b/test/ffmpeg_dcp_test.cc index c0921bd4c..5e436b503 100644 --- a/test/ffmpeg_dcp_test.cc +++ b/test/ffmpeg_dcp_test.cc @@ -59,13 +59,15 @@ BOOST_AUTO_TEST_CASE(ffmpeg_have_dcp_test, * boost::unit_test::depends_on("ffmpe BOOST_CHECK(!film->cpls().empty()); p /= film->dcp_name(); - auto i = boost::filesystem::directory_iterator(p); - while (i != boost::filesystem::directory_iterator() && !boost::algorithm::starts_with(i->path().filename().string(), "j2c")) { - ++i; - } - - if (i != boost::filesystem::directory_iterator()) { - boost::filesystem::remove(i->path()); + auto iter = std::find_if( + boost::filesystem::directory_iterator(p), + boost::filesystem::directory_iterator(), + [](boost::filesystem::directory_entry const& entry) { + return boost::algorithm::starts_with(entry.path().filename().string(), "cpl"); + }); + + if (iter != boost::filesystem::directory_iterator()) { + boost::filesystem::remove(iter->path()); } BOOST_CHECK(film->cpls().empty()); |