From e09bd822b1431e1ca5ac2976a885ac0d31a1529e Mon Sep 17 00:00:00 2001
From: Patrick Baudin <patrick.baudin@cea.fr>
Date: Wed, 1 Dec 2021 15:24:07 +0100
Subject: [PATCH] [ptests] allows and removes dune features from the test
commands
---
ptests/ptests.ml | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/ptests/ptests.ml b/ptests/ptests.ml
index 95d3dac5606..32ef1974563 100644
--- a/ptests/ptests.ml
+++ b/ptests/ptests.ml
@@ -1357,7 +1357,9 @@ end = struct
let get_ptest_file cmd = SubDir.make_file cmd.directory cmd.file
- let expand_macros ~defaults cmd =
+ let expand_macros =
+ let dune_cmd_features = Str.regexp "%{[a-z][a-z-]*:\\([^}]*\\)}" in
+ fun ~defaults cmd ->
let ptest_config =
if !special_config = "" then "" else "_" ^ !special_config
in
@@ -1409,6 +1411,9 @@ end = struct
end
else toplevel
in
+ let toplevel = (* removes dune feature such as %{deps:...} *)
+ str_global_replace dune_cmd_features "\\1" toplevel
+ in
{ cmd with
macros;
toplevel;
--
GitLab