From ab43cbb2125b6818d2b880ed1b3147a3b70fd7d5 Mon Sep 17 00:00:00 2001
From: Tim Felgentreff <tim.felgentreff@oracle.com>
Date: Fri, 30 Jun 2023 17:40:18 +0200
Subject: [PATCH] fix expected graalpy wheel names for tests

---
 test/utils.py | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/test/utils.py b/test/utils.py
index 0ebfe28bb..48bd49dd7 100644
--- a/test/utils.py
+++ b/test/utils.py
@@ -181,13 +181,16 @@ def expected_wheels(
                 "pp310-pypy310_pp73",
             ]
 
-        # GraalPy encodes compilation platform and arch in the tag
-        if machine_arch == "x86_64" and platform == "linux":
-            python_abi_tags += ["graalpy230_310_native_x86_64_linux"]
-        elif machine_arch == "aarch64" and platform == "linux":
-            python_abi_tags += ["graalpy230_310_native_aarch64_linux"]
-        elif machine_arch == "AMD64" and platform == "macos":
-            python_abi_tags += ["graalpy230_310_native_x86_64_darwin"]
+        # GraalPy encodes compilation platform and arch in the tag, because it
+        # can execute native extensions compiled for different platforms
+        if machine_arch in ["x86_64", "AMD64"]:
+            if platform == "linux":
+                python_abi_tags += ["graalpy310-graalpy230_310_native_x86_64_linux-linux_i686"]
+            elif platform == "macos":
+                python_abi_tags += ["graalpy310-graalpy230_310_native_x86_64_darwin-darwin_i686"]
+
+        if machine_arch == "aarch64" and platform == "linux":
+            python_abi_tags += ["graalpy310-graalpy230_310_native_aarch64_linux-linux-aarch64"]
 
         if platform == "macos" and machine_arch == "arm64":
             # arm64 macs are only supported by cp38+
@@ -200,7 +203,7 @@ def expected_wheels(
                 "pp38-pypy38_pp73",
                 "pp39-pypy39_pp73",
                 "pp310-pypy310_pp73",
-                "graalpy230_310_native_aarch64_darwin",
+                "graalpy310-graalpy230_310_native_x86_64_linux-linux_i686",
             ]
 
     wheels = []
@@ -211,7 +214,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 python_abi_tag.startswith("graalpy"):
                 architectures.append("i686")
 
             platform_tags = [
@@ -221,7 +224,7 @@ def expected_wheels(
                 )
                 for architecture in architectures
             ]
-            if len(musllinux_versions) > 0 and not python_abi_tag.startswith("pp"):
+            if len(musllinux_versions) > 0 and not python_abi_tag.startswith(("pp", "graalpy")):
                 platform_tags.extend(
                     [
                         ".".join(