X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2F4k_test.cc;h=71d60f5732e10106a721b02ebf016b1cc9d8612f;hb=736745c86cefc6d5d4d8098799efc86f0f639061;hp=c5418e9dd5bd4ed85b395d6909db90f78b3a1996;hpb=5a5324ed3a381a86dfe0a6e3932c1d58fdcd596f;p=dcpomatic.git

diff --git a/test/4k_test.cc b/test/4k_test.cc
index c5418e9dd..71d60f573 100644
--- a/test/4k_test.cc
+++ b/test/4k_test.cc
@@ -18,39 +18,42 @@
 
 */
 
+/** @defgroup completedcp Complete builds of DCPs with various characteristics, testing broad areas of code */
+
 /** @file  test/4k_test.cc
  *  @brief Run a 4K encode from a simple input.
+ *  @ingroup completedcp
  *
  *  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 "test.h"
-#include <boost/test/unit_test.hpp>
-#include <boost/make_shared.hpp>
 
 using boost::shared_ptr;
-using boost::make_shared;
 
 BOOST_AUTO_TEST_CASE (fourk_test)
 {
 	shared_ptr<Film> film = new_test_film ("4k_test");
+	dcpomatic_log = film->log ();
 	film->set_name ("4k_test");
-	shared_ptr<FFmpegContent> c = make_shared<FFmpegContent> (film, "test/data/test.mp4");
+	shared_ptr<FFmpegContent> c (new FFmpegContent("test/data/test.mp4"));
 	film->set_resolution (RESOLUTION_4K);
 	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR"));
 	film->set_container (Ratio::from_id ("185"));
 	film->examine_and_add_content (c);
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 
 	c->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
 
 	film->make_dcp ();
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 
 	boost::filesystem::path p (test_film_dir ("4k_test"));
 	p /= film->dcp_name ();