projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ignore differing SMPTE subtitle issue dates when comparing DCPs.
[dcpomatic.git]
/
test
/
test.cc
diff --git
a/test/test.cc
b/test/test.cc
index e636b7b525118ebd7bdc6a9f27d44ffeaf2e550a..f325aacbc766f1a2b31ed194368d2b51386d5981 100644
(file)
--- a/
test/test.cc
+++ b/
test/test.cc
@@
-46,6
+46,7
@@
using std::min;
using std::cout;
using std::cerr;
using std::list;
using std::cout;
using std::cerr;
using std::list;
+using std::abs;
using boost::shared_ptr;
using boost::scoped_array;
using boost::shared_ptr;
using boost::scoped_array;
@@
-143,7
+144,7
@@
check_audio_file (boost::filesystem::path ref, boost::filesystem::path check)
BOOST_CHECK_EQUAL (r, this_time);
for (sf_count_t i = 0; i < this_time; ++i) {
BOOST_CHECK_EQUAL (r, this_time);
for (sf_count_t i = 0; i < this_time; ++i) {
- BOOST_
CHECK (f
abs (ref_buffer[i] - check_buffer[i]) <= 65536);
+ BOOST_
REQUIRE (
abs (ref_buffer[i] - check_buffer[i]) <= 65536);
}
N -= this_time;
}
N -= this_time;
@@
-210,9
+211,9
@@
check_dcp (boost::filesystem::path ref, boost::filesystem::path check)
options.max_std_dev_pixel_error = 5;
options.max_audio_sample_error = 255;
options.cpl_annotation_texts_can_differ = true;
options.max_std_dev_pixel_error = 5;
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;
options.reel_annotation_texts_can_differ = true;
options.reel_hashes_can_differ = true;
+ options.issue_dates_can_differ = true;
BOOST_CHECK (ref_dcp.equals (check_dcp, options, boost::bind (note, _1, _2)));
}
BOOST_CHECK (ref_dcp.equals (check_dcp, options, boost::bind (note, _1, _2)));
}
@@
-288,6
+289,9
@@
wait_for_jobs ()
while (jm->work_to_do ()) {
signal_manager->ui_idle ();
}
while (jm->work_to_do ()) {
signal_manager->ui_idle ();
}
+
+ cout << "Waiting for jobs: all finished; errors=" << jm->errors() << ".\n";
+
if (jm->errors ()) {
int N = 0;
for (list<shared_ptr<Job> >::iterator i = jm->_jobs.begin(); i != jm->_jobs.end(); ++i) {
if (jm->errors ()) {
int N = 0;
for (list<shared_ptr<Job> >::iterator i = jm->_jobs.begin(); i != jm->_jobs.end(); ++i) {
@@
-308,8
+312,12
@@
wait_for_jobs ()
signal_manager->ui_idle ();
signal_manager->ui_idle ();
- /* Discard all jobs so we lose any we just reported an error in */
- JobManager::drop ();
+ if (jm->errors ()) {
+ cout << "Dropping JobManager\n";
+ JobManager::drop ();
+ } else {
+ cout << "Not dropping JobManager\n";
+ }
}
void
}
void