diff options
| author | Carl Hetherington <cth@carlh.net> | 2025-05-19 00:01:51 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2025-05-19 21:27:21 +0200 |
| commit | d84cfe7de28070ea31c9a1c0bd7872ac4be4b773 (patch) | |
| tree | c3eb3328bac89bfecf9a6e0c914c4768e06c345b | |
| parent | 8d18da108282203a90f4b5ae0123700b827e3eb7 (diff) | |
Remove Ubuntu 22.04 test reference hacks.
Before the previous commit Ubuntu 22.04 would give slightly different
results to 24.04 when burning subtitles. I think this was because
DoM was erroneously using the system copy of Liberation Sans, which
I presume was changed.
After the previous commit we are always using the in-tree Liberation
Sans, which means that we can update the test references for Ubuntu
24.04 and use them also for 22.04.
| -rw-r--r-- | test/burnt_subtitle_test.cc | 12 | ||||
| m--------- | test/data | 0 |
2 files changed, 4 insertions, 8 deletions
diff --git a/test/burnt_subtitle_test.cc b/test/burnt_subtitle_test.cc index 185f69839..6b2e64d6a 100644 --- a/test/burnt_subtitle_test.cc +++ b/test/burnt_subtitle_test.cc @@ -57,11 +57,7 @@ using namespace dcpomatic; /* Some of these tests produce slightly different outputs on different platforms / OS versions. - * I'm not sure of the cause of these differences, but as it happens the tests on Ubuntu 24.04 - * produce the same results as on macOS, while the Ubuntu 22.04 results are slightly different. - * Hence the hacks in this file to check for DCPOMATIC_OSX or the Ubuntu 24.04 version of Pango - * (22.04 uses Pango 1.52.1, 24.04 is 1.50.6, macOS is 1.51.0). Maybe it has nothing to do - * with Pango, of course... + * I don't know why... */ @@ -80,7 +76,7 @@ BOOST_AUTO_TEST_CASE (burnt_subtitle_test_subrip) #if defined(DCPOMATIC_WINDOWS) check_dcp("test/data/windows/burnt_subtitle_test_subrip", film); -#elif defined(DCPOMATIC_OSX) || PANGO_VERSION_CHECK(1, 52, 1) +#elif defined(DCPOMATIC_OSX) check_dcp("test/data/mac/burnt_subtitle_test_subrip", film); #else check_dcp("test/data/burnt_subtitle_test_subrip", film); @@ -143,7 +139,7 @@ BOOST_AUTO_TEST_CASE (burnt_subtitle_test_onto_dcp) #if defined(DCPOMATIC_WINDOWS) check_dcp("test/data/windows/burnt_subtitle_test_onto_dcp2", film2); -#elif defined(DCPOMATIC_OSX) || PANGO_VERSION_CHECK(1, 52, 1) +#elif defined(DCPOMATIC_OSX) check_dcp("test/data/mac/burnt_subtitle_test_onto_dcp2", film2); #else check_dcp("test/data/burnt_subtitle_test_onto_dcp2", film2); @@ -172,7 +168,7 @@ BOOST_AUTO_TEST_CASE(burnt_subtitle_test_position) #if defined(DCPOMATIC_WINDOWS) check_dcp(String::compose("test/data/windows/%1", name), film); -#elif defined(DCPOMATIC_OSX) || PANGO_VERSION_CHECK(1, 52, 1) +#elif defined(DCPOMATIC_OSX) check_dcp(String::compose("test/data/mac/%1", name), film); #else check_dcp(String::compose("test/data/%1", name), film); diff --git a/test/data b/test/data -Subproject 6f42832e91bd7e5b2475a13e1103817bc8ec355 +Subproject ec2d28b9d2561ae92e05ce4034379587549642f |