Use $HOME rather than hard-coded user name.

[dcpomatic.git] / test / subtitle_language_test.cc

diff --git a/test/subtitle_language_test.cc b/test/subtitle_language_test.cc
index 5b7a261fd2c038c80394eaf07fd665c2be5b5c0c..6ae0647e9ebfd5328f922beda71efc6ea1527046 100644 (file)
--- a/test/subtitle_language_test.cc
+++ b/test/subtitle_language_test.cc
@@ -44,8 +44,9 @@ BOOST_AUTO_TEST_CASE (subtitle_language_interop_test)
        auto fr = content_factory("test/data/frames.srt");
        auto film = new_test_film2 (name, fr);
 
-       fr[0]->only_text()->set_language (dcp::LanguageTag("fr-FR"));
+       fr[0]->only_text()->set_language(dcp::LanguageTag("fr"));
        film->set_interop (true);
+       film->set_audio_channels(6);
 
        make_and_verify_dcp (
                film,
@@ -53,9 +54,13 @@ BOOST_AUTO_TEST_CASE (subtitle_language_interop_test)
                        dcp::VerificationNote::Code::INVALID_STANDARD,
                        dcp::VerificationNote::Code::INVALID_SUBTITLE_SPACING,
                        dcp::VerificationNote::Code::INVALID_SUBTITLE_DURATION
-               });
+               },
+               false,
+               /* clairmeta raises errors about subtitle spacing/duration */
+               false
+               );
 
-       check_dcp (String::compose("test/data/%1", name), String::compose("build/test/%1/%2", name, film->dcp_name()));
+       check_dcp(String::compose("test/data/%1", name), String::compose("build/test/%1/%2", name, film->dcp_name()));
 }
 
 
@@ -65,7 +70,7 @@ BOOST_AUTO_TEST_CASE (subtitle_language_smpte_test)
        auto fr = content_factory("test/data/frames.srt");
        auto film = new_test_film2 (name, fr);
 
-       fr[0]->only_text()->set_language (dcp::LanguageTag("fr-FR"));
+       fr[0]->only_text()->set_language(dcp::LanguageTag("fr"));
        film->set_interop (false);
 
        make_and_verify_dcp (
@@ -78,7 +83,11 @@ BOOST_AUTO_TEST_CASE (subtitle_language_smpte_test)
                        dcp::VerificationNote::Code::MISSING_CPL_METADATA
                });
 
-       check_dcp (String::compose("test/data/%1", name), String::compose("build/test/%1/%2", name, film->dcp_name()));
+       /* This test is concerned with the subtitles, so we'll ignore any
+        * differences in sound between the DCP and the reference to avoid test
+        * failures for unrelated reasons.
+        */
+       check_dcp(String::compose("test/data/%1", name), String::compose("build/test/%1/%2", name, film->dcp_name()), true);
 }
 
 
@@ -90,7 +99,7 @@ BOOST_AUTO_TEST_CASE(subtitle_language_in_cpl_test)
        auto film = new_test_film2(boost::unit_test::framework::current_test_unit().full_name(), { subs, video1, video2 });
        video2->set_position(film, dcpomatic::DCPTime::from_seconds(5));
        film->set_reel_type(ReelType::BY_VIDEO_CONTENT);
-       subs->only_text()->set_language(dcp::LanguageTag("fr-FR"));
+       subs->only_text()->set_language(dcp::LanguageTag("fr"));
 
        make_and_verify_dcp(
                film,