| author |  Alex Rønne Petersen <alex@alexrp.com> 2025-09-26 00:44:54+02:00 |
| committer | Alex Rønne Petersen <alex@alexrp.com> 2025-09-26 01:33:26+02:00 |
| log | 17f9a25924382240021c6adacbb7bae4a3aafc97 |
| tree | 54b97ad6ff5a89e01301752205129d1160411331 |
| parent | 2a88a6a456bebcf6c28d7110a5cd60213f43508e |
| signature |  Signed by SSH key SHA256:7B/LJ7bpR1eX8aCXSr4mtd5M45VMPKcx9zY8e95b5QM |
test: remove -Dskip-translate-c from test-standalone
No longer necessary since we've stopped using Clang for this.5 files changed, 2 insertions(+), 20 deletions(-)
test/standalone/build.zig+1-6
| ... | @@ -9,7 +9,6 @@ pub fn build(b: *std.Build) void { | ... | @@ -9,7 +9,6 @@ pub fn build(b: *std.Build) void { |
| 9 | const enable_macos_sdk = b.option(bool, "enable_macos_sdk", "Run tests requiring presence of macOS SDK and frameworks") orelse enable_ios_sdk; | 9 | const enable_macos_sdk = b.option(bool, "enable_macos_sdk", "Run tests requiring presence of macOS SDK and frameworks") orelse enable_ios_sdk; |
| 10 | const enable_symlinks_windows = b.option(bool, "enable_symlinks_windows", "Run tests requiring presence of symlinks on Windows") orelse false; | 10 | const enable_symlinks_windows = b.option(bool, "enable_symlinks_windows", "Run tests requiring presence of symlinks on Windows") orelse false; |
| 11 | const omit_symlinks = builtin.os.tag == .windows and !enable_symlinks_windows; | 11 | const omit_symlinks = builtin.os.tag == .windows and !enable_symlinks_windows; |
| 12 | const skip_translate_c = b.option(bool, "skip_translate_c", "Test suite skips translate-c tests") orelse false; | ||
| 13 | 12 | ||
| 14 | const simple_skip_debug = b.option(bool, "simple_skip_debug", "Simple tests skip debug builds") orelse false; | 13 | const simple_skip_debug = b.option(bool, "simple_skip_debug", "Simple tests skip debug builds") orelse false; |
| 15 | const simple_skip_release_safe = b.option(bool, "simple_skip_release_safe", "Simple tests skip release-safe builds") orelse false; | 14 | const simple_skip_release_safe = b.option(bool, "simple_skip_release_safe", "Simple tests skip release-safe builds") orelse false; |
| ... | @@ -21,7 +20,6 @@ pub fn build(b: *std.Build) void { | ... | @@ -21,7 +20,6 @@ pub fn build(b: *std.Build) void { |
| 21 | .skip_release_safe = simple_skip_release_safe, | 20 | .skip_release_safe = simple_skip_release_safe, |
| 22 | .skip_release_fast = simple_skip_release_fast, | 21 | .skip_release_fast = simple_skip_release_fast, |
| 23 | .skip_release_small = simple_skip_release_small, | 22 | .skip_release_small = simple_skip_release_small, |
| 24 | .skip_translate_c = skip_translate_c, | ||
| 25 | }); | 23 | }); |
| 26 | const simple_dep_step = simple_dep.builder.default_step; | 24 | const simple_dep_step = simple_dep.builder.default_step; |
| 27 | simple_dep_step.name = "standalone_test_cases.simple"; | 25 | simple_dep_step.name = "standalone_test_cases.simple"; |
| ... | @@ -99,12 +97,9 @@ pub fn build(b: *std.Build) void { | ... | @@ -99,12 +97,9 @@ pub fn build(b: *std.Build) void { |
| 99 | pkg.build_zig.requires_macos_sdk; | 97 | pkg.build_zig.requires_macos_sdk; |
| 100 | const requires_symlinks = @hasDecl(pkg.build_zig, "requires_symlinks") and | 98 | const requires_symlinks = @hasDecl(pkg.build_zig, "requires_symlinks") and |
| 101 | pkg.build_zig.requires_symlinks; | 99 | pkg.build_zig.requires_symlinks; |
| 102 | const requires_translate_c = @hasDecl(pkg.build_zig, "requires_translate_c") and | ||
| 103 | pkg.build_zig.requires_translate_c; | ||
| 104 | if ((requires_symlinks and omit_symlinks) or | 100 | if ((requires_symlinks and omit_symlinks) or |
| 105 | (requires_macos_sdk and !enable_macos_sdk) or | 101 | (requires_macos_sdk and !enable_macos_sdk) or |
| 106 | (requires_ios_sdk and !enable_ios_sdk) or | 102 | (requires_ios_sdk and !enable_ios_sdk)) |
| 107 | (requires_translate_c and skip_translate_c)) | ||
| 108 | { | 103 | { |
| 109 | continue :add_dep_steps; | 104 | continue :add_dep_steps; |
| 110 | } | 105 | } |
test/standalone/dep_lazypath/build.zig-2
| ... | @@ -1,7 +1,5 @@ | ... | @@ -1,7 +1,5 @@ |
| 1 | const std = @import("std"); | 1 | const std = @import("std"); |
| 2 | 2 | ||
| 3 | pub const requires_translate_c = true; | ||
| 4 | |||
| 5 | pub fn build(b: *std.Build) void { | 3 | pub fn build(b: *std.Build) void { |
| 6 | const test_step = b.step("test", "Test it"); | 4 | const test_step = b.step("test", "Test it"); |
| 7 | b.default_step = test_step; | 5 | b.default_step = test_step; |
test/standalone/glibc_compat/build.zig-2
| ... | @@ -1,8 +1,6 @@ | ... | @@ -1,8 +1,6 @@ |
| 1 | const std = @import("std"); | 1 | const std = @import("std"); |
| 2 | const builtin = @import("builtin"); | 2 | const builtin = @import("builtin"); |
| 3 | 3 | ||
| 4 | pub const requires_translate_c = true; | ||
| 5 | |||
| 6 | // To run executables linked against a specific glibc version, the | 4 | // To run executables linked against a specific glibc version, the |
| 7 | // run-time glibc version needs to be new enough. Check the host's glibc | 5 | // run-time glibc version needs to be new enough. Check the host's glibc |
| 8 | // version. Note that this does not allow for translation/vm/emulation | 6 | // version. Note that this does not allow for translation/vm/emulation |
test/standalone/issue_794/build.zig-2
| ... | @@ -1,7 +1,5 @@ | ... | @@ -1,7 +1,5 @@ |
| 1 | const std = @import("std"); | 1 | const std = @import("std"); |
| 2 | 2 | ||
| 3 | pub const requires_translate_c = true; | ||
| 4 | |||
| 5 | pub fn build(b: *std.Build) void { | 3 | pub fn build(b: *std.Build) void { |
| 6 | const test_step = b.step("test", "Test it"); | 4 | const test_step = b.step("test", "Test it"); |
| 7 | b.default_step = test_step; | 5 | b.default_step = test_step; |
test/standalone/simple/build.zig+1-8
| ... | @@ -9,7 +9,6 @@ pub fn build(b: *std.Build) void { | ... | @@ -9,7 +9,6 @@ pub fn build(b: *std.Build) void { |
| 9 | const skip_release_safe = b.option(bool, "skip_release_safe", "Skip release-safe builds") orelse false; | 9 | const skip_release_safe = b.option(bool, "skip_release_safe", "Skip release-safe builds") orelse false; |
| 10 | const skip_release_fast = b.option(bool, "skip_release_fast", "Skip release-fast builds") orelse false; | 10 | const skip_release_fast = b.option(bool, "skip_release_fast", "Skip release-fast builds") orelse false; |
| 11 | const skip_release_small = b.option(bool, "skip_release_small", "Skip release-small builds") orelse false; | 11 | const skip_release_small = b.option(bool, "skip_release_small", "Skip release-small builds") orelse false; |
| 12 | const skip_translate_c = b.option(bool, "skip_translate_c", "Test suite skips translate-c tests") orelse false; | ||
| 13 | 12 | ||
| 14 | var optimize_modes_buf: [4]std.builtin.OptimizeMode = undefined; | 13 | var optimize_modes_buf: [4]std.builtin.OptimizeMode = undefined; |
| 15 | var optimize_modes_len: usize = 0; | 14 | var optimize_modes_len: usize = 0; |
| ... | @@ -37,7 +36,6 @@ pub fn build(b: *std.Build) void { | ... | @@ -37,7 +36,6 @@ pub fn build(b: *std.Build) void { |
| 37 | if (case.os_filter) |os_tag| { | 36 | if (case.os_filter) |os_tag| { |
| 38 | if (os_tag != builtin.os.tag) continue; | 37 | if (os_tag != builtin.os.tag) continue; |
| 39 | } | 38 | } |
| 40 | if (case.uses_translate_c and skip_translate_c) continue; | ||
| 41 | 39 | ||
| 42 | const resolved_target = b.resolveTargetQuery(case.target); | 40 | const resolved_target = b.resolveTargetQuery(case.target); |
| 43 | 41 | ||
| ... | @@ -84,7 +82,6 @@ const Case = struct { | ... | @@ -84,7 +82,6 @@ const Case = struct { |
| 84 | is_exe: bool = true, | 82 | is_exe: bool = true, |
| 85 | /// Run only on this OS. | 83 | /// Run only on this OS. |
| 86 | os_filter: ?std.Target.Os.Tag = null, | 84 | os_filter: ?std.Target.Os.Tag = null, |
| 87 | uses_translate_c: bool = false, | ||
| 88 | }; | 85 | }; |
| 89 | 86 | ||
| 90 | const cases = [_]Case{ | 87 | const cases = [_]Case{ |
| ... | @@ -96,7 +93,6 @@ const cases = [_]Case{ | ... | @@ -96,7 +93,6 @@ const cases = [_]Case{ |
| 96 | .src_path = "hello_world/hello_libc.zig", | 93 | .src_path = "hello_world/hello_libc.zig", |
| 97 | .link_libc = true, | 94 | .link_libc = true, |
| 98 | .all_modes = true, | 95 | .all_modes = true, |
| 99 | .uses_translate_c = true, | ||
| 100 | }, | 96 | }, |
| 101 | .{ | 97 | .{ |
| 102 | .src_path = "cat/main.zig", | 98 | .src_path = "cat/main.zig", |
| ... | @@ -112,10 +108,7 @@ const cases = [_]Case{ | ... | @@ -112,10 +108,7 @@ const cases = [_]Case{ |
| 112 | .os_tag = .freestanding, | 108 | .os_tag = .freestanding, |
| 113 | }, | 109 | }, |
| 114 | }, | 110 | }, |
| 115 | .{ | 111 | .{ .src_path = "issue_12471/main.zig" }, |
| 116 | .src_path = "issue_12471/main.zig", | ||
| 117 | .uses_translate_c = true, | ||
| 118 | }, | ||
| 119 | .{ .src_path = "guess_number/main.zig" }, | 112 | .{ .src_path = "guess_number/main.zig" }, |
| 120 | .{ .src_path = "main_return_error/error_u8.zig" }, | 113 | .{ .src_path = "main_return_error/error_u8.zig" }, |
| 121 | .{ .src_path = "main_return_error/error_u8_non_zero.zig" }, | 114 | .{ .src_path = "main_return_error/error_u8_non_zero.zig" }, |