diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-06-02 22:46:38 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-06-02 22:46:38 +0100 |
| commit | e6d086fff404d9fe5ac080f9e75334eeb315c1da (patch) | |
| tree | a8d80e3c36bb37fb9d68b2138b2c1d9cc6b02157 | |
| parent | f45cbb73068321d857249aaa21f770b87493c7c2 (diff) | |
A few test fixups.
| -rw-r--r-- | test/dcp_test.cc | 5 | ||||
| -rw-r--r-- | test/film_metadata_test.cc | 2 | ||||
| -rw-r--r-- | test/test.cc | 2 | ||||
| -rw-r--r-- | test/util_test.cc | 2 |
4 files changed, 7 insertions, 4 deletions
diff --git a/test/dcp_test.cc b/test/dcp_test.cc index cf31d674e..3565c1cfd 100644 --- a/test/dcp_test.cc +++ b/test/dcp_test.cc @@ -21,13 +21,14 @@ BOOST_AUTO_TEST_CASE (make_dcp_test) { shared_ptr<Film> film = new_test_film ("make_dcp_test"); film->set_name ("test_film2"); - system ("pwd"); - film->examine_and_add_content (shared_ptr<FFmpegContent> (new FFmpegContent (film, "test/test.mp4"))); + film->examine_and_add_content (shared_ptr<FFmpegContent> (new FFmpegContent (film, "test/data/test.mp4"))); /* Wait for the examine to finish */ while (JobManager::instance()->work_to_do ()) { dcpomatic_sleep (1); } + + BOOST_CHECK_EQUAL (JobManager::instance()->errors(), false); film->set_container (Ratio::from_id ("185")); film->set_dcp_content_type (DCPContentType::from_pretty_name ("Test")); diff --git a/test/film_metadata_test.cc b/test/film_metadata_test.cc index 397b9e43a..e0406db55 100644 --- a/test/film_metadata_test.cc +++ b/test/film_metadata_test.cc @@ -37,7 +37,7 @@ BOOST_AUTO_TEST_CASE (film_metadata_test) f->write_metadata (); stringstream s; - s << "diff -u test/metadata.xml.ref " << test_film << "/metadata.xml"; + s << "diff -u test/data/metadata.xml.ref " << test_film << "/metadata.xml"; BOOST_CHECK_EQUAL (::system (s.str().c_str ()), 0); shared_ptr<Film> g (new Film (test_film)); diff --git a/test/test.cc b/test/test.cc index d9c53209c..7c7efd1a0 100644 --- a/test/test.cc +++ b/test/test.cc @@ -145,6 +145,8 @@ check_dcp (string ref, string check) options.max_mean_pixel_error = 5; options.max_std_dev_pixel_error = 5; options.max_audio_sample_error = 255; + options.cpl_names_can_differ = true; + options.mxf_names_can_differ = true; BOOST_CHECK (ref_dcp.equals (check_dcp, options, boost::bind (note, _1, _2))); } diff --git a/test/util_test.cc b/test/util_test.cc index 18c24ac3a..f75fd0e70 100644 --- a/test/util_test.cc +++ b/test/util_test.cc @@ -36,7 +36,7 @@ BOOST_AUTO_TEST_CASE (util_test) BOOST_AUTO_TEST_CASE (md5_digest_test) { - string const t = md5_digest ("test/md5.test"); + string const t = md5_digest ("test/data/md5.test"); BOOST_CHECK_EQUAL (t, "15058685ba99decdc4398c7634796eb0"); BOOST_CHECK_THROW (md5_digest ("foobar"), OpenFileError); |