[tests] adds some %{dep:file}

tests/jcdb/jbdb.c

 /* 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 () {

tests/jcdb/jbdb2.c

 /* 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 () {

tests/misc/audit.c

 /* 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"

tests/misc/bts0525-2.i

 /* run.config
-   OPT: -typecheck @PTEST_DIR@/bts0525.i
+   OPT: -typecheck %{dep:@PTEST_DIR@/bts0525.i}
 */
 
 typedef enum {E1=2, E2} T_EN1 ;

tests/misc/bts0525.i

 /* 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 ;

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;
 

tests/misc/global_decl_loc2.i

 /* 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;
 

tests/misc/mergestruct3.i

 /* 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;
 

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"

tests/misc/oracle/audit.res.oracle

 [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: 

tests/saveload/bool.c

 /* 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@"
  */

tests/saveload/callbacks.i

 /* 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"
 */
 

tests/saveload/isset.c

 /* 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"

tests/saveload/sparecode.i

 /* 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;

tests/scope/bts383.c

 /* 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) {

tests/spec/first.c

 /* 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);

tests/spec/model2.c

 /* run.config
-DONTRUN: main test is in @PTEST_DIR@/model1.c
+DONTRUN: main test is in %{dep:@PTEST_DIR@/model1.c}
 */
 
 #include "model1.h"

tests/spec/multi_axiomatic_1.i

 /* run.config
-OPT: @PTEST_DIR@/multi_axiomatic_2.i -print
+OPT: %{dep:@PTEST_DIR@/multi_axiomatic_2.i} -print
 */
 
 /*@

tests/spec/multi_axiomatic_2.i

 /* 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); }

tests/spec/multiple_decl_def_1.c

 /* 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 */