Commit a59d18779fe71ea0a13899e794ce1de8b526a8a9 | zig

author	Andrew Kelley <andrew@ziglang.org> 2025-06-04 10:22:51-07:00
committer	Andrew Kelley <andrew@ziglang.org> 2025-06-06 23:42:14-07:00
log	a59d18779fe71ea0a13899e794ce1de8b526a8a9
tree	2480f1f3583d547ef1e654c146ea87893c74c62e
parent	5986bdf868a58cdef2adf58ff27b6526eafd99fe

langref: global assembly test depends on llvm

see #24046

2 files changed, 45 insertions(+), 1 deletions(-)

doc
- langref
  - test_global_assembly.zig
tools
- doctest.zig

doc/langref/test_global_assembly.zig+1

...	@@ -19,3 +19,4 @@ test "global assembly" {	...	@@ -19,3 +19,4 @@ test "global assembly" {
19		19
20	// test	20	// test
21	// target=x86_64-linux	21	// target=x86_64-linux
		22	// llvm=true

tools/doctest.zig+44-1

 @@ -168,6 +168,15 @@ fn printOutput(
                 try build_args.appendSlice(&[_][]const u8{ "-target", triple });
                 try shell_out.print("-target {s} ", .{triple});
             }
+            if (code.use_llvm) |use_llvm| {
+                if (use_llvm) {
+                    try build_args.append("-fllvm");
+                    try shell_out.print("-fllvm", .{});
+                } else {
+                    try build_args.append("-fno-llvm");
+                    try shell_out.print("-fno-llvm", .{});
+                }
+            }
             if (code.verbose_cimport) {
                 try build_args.append("--verbose-cimport");
                 try shell_out.print("--verbose-cimport ", .{});
 @@ -224,7 +233,6 @@ fn printOutput(
                     break :code_block;
                 }
             }
             const target_query = try std.Target.Query.parse(.{
                 .arch_os_abi = code.target_str orelse "native",
             });
 @@ -319,6 +327,16 @@ fn printOutput(
                     },
                 }
             }
+            if (code.use_llvm) |use_llvm| {
+                if (use_llvm) {
+                    try test_args.append("-fllvm");
+                    try shell_out.print("-fllvm", .{});
+                } else {
+                    try test_args.append("-fno-llvm");
+                    try shell_out.print("-fno-llvm", .{});
+                }
+            }
             const result = run(arena, &env_map, tmp_dir_path, test_args.items) catch
                 fatal("test failed", .{});
             const escaped_stderr = try escapeHtml(arena, result.stderr);
 @@ -469,6 +487,15 @@ fn printOutput(
                 try build_args.appendSlice(&[_][]const u8{ "-target", triple });
                 try shell_out.print("-target {s} ", .{triple});
             }
+            if (code.use_llvm) |use_llvm| {
+                if (use_llvm) {
+                    try build_args.append("-fllvm");
+                    try shell_out.print("-fllvm", .{});
+                } else {
+                    try build_args.append("-fno-llvm");
+                    try shell_out.print("-fno-llvm", .{});
+                }
+            }
             for (code.additional_options) |option| {
                 try build_args.append(option);
                 try shell_out.print("{s} ", .{option});
 @@ -538,6 +565,15 @@ fn printOutput(
                 try test_args.appendSlice(&[_][]const u8{ "-target", triple });
                 try shell_out.print("-target {s} ", .{triple});
             }
+            if (code.use_llvm) |use_llvm| {
+                if (use_llvm) {
+                    try test_args.append("-fllvm");
+                    try shell_out.print("-fllvm", .{});
+                } else {
+                    try test_args.append("-fno-llvm");
+                    try shell_out.print("-fno-llvm", .{});
+                }
+            }
             if (code.link_mode) |link_mode| {
                 switch (link_mode) {
                     .static => {
 @@ -827,6 +863,7 @@ const Code = struct {
     verbose_cimport: bool,
     just_check_syntax: bool,
     additional_options: []const []const u8,
+    use_llvm: ?bool,
     const Id = union(enum) {
         @"test",
 @@ -886,6 +923,7 @@ fn parseManifest(arena: Allocator, source_bytes: []const u8) !Code {
     var link_libc = false;
     var disable_cache = false;
     var verbose_cimport = false;
+    var use_llvm: ?bool = null;
     while (it.next()) |prefixed_line| {
         const line = skipPrefix(prefixed_line);
 @@ -901,6 +939,10 @@ fn parseManifest(arena: Allocator, source_bytes: []const u8) !Code {
             try additional_options.append(arena, line["additional_option=".len..]);
         } else if (mem.startsWith(u8, line, "target=")) {
             target_str = line["target=".len..];
+        } else if (mem.eql(u8, line, "llvm=true")) {
+            use_llvm = true;
+        } else if (mem.eql(u8, line, "llvm=false")) {
+            use_llvm = false;
         } else if (mem.eql(u8, line, "link_libc")) {
             link_libc = true;
         } else if (mem.eql(u8, line, "disable_cache")) {
 @@ -923,6 +965,7 @@ fn parseManifest(arena: Allocator, source_bytes: []const u8) !Code {
         .disable_cache = disable_cache,
         .verbose_cimport = verbose_cimport,
         .just_check_syntax = just_check_syntax,
+        .use_llvm = use_llvm,
     };
 }