From 7774287fdca1b56e12a420c446e83191c05fb468 Mon Sep 17 00:00:00 2001 From: mlugg Date: Thu, 23 Jan 2025 04:48:01 +0000 Subject: tests: enable stack trace tests for x86_64-selfhosted Allows the stack trace tests to be additionally compiled and run with `.use_llvm = false, .use_lld = false` depending on the host target. This is currently enabled for x86_64 targets emitting ELF. Self-hosted backends emit slightly different DWARF info to the LLVM backend, so the checking logic (and the tests themselves) had to be tweaked slightly to support both backends at once. --- test/src/StackTrace.zig | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) (limited to 'test/src/StackTrace.zig') diff --git a/test/src/StackTrace.zig b/test/src/StackTrace.zig index 37e390c78d..5151447a43 100644 --- a/test/src/StackTrace.zig +++ b/test/src/StackTrace.zig @@ -21,17 +21,34 @@ const Config = struct { }; pub fn addCase(self: *StackTrace, config: Config) void { + self.addCaseInner(config, true); + if (shouldTestNonLlvm(self.b.graph.host.result)) { + self.addCaseInner(config, false); + } +} + +fn addCaseInner(self: *StackTrace, config: Config, use_llvm: bool) void { if (config.Debug) |per_mode| - self.addExpect(config.name, config.source, .Debug, per_mode); + self.addExpect(config.name, config.source, .Debug, use_llvm, per_mode); if (config.ReleaseSmall) |per_mode| - self.addExpect(config.name, config.source, .ReleaseSmall, per_mode); + self.addExpect(config.name, config.source, .ReleaseSmall, use_llvm, per_mode); if (config.ReleaseFast) |per_mode| - self.addExpect(config.name, config.source, .ReleaseFast, per_mode); + self.addExpect(config.name, config.source, .ReleaseFast, use_llvm, per_mode); if (config.ReleaseSafe) |per_mode| - self.addExpect(config.name, config.source, .ReleaseSafe, per_mode); + self.addExpect(config.name, config.source, .ReleaseSafe, use_llvm, per_mode); +} + +fn shouldTestNonLlvm(target: std.Target) bool { + return switch (target.cpu.arch) { + .x86_64 => switch (target.ofmt) { + .elf => true, + else => false, + }, + else => false, + }; } fn addExpect( @@ -39,13 +56,14 @@ fn addExpect( name: []const u8, source: []const u8, optimize_mode: OptimizeMode, + use_llvm: bool, mode_config: Config.PerMode, ) void { for (mode_config.exclude_os) |tag| if (tag == builtin.os.tag) return; const b = self.b; - const annotated_case_name = b.fmt("check {s} ({s})", .{ - name, @tagName(optimize_mode), + const annotated_case_name = b.fmt("check {s} ({s} {s})", .{ + name, @tagName(optimize_mode), if (use_llvm) "llvm" else "selfhosted", }); for (self.test_filters) |test_filter| { if (mem.indexOf(u8, annotated_case_name, test_filter)) |_| break; @@ -61,6 +79,7 @@ fn addExpect( .target = b.graph.host, .error_tracing = mode_config.error_tracing, }), + .use_llvm = use_llvm, }); const run = b.addRunArtifact(exe); -- cgit v1.2.3