zig

commit 044ccf4138f8b027be01c95ad759d5302e2ff39d (tree)
parent fc993945a92a1bf2577354359897071ec52f4b90
Author: Alex Rønne Petersen <alex@alexrp.com>
Date:   Fri,  4 Jul 2025 13:25:25 +0200

test: More cleanup of Windows targets in the module test matrix

It's kind of unclear what `*-windows-none` actually means, but as far as LLVM is
concerned, it's equivalent to `*-windows-msvc`. For clarity, only test
`*-windows-msvc` and `*-windows-gnu`. #20690 will clean this situation up
eventually.

Also ensure coverage of `link_libc = true` and `link_libc = false` for both.

Diffstat:
M
test/tests.zig
 | 
78
+++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------

1 file changed, 53 insertions(+), 25 deletions(-)
diff --git a/test/tests.zig b/test/tests.zig
@@ -1480,16 +1480,8 @@ const test_targets = blk: {
             .target = .{
                 .cpu_arch = .aarch64,
                 .os_tag = .windows,
-                .abi = .none,
-            },
-        },
-        .{
-            .target = .{
-                .cpu_arch = .aarch64,
-                .os_tag = .windows,
-                .abi = .gnu,
+                .abi = .msvc,
             },
-            .link_libc = true,
         },
         .{
             .target = .{
@@ -1499,37 +1491,36 @@ const test_targets = blk: {
             },
             .link_libc = true,
         },
-
         .{
             .target = .{
-                .cpu_arch = .x86,
+                .cpu_arch = .aarch64,
                 .os_tag = .windows,
-                .abi = .none,
+                .abi = .gnu,
             },
         },
         .{
             .target = .{
-                .cpu_arch = .x86,
+                .cpu_arch = .aarch64,
                 .os_tag = .windows,
                 .abi = .gnu,
             },
             .link_libc = true,
         },
+
         .{
             .target = .{
-                .cpu_arch = .x86,
+                .cpu_arch = .thumb,
                 .os_tag = .windows,
                 .abi = .msvc,
             },
-            .link_libc = true,
         },
-
         .{
             .target = .{
                 .cpu_arch = .thumb,
                 .os_tag = .windows,
-                .abi = .none,
+                .abi = .msvc,
             },
+            .link_libc = true,
         },
         // https://github.com/ziglang/zig/issues/24016
         // .{
@@ -1538,22 +1529,52 @@ const test_targets = blk: {
         //         .os_tag = .windows,
         //         .abi = .gnu,
         //     },
+        // },
+        // .{
+        //     .target = .{
+        //         .cpu_arch = .thumb,
+        //         .os_tag = .windows,
+        //         .abi = .gnu,
+        //     },
         //     .link_libc = true,
         // },
+
         .{
             .target = .{
-                .cpu_arch = .thumb,
+                .cpu_arch = .x86,
+                .os_tag = .windows,
+                .abi = .msvc,
+            },
+        },
+        .{
+            .target = .{
+                .cpu_arch = .x86,
                 .os_tag = .windows,
                 .abi = .msvc,
             },
             .link_libc = true,
         },
+        .{
+            .target = .{
+                .cpu_arch = .x86,
+                .os_tag = .windows,
+                .abi = .gnu,
+            },
+        },
+        .{
+            .target = .{
+                .cpu_arch = .x86,
+                .os_tag = .windows,
+                .abi = .gnu,
+            },
+            .link_libc = true,
+        },
 
         .{
             .target = .{
                 .cpu_arch = .x86_64,
                 .os_tag = .windows,
-                .abi = .none,
+                .abi = .msvc,
             },
             .use_llvm = false,
             .use_lld = false,
@@ -1562,17 +1583,16 @@ const test_targets = blk: {
             .target = .{
                 .cpu_arch = .x86_64,
                 .os_tag = .windows,
-                .abi = .gnu,
+                .abi = .msvc,
             },
-            .use_llvm = false,
-            .use_lld = false,
         },
         .{
             .target = .{
                 .cpu_arch = .x86_64,
                 .os_tag = .windows,
-                .abi = .none,
+                .abi = .msvc,
             },
+            .link_libc = true,
         },
         .{
             .target = .{
@@ -1580,13 +1600,21 @@ const test_targets = blk: {
                 .os_tag = .windows,
                 .abi = .gnu,
             },
-            .link_libc = true,
+            .use_llvm = false,
+            .use_lld = false,
         },
         .{
             .target = .{
                 .cpu_arch = .x86_64,
                 .os_tag = .windows,
-                .abi = .msvc,
+                .abi = .gnu,
+            },
+        },
+        .{
+            .target = .{
+                .cpu_arch = .x86_64,
+                .os_tag = .windows,
+                .abi = .gnu,
             },
             .link_libc = true,
         },