X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Ftest.cc;h=53a561aa353d1de5563c9bb100a6e9ca866c182e;hb=363dee03e61d65538841541028ed62c91ffca124;hp=081a13a8cd93e07de09e5f25034dfa3c6e8c5ed5;hpb=ba7516b01ddef143d58b32ac14350dcd15079641;p=dcpomatic.git

diff --git a/test/test.cc b/test/test.cc
index 081a13a8c..53a561aa3 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2017 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -34,6 +34,8 @@
 #include "lib/ratio.h"
 #include "lib/dcp_content_type.h"
 #include "lib/log_entry.h"
+#include "lib/compose.hpp"
+#include "test.h"
 #include <dcp/dcp.h>
 #include <dcp/cpl.h>
 #include <dcp/reel.h>
@@ -67,7 +69,24 @@ using boost::shared_ptr;
 using boost::scoped_array;
 using boost::dynamic_pointer_cast;
 
-boost::filesystem::path private_data = boost::filesystem::path ("..") / boost::filesystem::path ("dcpomatic-test-private");
+boost::filesystem::path private_data = boost::filesystem::absolute(boost::filesystem::path ("..") / boost::filesystem::path ("dcpomatic-test-private"));
+
+void
+setup_test_config ()
+{
+	Config::instance()->set_master_encoding_threads (1);
+	Config::instance()->set_server_encoding_threads (1);
+	Config::instance()->set_server_port_base (61921);
+	Config::instance()->set_default_isdcf_metadata (ISDCFMetadata ());
+	Config::instance()->set_default_container (Ratio::from_id ("185"));
+	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_default_still_length (10);
+	Config::instance()->set_log_types (LogEntry::TYPE_GENERAL | LogEntry::TYPE_WARNING | LogEntry::TYPE_ERROR);
+	Config::instance()->set_automatic_audio_analysis (false);
+}
 
 class TestSignalManager : public SignalManager
 {
@@ -84,19 +103,7 @@ struct TestConfig
 	TestConfig ()
 	{
 		dcpomatic_setup ();
-
-		Config::instance()->set_master_encoding_threads (1);
-		Config::instance()->set_server_encoding_threads (1);
-		Config::instance()->set_server_port_base (61921);
-		Config::instance()->set_default_isdcf_metadata (ISDCFMetadata ());
-		Config::instance()->set_default_container (Ratio::from_id ("185"));
-		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_default_still_length (10);
-		Config::instance()->set_log_types (LogEntry::TYPE_GENERAL | LogEntry::TYPE_WARNING | LogEntry::TYPE_ERROR);
-		Config::instance()->set_automatic_audio_analysis (false);
+		setup_test_config ();
 
 		EncodeServerFinder::instance()->stop ();
 
@@ -236,7 +243,15 @@ check_image (boost::filesystem::path ref, boost::filesystem::path check)
 	ref_image.read (ref.string ());
 	Magick::Image check_image;
 	check_image.read (check.string ());
-	BOOST_CHECK_MESSAGE (ref_image.compare (check_image), ref << " differs from " << check);
+	/* 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 < 0.01, ref << " differs from " << check << " " << dist);
+#else
+	BOOST_CHECK_MESSAGE (!ref_image.compare(check_image), ref << " differs from " << check);
+#endif
 }
 
 void
@@ -422,30 +437,11 @@ write_image (shared_ptr<const Image> image, boost::filesystem::path file, string
 	m.write (file.string ());
 }
 
-static
-void
-check_ffmpeg_stream (boost::filesystem::path ref, boost::filesystem::path check, string stream)
-{
-	FILE* ref_file = popen(string("ffmpeg -loglevel error -i " + ref.string() + " -map 0:" + stream + " -f md5 -").c_str(), "r");
-	BOOST_REQUIRE (ref_file);
-	char ref_md5[64];
-	fscanf (ref_file, "%63s", ref_md5);
-	pclose (ref_file);
-
-	FILE* check_file = popen(string("ffmpeg -loglevel error -i " + check.string() + " -map 0:" + stream + " -f md5 -").c_str(), "r");
-	BOOST_REQUIRE (check_file);
-	char check_md5[64];
-	fscanf (check_file, "%63s", check_md5);
-	pclose (check_file);
-
-	BOOST_REQUIRE_EQUAL (strcmp(ref_md5, check_md5), 0);
-}
-
 void
-check_ffmpeg (boost::filesystem::path ref, boost::filesystem::path check)
+check_ffmpeg (boost::filesystem::path ref, boost::filesystem::path check, int audio_tolerance)
 {
-	check_ffmpeg_stream (ref, check, "v");
-	check_ffmpeg_stream (ref, check, "a");
+	int const r = system (String::compose("ffcmp -t %1 %2 %3", audio_tolerance, ref.string(), check.string()).c_str());
+	BOOST_REQUIRE_EQUAL (WEXITSTATUS(r), 0);
 }
 
 void