Fix incorrect test subtitle gathering; fix a few missing standard-setting calls.

diff --git a/test/dcp_subtitle_test.cc b/test/dcp_subtitle_test.cc
index b4dfe1df7acea1119e561a5529a5c3b0c987da39..407ac26164e405cc674c0b349f4c4dcd7869f5ee 100644 (file)
--- a/test/dcp_subtitle_test.cc
+++ b/test/dcp_subtitle_test.cc
@@ -47,7 +47,13 @@ optional<ContentTextSubtitle> stored;
 static void
 store (ContentTextSubtitle sub)
 {
-       stored = sub;
+       if (!stored) {
+               stored = sub;
+       } else {
+               BOOST_FOREACH (dcp::SubtitleString i, sub.subs) {
+                       stored->subs.push_back (i);
+               }
+       }
 }
 
 /** Test pass-through of a very simple DCP subtitle file */
@@ -57,6 +63,7 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_test)
        film->set_container (Ratio::from_id ("185"));
        film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
        film->set_name ("frobozz");
+       film->set_interop (false);
        shared_ptr<DCPSubtitleContent> content (new DCPSubtitleContent (film, "test/data/dcp_sub.xml"));
        film->examine_and_add_content (content);
        wait_for_jobs ();

diff --git a/test/scaling_test.cc b/test/scaling_test.cc
index 13276977d891912ad98a03a40a3fa5873a6f35a1..ed0461005f12376ba00e1b13fef07c3edd83c573 100644 (file)
--- a/test/scaling_test.cc
+++ b/test/scaling_test.cc
@@ -38,6 +38,7 @@ static void scaling_test_for (shared_ptr<Film> film, shared_ptr<Content> 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 ();