From 1afa6e260e37597f14bd53eb25de34fd3d663096 Mon Sep 17 00:00:00 2001
From: Andrew Kelley <andrew@ziglang.org>
Date: Mon, 13 Jan 2025 21:00:17 -0800
Subject: [PATCH] build: respect -Duse-llvm option when doing behavior tests

---
 build.zig      | 5 +++++
 test/tests.zig | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/build.zig b/build.zig
index c6f95ca80d..dcc84509f9 100644
--- a/build.zig
+++ b/build.zig
@@ -447,6 +447,7 @@ pub fn build(b: *std.Build) !void {
         .skip_single_threaded = skip_single_threaded,
         .skip_non_native = skip_non_native,
         .skip_libc = skip_libc,
+        .use_llvm = use_llvm,
         .max_rss = 1 * 1024 * 1024 * 1024,
     }));
 
@@ -462,6 +463,7 @@ pub fn build(b: *std.Build) !void {
         .skip_single_threaded = true,
         .skip_non_native = skip_non_native,
         .skip_libc = skip_libc,
+        .use_llvm = use_llvm,
     }));
 
     test_modules_step.dependOn(tests.addModuleTests(b, .{
@@ -476,6 +478,7 @@ pub fn build(b: *std.Build) !void {
         .skip_single_threaded = true,
         .skip_non_native = skip_non_native,
         .skip_libc = true,
+        .use_llvm = use_llvm,
         .no_builtin = true,
     }));
 
@@ -491,6 +494,7 @@ pub fn build(b: *std.Build) !void {
         .skip_single_threaded = true,
         .skip_non_native = skip_non_native,
         .skip_libc = true,
+        .use_llvm = use_llvm,
         .no_builtin = true,
     }));
 
@@ -506,6 +510,7 @@ pub fn build(b: *std.Build) !void {
         .skip_single_threaded = skip_single_threaded,
         .skip_non_native = skip_non_native,
         .skip_libc = skip_libc,
+        .use_llvm = use_llvm,
         // I observed a value of 4572626944 on the M2 CI.
         .max_rss = 5029889638,
     }));
diff --git a/test/tests.zig b/test/tests.zig
index ecbaa2456a..306b0d04f0 100644
--- a/test/tests.zig
+++ b/test/tests.zig
@@ -1375,6 +1375,7 @@ const ModuleTestOptions = struct {
     skip_single_threaded: bool,
     skip_non_native: bool,
     skip_libc: bool,
+    use_llvm: ?bool = null,
     max_rss: usize = 0,
     no_builtin: bool = false,
     build_options: ?*std.Build.Step.Options = null,
@@ -1411,6 +1412,10 @@ pub fn addModuleTests(b: *std.Build, options: ModuleTestOptions) *Step {
         if (options.skip_single_threaded and test_target.single_threaded == true)
             continue;
 
+        if (options.use_llvm) |use_llvm| {
+            if (test_target.use_llvm != use_llvm) continue;
+        }
+
         // TODO get compiler-rt tests passing for self-hosted backends.
         if ((target.cpu.arch != .x86_64 or target.ofmt != .elf) and
             test_target.use_llvm == false and mem.eql(u8, options.name, "compiler-rt"))