#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>
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");
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 ();
}
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));
film->write_metadata ();
return film;
}
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);
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;
}
check_xml (ref_root, test_root, ignore);
}
-void
+bool
wait_for_jobs ()
{
JobManager* jm = JobManager::instance ();
if (jm->errors ()) {
JobManager::drop ();
+ return true;
}
+
+ return false;
}
void