From 12e31ab7e86021c33072558acb68a2701058ab16 Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Fri, 21 Mar 2025 02:24:00 +0200 Subject: [PATCH 1/4] [test] Allow running test suite under wine Set exe_wrapper in the Windows cross files, which will cause unit tests to be run with wine. When we call the binary ourselves, e.g. in shape run-tests.py, we need to check for MESON_EXE_WRAPPER env var (which meson sets automatically if exe_wrapper is set) and use it. --- .ci/win32-cross-file.txt | 1 + .ci/win64-cross-file.txt | 1 + test/shape/run-tests.py | 15 +++++++++++++-- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.ci/win32-cross-file.txt b/.ci/win32-cross-file.txt index 0c9b99beb..22e060d80 100644 --- a/.ci/win32-cross-file.txt +++ b/.ci/win32-cross-file.txt @@ -19,3 +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' diff --git a/.ci/win64-cross-file.txt b/.ci/win64-cross-file.txt index 84f0766de..a03c049a1 100644 --- a/.ci/win64-cross-file.txt +++ b/.ci/win64-cross-file.txt @@ -19,3 +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' diff --git a/test/shape/run-tests.py b/test/shape/run-tests.py index db1ffe9eb..5046aeabc 100755 --- a/test/shape/run-tests.py +++ b/test/shape/run-tests.py @@ -16,11 +16,18 @@ hb_shape, args = args[0], args[1:] env = os.environ.copy() env["LC_ALL"] = "C" +EXE_WRAPPER = os.environ.get("MESON_EXE_WRAPPER") + def open_shape_batch_process(): global hb_shape, env + + cmd = [hb_shape, "--batch"] + if EXE_WRAPPER: + cmd = [EXE_WRAPPER] + cmd + process = subprocess.Popen( - [hb_shape, "--batch"], + cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=sys.stdout, @@ -79,8 +86,12 @@ def all_whats(what): for what in ["shaper", "face-loader", "font-funcs"]: subcommand = "--list-" + plural(what) + cmd = [hb_shape, subcommand] + if EXE_WRAPPER: + cmd = [EXE_WRAPPER] + cmd + what_process = subprocess.Popen( - [hb_shape, subcommand], + cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=sys.stdout, From ca1498126294e4b2c94300c712be4c3ef9c54d1f Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Fri, 21 Mar 2025 02:31:28 +0200 Subject: [PATCH 2/4] [ci] Install wine on Windows cross-compile jobs --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a2dc098ae..f104cfada 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -132,7 +132,7 @@ 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: apt update && DEBIAN_FRONTEND=noninteractive apt install -y ninja-build python3 python3-pip python3-venv git g++-mingw-w64-i686 zip wine - run: | python3 -m venv venv source venv/bin/activate @@ -158,7 +158,7 @@ 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 && 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 a189b0f77279726ef767ec486f500506770f124f Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Fri, 21 Mar 2025 03:02:19 +0200 Subject: [PATCH 3/4] Revert "[ci] Install wine on Windows cross-compile jobs" This reverts commit ca1498126294e4b2c94300c712be4c3ef9c54d1f. --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f104cfada..a2dc098ae 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -132,7 +132,7 @@ 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 wine + - run: apt update && DEBIAN_FRONTEND=noninteractive apt install -y ninja-build python3 python3-pip python3-venv git g++-mingw-w64-i686 zip - run: | python3 -m venv venv source venv/bin/activate @@ -158,7 +158,7 @@ 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 wine wine64 + - run: apt update && DEBIAN_FRONTEND=noninteractive apt install -y ninja-build python3 python3-pip python3-venv git g++-mingw-w64-x86-64 zip - run: | python3 -m venv venv source venv/bin/activate From e3dc86bb0f6ac350fb0bbfa6dcd5e9106d036c1b Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Fri, 21 Mar 2025 03:02:56 +0200 Subject: [PATCH 4/4] =?UTF-8?q?[ci]=20Don=E2=80=99t=20set=20exe=5Fwrapper?= =?UTF-8?q?=20in=20the=20cross=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Complicates the build setup. Keep it commented in case one wants to enable it locally. --- .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 22e060d80..cefb24d29 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 a03c049a1..acda4b622 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'