chore(ci): split emulation tests per architecture

mayeut · May 27, 2024 · 22fc221 · 22fc221
1 parent 97da904
commit 22fc221
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 14 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -125,19 +125,42 @@ jobs:
       run: |
         python ./bin/run_tests.py --run-podman
 
+  emulated-archs:
+    name: Get emulated architectures
+    needs: lint
+    runs-on: ubuntu-latest
+    outputs:
+      archs: ${{ steps.archs.outputs.archs }}
+    steps:
+    - uses: actions/checkout@v4
+    - uses: actions/setup-python@v5
+      with:
+        python-version: "3.x"
+    - name: Install dependencies
+      run: python -m pip install ".[test]"
+    - name: Get emulated architectures
+      id: archs
+      run: |
+        OUTPUT=$(python -c "from test.utils import EMULATED_ARCHS; print(', '.join(EMULATED_ARCHS))")
+        OUTPUT="[${OUTPUT}]"
+        echo "${OUTPUT}"
+        echo "archs=${OUTPUT}" >> "$GITHUB_OUTPUT"
+
   test-emulated:
     name: Test emulated cibuildwheel using qemu
-    needs: lint
+    needs: emulated-archs
     runs-on: ubuntu-latest
     timeout-minutes: 180
+    strategy:
+      matrix:
+        arch: ${{ needs.emulated-archs.outputs.archs }}
     steps:
     - uses: actions/checkout@v4
     - uses: actions/setup-python@v5
       with:
         python-version: "3.x"
     - name: Install dependencies
-      run: |
-        python -m pip install ".[test]"
+      run: python -m pip install ".[test]"
 
     - name: Set up QEMU
       id: qemu
@@ -146,5 +169,4 @@ jobs:
         platforms: all
 
     - name: Run the emulation tests
-      run: |
-        pytest --run-emulation test/test_emulation.py
+      run: pytest --run-emulation ${{ matrix.arch }} test/test_emulation.py
diff --git a/test/conftest.py b/test/conftest.py
@@ -8,12 +8,16 @@
 
 from cibuildwheel.util import detect_ci_provider
 
-from .utils import platform
+from .utils import EMULATED_ARCHS, platform
 
 
 def pytest_addoption(parser) -> None:
     parser.addoption(
-        "--run-emulation", action="store_true", default=False, help="run emulation tests"
+        "--run-emulation",
+        action="store",
+        default=None,
+        help="run emulation tests",
+        choices=("all", *EMULATED_ARCHS),
     )
     parser.addoption("--run-podman", action="store_true", default=False, help="run podman tests")
     parser.addoption(

diff --git a/test/test_emulation.py b/test/test_emulation.py
@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import itertools
 import subprocess
 
 import pytest
@@ -18,9 +19,13 @@ def test_spam():
 
 
 def test(tmp_path, request):
-    if not request.config.getoption("--run-emulation"):
+    archs = request.config.getoption("--run-emulation")
+    if archs is None:
         pytest.skip("needs --run-emulation option to run")
 
+    if archs == "all":
+        archs = " ".join(utils.EMULATED_ARCHS)
+
     project_dir = tmp_path / "project"
     project_with_a_test.generate(project_dir)
 
@@ -30,15 +35,14 @@ def test(tmp_path, request):
         add_env={
             "CIBW_TEST_REQUIRES": "pytest",
             "CIBW_TEST_COMMAND": "pytest {project}/test",
-            "CIBW_ARCHS": "aarch64 ppc64le s390x",
+            "CIBW_ARCHS": archs,
         },
     )
 
     # also check that we got the right wheels
-    expected_wheels = (
-        utils.expected_wheels("spam", "0.1.0", machine_arch="aarch64")
-        + utils.expected_wheels("spam", "0.1.0", machine_arch="ppc64le")
-        + utils.expected_wheels("spam", "0.1.0", machine_arch="s390x")
+    expected_wheels = itertools.chain.from_iterable(
+        utils.expected_wheels("spam", "0.1.0", machine_arch=arch, single_arch=True)
+        for arch in archs.split(" ")
     )
     assert set(actual_wheels) == set(expected_wheels)
 

diff --git a/test/utils.py b/test/utils.py
@@ -13,8 +13,12 @@
 from tempfile import TemporaryDirectory
 from typing import Final
 
+from cibuildwheel.architecture import Architecture
 from cibuildwheel.util import CIBW_CACHE_PATH
 
+EMULATED_ARCHS: Final[list[str]] = sorted(
+    arch.value for arch in (Architecture.all_archs("linux") - Architecture.auto_archs("linux"))
+)
 SINGLE_PYTHON_VERSION: Final[tuple[int, int]] = (3, 12)
 
 platform: str
@@ -154,6 +158,7 @@ def expected_wheels(
     python_abi_tags=None,
     include_universal2=False,
     single_python=False,
+    single_arch=False,
 ):
     """
     Returns a list of expected wheels from a run of cibuildwheel.
@@ -237,7 +242,7 @@ def expected_wheels(
         if platform == "linux":
             architectures = [arch_name_for_linux(machine_arch)]
 
-            if machine_arch == "x86_64":
+            if machine_arch == "x86_64" and not single_arch:
                 architectures.append("i686")
 
             if len(manylinux_versions) > 0: