X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Ftest.cc;h=9d444e5cbb46bb9c974bd24243b824ceec630044;hb=0a4c399e8ed2ebb8b7dadf2684595effd1ca9f3e;hp=e94a4541336be02de12dccf528f748ee3de645d4;hpb=73a0bf21c7cc460549b6faedc0413d4eab735621;p=dcpomatic.git diff --git a/test/test.cc b/test/test.cc index e94a45413..9d444e5cb 100644 --- a/test/test.cc +++ b/test/test.cc @@ -827,7 +827,7 @@ dcp_file (shared_ptr film, string prefix) using namespace boost::filesystem; vector matches; - std::copy_if(directory_iterator(film->dir(film->dcp_name())), directory_iterator(), std::back_inserter(matches), [&prefix](directory_entry const& entry) { + std::copy_if(recursive_directory_iterator(film->dir(film->dcp_name())), recursive_directory_iterator(), std::back_inserter(matches), [&prefix](directory_entry const& entry) { return boost::algorithm::starts_with(entry.path().leaf().string(), prefix); }); @@ -936,7 +936,7 @@ make_and_verify_dcp (shared_ptr film, vector film->write_metadata (); make_dcp (film, TranscodeJob::ChangedBehaviour::IGNORE); BOOST_REQUIRE (!wait_for_jobs()); - auto notes = dcp::verify ({film->dir(film->dcp_name())}, &stage, &progress, TestPaths::xsd()); + auto notes = dcp::verify({film->dir(film->dcp_name())}, &stage, &progress, {}, TestPaths::xsd()); bool ok = true; for (auto i: notes) { if (find(ignore.begin(), ignore.end(), i.code()) == ignore.end()) {