From 8db34adc37a11d2d0c113cd52edb587f258abbb7 Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Sat, 22 Mar 2025 23:04:23 +0200 Subject: [PATCH 1/6] =?UTF-8?q?Revert=20"[ci]=20Don=E2=80=99t=20set=20exe?= =?UTF-8?q?=5Fwrapper=20in=20the=20cross=20files"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit e3dc86bb0f6ac350fb0bbfa6dcd5e9106d036c1b. --- .ci/win32-cross-file.txt | 2 +- .ci/win64-cross-file.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci/win32-cross-file.txt b/.ci/win32-cross-file.txt index cefb24d29..22e060d80 100644 --- a/.ci/win32-cross-file.txt +++ b/.ci/win32-cross-file.txt @@ -19,4 +19,4 @@ objcopy = 'i686-w64-mingw32-objcopy' strip = 'i686-w64-mingw32-strip' windres = 'i686-w64-mingw32-windres' pkg-config = 'i686-w64-mingw32-pkg-config' -#exe_wrapper = 'wine' +exe_wrapper = 'wine' diff --git a/.ci/win64-cross-file.txt b/.ci/win64-cross-file.txt index acda4b622..a03c049a1 100644 --- a/.ci/win64-cross-file.txt +++ b/.ci/win64-cross-file.txt @@ -19,4 +19,4 @@ objcopy = 'x86_64-w64-mingw32-objcopy' strip = 'x86_64-w64-mingw32-strip' windres = 'x86_64-w64-mingw32-windres' pkg-config = 'x86_64-w64-mingw32-pkg-config' -#exe_wrapper = 'wine' +exe_wrapper = 'wine' From 7153e7814bcea33729aca833257b00594dae73d9 Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Sat, 22 Mar 2025 23:09:33 +0200 Subject: [PATCH 2/6] [circleci] Install wine on cross-compile jobs --- .circleci/config.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a2dc098ae..fbf5c0f9b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -132,7 +132,9 @@ jobs: executor: win32-executor steps: - checkout - - run: apt update && DEBIAN_FRONTEND=noninteractive apt install -y ninja-build python3 python3-pip python3-venv git g++-mingw-w64-i686 zip + - run: dpkg --add-architecture i386 + - run: apt update + - run: DEBIAN_FRONTEND=noninteractive apt install -y ninja-build python3 python3-pip python3-venv git g++-mingw-w64-i686 zip wine wine32 - run: | python3 -m venv venv source venv/bin/activate @@ -158,7 +160,8 @@ jobs: executor: win64-executor steps: - checkout - - run: apt update && DEBIAN_FRONTEND=noninteractive apt install -y ninja-build python3 python3-pip python3-venv git g++-mingw-w64-x86-64 zip + - run: apt update + - run: DEBIAN_FRONTEND=noninteractive apt install -y ninja-build python3 python3-pip python3-venv git g++-mingw-w64-x86-64 zip wine wine64 - run: | python3 -m venv venv source venv/bin/activate From b205a7fbe8ae58cd812073c92e142b27212d0b55 Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Sat, 22 Mar 2025 23:22:40 +0200 Subject: [PATCH 3/6] [circleci] Run tests on cross-compile jobs --- .circleci/config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index fbf5c0f9b..91f2a2214 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -140,6 +140,7 @@ jobs: source venv/bin/activate pip3 install meson==1.6.0 bash .ci/build-win.sh 32 + meson devenv -Cbuild-win32 meson test --print-errorlogs --suite=harfbuzz - store_artifacts: path: harfbuzz-win32.zip - persist_to_workspace: @@ -167,6 +168,7 @@ jobs: source venv/bin/activate pip3 install meson==1.6.0 bash .ci/build-win.sh 64 + meson devenv -Cbuild-win64 meson test --print-errorlogs --suite=harfbuzz - store_artifacts: path: harfbuzz-win64.zip - persist_to_workspace: From 40ef946ec58e2ea1e2701053998a090f01a76e99 Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Sun, 23 Mar 2025 00:09:20 +0200 Subject: [PATCH 4/6] [circleci] Set LANG=en_US.UTF-8 on cross-compile jobs Otherwise GLib fails when running the tests under Wine with: GLib-WARNING (recursed) **: Failed to determine console output code page: Invalid access.. Falling back to UTF-8 --- .circleci/config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 91f2a2214..3026349fd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -136,6 +136,7 @@ jobs: - run: apt update - run: DEBIAN_FRONTEND=noninteractive apt install -y ninja-build python3 python3-pip python3-venv git g++-mingw-w64-i686 zip wine wine32 - run: | + export LANG=en_US.UTF-8 python3 -m venv venv source venv/bin/activate pip3 install meson==1.6.0 @@ -164,6 +165,7 @@ jobs: - run: apt update - run: DEBIAN_FRONTEND=noninteractive apt install -y ninja-build python3 python3-pip python3-venv git g++-mingw-w64-x86-64 zip wine wine64 - run: | + export LANG=en_US.UTF-8 python3 -m venv venv source venv/bin/activate pip3 install meson==1.6.0 From ed558e5da451590df6dcb7ebb6cc2079d2d145e9 Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Sun, 23 Mar 2025 01:28:41 +0200 Subject: [PATCH 5/6] [test] Add name table to test/api/fonts/glyphs.ttf Some version of Wine fails to load the font otherwise. --- test/api/fonts/glyphs.ttf | Bin 808 -> 932 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/test/api/fonts/glyphs.ttf b/test/api/fonts/glyphs.ttf index 64ff55eb342972bf03d8a02be14789a08fed8187..cd0e92e3b0fe0f4c22bc517c0a507259e639b937 100644 GIT binary patch delta 410 zcmZXQy-Px26vm%(z1`FyU6Q7BXb36<3314VvR3JHXsL_&5#6hnH!=vUtu0JiqM@Oo zp)DJNhK8n=pg$oD+q3WB_LLA&@5|wRe$R8@9Nr`Cu(bpM;Kl|V2*f9Xq3!j}X+XN^ z&LvDe|1_vY$p_?E+E`0f&##xr4VIco>hrH>!7FCRtZ;^gwkR&@8mlW~T1Dpr?%2CU z?l5u*9d8mNf8}0NFOKEm!4M56jX+j6lUm$Y2b34GmCqHd)ke7;a2Vvs_p)5rf7`!1 z>lt{2IPU4Ay2E{VYU*>nd@&_T#V5lOt<1(uftf+TKUm+W-@Y-7fq_v1D4LL*n^?fG@ApX{e*%#2lb%zV zwq?)xLLmPQ5VK^YCZ@dm_Sp|8HwTE#GJpbX*^Hb(_7xyj$;d6K;P}k&6sWcW$d|~; zPfld`#pnX$-vROkauX{Y3m60#oPeAkK&()ZUtCiDWuhnp1Jef}-vaD7paW;$P2z~> zxB1Gz$ov8*&ah?D7ZAm8(`k41#0#N}%#+m^of#P>XEC~}I{?Lb7&sW17+8QTTZS}- b%-@Xv{{z`5yvY|B#Wz1?6k(j4%WMt+c3DEP From 1c7a1c7b049e096b81ad986180f6061b320ad367 Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Sun, 23 Mar 2025 02:10:06 +0200 Subject: [PATCH 6/6] =?UTF-8?q?[test-directwrite]=20Don=E2=80=99t=20fail?= =?UTF-8?q?=20if=20Bahnschrift=20can=E2=80=99t=20be=20loaded=20under=20Win?= =?UTF-8?q?e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It is unlikely to be present if one is not running on Windows. --- test/api/test-directwrite.cc | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/test/api/test-directwrite.cc b/test/api/test-directwrite.cc index c48572192..9367818e3 100644 --- a/test/api/test-directwrite.cc +++ b/test/api/test-directwrite.cc @@ -47,7 +47,7 @@ get_dwfont (const wchar_t *family_name) IDWriteFontCollection3 *collection; UINT32 count; IDWriteFontFamily2 *family; - IDWriteFont *font; + IDWriteFont *font = nullptr; UINT32 index = 0; dwrite_dll = LoadLibrary (TEXT ("DWRITE")); @@ -81,8 +81,8 @@ get_dwfont (const wchar_t *family_name) { BOOL exists; hr = collection->FindFamilyName (family_name, &index, &exists); - g_assert_true (SUCCEEDED (hr)); - g_assert_true (exists); + if (FAILED (hr) || !exists) + goto done; } hr = collection->GetFontFamily (index, &family); @@ -94,6 +94,7 @@ get_dwfont (const wchar_t *family_name) &font); g_assert_true (SUCCEEDED (hr)); +done: factory->Release (); return font; @@ -129,6 +130,14 @@ test_native_directwrite_variations (void) unsigned int length; dwfont = get_dwfont (L"Bahnschrift"); + + const char *env = getenv ("MESON_EXE_WRAPPER"); + if (env && strstr (env, "wine")) + { + g_test_skip ("Failed to load \"Bahnschrift\" font under Wine"); + return; + } + g_assert_nonnull (dwfont); font = hb_directwrite_font_create (dwfont);