Default to SMPTE for tests.

[dcpomatic.git] / test / test.cc

diff --git a/test/test.cc b/test/test.cc
index c7a9e95bfd6f8d6a78eda143c4020f4d4bf458ce..374f14637fe0af4f16880c133d56ddc658f54289 100644 (file)
--- a/test/test.cc
+++ b/test/test.cc
@@ -79,9 +79,10 @@ struct TestConfig
                Config::instance()->set_default_dcp_content_type (static_cast<DCPContentType*> (0));
                Config::instance()->set_default_audio_delay (0);
                Config::instance()->set_default_j2k_bandwidth (100000000);
+               Config::instance()->set_default_interop (false);
                Config::instance()->set_log_types (LogEntry::TYPE_GENERAL | LogEntry::TYPE_WARNING | LogEntry::TYPE_ERROR);
 
-               EncodeServerFinder::instance()->disable ();
+               EncodeServerFinder::instance()->stop ();
 
                signal_manager = new TestSignalManager ();
        }
@@ -112,7 +113,7 @@ new_test_film (string name)
                boost::filesystem::remove_all (p);
        }
 
-       shared_ptr<Film> film = shared_ptr<Film> (new Film (p.string()));
+       shared_ptr<Film> film = shared_ptr<Film> (new Film (p));
        film->write_metadata ();
        return film;
 }
@@ -174,8 +175,7 @@ check_file (boost::filesystem::path ref, boost::filesystem::path check)
        uint8_t* ref_buffer = new uint8_t[buffer_size];
        uint8_t* check_buffer = new uint8_t[buffer_size];
 
-       SafeStringStream error;
-       error << "File " << check.string() << " differs from reference " << ref.string();
+       string error = "File " + check.string() + " differs from reference " + ref.string();
 
        while (N) {
                uintmax_t this_time = min (uintmax_t (buffer_size), N);
@@ -184,7 +184,7 @@ check_file (boost::filesystem::path ref, boost::filesystem::path check)
                r = fread (check_buffer, 1, this_time, check_file);
                BOOST_CHECK_EQUAL (r, this_time);
 
-               BOOST_CHECK_MESSAGE (memcmp (ref_buffer, check_buffer, this_time) == 0, error.str ());
+               BOOST_CHECK_MESSAGE (memcmp (ref_buffer, check_buffer, this_time) == 0, error);
                if (memcmp (ref_buffer, check_buffer, this_time)) {
                        break;
                }
@@ -291,7 +291,7 @@ check_xml (boost::filesystem::path ref, boost::filesystem::path test, list<strin
        check_xml (ref_root, test_root, ignore);
 }
 
-void
+bool
 wait_for_jobs ()
 {
        JobManager* jm = JobManager::instance ();
@@ -322,7 +322,10 @@ wait_for_jobs ()
 
        if (jm->errors ()) {
                JobManager::drop ();
+               return true;
        }
+
+       return false;
 }
 
 void