Commit 3d2b0a53fe

Alex Rønne Petersen <alex@alexrp.com>
2025-05-29 15:12:59
test: Improve Windows module test coverage.
There's not really any point in targeting *-windows-(gnu,msvc) when not linking libc, so add entries for *-windows-(gnu,msvc) that actually link libc, and change the old non-libc entries to *-windows-none. Also add missing aarch64-windows-(none,msvc) and thumb-windows-(none,msvc) entries. thumb-windows-gnu is disabled for now due to #24016.
master
1 parent 358ee85
Changed files (1)
test
tests.zig
test/tests.zig
@@ -1179,6 +1179,13 @@ const test_targets = blk: {
 
         // Windows Targets
 
+        .{
+            .target = .{
+                .cpu_arch = .aarch64,
+                .os_tag = .windows,
+                .abi = .none,
+            },
+        },
         .{
             .target = .{
                 .cpu_arch = .aarch64,
@@ -1187,7 +1194,22 @@ const test_targets = blk: {
             },
             .link_libc = true,
         },
+        .{
+            .target = .{
+                .cpu_arch = .aarch64,
+                .os_tag = .windows,
+                .abi = .msvc,
+            },
+            .link_libc = true,
+        },
 
+        .{
+            .target = .{
+                .cpu_arch = .x86,
+                .os_tag = .windows,
+                .abi = .none,
+            },
+        },
         .{
             .target = .{
                 .cpu_arch = .x86,
@@ -1202,17 +1224,50 @@ const test_targets = blk: {
                 .os_tag = .windows,
                 .abi = .msvc,
             },
+            .link_libc = true,
+        },
+
+        .{
+            .target = .{
+                .cpu_arch = .thumb,
+                .os_tag = .windows,
+                .abi = .none,
+            },
+        },
+        // https://github.com/ziglang/zig/issues/24016
+        // .{
+        //     .target = .{
+        //         .cpu_arch = .thumb,
+        //         .os_tag = .windows,
+        //         .abi = .gnu,
+        //     },
+        //     .link_libc = true,
+        // },
+        .{
+            .target = .{
+                .cpu_arch = .thumb,
+                .os_tag = .windows,
+                .abi = .msvc,
+            },
+            .link_libc = true,
         },
 
         .{
             .target = .{
                 .cpu_arch = .x86_64,
                 .os_tag = .windows,
-                .abi = .gnu,
+                .abi = .none,
             },
             .use_llvm = false,
             .use_lld = false,
         },
+        .{
+            .target = .{
+                .cpu_arch = .x86_64,
+                .os_tag = .windows,
+                .abi = .none,
+            },
+        },
         .{
             .target = .{
                 .cpu_arch = .x86_64,
@@ -1227,6 +1282,7 @@ const test_targets = blk: {
                 .os_tag = .windows,
                 .abi = .msvc,
             },
+            .link_libc = true,
         },
     };
 };