From f66aba2e54e22b57edc18583079d728b9b5a4b60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Bobot?= <francois.bobot@cea.fr> Date: Tue, 29 Sep 2020 11:23:25 +0200 Subject: [PATCH] [Tests] works in directory scope --- ptests/ptests.ml | 2 +- tests/scope/bts971.c | 2 +- tests/scope/zones.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ptests/ptests.ml b/ptests/ptests.ml index c0ed51a3faa..d7df845274c 100644 --- a/ptests/ptests.ml +++ b/ptests/ptests.ml @@ -1114,7 +1114,7 @@ let command_string ~result_fmt ~oracle_fmt command = "(rule\n \ (targets %S %S %a)\n \ (deps %a %S (package frama-c)%a (universe))\n \ - (action (with-stderr-to %S (with-stdout-to %S (with-accepted-exit-codes (or 0 1) (system %S)))))\n\ + (action (with-stderr-to %S (with-stdout-to %S (with-accepted-exit-codes (or 0 1 125) (system %S)))))\n\ )@." errlog res diff --git a/tests/scope/bts971.c b/tests/scope/bts971.c index dc7a4da3197..0f97cda0a31 100644 --- a/tests/scope/bts971.c +++ b/tests/scope/bts971.c @@ -1,11 +1,11 @@ /* run.config + PLUGIN: pdg CMXS: @PTEST_NAME@ OPT: -journal-disable -load-module %{dep:@PTEST_NAME@.cmxs} -then -main main2 */ /* bug 971: */ volatile foo; int v; - void f1 () { v += 1; } diff --git a/tests/scope/zones.c b/tests/scope/zones.c index b28bc5bdabf..7923d96d228 100644 --- a/tests/scope/zones.c +++ b/tests/scope/zones.c @@ -1,9 +1,9 @@ /* run.config -# CMXS: @PTEST_NAME@ - OPT: -load-module @PTEST_NAME@ -eva @EVA_OPTIONS@ -journal-disable + PLUGIN: pdg + CMXS: @PTEST_NAME@ + OPT: -load-module %{dep:@PTEST_NAME@.cmxs} -eva @EVA_OPTIONS@ -journal-disable */ - /* bin/viewer.opt -eva @PTEST_DIR@/@PTEST_NAME@.c */ int T [10]; -- GitLab