authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-09-26 13:11:07-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-09-26 13:11:07-04:00
logb89a09af4bb0064bb3d37acef4c9c1d4ee1515a6
tree04917e877f6ee99727b5ce8ae06c844cc87ded02
parent94e9b9c6255fe264ecb5850eb4edc0bb5c4b2a17
signaturelock-open Commit is signed but in an unrecognized format.

docgen: add "process terminated by signal" to exe_err

1 files changed, 8 insertions(+), 1 deletions(-)

doc/docgen.zig+8-1
...@@ -1140,6 +1140,8 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: var...@@ -1140,6 +1140,8 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: var
1140 const path_to_exe = mem.trim(u8, exec_result.stdout, " \r\n");1140 const path_to_exe = mem.trim(u8, exec_result.stdout, " \r\n");
1141 const run_args = [_][]const u8{path_to_exe};1141 const run_args = [_][]const u8{path_to_exe};
11421142
1143 var exited_with_signal = false;
1144
1143 const result = if (expected_outcome == ExpectedOutcome.Fail) blk: {1145 const result = if (expected_outcome == ExpectedOutcome.Fail) blk: {
1144 const result = try ChildProcess.exec(allocator, run_args, null, &env_map, max_doc_file_size);1146 const result = try ChildProcess.exec(allocator, run_args, null, &env_map, max_doc_file_size);
1145 switch (result.term) {1147 switch (result.term) {
...@@ -1153,6 +1155,7 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: var...@@ -1153,6 +1155,7 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: var
1153 return parseError(tokenizer, code.source_token, "example incorrectly compiled");1155 return parseError(tokenizer, code.source_token, "example incorrectly compiled");
1154 }1156 }
1155 },1157 },
1158 .Signal => exited_with_signal = true,
1156 else => {},1159 else => {},
1157 }1160 }
1158 break :blk result;1161 break :blk result;
...@@ -1166,7 +1169,11 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: var...@@ -1166,7 +1169,11 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: var
1166 const colored_stderr = try termColor(allocator, escaped_stderr);1169 const colored_stderr = try termColor(allocator, escaped_stderr);
1167 const colored_stdout = try termColor(allocator, escaped_stdout);1170 const colored_stdout = try termColor(allocator, escaped_stdout);
11681171
1169 try out.print("\n$ ./{}\n{}{}</code></pre>\n", code.name, colored_stdout, colored_stderr);1172 try out.print("\n$ ./{}\n{}{}", code.name, colored_stdout, colored_stderr);
1173 if (exited_with_signal) {
1174 try out.print("(process terminated by signal)");
1175 }
1176 try out.print("</code></pre>\n");
1170 },1177 },
1171 Code.Id.Test => {1178 Code.Id.Test => {
1172 var test_args = std.ArrayList([]const u8).init(allocator);1179 var test_args = std.ArrayList([]const u8).init(allocator);