Various bits mostly related to colour conversions.

[dcpomatic.git] / test / test.cc

diff --git a/test/test.cc b/test/test.cc
index 1fd79872fa3337668144d4d0809939276a18f40c..1c7b7e245c11e967cf59dd8f02e497aa67cd3212 100644 (file)
--- a/test/test.cc
+++ b/test/test.cc
@@ -46,7 +46,7 @@ struct TestConfig
                dcpomatic_setup();
 
                Config::instance()->set_num_local_encoding_threads (1);
-               Config::instance()->set_servers (vector<ServerDescription*> ());
+               Config::instance()->set_servers (vector<ServerDescription> ());
                Config::instance()->set_server_port (61920);
                Config::instance()->set_default_dci_metadata (DCIMetadata ());
                Config::instance()->set_default_container (static_cast<Ratio*> (0));
@@ -144,8 +144,10 @@ wait_for_jobs ()
        while (jm->work_to_do ()) {}
        if (jm->errors ()) {
                for (list<shared_ptr<Job> >::iterator i = jm->_jobs.begin(); i != jm->_jobs.end(); ++i) {
-                       cerr << (*i)->error_summary () << "\n"
-                            << (*i)->error_details () << "\n";
+                       if ((*i)->finished_in_error ()) {
+                               cerr << (*i)->error_summary () << "\n"
+                                    << (*i)->error_details () << "\n";
+                       }
                }
        }