Skip to content

Commit 3d2b0a5

Browse files
committed
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 ziglang#24016.
1 parent 358ee85 commit 3d2b0a5

File tree

1 file changed

+57
-1
lines changed

1 file changed

+57
-1
lines changed

test/tests.zig

Lines changed: 57 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1179,6 +1179,13 @@ const test_targets = blk: {
11791179

11801180
// Windows Targets
11811181

1182+
.{
1183+
.target = .{
1184+
.cpu_arch = .aarch64,
1185+
.os_tag = .windows,
1186+
.abi = .none,
1187+
},
1188+
},
11821189
.{
11831190
.target = .{
11841191
.cpu_arch = .aarch64,
@@ -1187,7 +1194,22 @@ const test_targets = blk: {
11871194
},
11881195
.link_libc = true,
11891196
},
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+
},
11911213
.{
11921214
.target = .{
11931215
.cpu_arch = .x86,
@@ -1202,17 +1224,50 @@ const test_targets = blk: {
12021224
.os_tag = .windows,
12031225
.abi = .msvc,
12041226
},
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,
12051253
},
12061254

12071255
.{
12081256
.target = .{
12091257
.cpu_arch = .x86_64,
12101258
.os_tag = .windows,
1211-
.abi = .gnu,
1259+
.abi = .none,
12121260
},
12131261
.use_llvm = false,
12141262
.use_lld = false,
12151263
},
1264+
.{
1265+
.target = .{
1266+
.cpu_arch = .x86_64,
1267+
.os_tag = .windows,
1268+
.abi = .none,
1269+
},
1270+
},
12161271
.{
12171272
.target = .{
12181273
.cpu_arch = .x86_64,
@@ -1227,6 +1282,7 @@ const test_targets = blk: {
12271282
.os_tag = .windows,
12281283
.abi = .msvc,
12291284
},
1285+
.link_libc = true,
12301286
},
12311287
};
12321288
};

0 commit comments

Comments
 (0)