jimzah/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2024-11-27 23:52:31 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

docgen: add "process terminated by signal" to exe_err

Browse Source
This commit is contained in:
Andrew Kelley 2019-09-26 13:11:07 -04:00
parent 94e9b9c625
commit b89a09af4b
No known key found for this signature in database
GPG Key ID: 7C5F548F728501A9
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
doc/docgen.zig
View File

@ -1140,6 +1140,8 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: var
const path_to_exe = mem.trim(u8, exec_result.stdout, " \r\n");
const run_args = [_][]const u8{path_to_exe};
var exited_with_signal = false;
const result = if (expected_outcome == ExpectedOutcome.Fail) blk: {
const result = try ChildProcess.exec(allocator, run_args, null, &env_map, max_doc_file_size);
switch (result.term) {
@ -1153,6 +1155,7 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: var
return parseError(tokenizer, code.source_token, "example incorrectly compiled");
}
},
.Signal => exited_with_signal = true,
else => {},
}
break :blk result;
@ -1166,7 +1169,11 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: var
const colored_stderr = try termColor(allocator, escaped_stderr);
const colored_stdout = try termColor(allocator, escaped_stdout);
try out.print("\n$ ./{}\n{}{}</code></pre>\n", code.name, colored_stdout, colored_stderr);
try out.print("\n$ ./{}\n{}{}", code.name, colored_stdout, colored_stderr);
if (exited_with_signal) {
try out.print("(process terminated by signal)");
}
try out.print("</code></pre>\n");
},
Code.Id.Test => {
var test_args = std.ArrayList([]const u8).init(allocator);