From d03f5417e57eaad22f692b113bab96ecc62b2b18 Mon Sep 17 00:00:00 2001
From: Patrick Baudin <patrick.baudin@cea.fr>
Date: Tue, 7 Dec 2021 15:46:45 +0100
Subject: [PATCH] [tests] adds some %{dep:file}

---
 tests/jcdb/jbdb.c                  | 2 +-
 tests/jcdb/jbdb2.c                 | 2 +-
 tests/misc/audit.c                 | 2 +-
 tests/misc/bts0525-2.i             | 2 +-
 tests/misc/bts0525.i               | 2 +-
 tests/misc/bts0990_link.i          | 2 +-
 tests/misc/global_decl_loc2.i      | 4 ++--
 tests/misc/mergestruct3.i          | 4 ++--
 tests/misc/oracle/audit-out.json   | 2 +-
 tests/misc/oracle/audit.res.oracle | 2 +-
 tests/saveload/bool.c              | 2 +-
 tests/saveload/callbacks.i         | 2 +-
 tests/saveload/isset.c             | 2 +-
 tests/saveload/sparecode.i         | 2 +-
 tests/scope/bts383.c               | 6 +++---
 tests/spec/first.c                 | 2 +-
 tests/spec/model2.c                | 2 +-
 tests/spec/multi_axiomatic_1.i     | 2 +-
 tests/spec/multi_axiomatic_2.i     | 2 +-
 tests/spec/multiple_decl_def_1.c   | 2 +-
 tests/spec/multiple_file_1.c       | 2 +-
 tests/syntax/merge_inline_1.c      | 2 +-
 tests/syntax/typedef_multi_2.c     | 2 +-
 23 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/tests/jcdb/jbdb.c b/tests/jcdb/jbdb.c
index d7321842442..0180348922d 100644
--- a/tests/jcdb/jbdb.c
+++ b/tests/jcdb/jbdb.c
@@ -1,5 +1,5 @@
 /* run.config
-OPT: -json-compilation-database @PTEST_DIR@/build_commands.json -print
+OPT: -json-compilation-database %{dep:@PTEST_DIR@/build_commands.json} -print
 */
 
 int f2 () {
diff --git a/tests/jcdb/jbdb2.c b/tests/jcdb/jbdb2.c
index db89a97f607..90ff3d399fe 100644
--- a/tests/jcdb/jbdb2.c
+++ b/tests/jcdb/jbdb2.c
@@ -1,5 +1,5 @@
 /* run.config
-OPT: -json-compilation-database @PTEST_DIR@/build_commands.json -print
+OPT: -json-compilation-database %{dep:@PTEST_DIR@/build_commands.json} -print
 */
 
 int f1 () {
diff --git a/tests/misc/audit.c b/tests/misc/audit.c
index 40a9e6b9f1b..f9111560e09 100644
--- a/tests/misc/audit.c
+++ b/tests/misc/audit.c
@@ -1,7 +1,7 @@
 /* run.config
 PLUGIN: @EVA_PLUGINS@
    LOG: audit-out.json
-   STDOPT: #"-audit-check @PTEST_DIR@/audit-in.json -audit-prepare @PTEST_RESULT@/audit-out.json -kernel-warn-key audit=active"
+   STDOPT: #"-audit-check %{dep:@PTEST_DIR@/audit-in.json} -audit-prepare @PTEST_RESULT@/audit-out.json -kernel-warn-key audit=active"
 */
 #include "audit_included.h"
 #include "audit_included_but_not_listed.h"
diff --git a/tests/misc/bts0525-2.i b/tests/misc/bts0525-2.i
index 6949e4d4d03..f7d39a9f578 100644
--- a/tests/misc/bts0525-2.i
+++ b/tests/misc/bts0525-2.i
@@ -1,5 +1,5 @@
 /* run.config
-   OPT: -typecheck @PTEST_DIR@/bts0525.i
+   OPT: -typecheck %{dep:@PTEST_DIR@/bts0525.i}
 */
 
 typedef enum {E1=2, E2} T_EN1 ;
diff --git a/tests/misc/bts0525.i b/tests/misc/bts0525.i
index 3869382c8c0..bfbff38d31f 100644
--- a/tests/misc/bts0525.i
+++ b/tests/misc/bts0525.i
@@ -1,5 +1,5 @@
 /* run.config
-   OPT: @PTEST_DIR@/bts0525-2.i
+   OPT: %{dep:@PTEST_DIR@/bts0525-2.i}
 */
 typedef enum {E3=2, E4} T_EN2 ;
 typedef enum {E1=2, E2} T_EN1 ;
diff --git a/tests/misc/bts0990_link.i b/tests/misc/bts0990_link.i
index 667ab3eb1ad..df2e45884e7 100644
--- a/tests/misc/bts0990_link.i
+++ b/tests/misc/bts0990_link.i
@@ -3,7 +3,7 @@
    OPT: %{dep:@PTEST_DIR@/bts0990_link_1.i}
 */
 // NB: This test is meant to return an error, as s is declared as an array in
-// @PTEST_DIR@/bts0990_link_1.i
+// %{dep:@PTEST_DIR@/bts0990_link_1.i}
 
 char *s;
 
diff --git a/tests/misc/global_decl_loc2.i b/tests/misc/global_decl_loc2.i
index 46a2d3bb568..77ea1dfabb1 100644
--- a/tests/misc/global_decl_loc2.i
+++ b/tests/misc/global_decl_loc2.i
@@ -1,8 +1,8 @@
 /* run.config*
  COMMENT: with dune, the LIBS directive must be replaced by a MODULE directive (see also ./test_config file)
+
  LIBS: global_decl_loc
- DEPS: @PTEST_DIR@/global_decl_loc.i
-   OPT: @PTEST_DIR@/global_decl_loc.i
+   OPT: %{dep:@PTEST_DIR@/global_decl_loc.i}
 */
 extern int g;
 
diff --git a/tests/misc/mergestruct3.i b/tests/misc/mergestruct3.i
index ecc825733c7..3a8943a8d8f 100644
--- a/tests/misc/mergestruct3.i
+++ b/tests/misc/mergestruct3.i
@@ -1,6 +1,6 @@
 /* run.config
-   OPT: -print @PTEST_DIR@/mergestruct1.i @PTEST_DIR@/mergestruct2.i
-   OPT: -print @PTEST_DIR@/mergestruct2.i @PTEST_DIR@/mergestruct1.i
+   OPT: -print %{dep:@PTEST_DIR@/mergestruct1.i} %{dep:@PTEST_DIR@/mergestruct2.i}
+   OPT: -print %{dep:@PTEST_DIR@/mergestruct2.i} %{dep:@PTEST_DIR@/mergestruct1.i}
 */
 struct s { float a; } s2;
 
diff --git a/tests/misc/oracle/audit-out.json b/tests/misc/oracle/audit-out.json
index cacd9f1deac..7d27051ffcf 100644
--- a/tests/misc/oracle/audit-out.json
+++ b/tests/misc/oracle/audit-out.json
@@ -71,7 +71,7 @@
     }
   },
   "sources": {
-    "tests/misc/audit.c": "f94ce1c8f5e5911260931783495e2c88",
+    "tests/misc/audit.c": "849a5c434063ac353bc07ba7e8ca7109",
     "tests/misc/audit_included.h": "c2cc488143a476f69cf2ed04c3439e6e",
     "tests/misc/audit_included_but_not_listed.h":
       "c2cc488143a476f69cf2ed04c3439e6e"
diff --git a/tests/misc/oracle/audit.res.oracle b/tests/misc/oracle/audit.res.oracle
index 59fb1e210c6..040c0629cdf 100644
--- a/tests/misc/oracle/audit.res.oracle
+++ b/tests/misc/oracle/audit.res.oracle
@@ -1,5 +1,5 @@
 [kernel:audit] Warning: 
-  different hashes for tests/misc/audit.c: got f94ce1c8f5e5911260931783495e2c88, expected 01010101010101010101010101010101
+  different hashes for tests/misc/audit.c: got 849a5c434063ac353bc07ba7e8ca7109, expected 01010101010101010101010101010101
 [kernel:audit] Warning: 
   different hashes for tests/misc/audit_included_but_not_listed.h: got c2cc488143a476f69cf2ed04c3439e6e, expected <none> (not in list)
 [kernel:audit] Warning: 
diff --git a/tests/saveload/bool.c b/tests/saveload/bool.c
index 61013418386..9a6998b4566 100644
--- a/tests/saveload/bool.c
+++ b/tests/saveload/bool.c
@@ -1,5 +1,5 @@
 /* run.config
-   EXECNOW: BIN bool.sav LOG bool_sav.res LOG bool_sav.err @frama-c@ -save @PTEST_RESULT@/bool.sav -machdep x86_32 -eva @EVA_OPTIONS@ @PTEST_DIR@/bool.c > @PTEST_RESULT@/bool_sav.res 2> @PTEST_RESULT@/bool_sav.err
+   EXECNOW: BIN bool.sav LOG bool_sav.res LOG bool_sav.err @frama-c@ -save @PTEST_RESULT@/bool.sav -machdep x86_32 -eva @EVA_OPTIONS@ %{dep:@PTEST_DIR@/bool.c} > @PTEST_RESULT@/bool_sav.res 2> @PTEST_RESULT@/bool_sav.err
    STDOPT: +"-load @PTEST_RESULT@/bool.sav -out -input -deps"
    STDOPT: +"-load @PTEST_RESULT@/bool.sav -eva @EVA_OPTIONS@"
  */
diff --git a/tests/saveload/callbacks.i b/tests/saveload/callbacks.i
index 31080cb964b..8abbddfbc06 100644
--- a/tests/saveload/callbacks.i
+++ b/tests/saveload/callbacks.i
@@ -1,5 +1,5 @@
 /* run.config
-   EXECNOW: LOG callbacks_initial.res LOG callbacks_initial.err BIN callbacks.sav @frama-c@ @PTEST_DIR@/callbacks.i -out -calldeps -eva-show-progress -main main1 -save @PTEST_RESULT@/callbacks.sav > @PTEST_RESULT@/callbacks_initial.res 2> @PTEST_RESULT@/callbacks_initial.err
+   EXECNOW: LOG callbacks_initial.res LOG callbacks_initial.err BIN callbacks.sav @frama-c@ %{dep:@PTEST_DIR@/callbacks.i} -out -calldeps -eva-show-progress -main main1 -save @PTEST_RESULT@/callbacks.sav > @PTEST_RESULT@/callbacks_initial.res 2> @PTEST_RESULT@/callbacks_initial.err
    STDOPT: +"-load @PTEST_RESULT@/callbacks.sav -main main2 -then -main main3"
 */
 
diff --git a/tests/saveload/isset.c b/tests/saveload/isset.c
index 26c3f18e1fc..514aaedef34 100644
--- a/tests/saveload/isset.c
+++ b/tests/saveload/isset.c
@@ -1,5 +1,5 @@
 /* run.config
-   EXECNOW: LOG isset_sav.res LOG isset_sav.err BIN isset.sav @frama-c@ -quiet -eva @EVA_OPTIONS@ -save @PTEST_RESULT@/isset.sav @PTEST_DIR@/isset.c > @PTEST_RESULT@/isset_sav.res 2> @PTEST_RESULT@/isset_sav.err
+   EXECNOW: LOG isset_sav.res LOG isset_sav.err BIN isset.sav @frama-c@ -quiet -eva @EVA_OPTIONS@ -save @PTEST_RESULT@/isset.sav %{dep:@PTEST_DIR@/isset.c} > @PTEST_RESULT@/isset_sav.res 2> @PTEST_RESULT@/isset_sav.err
    STDOPT: +"-quiet -load @PTEST_RESULT@/isset.sav"
    STDOPT: +"-load @PTEST_RESULT@/isset.sav"
    STDOPT: +"-eva @EVA_OPTIONS@ -load @PTEST_RESULT@/isset.sav"
diff --git a/tests/saveload/sparecode.i b/tests/saveload/sparecode.i
index 31038cd6945..0ff25f71380 100644
--- a/tests/saveload/sparecode.i
+++ b/tests/saveload/sparecode.i
@@ -1,6 +1,6 @@
 /* run.config
  PLUGIN: @EVA_PLUGINS@ slicing
-   EXECNOW: BIN sparecode.sav LOG sparecode_sav.res LOG sparecode_sav.err @frama-c@ -slicing-level 2 -slice-return main -eva-show-progress -save @PTEST_RESULT@/sparecode.sav @PTEST_DIR@/sparecode.i -then-on 'Slicing export' -print > @PTEST_RESULT@/sparecode_sav.res 2> @PTEST_RESULT@/sparecode_sav.err
+   EXECNOW: BIN sparecode.sav LOG sparecode_sav.res LOG sparecode_sav.err @frama-c@ -slicing-level 2 -slice-return main -eva-show-progress -save @PTEST_RESULT@/sparecode.sav %{dep:@PTEST_DIR@/sparecode.i} -then-on 'Slicing export' -print > @PTEST_RESULT@/sparecode_sav.res 2> @PTEST_RESULT@/sparecode_sav.err
    STDOPT: +"-load @PTEST_RESULT@/sparecode.sav"
 */
 int G;
diff --git a/tests/scope/bts383.c b/tests/scope/bts383.c
index 5014bf4e045..580c77decc0 100644
--- a/tests/scope/bts383.c
+++ b/tests/scope/bts383.c
@@ -1,13 +1,13 @@
 /* run.config
    OPT: -eva @EVA_CONFIG@ -print -scope-verbose 1 -eva-remove-redundant-alarms -eva-context-width 3
 */
-/* 
+/*
    echo '!Db.Scope.check_asserts();;' \
-   | bin/toplevel.top -eva @PTEST_DIR@/bts383.c 
+   | bin/toplevel.top -eva bts383.c
 */
 int v;
 void if1 (int * p) {
-  if (*p > 0) 
+  if (*p > 0)
     v = *p;
 }
 int if2 (int c, int * p) {
diff --git a/tests/spec/first.c b/tests/spec/first.c
index d0a021fbefb..4578e7d6f98 100644
--- a/tests/spec/first.c
+++ b/tests/spec/first.c
@@ -1,5 +1,5 @@
 /* run.config
-   OPT: -print @PTEST_DIR@/third.c @PTEST_DIR@/second.c
+   OPT: -print %{dep:@PTEST_DIR@/third.c} %{dep:@PTEST_DIR@/second.c}
 */
 /*@ behavior b:
   requires \valid(first);
diff --git a/tests/spec/model2.c b/tests/spec/model2.c
index c079e4fafb9..dc4f5691904 100644
--- a/tests/spec/model2.c
+++ b/tests/spec/model2.c
@@ -1,5 +1,5 @@
 /* run.config
-DONTRUN: main test is in @PTEST_DIR@/model1.c
+DONTRUN: main test is in %{dep:@PTEST_DIR@/model1.c}
 */
 
 #include "model1.h"
diff --git a/tests/spec/multi_axiomatic_1.i b/tests/spec/multi_axiomatic_1.i
index cfe295495cc..0687661447a 100644
--- a/tests/spec/multi_axiomatic_1.i
+++ b/tests/spec/multi_axiomatic_1.i
@@ -1,5 +1,5 @@
 /* run.config
-OPT: @PTEST_DIR@/multi_axiomatic_2.i -print
+OPT: %{dep:@PTEST_DIR@/multi_axiomatic_2.i} -print
 */
 
 /*@
diff --git a/tests/spec/multi_axiomatic_2.i b/tests/spec/multi_axiomatic_2.i
index d1d8f406ec9..2d99bea95e3 100644
--- a/tests/spec/multi_axiomatic_2.i
+++ b/tests/spec/multi_axiomatic_2.i
@@ -1,5 +1,5 @@
 /* run.config
-DONTRUN: main configuration in @PTEST_DIR@/multi_axiomatic_1.i
+DONTRUN: main configuration in %{dep:@PTEST_DIR@/multi_axiomatic_1.i}
 */
 /*@
 	axiomatic ax { logic int Acc(int m); }
diff --git a/tests/spec/multiple_decl_def_1.c b/tests/spec/multiple_decl_def_1.c
index 02ca904b8ce..936d427c415 100644
--- a/tests/spec/multiple_decl_def_1.c
+++ b/tests/spec/multiple_decl_def_1.c
@@ -1,5 +1,5 @@
 /* run.config
-   OPT: -print @PTEST_DIR@/multiple_decl_def_2.c
+   OPT: -print %{dep:@PTEST_DIR@/multiple_decl_def_2.c}
 */
 
 /* see bug #43 && #128 */
diff --git a/tests/spec/multiple_file_1.c b/tests/spec/multiple_file_1.c
index f31326e8aea..63dc0cab621 100644
--- a/tests/spec/multiple_file_1.c
+++ b/tests/spec/multiple_file_1.c
@@ -1,5 +1,5 @@
 /* run.config
-   OPT: -print @PTEST_DIR@/multiple_file_2.c
+   OPT: -print %{dep:@PTEST_DIR@/multiple_file_2.c}
 */
 
 /* see bug #43 */
diff --git a/tests/syntax/merge_inline_1.c b/tests/syntax/merge_inline_1.c
index 325b55a258c..ec465fac509 100644
--- a/tests/syntax/merge_inline_1.c
+++ b/tests/syntax/merge_inline_1.c
@@ -1,5 +1,5 @@
 /* run.config
-OPT: @PTEST_DIR@/merge_inline_2.c -aggressive-merging -print
+OPT: %{dep:@PTEST_DIR@/merge_inline_2.c} -aggressive-merging -print
 */
 
 /* Test that we rename properly inlines even if they have prototypes and
diff --git a/tests/syntax/typedef_multi_2.c b/tests/syntax/typedef_multi_2.c
index 3dfefa3de8e..24bbeae93e5 100644
--- a/tests/syntax/typedef_multi_2.c
+++ b/tests/syntax/typedef_multi_2.c
@@ -1,5 +1,5 @@
 /* run.config
-DONTRUN: main test is at @PTEST_DIR@/typedef_multi_1.c
+DONTRUN: main test is at %{dep:@PTEST_DIR@/typedef_multi_1.c}
 */
 
 #include "typedef_multi.h"
-- 
GitLab