X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2F4k_test.cc;h=9e80a6e27bb035c25e940fd8dccf3d9b060a57fc;hb=HEAD;hp=f3ce0bfcc2b2e8ab03cdb3140bea39f55487d63c;hpb=ea63ad9560757e56505551db3bf2e1c31be5c76c;p=dcpomatic.git

diff --git a/test/4k_test.cc b/test/4k_test.cc
index f3ce0bfcc..9e80a6e27 100644
--- a/test/4k_test.cc
+++ b/test/4k_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,6 +18,7 @@
 
 */
 
+
 /** @defgroup completedcp Complete builds of DCPs */
 
 /** @file  test/4k_test.cc
@@ -27,18 +28,20 @@
  *  The output is checked against test/data/4k_test.
  */
 
-#include <boost/test/unit_test.hpp>
-#include "lib/film.h"
-#include "lib/ffmpeg_content.h"
+
 #include "lib/dcp_content_type.h"
-#include "lib/video_content.h"
-#include "lib/ratio.h"
 #include "lib/dcpomatic_log.h"
+#include "lib/ffmpeg_content.h"
+#include "lib/film.h"
+#include "lib/ratio.h"
+#include "lib/video_content.h"
 #include "test.h"
+#include <boost/test/unit_test.hpp>
+
 
-using std::shared_ptr;
 using std::make_shared;
 
+
 BOOST_AUTO_TEST_CASE (fourk_test)
 {
 	auto film = new_test_film ("4k_test");
@@ -58,8 +61,12 @@ BOOST_AUTO_TEST_CASE (fourk_test)
 			dcp::VerificationNote::Code::MISSING_FFEC_IN_FEATURE
 		});
 
-	boost::filesystem::path p (test_film_dir ("4k_test"));
+	boost::filesystem::path p (test_film_dir("4k_test"));
 	p /= film->dcp_name ();
 
-	check_dcp ("test/data/4k_test", p.string ());
+	/* This test is concerned with the image and its metadata, so we'll
+	 * ignore any differences in sound between the DCP and the reference to
+	 * avoid test failures for unrelated reasons.
+	 */
+	check_dcp("test/data/4k_test", p.string(), true);
 }