projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add new version of check_dcp().
[dcpomatic.git]
/
test
/
test.cc
diff --git
a/test/test.cc
b/test/test.cc
index b111a3b6b85a62dfe591e81aac2c78c2aae822b1..9be0d4711a3382af07508876864ecb6f0bdcc4e8 100644
(file)
--- a/
test/test.cc
+++ b/
test/test.cc
@@
-71,7
+71,7
@@
using boost::shared_ptr;
using boost::scoped_array;
using boost::dynamic_pointer_cast;
using boost::scoped_array;
using boost::dynamic_pointer_cast;
-boost::filesystem::path private_data = boost::filesystem::canonical(boost::filesystem::path ("..") / boost::filesystem::path ("dcpomatic-test-private"));
+boost::filesystem::path
TestPaths::TestPaths::
private_data = boost::filesystem::canonical(boost::filesystem::path ("..") / boost::filesystem::path ("dcpomatic-test-private"));
boost::filesystem::path TestPaths::xsd = boost::filesystem::canonical(boost::filesystem::path("..") / boost::filesystem::path("libdcp") / boost::filesystem::path("xsd"));
void
boost::filesystem::path TestPaths::xsd = boost::filesystem::canonical(boost::filesystem::path("..") / boost::filesystem::path("libdcp") / boost::filesystem::path("xsd"));
void
@@
-114,7
+114,7
@@
struct TestConfig
char* env_private = getenv("DCPOMATIC_TEST_PRIVATE");
if (env_private) {
char* env_private = getenv("DCPOMATIC_TEST_PRIVATE");
if (env_private) {
- private_data = env_private;
+
TestPaths::TestPaths::
private_data = env_private;
}
dcpomatic_log.reset (new FileLog("build/test/log"));
}
dcpomatic_log.reset (new FileLog("build/test/log"));
@@
-297,6
+297,14
@@
note (dcp::NoteType t, string n)
}
}
}
}
+
+void
+check_dcp (boost::filesystem::path ref, shared_ptr<const Film> film)
+{
+ check_dcp (ref, film->dir(film->dcp_name()));
+}
+
+
void
check_dcp (boost::filesystem::path ref, boost::filesystem::path check)
{
void
check_dcp (boost::filesystem::path ref, boost::filesystem::path check)
{