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

diff --git a/test/test.cc b/test/test.cc
index 93cd5ee14..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 ()
@@ -233,11 +237,7 @@ check_mxf_audio_file (boost::filesystem::path ref, boost::filesystem::path check
 void
 check_image (boost::filesystem::path ref, boost::filesystem::path check, double threshold)
 {
-#ifdef DCPOMATIC_IMAGE_MAGICK
 	using namespace MagickCore;
-#else
-	using namespace MagickLib;
-#endif
 
 	Magick::Image ref_image;
 	ref_image.read (ref.string ());
@@ -246,12 +246,8 @@ check_image (boost::filesystem::path ref, boost::filesystem::path check, double
 	/* XXX: this is a hack; we really want the ImageMagick call but GraphicsMagick doesn't have it;
 	   this may cause random test failures on platforms that use GraphicsMagick.
 	*/
-#ifdef DCPOMATIC_ADVANCED_MAGICK_COMPARE
 	double const dist = ref_image.compare(check_image, Magick::RootMeanSquaredErrorMetric);
 	BOOST_CHECK_MESSAGE (dist < threshold, ref << " differs from " << check << " " << dist);
-#else
-	BOOST_CHECK_MESSAGE (!ref_image.compare(check_image), ref << " differs from " << check);
-#endif
 }
 
 void
@@ -393,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 ()) {
@@ -425,15 +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)
 {
-#ifdef DCPOMATIC_IMAGE_MAGICK
-		using namespace MagickCore;
-#else
-		using namespace MagickLib;
-#endif
+	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 ());
 }
 
@@ -504,4 +496,29 @@ subtitle_file (shared_ptr<Film> film)
 	}
 
 	BOOST_REQUIRE (false);
+	/* Remove warning */
+	return boost::filesystem::path("/");
+}
+
+void
+make_random_file (boost::filesystem::path path, size_t size)
+{
+	size_t const chunk = 128 * 1024;
+	uint8_t* buffer = static_cast<uint8_t*> (malloc(chunk));
+	BOOST_REQUIRE (buffer);
+	FILE* r = fopen("/dev/urandom", "rb");
+	BOOST_REQUIRE (r);
+	FILE* t = fopen_boost(path, "wb");
+	BOOST_REQUIRE (t);
+	while (size) {
+		size_t this_time = min (size, chunk);
+		size_t N = fread (buffer, 1, this_time, r);
+		BOOST_REQUIRE (N == this_time);
+		N = fwrite (buffer, 1, this_time, t);
+		BOOST_REQUIRE (N == this_time);
+		size -= this_time;
+	}
+	fclose (t);
+	fclose (r);
+	free (buffer);
 }