Trying to create export audio encoders with between 9 and 15 channels

[dcpomatic.git] / test / recover_test.cc

diff --git a/test/recover_test.cc b/test/recover_test.cc
index 017c019274af0b69254cd65331b1b6667118609c..060c55b010cb3506d38810da1e370e09af7b5bd1 100644 (file)
--- a/test/recover_test.cc
+++ b/test/recover_test.cc
@@ -57,10 +57,10 @@ BOOST_AUTO_TEST_CASE (recover_test_2d)
 
        shared_ptr<FFmpegContent> content (new FFmpegContent("test/data/count300bd24.m2ts"));
        film->examine_and_add_content (content);
-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());
 
        film->make_dcp ();
-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());
 
        boost::filesystem::path const video = "build/test/recover_test_2d/video/185_2K_84d36460538435d5d511ee533c8528df_24_100000000_P_S_0_1200000.mxf";
        boost::filesystem::copy_file (
@@ -71,7 +71,7 @@ BOOST_AUTO_TEST_CASE (recover_test_2d)
        boost::filesystem::resize_file (video, 2 * 1024 * 1024);
 
        film->make_dcp ();
-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());
 
        shared_ptr<dcp::MonoPictureAsset> A (new dcp::MonoPictureAsset ("build/test/recover_test_2d/original.mxf"));
        shared_ptr<dcp::MonoPictureAsset> B (new dcp::MonoPictureAsset (video));
@@ -80,7 +80,7 @@ BOOST_AUTO_TEST_CASE (recover_test_2d)
        BOOST_CHECK (A->equals (B, eq, boost::bind (&note, _1, _2)));
 }
 
-BOOST_AUTO_TEST_CASE (recover_test_3d)
+BOOST_AUTO_TEST_CASE (recover_test_3d, * boost::unit_test::depends_on("recover_test_2d"))
 {
        shared_ptr<Film> film = new_test_film ("recover_test_3d");
        film->set_interop (false);
@@ -92,12 +92,12 @@ BOOST_AUTO_TEST_CASE (recover_test_3d)
        shared_ptr<ImageContent> content (new ImageContent("test/data/3d_test"));
        content->video->set_frame_type (VIDEO_FRAME_TYPE_3D_LEFT_RIGHT);
        film->examine_and_add_content (content);
-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());
 
        film->make_dcp ();
-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());
 
-       boost::filesystem::path const video = "build/test/recover_test_3d/video/185_2K_961f053444e90c5ddbf978eb0ebfa772_24_100000000_P_S_3D_0_96000.mxf";
+       boost::filesystem::path const video = "build/test/recover_test_3d/video/185_2K_3c5ecc5e62c481206d978eddb620fd32_24_100000000_P_S_3D_0_96000.mxf";
 
        boost::filesystem::copy_file (
                video,
@@ -107,7 +107,7 @@ BOOST_AUTO_TEST_CASE (recover_test_3d)
        boost::filesystem::resize_file (video, 2 * 1024 * 1024);
 
        film->make_dcp ();
-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());
 
        shared_ptr<dcp::StereoPictureAsset> A (new dcp::StereoPictureAsset ("build/test/recover_test_3d/original.mxf"));
        shared_ptr<dcp::StereoPictureAsset> B (new dcp::StereoPictureAsset (video));
@@ -117,7 +117,7 @@ BOOST_AUTO_TEST_CASE (recover_test_3d)
 }
 
 
-BOOST_AUTO_TEST_CASE (recover_test_2d_encrypted)
+BOOST_AUTO_TEST_CASE (recover_test_2d_encrypted, * boost::unit_test::depends_on("recover_test_3d"))
 {
        shared_ptr<Film> film = new_test_film ("recover_test_2d_encrypted");
        film->set_interop (false);
@@ -128,10 +128,10 @@ BOOST_AUTO_TEST_CASE (recover_test_2d_encrypted)
 
        shared_ptr<FFmpegContent> content (new FFmpegContent("test/data/count300bd24.m2ts"));
        film->examine_and_add_content (content);
-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());
 
        film->make_dcp ();
-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());
 
        boost::filesystem::path const video =
                "build/test/recover_test_2d_encrypted/video/185_2K_84d36460538435d5d511ee533c8528df_24_100000000_E_S_0_1200000.mxf";
@@ -144,7 +144,7 @@ BOOST_AUTO_TEST_CASE (recover_test_2d_encrypted)
        boost::filesystem::resize_file (video, 2 * 1024 * 1024);
 
        film->make_dcp ();
-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());
 
        shared_ptr<dcp::MonoPictureAsset> A (new dcp::MonoPictureAsset ("build/test/recover_test_2d_encrypted/original.mxf"));
        A->set_key (film->key ());