matthieu
/
dune
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improve rendering of errors

This commit is contained in:
Jeremie Dimino 2017-02-23 11:55:14 +00:00
parent 901d9acc2a
commit aa5c4078f7
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/future.ml
View File

@ -268,10 +268,24 @@ module Scheduler = struct
flush oc flush oc
); );
if not exiting then begin if not exiting then begin
if output <> "" then match status with
Printf.eprintf "Output[%d]:\n%s%!" job.id output; | WEXITED 0 ->
handle_process_status job status; if output <> "" then
Ivar.fill job.job.ivar () Printf.eprintf "Output[%d]:\n%s%!" job.id output;
Ivar.fill job.job.ivar ()
| WEXITED n ->
Printf.eprintf "\nCommand [%d] exited with code %d:\n$ %s\n%s%!"
job.id n
(strip_colors_for_stderr job.command_line)
(strip_colors_for_stderr output);
die ""
| WSIGNALED n ->
Printf.eprintf "\nCommand [%d] got signal %d:\n$ %s\n%s%!"
job.id n
(strip_colors_for_stderr job.command_line)
(strip_colors_for_stderr output);
die ""
| WSTOPPED _ -> assert false
end end
let gen_id = let gen_id =

1
src/main.ml
View File

@ -32,6 +32,7 @@ let report_error ?(map_fname=fun x->x) ppf exn ~backtrace =
"File \"%s\", line %d, characters %d-%d:\n\ "File \"%s\", line %d, characters %d-%d:\n\
Error: %s\n" Error: %s\n"
(map_fname start.pos_fname) start.pos_lnum start_c stop_c msg (map_fname start.pos_fname) start.pos_lnum start_c stop_c msg
| Fatal_error "" -> ()
| Fatal_error msg -> | Fatal_error msg ->
Format.fprintf ppf "%s\n" (String.capitalize msg) Format.fprintf ppf "%s\n" (String.capitalize msg)
| Findlib.Package_not_found pkg -> | Findlib.Package_not_found pkg ->