Fix potential crash if maybe_add_text() fails.

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

diff --git a/test/4k_test.cc b/test/4k_test.cc
index 82c5a2583ef64fbd4ef100d8997a1c94e885bd89..cbbede0a9991dff957bae0600a6028e639f21275 100644 (file)
--- a/test/4k_test.cc
+++ b/test/4k_test.cc
@@ -18,7 +18,7 @@
 
 */
 
-/** @defgroup completedcp Complete builds of DCPs with various characteristics, testing broad areas of code */
+/** @defgroup completedcp Complete builds of DCPs */
 
 /** @file  test/4k_test.cc
  *  @brief Run a 4K encode from a simple input.
@@ -41,19 +41,17 @@ using boost::shared_ptr;
 BOOST_AUTO_TEST_CASE (fourk_test)
 {
        shared_ptr<Film> film = new_test_film ("4k_test");
-       dcpomatic_log = film->log ();
+       LogSwitcher ls (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 ();
-
-       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 ();