authorgravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2025-07-04 13:25:25+02:00
committergravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2025-07-05 04:05:34+02:00
log044ccf4138f8b027be01c95ad759d5302e2ff39d
tree939af17a34f9ffe403f3fbdef3de4c237bb53817
parentfc993945a92a1bf2577354359897071ec52f4b90

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 files changed, 53 insertions(+), 25 deletions(-)

test/tests.zig+53-25
...@@ -1480,16 +1480,8 @@ const test_targets = blk: {...@@ -1480,16 +1480,8 @@ const test_targets = blk: {
1480 .target = .{1480 .target = .{
1481 .cpu_arch = .aarch64,1481 .cpu_arch = .aarch64,
1482 .os_tag = .windows,1482 .os_tag = .windows,
1483 .abi = .none,1483 .abi = .msvc,
1484 },
1485 },
1486 .{
1487 .target = .{
1488 .cpu_arch = .aarch64,
1489 .os_tag = .windows,
1490 .abi = .gnu,
1491 },1484 },
1492 .link_libc = true,
1493 },1485 },
1494 .{1486 .{
1495 .target = .{1487 .target = .{
...@@ -1499,37 +1491,36 @@ const test_targets = blk: {...@@ -1499,37 +1491,36 @@ const test_targets = blk: {
1499 },1491 },
1500 .link_libc = true,1492 .link_libc = true,
1501 },1493 },
1502
1503 .{1494 .{
1504 .target = .{1495 .target = .{
1505 .cpu_arch = .x86,1496 .cpu_arch = .aarch64,
1506 .os_tag = .windows,1497 .os_tag = .windows,
1507 .abi = .none,1498 .abi = .gnu,
1508 },1499 },
1509 },1500 },
1510 .{1501 .{
1511 .target = .{1502 .target = .{
1512 .cpu_arch = .x86,1503 .cpu_arch = .aarch64,
1513 .os_tag = .windows,1504 .os_tag = .windows,
1514 .abi = .gnu,1505 .abi = .gnu,
1515 },1506 },
1516 .link_libc = true,1507 .link_libc = true,
1517 },1508 },
1509
1518 .{1510 .{
1519 .target = .{1511 .target = .{
1520 .cpu_arch = .x86,1512 .cpu_arch = .thumb,
1521 .os_tag = .windows,1513 .os_tag = .windows,
1522 .abi = .msvc,1514 .abi = .msvc,
1523 },1515 },
1524 .link_libc = true,
1525 },1516 },
1526
1527 .{1517 .{
1528 .target = .{1518 .target = .{
1529 .cpu_arch = .thumb,1519 .cpu_arch = .thumb,
1530 .os_tag = .windows,1520 .os_tag = .windows,
1531 .abi = .none,1521 .abi = .msvc,
1532 },1522 },
1523 .link_libc = true,
1533 },1524 },
1534 // https://github.com/ziglang/zig/issues/240161525 // https://github.com/ziglang/zig/issues/24016
1535 // .{1526 // .{
...@@ -1538,22 +1529,52 @@ const test_targets = blk: {...@@ -1538,22 +1529,52 @@ const test_targets = blk: {
1538 // .os_tag = .windows,1529 // .os_tag = .windows,
1539 // .abi = .gnu,1530 // .abi = .gnu,
1540 // },1531 // },
1532 // },
1533 // .{
1534 // .target = .{
1535 // .cpu_arch = .thumb,
1536 // .os_tag = .windows,
1537 // .abi = .gnu,
1538 // },
1541 // .link_libc = true,1539 // .link_libc = true,
1542 // },1540 // },
1541
1543 .{1542 .{
1544 .target = .{1543 .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,
1546 .os_tag = .windows,1552 .os_tag = .windows,
1547 .abi = .msvc,1553 .abi = .msvc,
1548 },1554 },
1549 .link_libc = true,1555 .link_libc = true,
1550 },1556 },
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
1552 .{1573 .{
1553 .target = .{1574 .target = .{
1554 .cpu_arch = .x86_64,1575 .cpu_arch = .x86_64,
1555 .os_tag = .windows,1576 .os_tag = .windows,
1556 .abi = .none,1577 .abi = .msvc,
1557 },1578 },
1558 .use_llvm = false,1579 .use_llvm = false,
1559 .use_lld = false,1580 .use_lld = false,
...@@ -1562,17 +1583,16 @@ const test_targets = blk: {...@@ -1562,17 +1583,16 @@ const test_targets = blk: {
1562 .target = .{1583 .target = .{
1563 .cpu_arch = .x86_64,1584 .cpu_arch = .x86_64,
1564 .os_tag = .windows,1585 .os_tag = .windows,
1565 .abi = .gnu,1586 .abi = .msvc,
1566 },1587 },
1567 .use_llvm = false,
1568 .use_lld = false,
1569 },1588 },
1570 .{1589 .{
1571 .target = .{1590 .target = .{
1572 .cpu_arch = .x86_64,1591 .cpu_arch = .x86_64,
1573 .os_tag = .windows,1592 .os_tag = .windows,
1574 .abi = .none,1593 .abi = .msvc,
1575 },1594 },
1595 .link_libc = true,
1576 },1596 },
1577 .{1597 .{
1578 .target = .{1598 .target = .{
...@@ -1580,13 +1600,21 @@ const test_targets = blk: {...@@ -1580,13 +1600,21 @@ const test_targets = blk: {
1580 .os_tag = .windows,1600 .os_tag = .windows,
1581 .abi = .gnu,1601 .abi = .gnu,
1582 },1602 },
1583 .link_libc = true,1603 .use_llvm = false,
1604 .use_lld = false,
1584 },1605 },
1585 .{1606 .{
1586 .target = .{1607 .target = .{
1587 .cpu_arch = .x86_64,1608 .cpu_arch = .x86_64,
1588 .os_tag = .windows,1609 .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,
1590 },1618 },
1591 .link_libc = true,1619 .link_libc = true,
1592 },1620 },