summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xrun/tests2
m---------test/data0
-rw-r--r--test/no_use_video_test.cc6
3 files changed, 6 insertions, 2 deletions
diff --git a/run/tests b/run/tests
index 3324b02ab..c17330dca 100755
--- a/run/tests
+++ b/run/tests
@@ -3,7 +3,7 @@
# e.g. --run_tests=foo
set -e
-PRIVATE_GIT="5aa4660a36d2aa9c95de8e353b75c9cf29f6b02e"
+PRIVATE_GIT="9c6e881036e5ce29d0e64d8c3159714706ce49f9"
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
source $DIR/environment
diff --git a/test/data b/test/data
-Subproject fdeb5d1946f4743ca4634778e7f976b03b0df29
+Subproject 67e713cb1b06dede9cd0e972c6e1a0202b6a835
diff --git a/test/no_use_video_test.cc b/test/no_use_video_test.cc
index 7ac02afc4..234de4049 100644
--- a/test/no_use_video_test.cc
+++ b/test/no_use_video_test.cc
@@ -85,7 +85,11 @@ BOOST_AUTO_TEST_CASE (no_use_video_test2)
make_and_verify_dcp (film);
- check_dcp (TestPaths::private_data() / "no_use_video_test2", film);
+#ifdef DCPOMATIC_FFMPEG_8
+ check_dcp(TestPaths::private_data() / "no_use_video_test2_ffmpeg8", film);
+#else
+ check_dcp(TestPaths::private_data() / "no_use_video_test2", film);
+#endif
cl.run();
}