Merge pull request #5191 from harfbuzz/ci-exe-wrapper

Revert "[ci] Don’t set exe_wrapper in the cross files"

.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'

.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'

.circleci/config.yml

@@ -132,12 +132,16 @@ 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: |
+          export LANG=en_US.UTF-8
           python3 -m venv venv
           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:
@@ -158,12 +162,15 @@ 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: |
+          export LANG=en_US.UTF-8
           python3 -m venv venv
           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: