From 77363dab647efa1f22438dd4fa64f95d73c9ef7f Mon Sep 17 00:00:00 2001
From: Virgile Prevosto <virgile.prevosto@m4x.org>
Date: Fri, 30 Aug 2019 18:28:14 +0200
Subject: [PATCH] [ptests] expand builtin macros in log files of EXEC
directives...
---
ptests/ptests.ml | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/ptests/ptests.ml b/ptests/ptests.ml
index 33373150bf3..08b3f5fe177 100644
--- a/ptests/ptests.ml
+++ b/ptests/ptests.ml
@@ -1617,10 +1617,10 @@ let dispatcher () =
execnow=false;
}
in
- let process_macros_cmd s =
- basic_command_string
- { file = file;
- nb_files = nb_files;
+ let mk_cmd s =
+ {
+ file = file;
+ nb_files = nb_files;
log_files = [];
options = "";
toplevel = s;
@@ -1628,9 +1628,12 @@ let dispatcher () =
directory = directory;
filter = config.dc_filter;
macros = config.dc_macros;
- execnow = true; }
+ execnow = true;
+ }
in
- let process_macros s = Macros.expand config.dc_macros s in
+ let process_macros_cmd s = basic_command_string (mk_cmd s) in
+ let macros = get_macros (mk_cmd "/bin/true") in
+ let process_macros s = Macros.expand macros s in
let make_execnow_cmd execnow =
let res =
{
--
GitLab