diff --git a/tests/metrics/func_ptr.c b/tests/metrics/func_ptr.c
index 7752cc707be171e28642746b6df6b779420c90e7..a0df67179d8b7826e03d2991076cd9f74d3b49ed 100644
--- a/tests/metrics/func_ptr.c
+++ b/tests/metrics/func_ptr.c
@@ -1,4 +1,5 @@
/* run.config
+ PLUGIN: @PTEST_PLUGIN@ inout
STDOPT: +"-metrics-eva-cover -metrics-cover main"
STDOPT: +"-metrics-eva-cover -main foobar -metrics-cover foobar"
**/
diff --git a/tests/metrics/libc.c b/tests/metrics/libc.c
index 80ddfacff9876941d852d5847b1d7cd40f4815dd..24a6f7278783c020da7b24d15deddcfe140f1a9e 100644
--- a/tests/metrics/libc.c
+++ b/tests/metrics/libc.c
@@ -1,5 +1,6 @@
/* run.config
- EXECNOW: LOG @PTEST_NAME@_metrics.res LOG @PTEST_NAME@_metrics.err @frama-c@ @PTEST_FILE@ -metrics -metrics-libc -then -metrics-no-libc | @PTEST_SUITE_DIR@/../libc/check_some_metrics.sh "> 5" "> 100" "= 0" "> 10" "= 2" "= 6" "= 0" "= 0" "= 0" "= 4" >@PTEST_NAME@_metrics.res 2>@PTEST_NAME@_metrics.err
+ PLUGIN: @PTEST_PLUGIN@ inout
+ EXECNOW: LOG @PTEST_NAME@_metrics.res LOG @PTEST_NAME@_metrics.err @frama-c@ @PTEST_FILE@ -metrics -metrics-libc -then -metrics-no-libc | %{dep:@PTEST_SUITE_DIR@/../libc/check_some_metrics.sh} "> 5" "> 100" "= 0" "> 10" "= 2" "= 6" "= 0" "= 0" "= 0" "= 4" >@PTEST_NAME@_metrics.res 2>@PTEST_NAME@_metrics.err
STDOPT: #"-metrics-eva-cover"
LOG: libc.json
STDOPT: #"-metrics-libc -metrics-output @PTEST_RESULT@/libc.json"
diff --git a/tests/metrics/oracle/func_ptr.0.res.oracle b/tests/metrics/oracle/func_ptr.0.res.oracle
index 1ecd0860369a79d1488680329f65f4d04b900488..828890b6d95f94c89038d55281b2a25697fdd839 100644
--- a/tests/metrics/oracle/func_ptr.0.res.oracle
+++ b/tests/metrics/oracle/func_ptr.0.res.oracle
@@ -1,5 +1,5 @@
[kernel] Parsing func_ptr.c (with preprocessing)
-[kernel:typing:implicit-function-declaration] func_ptr.c:28: Warning:
+[kernel:typing:implicit-function-declaration] func_ptr.c:29: Warning:
Calling undeclared function exit. Old style K&R code?
[metrics] Defined functions (4)
=====================
@@ -73,8 +73,8 @@
<func_ptr.c>: exit; foo;
[metrics] References to non-analyzed functions
------------------------------------
- Function main calls exit (at func_ptr.c:28)
- Function main references foo (at func_ptr.c:29)
+ Function main calls exit (at func_ptr.c:29)
+ Function main references foo (at func_ptr.c:30)
[metrics] Statements analyzed by Eva
--------------------------
13 stmts in analyzed functions, 6 stmts analyzed (46.2%)
diff --git a/tests/metrics/oracle/func_ptr.1.res.oracle b/tests/metrics/oracle/func_ptr.1.res.oracle
index 6fc64c87adcb7c272f1be7099ff8f19c227db19f..06495304903457d44ecf45b011c0be6c77c1d6bf 100644
--- a/tests/metrics/oracle/func_ptr.1.res.oracle
+++ b/tests/metrics/oracle/func_ptr.1.res.oracle
@@ -1,5 +1,5 @@
[kernel] Parsing func_ptr.c (with preprocessing)
-[kernel:typing:implicit-function-declaration] func_ptr.c:28: Warning:
+[kernel:typing:implicit-function-declaration] func_ptr.c:29: Warning:
Calling undeclared function exit. Old style K&R code?
[metrics] Defined functions (4)
=====================
diff --git a/tests/metrics/oracle/reach.res.oracle b/tests/metrics/oracle/reach.res.oracle
index 0356ff2a0eda27280b7de642285ad8b351fe3cc9..672174fdaaabe1f42b708322fa7cb2d233a0fa72 100644
--- a/tests/metrics/oracle/reach.res.oracle
+++ b/tests/metrics/oracle/reach.res.oracle
@@ -108,8 +108,8 @@
<reach.c>: baz; foo;
[metrics] References to non-analyzed functions
------------------------------------
- Function main references foo (at reach.c:26)
- Initializer of t references baz (at reach.c:10)
+ Function main references foo (at reach.c:27)
+ Initializer of t references baz (at reach.c:11)
[metrics] Statements analyzed by Eva
--------------------------
12 stmts in analyzed functions, 7 stmts analyzed (58.3%)
diff --git a/tests/metrics/oracle/referenced-by-acsl.res.oracle b/tests/metrics/oracle/referenced-by-acsl.res.oracle
index c7110eb0416f9eef68d09112f46b4a7e5601acf9..6f3730a9713cb9bb980e4e43ef9fcf622ee4fe10 100644
--- a/tests/metrics/oracle/referenced-by-acsl.res.oracle
+++ b/tests/metrics/oracle/referenced-by-acsl.res.oracle
@@ -60,7 +60,7 @@
<referenced-by-acsl.c>: f;
[metrics] References to non-analyzed functions
------------------------------------
- f referenced by an ACSL specification (at referenced-by-acsl.c:7)
+ f referenced by an ACSL specification (at referenced-by-acsl.c:8)
[metrics] Statements analyzed by Eva
--------------------------
2 stmts in analyzed functions, 2 stmts analyzed (100.0%)
diff --git a/tests/metrics/reach.c b/tests/metrics/reach.c
index 1fdcc0eb74536cacfed37f44d9c914779a35c886..7092caac5581b73350125146e6f0dd877f86471f 100644
--- a/tests/metrics/reach.c
+++ b/tests/metrics/reach.c
@@ -1,4 +1,5 @@
/* run.config
+ PLUGIN: @PTEST_PLUGIN@ inout
STDOPT: +"-metrics-by-function -metrics-eva-cover"
**/
diff --git a/tests/metrics/referenced-by-acsl.c b/tests/metrics/referenced-by-acsl.c
index 2fd056aa60bc612d3bb19e14528eeb0505af630d..b867b78422405e790935bcb52f5440399d50919c 100644
--- a/tests/metrics/referenced-by-acsl.c
+++ b/tests/metrics/referenced-by-acsl.c
@@ -1,4 +1,5 @@
/* run.config
+ PLUGIN: @PTEST_PLUGIN@ inout
STDOPT: +"-metrics-eva-cover"
**/
diff --git a/tests/metrics/unreachable.c b/tests/metrics/unreachable.c
index 8d46f2b591860b1402790d9205bd30451362da92..17314feb53951849ba13c10612712257e47dbbd4 100644
--- a/tests/metrics/unreachable.c
+++ b/tests/metrics/unreachable.c
@@ -1,5 +1,5 @@
/* run.config
- PLUGIN: @PTEST_PLUGIN@ scope
+ PLUGIN: @PTEST_PLUGIN@ inout,scope
STDOPT: +"-metrics-eva-cover -then -main foo"
*/
void foo () {
diff --git a/tests/metrics/used-files.i b/tests/metrics/used-files.i
index bebb54173e8dd24888eded2ad23503e63cef3241..1e26ff05add3c121cbbe4c02dced14566e998662 100644
--- a/tests/metrics/used-files.i
+++ b/tests/metrics/used-files.i
@@ -1,6 +1,8 @@
/* run.config
- OPT: -metrics-used-files %{dep:@PTEST_DIR@/@PTEST_NAME@1.i} %{dep:@PTEST_DIR@/@PTEST_NAME@2.i} %{dep:@PTEST_DIR@/@PTEST_NAME@3.i} %{dep:@PTEST_DIR@/@PTEST_NAME@4.i} %{dep:@PTEST_DIR@/@PTEST_NAME@5.i} %{dep:@PTEST_DIR@/@PTEST_NAME@6.i} %{dep:@PTEST_DIR@/@PTEST_NAME@7.i} %{dep:@PTEST_DIR@/@PTEST_NAME@8.i} %{dep:@PTEST_DIR@/@PTEST_NAME@9.c} @PTEST_DIR@/@PTEST_NAME@1.h @PTEST_DIR@/@PTEST_NAME@2.h
- OPT: -metrics-used-files -main g %{dep:@PTEST_DIR@/@PTEST_NAME@1.i} %{dep:@PTEST_DIR@/@PTEST_NAME@2.i} %{dep:@PTEST_DIR@/@PTEST_NAME@3.i} %{dep:@PTEST_DIR@/@PTEST_NAME@4.i} %{dep:@PTEST_DIR@/@PTEST_NAME@5.i} %{dep:@PTEST_DIR@/@PTEST_NAME@6.i} %{dep:@PTEST_DIR@/@PTEST_NAME@7.i} %{dep:@PTEST_DIR@/@PTEST_NAME@8.i} %{dep:@PTEST_DIR@/@PTEST_NAME@9.c} @PTEST_DIR@/@PTEST_NAME@1.h @PTEST_DIR@/@PTEST_NAME@2.h
+ MACRO: SOURCES %{dep:@PTEST_DIR@/@PTEST_NAME@1.i} %{dep:@PTEST_DIR@/@PTEST_NAME@2.i} %{dep:@PTEST_DIR@/@PTEST_NAME@3.i} %{dep:@PTEST_DIR@/@PTEST_NAME@4.i} %{dep:@PTEST_DIR@/@PTEST_NAME@5.i} %{dep:@PTEST_DIR@/@PTEST_NAME@6.i} %{dep:@PTEST_DIR@/@PTEST_NAME@7.i} %{dep:@PTEST_DIR@/@PTEST_NAME@8.i} %{dep:@PTEST_DIR@/@PTEST_NAME@9.c} %{dep:@PTEST_DIR@/@PTEST_NAME@1.h} %{dep:@PTEST_DIR@/@PTEST_NAME@2.h}
+ DEPS: @PTEST_DIR@/@PTEST_NAME@10.c
+ OPT: -metrics-used-files @SOURCES@
+ OPT: -metrics-used-files -main g @SOURCES@
*/
int h(void);