fix expected graalpy wheel names for tests

pypa · Jul 1, 2023 · ad26df1 · ad26df1
1 parent 8f425ae
commit ad26df1
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/test/utils.py b/test/utils.py
@@ -182,12 +182,14 @@ def expected_wheels(
             ]
 
         # 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":
+        if machine_arch in ["x86_64", "AMD64"]:
+            if platform == "linux":
+                python_abi_tags += ["graalpy230_310_native_x86_64_linux"]
+            elif platform == "macos":
+                python_abi_tags += ["graalpy230_310_native_x86_64_darwin"]
+
+        if 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"]
 
         if platform == "macos" and machine_arch == "arm64":
             # arm64 macs are only supported by cp38+
@@ -211,7 +213,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 +223,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(