Do EncodeServerFinder 'disable' in a more sensible way.

[dcpomatic.git] / test / test.cc

diff --git a/test/test.cc b/test/test.cc
index d3180434d082307896f4c0e201d3eaa9336fdd64..7a759314d8ba4713a7333b32856889746f662044 100644 (file)
--- a/test/test.cc
+++ b/test/test.cc
@@ -40,7 +40,6 @@
 #define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE dcpomatic_test
 #include <boost/test/unit_test.hpp>
-#include <boost/make_shared.hpp>
 #include <list>
 #include <vector>
 #include <iostream>
@@ -54,7 +53,6 @@ using std::list;
 using std::abs;
 using boost::shared_ptr;
 using boost::scoped_array;
-using boost::make_shared;
 
 boost::filesystem::path private_data = boost::filesystem::path ("..") / boost::filesystem::path ("dcpomatic-test-private");
 
@@ -83,7 +81,7 @@ struct TestConfig
                Config::instance()->set_default_j2k_bandwidth (100000000);
                Config::instance()->set_log_types (LogEntry::TYPE_GENERAL | LogEntry::TYPE_WARNING | LogEntry::TYPE_ERROR);
 
-               EncodeServerFinder::instance()->disable ();
+               EncodeServerFinder::instance()->stop ();
 
                signal_manager = new TestSignalManager ();
        }
@@ -114,7 +112,7 @@ new_test_film (string name)
                boost::filesystem::remove_all (p);
        }
 
-       shared_ptr<Film> film = boost::make_shared<Film> (p.string());
+       shared_ptr<Film> film = shared_ptr<Film> (new Film (p.string()));
        film->write_metadata ();
        return film;
 }
@@ -293,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 ();
@@ -324,7 +322,10 @@ wait_for_jobs ()
 
        if (jm->errors ()) {
                JobManager::drop ();
+               return true;
        }
+
+       return false;
 }
 
 void