authorgravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2025-05-29 15:12:59+02:00
committergravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2025-05-29 16:47:54+02:00
log3d2b0a53fed3df37e8ff4261624631560380928c
tree4162c9b6d7066fe5293754c91fd7919263517407
parent358ee859bae5baa87bcff1fabfde87fe2aa1ab52
signaturebadge-check Signed by SSH key SHA256:7B/LJ7bpR1eX8aCXSr4mtd5M45VMPKcx9zY8e95b5QM

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.

1 files changed, 57 insertions(+), 1 deletions(-)

test/tests.zig+57-1
...@@ -1179,6 +1179,13 @@ const test_targets = blk: {...@@ -1179,6 +1179,13 @@ const test_targets = blk: {
11791179
1180 // Windows Targets1180 // Windows Targets
11811181
1182 .{
1183 .target = .{
1184 .cpu_arch = .aarch64,
1185 .os_tag = .windows,
1186 .abi = .none,
1187 },
1188 },
1182 .{1189 .{
1183 .target = .{1190 .target = .{
1184 .cpu_arch = .aarch64,1191 .cpu_arch = .aarch64,
...@@ -1187,7 +1194,22 @@ const test_targets = blk: {...@@ -1187,7 +1194,22 @@ const test_targets = blk: {
1187 },1194 },
1188 .link_libc = true,1195 .link_libc = true,
1189 },1196 },
1197 .{
1198 .target = .{
1199 .cpu_arch = .aarch64,
1200 .os_tag = .windows,
1201 .abi = .msvc,
1202 },
1203 .link_libc = true,
1204 },
11901205
1206 .{
1207 .target = .{
1208 .cpu_arch = .x86,
1209 .os_tag = .windows,
1210 .abi = .none,
1211 },
1212 },
1191 .{1213 .{
1192 .target = .{1214 .target = .{
1193 .cpu_arch = .x86,1215 .cpu_arch = .x86,
...@@ -1202,17 +1224,50 @@ const test_targets = blk: {...@@ -1202,17 +1224,50 @@ const test_targets = blk: {
1202 .os_tag = .windows,1224 .os_tag = .windows,
1203 .abi = .msvc,1225 .abi = .msvc,
1204 },1226 },
1227 .link_libc = true,
1228 },
1229
1230 .{
1231 .target = .{
1232 .cpu_arch = .thumb,
1233 .os_tag = .windows,
1234 .abi = .none,
1235 },
1236 },
1237 // https://github.com/ziglang/zig/issues/24016
1238 // .{
1239 // .target = .{
1240 // .cpu_arch = .thumb,
1241 // .os_tag = .windows,
1242 // .abi = .gnu,
1243 // },
1244 // .link_libc = true,
1245 // },
1246 .{
1247 .target = .{
1248 .cpu_arch = .thumb,
1249 .os_tag = .windows,
1250 .abi = .msvc,
1251 },
1252 .link_libc = true,
1205 },1253 },
12061254
1207 .{1255 .{
1208 .target = .{1256 .target = .{
1209 .cpu_arch = .x86_64,1257 .cpu_arch = .x86_64,
1210 .os_tag = .windows,1258 .os_tag = .windows,
1211 .abi = .gnu,1259 .abi = .none,
1212 },1260 },
1213 .use_llvm = false,1261 .use_llvm = false,
1214 .use_lld = false,1262 .use_lld = false,
1215 },1263 },
1264 .{
1265 .target = .{
1266 .cpu_arch = .x86_64,
1267 .os_tag = .windows,
1268 .abi = .none,
1269 },
1270 },
1216 .{1271 .{
1217 .target = .{1272 .target = .{
1218 .cpu_arch = .x86_64,1273 .cpu_arch = .x86_64,
...@@ -1227,6 +1282,7 @@ const test_targets = blk: {...@@ -1227,6 +1282,7 @@ const test_targets = blk: {
1227 .os_tag = .windows,1282 .os_tag = .windows,
1228 .abi = .msvc,1283 .abi = .msvc,
1229 },1284 },
1285 .link_libc = true,
1230 },1286 },
1231 };1287 };
1232};1288};