From 17239f307efc5c91a0decca85eb7cbcdab337b29 Mon Sep 17 00:00:00 2001
From: Virgile Prevosto <virgile.prevosto@m4x.org>
Date: Thu, 16 Jul 2020 10:29:22 +0200
Subject: [PATCH] [ptests] add NOFRAMAC directive in ptests
---
ptests/ptests.ml | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/ptests/ptests.ml b/ptests/ptests.ml
index 3202933a25a..23f595045f5 100644
--- a/ptests/ptests.ml
+++ b/ptests/ptests.ml
@@ -600,6 +600,7 @@ type config =
(** toplevel full path, options to launch the toplevel on, and list
of output files to monitor beyond stdout and stderr. *)
dc_dont_run : bool;
+ dc_framac : bool;
dc_default_log: string list;
dc_timeout: string
}
@@ -619,6 +620,7 @@ let default_config () =
dc_default_toplevel = !toplevel_path;
dc_toplevels = [ !toplevel_path, default_options, [], Macros.empty, "" ];
dc_dont_run = false;
+ dc_framac = true;
dc_default_log = [];
dc_timeout = "";
}
@@ -802,6 +804,8 @@ let config_options =
{ current with dc_default_log = s :: current.dc_default_log });
"TIMEOUT",
(fun _ s current -> { current with dc_timeout = s });
+ "NOFRAMAC",
+ (fun _ _ current -> { current with dc_toplevels = []; dc_framac = false; });
]
let scan_options dir scan_buffer default =
@@ -835,7 +839,7 @@ let scan_options dir scan_buffer default =
with
End_of_file ->
(match !r.dc_toplevels with
- | [] -> { !r with dc_toplevels = default.dc_toplevels }
+ | [] when !r.dc_framac -> { !r with dc_toplevels = default.dc_toplevels }
| l -> { !r with dc_toplevels = List.rev l })
let split_config = Str.regexp ",[ ]*"
--
GitLab