projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix cross-thread access to info files. May help with #1618.
[dcpomatic.git]
/
test
/
recover_test.cc
diff --git
a/test/recover_test.cc
b/test/recover_test.cc
index 7a37020de7034f7653c5b41a4f9315c40e1c0b9a..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());
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"
boost::filesystem::copy_file (
video,
"build/test/recover_test_2d/original.mxf"
@@
-97,7
+97,7
@@
BOOST_AUTO_TEST_CASE (recover_test_3d, * boost::unit_test::depends_on("recover_t
film->make_dcp ();
BOOST_REQUIRE (!wait_for_jobs());
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,
boost::filesystem::copy_file (
video,
@@
-117,7
+117,7
@@
BOOST_AUTO_TEST_CASE (recover_test_3d, * boost::unit_test::depends_on("recover_t
}
}
-BOOST_AUTO_TEST_CASE (recover_test_2d_encrypted, * boost::unit_test::depends_on("recover_test_3d"))
)
+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);
{
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::unit_test::depends_on(
BOOST_REQUIRE (!wait_for_jobs());
boost::filesystem::path const video =
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,
boost::filesystem::copy_file (
video,