Fix assertion failure on making a VF, in certain circumstances.

[dcpomatic.git] / test / recover_test.cc

diff --git a/test/recover_test.cc b/test/recover_test.cc
index 0a73b0c23270cf2281ec4cfb928ca613edbd47bf..ecbc38156d4235c2ff687d4b2ba570ac8874e7c4 100644 (file)
--- a/test/recover_test.cc
+++ b/test/recover_test.cc
@@ -62,7 +62,7 @@ BOOST_AUTO_TEST_CASE (recover_test_2d)
        film->make_dcp ();
        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::path const video = "build/test/recover_test_2d/video/185_2K_d4343facdd66ca71f62a964fbade89f3_24_100000000_P_S_0_1200000.mxf";
        boost::filesystem::copy_file (
                video,
                "build/test/recover_test_2d/original.mxf"
@@ -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);
@@ -97,7 +97,7 @@ BOOST_AUTO_TEST_CASE (recover_test_3d)
        film->make_dcp ();
        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_342fe9115d2b446914b31f7602e48cc6_24_100000000_P_S_3D_0_96000.mxf";
 
        boost::filesystem::copy_file (
                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);
@@ -134,7 +134,7 @@ BOOST_AUTO_TEST_CASE (recover_test_2d_encrypted)
        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";
+               "build/test/recover_test_2d_encrypted/video/185_2K_d4343facdd66ca71f62a964fbade89f3_24_100000000_E_S_0_1200000.mxf";
 
        boost::filesystem::copy_file (
                video,