X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Ftest.cc;h=68c1cfccd897e5792d88698af675337290813097;hp=76678b74be4ba77bd0957dfb2e6b8a0b1ceda7a2;hb=44b97d718fa4b487641a983fa0b6ae485470eef8;hpb=a840ce739c75e1d5c84cd1956698f4ee0d1e1b2b

diff --git a/test/test.cc b/test/test.cc
index 76678b74b..68c1cfccd 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::canonical(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 ();
 
@@ -224,7 +231,7 @@ check_mxf_audio_file (boost::filesystem::path ref, boost::filesystem::path check
 }
 
 void
-check_image (boost::filesystem::path ref, boost::filesystem::path check)
+check_image (boost::filesystem::path ref, boost::filesystem::path check, double threshold)
 {
 #ifdef DCPOMATIC_IMAGE_MAGICK
 	using namespace MagickCore;
@@ -241,7 +248,7 @@ check_image (boost::filesystem::path ref, boost::filesystem::path check)
 	*/
 #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);
+	BOOST_CHECK_MESSAGE (dist < threshold, ref << " differs from " << check << " " << dist);
 #else
 	BOOST_CHECK_MESSAGE (!ref_image.compare(check_image), ref << " differs from " << check);
 #endif
@@ -431,9 +438,9 @@ write_image (shared_ptr<const Image> image, boost::filesystem::path file, string
 }
 
 void
-check_ffmpeg (boost::filesystem::path ref, boost::filesystem::path check)
+check_ffmpeg (boost::filesystem::path ref, boost::filesystem::path check, int audio_tolerance)
 {
-	int const r = system (string("ffcmp " + ref.string() + " " + check.string()).c_str());
+	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);
 }