mirrors/zig
1
0
Fork 0
mirror of https://codeberg.org/ziglang/zig.git synced 2025-12-09 23:29:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

test: More cleanup of Windows targets in the module test matrix

Browse source 
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.
This commit is contained in:
Alex Rønne Petersen 2025-07-04 13:25:25 +02:00
parent fc993945a9
commit 044ccf4138
1 changed files with 64 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

100
test/tests.zig
View file

@ -1480,17 +1480,9 @@ const test_targets = blk: {
.target = .{ .target = .{
.cpu_arch = .aarch64, .cpu_arch = .aarch64,
.os_tag = .windows, .os_tag = .windows,
.abi = .none, .abi = .msvc,
}, },
}, },
.{
.target = .{
.cpu_arch = .aarch64,
.os_tag = .windows,
.abi = .gnu,
},
.link_libc = true,
},
.{ .{
.target = .{ .target = .{
.cpu_arch = .aarch64, .cpu_arch = .aarch64,
@ -1499,27 +1491,18 @@ const test_targets = blk: {
}, },
.link_libc = true, .link_libc = true,
}, },
.{ .{
.target = .{ .target = .{
.cpu_arch = .x86, .cpu_arch = .aarch64,
.os_tag = .windows,
.abi = .none,
},
},
.{
.target = .{
.cpu_arch = .x86,
.os_tag = .windows, .os_tag = .windows,
.abi = .gnu, .abi = .gnu,
}, },
.link_libc = true,
}, },
.{ .{
.target = .{ .target = .{
.cpu_arch = .x86, .cpu_arch = .aarch64,
.os_tag = .windows, .os_tag = .windows,
.abi = .msvc, .abi = .gnu,
}, },
.link_libc = true, .link_libc = true,
}, },
@ -1528,9 +1511,17 @@ const test_targets = blk: {
.target = .{ .target = .{
.cpu_arch = .thumb, .cpu_arch = .thumb,
.os_tag = .windows, .os_tag = .windows,
.abi = .none, .abi = .msvc,
}, },
}, },
.{
.target = .{
.cpu_arch = .thumb,
.os_tag = .windows,
.abi = .msvc,
},
.link_libc = true,
},
// https://github.com/ziglang/zig/issues/24016 // https://github.com/ziglang/zig/issues/24016
// .{ // .{
// .target = .{ // .target = .{
@ -1538,14 +1529,44 @@ const test_targets = blk: {
// .os_tag = .windows, // .os_tag = .windows,
// .abi = .gnu, // .abi = .gnu,
// }, // },
// },
// .{
// .target = .{
// .cpu_arch = .thumb,
// .os_tag = .windows,
// .abi = .gnu,
// },
// .link_libc = true, // .link_libc = true,
// }, // },
.{ .{
.target = .{ .target = .{
.cpu_arch = .thumb, .cpu_arch = .x86,
.os_tag = .windows, .os_tag = .windows,
.abi = .msvc, .abi = .msvc,
}, },
},
.{
.target = .{
.cpu_arch = .x86,
.os_tag = .windows,
.abi = .msvc,
},
.link_libc = true,
},
.{
.target = .{
.cpu_arch = .x86,
.os_tag = .windows,
.abi = .gnu,
},
},
.{
.target = .{
.cpu_arch = .x86,
.os_tag = .windows,
.abi = .gnu,
},
.link_libc = true, .link_libc = true,
}, },
@ -1553,7 +1574,7 @@ const test_targets = blk: {
.target = .{ .target = .{
.cpu_arch = .x86_64, .cpu_arch = .x86_64,
.os_tag = .windows, .os_tag = .windows,
.abi = .none, .abi = .msvc,
}, },
.use_llvm = false, .use_llvm = false,
.use_lld = false, .use_lld = false,
@ -1562,23 +1583,14 @@ const test_targets = blk: {
.target = .{ .target = .{
.cpu_arch = .x86_64, .cpu_arch = .x86_64,
.os_tag = .windows, .os_tag = .windows,
.abi = .gnu, .abi = .msvc,
},
.use_llvm = false,
.use_lld = false,
},
.{
.target = .{
.cpu_arch = .x86_64,
.os_tag = .windows,
.abi = .none,
}, },
}, },
.{ .{
.target = .{ .target = .{
.cpu_arch = .x86_64, .cpu_arch = .x86_64,
.os_tag = .windows, .os_tag = .windows,
.abi = .gnu, .abi = .msvc,
}, },
.link_libc = true, .link_libc = true,
}, },
@ -1586,7 +1598,23 @@ const test_targets = blk: {
.target = .{ .target = .{
.cpu_arch = .x86_64, .cpu_arch = .x86_64,
.os_tag = .windows, .os_tag = .windows,
.abi = .msvc, .abi = .gnu,
},
.use_llvm = false,
.use_lld = false,
},
.{
.target = .{
.cpu_arch = .x86_64,
.os_tag = .windows,
.abi = .gnu,
},
},
.{
.target = .{
.cpu_arch = .x86_64,
.os_tag = .windows,
.abi = .gnu,
}, },
.link_libc = true, .link_libc = true,
}, },