Use configured issuer/creator for DCPs made by map (#2585).

[dcpomatic.git] / test / test.cc

diff --git a/test/test.cc b/test/test.cc
index 1739e8e899e4750ff1021f7264ea0dfe65e4fce7..630026120736327eb22cea872c9a5772f4315f8b 100644 (file)
--- a/test/test.cc
+++ b/test/test.cc
@@ -135,6 +135,7 @@ setup_test_config ()
        decryption->set_key(dcp::file_to_string("test/data/decryption_key"));
        Config::instance()->set_decryption_chain (decryption);
        Config::instance()->set_dcp_asset_filename_format(dcp::NameFormat("%t"));
+       Config::instance()->set_cinemas_file("test/data/empty_cinemas.xml");
 }
 
 
@@ -157,6 +158,7 @@ struct TestConfig
 
                dcpomatic_setup ();
                setup_test_config ();
+               capture_ffmpeg_logs();
 
                EncodeServerFinder::instance()->stop ();
 
@@ -565,7 +567,7 @@ check_dcp(boost::filesystem::path ref, boost::filesystem::path check, bool sound
        options.max_subtitle_vertical_position_error = 0.001;
        options.sound_assets_can_differ = sound_can_differ;
 
-       BOOST_CHECK (ref_dcp.equals (check_dcp, options, boost::bind (note, _1, _2)));
+       BOOST_CHECK_MESSAGE(ref_dcp.equals(check_dcp, options, boost::bind (note, _1, _2)), check << " does not match " << ref);
 }
 
 void