From ed8863dfeb77ed667e2ddca3c6524913cfd2ca82 Mon Sep 17 00:00:00 2001
From: Patrick Baudin <patrick.baudin@cea.fr>
Date: Tue, 27 Apr 2021 16:43:04 +0200
Subject: [PATCH] [ptests] STDOPT directive does not ignore the previous CMD
directive that is in the same test file
---
ptests/ptests.ml | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/ptests/ptests.ml b/ptests/ptests.ml
index a7f2b8790e6..74d172f88e4 100644
--- a/ptests/ptests.ml
+++ b/ptests/ptests.ml
@@ -932,11 +932,12 @@ end = struct
let new_top =
List.map
(fun command ->
- { command with opts= make_custom_opts command.opts s;
- logs= command.logs @ current.dc_default_log;
- macros= current.dc_macros;
- exit_code = current.dc_exit_code;
- timeout= current.dc_timeout
+ { toplevel = current.dc_default_toplevel;
+ opts= make_custom_opts command.opts s;
+ logs= command.logs @ current.dc_default_log;
+ macros= current.dc_macros;
+ exit_code = current.dc_exit_code;
+ timeout= current.dc_timeout
})
!default_parsing_env.current_default_cmds
in
--
GitLab