Skip to content

Commit 044ccf4

Browse files
committed
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.
1 parent fc99394 commit 044ccf4

File tree

1 file changed

+53
-25
lines changed

1 file changed

+53
-25
lines changed

test/tests.zig

Lines changed: 53 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1480,16 +1480,8 @@ const test_targets = blk: {
14801480
.target = .{
14811481
.cpu_arch = .aarch64,
14821482
.os_tag = .windows,
1483-
.abi = .none,
1484-
},
1485-
},
1486-
.{
1487-
.target = .{
1488-
.cpu_arch = .aarch64,
1489-
.os_tag = .windows,
1490-
.abi = .gnu,
1483+
.abi = .msvc,
14911484
},
1492-
.link_libc = true,
14931485
},
14941486
.{
14951487
.target = .{
@@ -1499,37 +1491,36 @@ const test_targets = blk: {
14991491
},
15001492
.link_libc = true,
15011493
},
1502-
15031494
.{
15041495
.target = .{
1505-
.cpu_arch = .x86,
1496+
.cpu_arch = .aarch64,
15061497
.os_tag = .windows,
1507-
.abi = .none,
1498+
.abi = .gnu,
15081499
},
15091500
},
15101501
.{
15111502
.target = .{
1512-
.cpu_arch = .x86,
1503+
.cpu_arch = .aarch64,
15131504
.os_tag = .windows,
15141505
.abi = .gnu,
15151506
},
15161507
.link_libc = true,
15171508
},
1509+
15181510
.{
15191511
.target = .{
1520-
.cpu_arch = .x86,
1512+
.cpu_arch = .thumb,
15211513
.os_tag = .windows,
15221514
.abi = .msvc,
15231515
},
1524-
.link_libc = true,
15251516
},
1526-
15271517
.{
15281518
.target = .{
15291519
.cpu_arch = .thumb,
15301520
.os_tag = .windows,
1531-
.abi = .none,
1521+
.abi = .msvc,
15321522
},
1523+
.link_libc = true,
15331524
},
15341525
// https://github.com/ziglang/zig/issues/24016
15351526
// .{
@@ -1538,22 +1529,52 @@ const test_targets = blk: {
15381529
// .os_tag = .windows,
15391530
// .abi = .gnu,
15401531
// },
1532+
// },
1533+
// .{
1534+
// .target = .{
1535+
// .cpu_arch = .thumb,
1536+
// .os_tag = .windows,
1537+
// .abi = .gnu,
1538+
// },
15411539
// .link_libc = true,
15421540
// },
1541+
15431542
.{
15441543
.target = .{
1545-
.cpu_arch = .thumb,
1544+
.cpu_arch = .x86,
1545+
.os_tag = .windows,
1546+
.abi = .msvc,
1547+
},
1548+
},
1549+
.{
1550+
.target = .{
1551+
.cpu_arch = .x86,
15461552
.os_tag = .windows,
15471553
.abi = .msvc,
15481554
},
15491555
.link_libc = true,
15501556
},
1557+
.{
1558+
.target = .{
1559+
.cpu_arch = .x86,
1560+
.os_tag = .windows,
1561+
.abi = .gnu,
1562+
},
1563+
},
1564+
.{
1565+
.target = .{
1566+
.cpu_arch = .x86,
1567+
.os_tag = .windows,
1568+
.abi = .gnu,
1569+
},
1570+
.link_libc = true,
1571+
},
15511572

15521573
.{
15531574
.target = .{
15541575
.cpu_arch = .x86_64,
15551576
.os_tag = .windows,
1556-
.abi = .none,
1577+
.abi = .msvc,
15571578
},
15581579
.use_llvm = false,
15591580
.use_lld = false,
@@ -1562,31 +1583,38 @@ const test_targets = blk: {
15621583
.target = .{
15631584
.cpu_arch = .x86_64,
15641585
.os_tag = .windows,
1565-
.abi = .gnu,
1586+
.abi = .msvc,
15661587
},
1567-
.use_llvm = false,
1568-
.use_lld = false,
15691588
},
15701589
.{
15711590
.target = .{
15721591
.cpu_arch = .x86_64,
15731592
.os_tag = .windows,
1574-
.abi = .none,
1593+
.abi = .msvc,
15751594
},
1595+
.link_libc = true,
15761596
},
15771597
.{
15781598
.target = .{
15791599
.cpu_arch = .x86_64,
15801600
.os_tag = .windows,
15811601
.abi = .gnu,
15821602
},
1583-
.link_libc = true,
1603+
.use_llvm = false,
1604+
.use_lld = false,
15841605
},
15851606
.{
15861607
.target = .{
15871608
.cpu_arch = .x86_64,
15881609
.os_tag = .windows,
1589-
.abi = .msvc,
1610+
.abi = .gnu,
1611+
},
1612+
},
1613+
.{
1614+
.target = .{
1615+
.cpu_arch = .x86_64,
1616+
.os_tag = .windows,
1617+
.abi = .gnu,
15901618
},
15911619
.link_libc = true,
15921620
},

0 commit comments

Comments
 (0)