From c80e94a400185bd9ec6ad4ffde4450f28c99fd31 Mon Sep 17 00:00:00 2001
From: Patrick Baudin <patrick.baudin@cea.fr>
Date: Tue, 6 Apr 2021 14:41:53 +0200
Subject: [PATCH] [Ptests] allows the check of EXIT directives when there is a
FILTER directive
---
ptests/ptests.ml | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/ptests/ptests.ml b/ptests/ptests.ml
index 74001218c82..6ed3dde5196 100644
--- a/ptests/ptests.ml
+++ b/ptests/ptests.ml
@@ -1427,9 +1427,7 @@ let do_command command =
let time = 0. (* Individual time is difficult to compute correctly
for now, and currently unused *) in
report_run command (launch_result, time) ;
- let summary_ret = (launch_result = command.exit_code)
- || (command.filter <> None) (* cannot checks exit code *)
- in
+ let summary_ret = launch_result = command.exit_code in
if not summary_ret then
lock_printf "%% Unexpected code (returns %d instead of %d) for command: %s@." launch_result command.exit_code command_string ;
summary_ret
@@ -1946,7 +1944,7 @@ let dispatcher () =
| None -> cmd
| Some filter ->
{ cmd with filter = Some (Macros.expand macros filter) }
- in
+ in
let nb_files_execnow = List.length config.dc_execnow in
let make_execnow_cmd =
let e = ref 0 in
--
GitLab