projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9189073
)
Test fixes.
author
Carl Hetherington
<cth@carlh.net>
Mon, 25 May 2015 22:11:29 +0000
(23:11 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Mon, 25 May 2015 22:11:29 +0000
(23:11 +0100)
cscript
patch
|
blob
|
history
test/test.cc
patch
|
blob
|
history
diff --git
a/cscript
b/cscript
index 2fe91132bfb625edf43ff1c81131acf7e7039559..49f8f62a90c1d9cd59df29b6fb79d3e5f2e875fc 100644
(file)
--- a/
cscript
+++ b/
cscript
@@
-206,7
+206,7
@@
def make_spec(filename, version, target):
def dependencies(target):
return (('ffmpeg-cdist', '0492ad2'),
- ('libdcp', '
6d5c9b4
'),
+ ('libdcp', '
484a900
'),
('libsub', 'f66b11f'))
def configure_options(target):
diff --git
a/test/test.cc
b/test/test.cc
index 3ffd9287af546cdb5df32a717688f115325042d3..e636b7b525118ebd7bdc6a9f27d44ffeaf2e550a 100644
(file)
--- a/
test/test.cc
+++ b/
test/test.cc
@@
-211,6
+211,7
@@
check_dcp (boost::filesystem::path ref, boost::filesystem::path check)
options.max_audio_sample_error = 255;
options.cpl_annotation_texts_can_differ = true;
options.mxf_filenames_can_differ = true;
+ options.reel_annotation_texts_can_differ = true;
options.reel_hashes_can_differ = true;
BOOST_CHECK (ref_dcp.equals (check_dcp, options, boost::bind (note, _1, _2)));