X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2F4k_test.cc;h=0fe492133f5dc0e4a3bc546fa30667620375b79b;hb=6eec3fea764f2fe35723089d60c51005616905bf;hp=033796ab23d2e65cc58c5461ec6316765a3eb95f;hpb=a8a0dfd1b21de6c0facf965ab119833ff6f790bf;p=dcpomatic.git

diff --git a/test/4k_test.cc b/test/4k_test.cc
index 033796ab2..0fe492133 100644
--- a/test/4k_test.cc
+++ b/test/4k_test.cc
@@ -18,8 +18,11 @@
 
 */
 
+/** @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.
  */
@@ -30,6 +33,7 @@
 #include "lib/dcp_content_type.h"
 #include "lib/video_content.h"
 #include "lib/ratio.h"
+#include "lib/dcpomatic_log.h"
 #include "test.h"
 
 using boost::shared_ptr;
@@ -37,18 +41,17 @@ using boost::shared_ptr;
 BOOST_AUTO_TEST_CASE (fourk_test)
 {
 	shared_ptr<Film> film = new_test_film ("4k_test");
+	LogSwitcher ls (film->log());
 	film->set_name ("4k_test");
-	shared_ptr<FFmpegContent> c (new 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 ();
-
-	c->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
+	BOOST_REQUIRE (!wait_for_jobs());
 
 	film->make_dcp ();
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 
 	boost::filesystem::path p (test_film_dir ("4k_test"));
 	p /= film->dcp_name ();