X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=test%2Fscaling_test.cc;h=93c994741f50e4926993ed8e4b2c7fe84396ea35;hb=5f3a88d3ab1e9c1a13d7e61fc37a0c4cef8df9a5;hp=13276977d891912ad98a03a40a3fa5873a6f35a1;hpb=67a68bd971ebe1b35daa3f75873b4ccb53c00ba0;p=dcpomatic.git diff --git a/test/scaling_test.cc b/test/scaling_test.cc index 13276977d..93c994741 100644 --- a/test/scaling_test.cc +++ b/test/scaling_test.cc @@ -38,9 +38,10 @@ static void scaling_test_for (shared_ptr film, shared_ptr content { content->video->set_scale (VideoContentScale (Ratio::from_id (image))); film->set_container (Ratio::from_id (container)); + film->set_interop (false); film->make_dcp (); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs()); boost::filesystem::path ref; ref = "test"; @@ -61,11 +62,11 @@ BOOST_AUTO_TEST_CASE (scaling_test) shared_ptr film = new_test_film ("scaling_test"); film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR")); film->set_name ("scaling_test"); - shared_ptr imc (new ImageContent (film, "test/data/simple_testcard_640x480.png")); + shared_ptr imc (new ImageContent("test/data/simple_testcard_640x480.png")); film->examine_and_add_content (imc); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs()); imc->video->set_length (1);