diff options
| author | Carl Hetherington <cth@carlh.net> | 2025-05-18 22:20:02 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2025-05-19 21:25:35 +0200 |
| commit | 8d18da108282203a90f4b5ae0123700b827e3eb7 (patch) | |
| tree | 627bf6dad0c0cf0c7bff5ca4f147f0baa5c683a3 /run | |
| parent | 0866fe0a549a489a140fd4670a5245ba231fc8ec (diff) | |
Tidy up finding required files during tests.
In particular, prefer not to use lots of fallback attempts. It seems
that something funny is going on with how we find Liberation Sans on
Linux, meaning that we were sometimes using the OS copy of the font when
we didn't mean to.
Diffstat (limited to 'run')
| -rwxr-xr-x | run/tests | 13 | ||||
| -rw-r--r-- | run/tests.bat | 7 |
2 files changed, 9 insertions, 11 deletions
@@ -58,6 +58,9 @@ done if [ "$(uname)" == "Linux" ]; then rm -f build/test/dcpomatic2_openssl mkdir -p build/test + cp -r ../libdcp/tags build/test + cp -r ../libdcp/xsd build/test + cp ../libdcp/ratings build/test # This must be our patched openssl or tests will fail if [ ! -f build/test/dcpomatic2_openssl ]; then ln -s ../../../openssl/apps/openssl build/test/dcpomatic2_openssl @@ -75,13 +78,9 @@ if [ "$(uname)" == "Linux" ]; then fi if [ "$(uname)" == "Darwin" ]; then - resources=build/Resources - rm -rf $resources - mkdir -p $resources - cp fonts/*.ttf $resources - cp -r ../libdcp/tags $resources - cp -r ../libdcp/xsd $resources - cp ../libdcp/ratings $resources + cp -r ../libdcp/tags build/test + cp -r ../libdcp/xsd build/test + cp ../libdcp/ratings build/test rm -f build/test/openssl ln -s ../../../openssl/apps/openssl build/test/openssl # We need to find ffcmp in here diff --git a/run/tests.bat b/run/tests.bat index f419027bc..3eb422d7d 100644 --- a/run/tests.bat +++ b/run/tests.bat @@ -1,8 +1,7 @@ set PATH=%PATH%;c:\users\ci\bin_v2.18.x;c:\users\ci\workspace\dcpomatic\bin;c:\users\ci\workspace\dcpomatic\lib set DCPOMATIC_TEST_PRIVATE=c:\users\ci\dcpomatic-test-private -xcopy ..\libdcp\tags build\tags\ -copy ..\libdcp\ratings build\ +xcopy ..\libdcp\tags build\test\tags\ +copy ..\libdcp\ratings build\test\ copy ..\openssl\apps\openssl.exe build\test\ -xcopy fonts build\fonts\ -move build\fonts\fonts.conf.windows build\fonts\fonts.conf +copy fonts\fonts.conf.windows fonts\fonts.conf build\test\unit-tests.exe --log_level=test_suite %1 %2 |