diff --git a/src/alcotest-engine/log_trap.ml b/src/alcotest-engine/log_trap.ml index 4254acd5..1f5d7f40 100644 --- a/src/alcotest-engine/log_trap.ml +++ b/src/alcotest-engine/log_trap.ml @@ -63,24 +63,29 @@ struct in ListLabels.iter display_lines ~f:(Fmt.pf ppf "%s@\n") - let log_dir { suite_name; uuid; root } = + let log_dir { suite_name = _; uuid; root } = + Filename.concat root uuid + + let log_dir_pretty { suite_name; uuid; root } = (* We don't create symlinks on Windows. *) let via_symlink = not Sys.win32 in Filename.concat root (if via_symlink then suite_name else uuid) let output_fpath t tname = Filename.concat (log_dir t) (Test_name.file tname) + let output_fpath_pretty t tname = Filename.concat (log_dir_pretty t) (Test_name.file tname) + let active_or_exn = function | Active t -> t | Inactive -> failwith "internal error: no log location" let pp_current_run_dir t ppf = let t = active_or_exn t in - pp_path ppf (log_dir t) + pp_path ppf (log_dir_pretty t) let pp_log_location t tname ppf = let t = active_or_exn t in - let path = output_fpath t tname in + let path = output_fpath_pretty t tname in pp_path ppf path let recover_logs t ~tail tname =