projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup: remove unused variable.
[dcpomatic.git]
/
test
/
test.cc
diff --git
a/test/test.cc
b/test/test.cc
index e94a4541336be02de12dccf528f748ee3de645d4..9d444e5cbb46bb9c974bd24243b824ceec630044 100644
(file)
--- a/
test/test.cc
+++ b/
test/test.cc
@@
-827,7
+827,7
@@
dcp_file (shared_ptr<const Film> film, string prefix)
using namespace boost::filesystem;
vector<directory_entry> matches;
using namespace boost::filesystem;
vector<directory_entry> 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);
});
return boost::algorithm::starts_with(entry.path().leaf().string(), prefix);
});
@@
-936,7
+936,7
@@
make_and_verify_dcp (shared_ptr<Film> film, vector<dcp::VerificationNote::Code>
film->write_metadata ();
make_dcp (film, TranscodeJob::ChangedBehaviour::IGNORE);
BOOST_REQUIRE (!wait_for_jobs());
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()) {
bool ok = true;
for (auto i: notes) {
if (find(ignore.begin(), ignore.end(), i.code()) == ignore.end()) {