Various playlist editor developments and fixes.

[dcpomatic.git] / test / 4k_test.cc

diff --git a/test/4k_test.cc b/test/4k_test.cc
index da3fdf0201da913c676dae7eb4e7e2901493f3c6..71d60f5732e10106a721b02ebf016b1cc9d8612f 100644 (file)
--- a/test/4k_test.cc
+++ b/test/4k_test.cc
@@ -33,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;
@@ -40,18 +41,19 @@ using boost::shared_ptr;
 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 (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 ();