From 3d2b0a53fed3df37e8ff4261624631560380928c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= <alex@alexrp.com>
Date: Thu, 29 May 2025 15:12:59 +0200
Subject: [PATCH] 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.
---
 test/tests.zig | 58 +++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 57 insertions(+), 1 deletion(-)

diff --git a/test/tests.zig b/test/tests.zig
index 4447577dff..05af2a82dd 100644
--- a/test/tests.zig
+++ b/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,
         },
     };
 };