Skip to content
Snippets Groups Projects
Commit c80e94a4 authored by Patrick Baudin's avatar Patrick Baudin Committed by Virgile Prevosto
Browse files

[Ptests] allows the check of EXIT directives when there is a FILTER directive

parent cccfc6ba
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 4 deletions
ptests/ptests.ml
+ 2
− 4
View file @ c80e94a4
...@@ -1427,9 +1427,7 @@ let do_command command = ...@@ -1427,9 +1427,7 @@ let do_command command =
let time = 0. (* Individual time is difficult to compute correctly let time = 0. (* Individual time is difficult to compute correctly
for now, and currently unused *) in for now, and currently unused *) in
report_run command (launch_result, time) ; report_run command (launch_result, time) ;
let summary_ret = (launch_result = command.exit_code) let summary_ret = launch_result = command.exit_code in
|| (command.filter <> None) (* cannot checks exit code *)
in
if not summary_ret then if not summary_ret then
lock_printf "%% Unexpected code (returns %d instead of %d) for command: %s@." launch_result command.exit_code command_string ; lock_printf "%% Unexpected code (returns %d instead of %d) for command: %s@." launch_result command.exit_code command_string ;
summary_ret summary_ret
...@@ -1946,7 +1944,7 @@ let dispatcher () = ...@@ -1946,7 +1944,7 @@ let dispatcher () =
| None -> cmd | None -> cmd
| Some filter -> | Some filter ->
{ cmd with filter = Some (Macros.expand macros filter) } { cmd with filter = Some (Macros.expand macros filter) }
in in
let nb_files_execnow = List.length config.dc_execnow in let nb_files_execnow = List.length config.dc_execnow in
let make_execnow_cmd = let make_execnow_cmd =
let e = ref 0 in let e = ref 0 in
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment