Commit d7571011 authored by Patrick Baudin's avatar Patrick Baudin
Browse files

Merge branch 'feature/ptests/using-dune-read-variable' into 'master'

[ptests] allows %{read:file} in STDOPT/OPT/EXECNOW

See merge request frama-c/frama-c!3879
parents f11a9938 2399e72a
......@@ -1284,9 +1284,12 @@ let pp_command_deps fmt command =
Fmt.(list (package_as_deps (quote plugin_as_package))) (list_of_deps command.deps.load_plugin)
let show_cmd =
let regexp = Str.regexp "%{[a-z]+:\\([^}]+\\)}" in
let subst = Str.global_replace regexp "\\1" in
subst
let regexp_read = Str.regexp "%{read:\\([^}]+\\)}" in
let subst_read = Str.global_replace regexp_read "$(cat \\1)" in
let regexp_ignore = Str.regexp "%{[a-z]+:\\([^}]+\\)}" in
let subst_ignore = Str.global_replace regexp_ignore "\\1" in
fun x ->
subst_ignore (subst_read x)
let redirection ?reslog ?errlog cmd =
match reslog, errlog with
......
frama-c default-options:=-check -no-autoload-plugins -add-symbolic-path=/home/pb122476/export-local/frama-c/master/trunk/tools/ptests/_build/default/./tests/nothing:.:= empty.i
frama-c default-options:=-check -no-autoload-plugins -add-symbolic-path=<path-to-frama-c-ptests-project>/_build/default/./tests/nothing:.:= empty.i
frama-c default-options:=-check -no-autoload-plugins -add-symbolic-path=/home/pb122476/export-local/frama-c/master/trunk/tools/ptests/_build/default/./tests/nothing:.:= -- OPT No0: number=0 name=opt file=opt.i
frama-c default-options:=-check -no-autoload-plugins -add-symbolic-path=<path-to-frama-c-ptests-project>/_build/default/./tests/nothing:.:= -- OPT No0: number=0 name=opt file=opt.i
frama-c default-options:=-check -no-autoload-plugins -add-symbolic-path=/home/pb122476/export-local/frama-c/master/trunk/tools/ptests/_build/default/./tests/nothing:.:= opt.i -- OPT No1: number=1
frama-c default-options:=-check -no-autoload-plugins -add-symbolic-path=<path-to-frama-c-ptests-project>/_build/default/./tests/nothing:.:= opt.i -- OPT No1: number=1
MACRO: frama-c-exe echo frama-c
MACRO: PTEST_DEFAULT_OPTIONS default-options:=@PTEST_DEFAULT_OPTIONS@:=
FILTER: sed "s:add-symbolic-path=.*/_build:add-symbolic-path=<path-to-frama-c-ptests-project>/_build:"
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment