X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Ftest.cc;h=c0d5d776f17b89a0a00e738aa44a2f8526caee18;hp=50770a6875ce2e2f05f9685f2319eb2fdc651d40;hb=875d15256aab7ebf9e9b0548b68d88056695d1cc;hpb=48b82de5b6e8e07330a2f72dbddd8d9830fe047e

diff --git a/test/test.cc b/test/test.cc
index 50770a687..c0d5d776f 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -35,6 +35,8 @@
 #include "lib/dcp_content_type.h"
 #include "lib/log_entry.h"
 #include "lib/compose.hpp"
+#include "lib/file_log.h"
+#include "lib/dcpomatic_log.h"
 #include "test.h"
 #include <dcp/dcp.h>
 #include <dcp/cpl.h>
@@ -113,6 +115,8 @@ struct TestConfig
 		if (env_private) {
 			private_data = env_private;
 		}
+
+		dcpomatic_log.reset (new FileLog("build/test/log"));
 	}
 
 	~TestConfig ()
@@ -385,7 +389,7 @@ wait_for_jobs ()
 	JobManager* jm = JobManager::instance ();
 	while (jm->work_to_do ()) {
 		while (signal_manager->ui_idle ()) {}
-		dcpomatic_sleep (1);
+		dcpomatic_sleep_seconds (1);
 	}
 
 	if (jm->errors ()) {
@@ -417,11 +421,11 @@ wait_for_jobs ()
 }
 
 void
-write_image (shared_ptr<const Image> image, boost::filesystem::path file, string format)
+write_image (shared_ptr<const Image> image, boost::filesystem::path file, string format, MagickCore::StorageType pixel_type)
 {
 	using namespace MagickCore;
 
-	Magick::Image m (image->size().width, image->size().height, format.c_str(), CharPixel, (void *) image->data()[0]);
+	Magick::Image m (image->size().width, image->size().height, format.c_str(), pixel_type, (void *) image->data()[0]);
 	m.write (file.string ());
 }