diff --git a/tools/ptests/ptests.ml b/tools/ptests/ptests.ml index 07f6d35ebe2ffc0d48698a78c5a4bacdaa669604..d5182e355f58b06bd8594dfcfa69ac41e2b95993 100644 --- a/tools/ptests/ptests.ml +++ b/tools/ptests/ptests.ml @@ -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 diff --git a/tools/ptests/tests/nothing/tests/basic/oracle/empty.res.oracle b/tools/ptests/tests/nothing/tests/basic/oracle/empty.res.oracle index e313fcfad133f712645760af8da197f7aaf34ea0..8be9f09f538bebe21722daf4c71b91c4bf71d6b1 100644 --- a/tools/ptests/tests/nothing/tests/basic/oracle/empty.res.oracle +++ b/tools/ptests/tests/nothing/tests/basic/oracle/empty.res.oracle @@ -1 +1 @@ -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 diff --git a/tools/ptests/tests/nothing/tests/basic/oracle/opt.0.res.oracle b/tools/ptests/tests/nothing/tests/basic/oracle/opt.0.res.oracle index f9923bff22b36aba0e6131a43dcf069a3a985188..3512929a301ac11ff458851b278d5a0081b472ee 100644 --- a/tools/ptests/tests/nothing/tests/basic/oracle/opt.0.res.oracle +++ b/tools/ptests/tests/nothing/tests/basic/oracle/opt.0.res.oracle @@ -1 +1 @@ -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 diff --git a/tools/ptests/tests/nothing/tests/basic/oracle/opt.1.res.oracle b/tools/ptests/tests/nothing/tests/basic/oracle/opt.1.res.oracle index ea8b71c4d6736982c0ae697f99f08e2fe54c13a8..fc686d35dd2b8e2f8aa27dd226f6016aafb60946 100644 --- a/tools/ptests/tests/nothing/tests/basic/oracle/opt.1.res.oracle +++ b/tools/ptests/tests/nothing/tests/basic/oracle/opt.1.res.oracle @@ -1 +1 @@ -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 diff --git a/tools/ptests/tests/nothing/tests/test_config b/tools/ptests/tests/nothing/tests/test_config index 4085b744d7f9a8bd3fad313e54a6e7d8757996d9..3c11a02fc35a060defd952c27cbee8b40dbbbf93 100644 --- a/tools/ptests/tests/nothing/tests/test_config +++ b/tools/ptests/tests/nothing/tests/test_config @@ -1,2 +1,3 @@ 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:"