From dd481d05f8a63291e4b26119beb4a1e575d0f557 Mon Sep 17 00:00:00 2001
From: Patrick Baudin <patrick.baudin@cea.fr>
Date: Wed, 16 Feb 2022 13:35:20 +0100
Subject: [PATCH] [tests] adds missing %{dep:file}
---
tests/fc_script/build-callgraph.i | 2 +-
tests/metrics/used-files.i | 4 ++--
tests/pdg/dyn_dpds.c | 2 +-
tests/pdg/loops.c | 4 ++--
tests/scope/scope.c | 6 +++---
tests/scope/zones.c | 2 +-
tests/slicing/bts335.i | 4 ++--
tests/slicing/horwitz.i | 4 ++--
tests/spec/lib.c | 2 +-
tests/spec/merge_1.i | 2 +-
tests/spec/merge_bts938.c | 4 ++--
tests/spec/merge_different_assigns.i | 2 +-
tests/spec/model1.c | 2 +-
tests/spec/use.c | 2 +-
tests/syntax/bts0442-2.i | 2 +-
tests/syntax/bts0442.i | 2 +-
tests/syntax/bts0672_link.c | 4 ++--
tests/syntax/extern_init.i | 4 ++--
tests/syntax/inconsistent_decl.c | 4 ++--
tests/syntax/inline_def_1.i | 2 +-
tests/syntax/inline_def_bad_1.i | 2 +-
tests/syntax/merge_attrs_align.c | 12 ++++++------
tests/syntax/merge_bts0948.i | 2 +-
tests/syntax/merge_variadic.i | 2 +-
tests/syntax/tentative_definition.c | 20 ++++++++++----------
tests/syntax/vdefined_bts1241.i | 2 +-
26 files changed, 50 insertions(+), 50 deletions(-)
diff --git a/tests/fc_script/build-callgraph.i b/tests/fc_script/build-callgraph.i
index 7ec5a976aeb..e31daa24c25 100644
--- a/tests/fc_script/build-callgraph.i
+++ b/tests/fc_script/build-callgraph.i
@@ -1,6 +1,6 @@
/* run.config
NOFRAMAC: testing frama-c-script, not frama-c itself
- EXECNOW: LOG build-callgraph.res LOG build-callgraph.err %{bin:frama-c-script} heuristic-print-callgraph @PTEST_DIR@/@PTEST_NAME@.i > @PTEST_RESULT@/build-callgraph.res 2> @PTEST_RESULT@/build-callgraph.err
+ EXECNOW: LOG build-callgraph.res LOG build-callgraph.err %{bin:frama-c-script} heuristic-print-callgraph %{dep:@PTEST_DIR@/@PTEST_NAME@.i} > @PTEST_RESULT@/build-callgraph.res 2> @PTEST_RESULT@/build-callgraph.err
*/
#include <stdio.h>
diff --git a/tests/metrics/used-files.i b/tests/metrics/used-files.i
index dee7f1945c2..bebb54173e8 100644
--- a/tests/metrics/used-files.i
+++ b/tests/metrics/used-files.i
@@ -1,6 +1,6 @@
/* run.config
- OPT: -metrics-used-files @PTEST_DIR@/@PTEST_NAME@1.i @PTEST_DIR@/@PTEST_NAME@2.i @PTEST_DIR@/@PTEST_NAME@3.i @PTEST_DIR@/@PTEST_NAME@4.i @PTEST_DIR@/@PTEST_NAME@5.i @PTEST_DIR@/@PTEST_NAME@6.i @PTEST_DIR@/@PTEST_NAME@7.i @PTEST_DIR@/@PTEST_NAME@8.i @PTEST_DIR@/@PTEST_NAME@9.c @PTEST_DIR@/@PTEST_NAME@1.h @PTEST_DIR@/@PTEST_NAME@2.h
- OPT: -metrics-used-files -main g @PTEST_DIR@/@PTEST_NAME@1.i @PTEST_DIR@/@PTEST_NAME@2.i @PTEST_DIR@/@PTEST_NAME@3.i @PTEST_DIR@/@PTEST_NAME@4.i @PTEST_DIR@/@PTEST_NAME@5.i @PTEST_DIR@/@PTEST_NAME@6.i @PTEST_DIR@/@PTEST_NAME@7.i @PTEST_DIR@/@PTEST_NAME@8.i @PTEST_DIR@/@PTEST_NAME@9.c @PTEST_DIR@/@PTEST_NAME@1.h @PTEST_DIR@/@PTEST_NAME@2.h
+ 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
*/
int h(void);
diff --git a/tests/pdg/dyn_dpds.c b/tests/pdg/dyn_dpds.c
index ac0cc5c1557..4d0909596c4 100644
--- a/tests/pdg/dyn_dpds.c
+++ b/tests/pdg/dyn_dpds.c
@@ -6,7 +6,7 @@
/*
To have a look at the dot PDG :
- bin/toplevel.byte -deps -pdg-dot pdg -fct-pdg main @PTEST_DIR@/@PTEST_NAME@.c ;
+ bin/toplevel.byte -deps -pdg-dot pdg -fct-pdg main %{dep:@PTEST_DIR@/@PTEST_NAME@.c} ;
zgrviewer pdg.main.dot
or use @PTEST_DIR@/@PTEST_NAME@.ml to test the dynamic dependencies.
diff --git a/tests/pdg/loops.c b/tests/pdg/loops.c
index 225fefc8c54..e6991c95603 100644
--- a/tests/pdg/loops.c
+++ b/tests/pdg/loops.c
@@ -24,11 +24,11 @@ bin/toplevel.opt -lib-entry -main $F -deps -verbose @PTEST_DIR@/loops.c
zgrviewer ./$F_cfg.dot
Pour voir les postdominateurs :
-bin/toplevel.opt -lib-entry -main $F -fct-pdg $F -dot-postdom p @PTEST_DIR@/loops.c ;
+bin/toplevel.opt -lib-entry -main $F -fct-pdg $F -dot-postdom p %{dep:@PTEST_DIR@/loops.c} ;
zgrviewer ./p.$F.dot
Pour voir le PDG :
-bin/toplevel.opt -lib-entry -main $F -fct-pdg $F -pdg-dot pdg @PTEST_DIR@/loops.c ;
+bin/toplevel.opt -lib-entry -main $F -fct-pdg $F -pdg-dot pdg %{dep:@PTEST_DIR@/loops.c} ;
zgrviewer ./pdg.$F.dot
*/
diff --git a/tests/scope/scope.c b/tests/scope/scope.c
index 713fa01b7e3..341b5a51f46 100644
--- a/tests/scope/scope.c
+++ b/tests/scope/scope.c
@@ -4,9 +4,9 @@
OPT: -eva @EVA_CONFIG@ -main loop
*/
/*
- * bin/viewer.byte -main f @PTEST_DIR@/scope.c -eva
- * bin/viewer.byte -main f2 @PTEST_DIR@/scope.c -eva
- * bin/viewer.byte -main loop @PTEST_DIR@/scope.c -eva
+ * bin/viewer.byte -main f %{dep:@PTEST_DIR@/scope.c} -eva
+ * bin/viewer.byte -main f2 %{dep:@PTEST_DIR@/scope.c} -eva
+ * bin/viewer.byte -main loop %{dep:@PTEST_DIR@/scope.c} -eva
*/
#include "__fc_builtin.h"
diff --git a/tests/scope/zones.c b/tests/scope/zones.c
index b60b239a0fc..c13c5daea5d 100644
--- a/tests/scope/zones.c
+++ b/tests/scope/zones.c
@@ -4,7 +4,7 @@
OPT: -eva @EVA_OPTIONS@
*/
-/* bin/viewer.opt -eva @PTEST_DIR@/@PTEST_NAME@.c */
+/* bin/viewer.opt -eva %{dep:@PTEST_DIR@/@PTEST_NAME@.c} */
int T [10];
struct Tstr { int a; int b; } S;
diff --git a/tests/slicing/bts335.i b/tests/slicing/bts335.i
index 61e42e2ccc7..6a2d334787f 100644
--- a/tests/slicing/bts335.i
+++ b/tests/slicing/bts335.i
@@ -3,8 +3,8 @@
*/
/*
-bin/toplevel.opt -slice-pragma g -calldeps -slicing-level 3 @PTEST_DIR@/bts335.c -debug 2
-bin/toplevel.opt -pdg-debug -pdg -pdg-debug "-pdg-pot bts335" @PTEST_DIR@/bts335.c
+bin/toplevel.opt -slice-pragma g -calldeps -slicing-level 3 %{dep:@PTEST_DIR@/bts335.c} -debug 2
+bin/toplevel.opt -pdg-debug -pdg -pdg-debug "-pdg-pot bts335" %{dep:@PTEST_DIR@/bts335.c}
*/
int T[2] = {0, 0};
void f (int i) { T[i]++; }
diff --git a/tests/slicing/horwitz.i b/tests/slicing/horwitz.i
index 1d78afc6949..62b29557bec 100644
--- a/tests/slicing/horwitz.i
+++ b/tests/slicing/horwitz.i
@@ -4,8 +4,8 @@
OPT: @EVA_OPTIONS@ -deps -slicing-level 0
*/
-/* bin/toplevel.opt -deps -eva @PTEST_DIR@/@PTEST_NAME@.c */
-/* bin/toplevel.opt -deps -pdg-debug -pdg @PTEST_DIR@/@PTEST_NAME@.c */
+/* bin/toplevel.opt -deps -eva %{dep:@PTEST_DIR@/@PTEST_NAME@.c} */
+/* bin/toplevel.opt -deps -pdg-debug -pdg %{dep:@PTEST_DIR@/@PTEST_NAME@.c} */
/* cf aussi @PTEST_DIR@/@PTEST_NAME@.ml */
int add (int a, int b) {
diff --git a/tests/spec/lib.c b/tests/spec/lib.c
index 67e22016306..eb145ec4167 100644
--- a/tests/spec/lib.c
+++ b/tests/spec/lib.c
@@ -1,6 +1,6 @@
/* run.config
+ DEPS: lib.h
OPT: -cpp-extra-args="-Itests/spec" -cpp-extra-args="-include lib.h" -print
*/
-
/*@ ensures f((int)0) == (int)0; */
int main () { return 0; }
diff --git a/tests/spec/merge_1.i b/tests/spec/merge_1.i
index 5781ff60a9d..0e236f1cfae 100644
--- a/tests/spec/merge_1.i
+++ b/tests/spec/merge_1.i
@@ -1,5 +1,5 @@
/* run.config
- STDOPT: +"@PTEST_DIR@/merge_2.i"
+ STDOPT: +"%{dep:@PTEST_DIR@/merge_2.i}"
*/
/*@ requires \valid(s);
@ assigns \nothing;
diff --git a/tests/spec/merge_bts938.c b/tests/spec/merge_bts938.c
index 9616f9bca20..81f2626d24b 100644
--- a/tests/spec/merge_bts938.c
+++ b/tests/spec/merge_bts938.c
@@ -1,7 +1,7 @@
/* run.config
- STDOPT: +"@PTEST_DIR@/merge_bts938_1.c"
+ DEPS: merge_bts938.h
+ STDOPT: +"%{dep:@PTEST_DIR@/merge_bts938_1.c}"
*/
-
#include "merge_bts938.h"
//@ ensures test:\true;
diff --git a/tests/spec/merge_different_assigns.i b/tests/spec/merge_different_assigns.i
index ff278513e6b..90c66e6c0f8 100644
--- a/tests/spec/merge_different_assigns.i
+++ b/tests/spec/merge_different_assigns.i
@@ -1,5 +1,5 @@
/* run.config
- STDOPT: +"@PTEST_DIR@/merge_different_assigns_bis.i"
+ STDOPT: +"%{dep:@PTEST_DIR@/merge_different_assigns_bis.i}"
*/
int x, z, t, u, v, w;
diff --git a/tests/spec/model1.c b/tests/spec/model1.c
index 21245d16066..69ab6b80250 100644
--- a/tests/spec/model1.c
+++ b/tests/spec/model1.c
@@ -1,6 +1,6 @@
/* run.config
DEPS: model1.h
- STDOPT: +"@PTEST_DIR@/model2.c"
+ STDOPT: +"%{dep:@PTEST_DIR@/model2.c}"
*/
#include "model1.h"
diff --git a/tests/spec/use.c b/tests/spec/use.c
index 31add8c1753..8a84f1802f3 100644
--- a/tests/spec/use.c
+++ b/tests/spec/use.c
@@ -1,6 +1,6 @@
/* run.config
DEPS: dec.h
- STDOPT: +"@PTEST_DIR@/use2.c"
+ STDOPT: +"%{dep:@PTEST_DIR@/use2.c}"
*/
// BTS 0887
diff --git a/tests/syntax/bts0442-2.i b/tests/syntax/bts0442-2.i
index c590a24098e..579a877ad22 100644
--- a/tests/syntax/bts0442-2.i
+++ b/tests/syntax/bts0442-2.i
@@ -1,5 +1,5 @@
/* run.config
-STDOPT: +"@PTEST_DIR@/bts0442.i"
+STDOPT: +"%{dep:@PTEST_DIR@/bts0442.i}"
*/
enum E { E0=0, E1=1} ve1=E1;
void f (void) {
diff --git a/tests/syntax/bts0442.i b/tests/syntax/bts0442.i
index 6a0681975ea..2c44d84fdb4 100644
--- a/tests/syntax/bts0442.i
+++ b/tests/syntax/bts0442.i
@@ -1,4 +1,4 @@
/* run.config
-STDOPT: +"@PTEST_DIR@/bts0442-2.i"
+STDOPT: +"%{dep:@PTEST_DIR@/bts0442-2.i}"
*/
enum E { E1=1, E2=2} ve2=E2;
diff --git a/tests/syntax/bts0672_link.c b/tests/syntax/bts0672_link.c
index 6fee817be92..b75887c3b41 100644
--- a/tests/syntax/bts0672_link.c
+++ b/tests/syntax/bts0672_link.c
@@ -1,6 +1,6 @@
/* run.config
- STDOPT: +"@PTEST_DIR@/bts0672_link_2.c"
- STDOPT: +"@PTEST_DIR@/bts0672_link_2.c" +"-cpp-extra-args='-DPROTO'"
+ STDOPT: +"%{dep:@PTEST_DIR@/bts0672_link_2.c}"
+ STDOPT: +"%{dep:@PTEST_DIR@/bts0672_link_2.c}" +"-cpp-extra-args='-DPROTO'"
*/
int Frama_C_entropy_source;
diff --git a/tests/syntax/extern_init.i b/tests/syntax/extern_init.i
index 37a97faef54..2a7d0516f9b 100644
--- a/tests/syntax/extern_init.i
+++ b/tests/syntax/extern_init.i
@@ -1,7 +1,7 @@
/* run.config
PLUGIN: eva,scope
-OPT: @PTEST_DIR@/@PTEST_NAME@_1.i @PTEST_DIR@/@PTEST_NAME@_2.i -eva @EVA_CONFIG@
-OPT: @PTEST_DIR@/@PTEST_NAME@_2.i @PTEST_DIR@/@PTEST_NAME@_1.i -eva @EVA_CONFIG@
+OPT: %{dep:@PTEST_DIR@/@PTEST_NAME@_1.i} %{dep:@PTEST_DIR@/@PTEST_NAME@_2.i} -eva @EVA_CONFIG@
+OPT: %{dep:@PTEST_DIR@/@PTEST_NAME@_2.i} %{dep:@PTEST_DIR@/@PTEST_NAME@_1.i} -eva @EVA_CONFIG@
*/
extern int a[] ;
diff --git a/tests/syntax/inconsistent_decl.c b/tests/syntax/inconsistent_decl.c
index 43fe38e5c0e..d27679ec4f1 100644
--- a/tests/syntax/inconsistent_decl.c
+++ b/tests/syntax/inconsistent_decl.c
@@ -1,7 +1,7 @@
/* run.config
EXIT: 1
- STDOPT: +"@PTEST_DIR@/inconsistent_decl_2.i"
- STDOPT: +"@PTEST_DIR@/inconsistent_decl_2.i"+"-cpp-extra-args='-DWITH_PROTO'"
+ STDOPT: +"%{dep:@PTEST_DIR@/inconsistent_decl_2.i}"
+ STDOPT: +"%{dep:@PTEST_DIR@/inconsistent_decl_2.i}"+"-cpp-extra-args='-DWITH_PROTO'"
*/
#ifdef WITH_PROTO
diff --git a/tests/syntax/inline_def_1.i b/tests/syntax/inline_def_1.i
index d9f3bf03143..2b6cf856a6a 100644
--- a/tests/syntax/inline_def_1.i
+++ b/tests/syntax/inline_def_1.i
@@ -1,5 +1,5 @@
/* run.config
-STDOPT: +"@PTEST_DIR@/inline_def_2.i"
+STDOPT: +"%{dep:@PTEST_DIR@/inline_def_2.i}"
*/
// inline definition can be used in this translation unit, but does not
diff --git a/tests/syntax/inline_def_bad_1.i b/tests/syntax/inline_def_bad_1.i
index 03ee6e12cdd..37c0f891ee0 100644
--- a/tests/syntax/inline_def_bad_1.i
+++ b/tests/syntax/inline_def_bad_1.i
@@ -1,5 +1,5 @@
/* run.config
-STDOPT: +"@PTEST_DIR@/inline_def_bad_2.i"
+STDOPT: +"%{dep:@PTEST_DIR@/inline_def_bad_2.i}"
*/
extern inline f() { return 1; }
diff --git a/tests/syntax/merge_attrs_align.c b/tests/syntax/merge_attrs_align.c
index c0d94d12f36..41cbe951b50 100644
--- a/tests/syntax/merge_attrs_align.c
+++ b/tests/syntax/merge_attrs_align.c
@@ -1,13 +1,13 @@
/*run.config
EXIT: 1
- STDOPT: +"-machdep x86_64" +"@PTEST_DIR@/merge_attrs_align1.c" +"@PTEST_DIR@/merge_attrs_align2.c"
- STDOPT: +"-machdep x86_64" +"@PTEST_DIR@/merge_attrs_align1.c" +"@PTEST_DIR@/merge_attrs_align3.c"
+ STDOPT: +"-machdep x86_64" +"%{dep:@PTEST_DIR@/merge_attrs_align1.c}" +"%{dep:@PTEST_DIR@/merge_attrs_align2.c}"
+ STDOPT: +"-machdep x86_64" +"%{dep:@PTEST_DIR@/merge_attrs_align1.c}" +"%{dep:@PTEST_DIR@/merge_attrs_align3.c}"
EXIT: 0
- STDOPT: +"-machdep x86_64" +"@PTEST_DIR@/merge_attrs_align1.c" +"@PTEST_DIR@/merge_attrs_align4.c"
- STDOPT: +"-machdep x86_64" +"@PTEST_DIR@/merge_attrs_align2.c" +"@PTEST_DIR@/merge_attrs_align3.c"
+ STDOPT: +"-machdep x86_64" +"%{dep:@PTEST_DIR@/merge_attrs_align1.c}" +"%{dep:@PTEST_DIR@/merge_attrs_align4.c}"
+ STDOPT: +"-machdep x86_64" +"%{dep:@PTEST_DIR@/merge_attrs_align2.c}" +"%{dep:@PTEST_DIR@/merge_attrs_align3.c}"
EXIT: 1
- STDOPT: +"-machdep x86_64" +"@PTEST_DIR@/merge_attrs_align2.c" +"@PTEST_DIR@/merge_attrs_align4.c"
- STDOPT: +"-machdep x86_64" +"@PTEST_DIR@/merge_attrs_align3.c" +"@PTEST_DIR@/merge_attrs_align4.c"
+ STDOPT: +"-machdep x86_64" +"%{dep:@PTEST_DIR@/merge_attrs_align2.c}" +"%{dep:@PTEST_DIR@/merge_attrs_align4.c}"
+ STDOPT: +"-machdep x86_64" +"%{dep:@PTEST_DIR@/merge_attrs_align3.c}" +"%{dep:@PTEST_DIR@/merge_attrs_align4.c}"
*/
// for testing with GCC/Clang
diff --git a/tests/syntax/merge_bts0948.i b/tests/syntax/merge_bts0948.i
index 38a8ae897bb..9cec05f94ed 100644
--- a/tests/syntax/merge_bts0948.i
+++ b/tests/syntax/merge_bts0948.i
@@ -1,5 +1,5 @@
/* run.config
- STDOPT: +"@PTEST_DIR@/merge_bts0948_1.i" +"@PTEST_DIR@/merge_bts0948_2.i"
+ STDOPT: +"%{dep:@PTEST_DIR@/merge_bts0948_1.i}" +"%{dep:@PTEST_DIR@/merge_bts0948_2.i}"
*/
/*@ requires \valid((char*)dest);
diff --git a/tests/syntax/merge_variadic.i b/tests/syntax/merge_variadic.i
index b296224e959..71598363f14 100644
--- a/tests/syntax/merge_variadic.i
+++ b/tests/syntax/merge_variadic.i
@@ -1,6 +1,6 @@
/* run.config
PLUGIN: variadic
- OPT: @PTEST_DIR@/@PTEST_NAME@_aux.i -print
+ OPT: %{dep:@PTEST_DIR@/@PTEST_NAME@_aux.i} -print
*/
int open (const char* file, int flags, int mode) {
return -1;
diff --git a/tests/syntax/tentative_definition.c b/tests/syntax/tentative_definition.c
index 2d8e8726590..4e8253e21ff 100644
--- a/tests/syntax/tentative_definition.c
+++ b/tests/syntax/tentative_definition.c
@@ -1,15 +1,15 @@
/* run.config*
-OPT: -cpp-extra-args="-DEEDN" @PTEST_DIR@/@PTEST_NAME@_aux.c -print
-OPT: -cpp-extra-args="-DEENN" @PTEST_DIR@/@PTEST_NAME@_aux.c -print
-OPT: -cpp-extra-args="-DENND" @PTEST_DIR@/@PTEST_NAME@_aux.c -print
-OPT: -cpp-extra-args="-DENNN" @PTEST_DIR@/@PTEST_NAME@_aux.c -print
-OPT: -cpp-extra-args="-DNNNN" @PTEST_DIR@/@PTEST_NAME@_aux.c -print
+OPT: -cpp-extra-args="-DEEDN" %{dep:@PTEST_DIR@/@PTEST_NAME@_aux.c} -print
+OPT: -cpp-extra-args="-DEENN" %{dep:@PTEST_DIR@/@PTEST_NAME@_aux.c} -print
+OPT: -cpp-extra-args="-DENND" %{dep:@PTEST_DIR@/@PTEST_NAME@_aux.c} -print
+OPT: -cpp-extra-args="-DENNN" %{dep:@PTEST_DIR@/@PTEST_NAME@_aux.c} -print
+OPT: -cpp-extra-args="-DNNNN" %{dep:@PTEST_DIR@/@PTEST_NAME@_aux.c} -print
EXIT: 1
-OPT: -cpp-extra-args="-DEEDD" @PTEST_DIR@/@PTEST_NAME@_aux.c -print
-OPT: -cpp-extra-args="-DENDD" @PTEST_DIR@/@PTEST_NAME@_aux.c -print
-OPT: -cpp-extra-args="-DENDN" @PTEST_DIR@/@PTEST_NAME@_aux.c -print
-OPT: -cpp-extra-args="-DNNDD" @PTEST_DIR@/@PTEST_NAME@_aux.c -print
-OPT: -cpp-extra-args="-DNNDN" @PTEST_DIR@/@PTEST_NAME@_aux.c -print
+OPT: -cpp-extra-args="-DEEDD" %{dep:@PTEST_DIR@/@PTEST_NAME@_aux.c} -print
+OPT: -cpp-extra-args="-DENDD" %{dep:@PTEST_DIR@/@PTEST_NAME@_aux.c} -print
+OPT: -cpp-extra-args="-DENDN" %{dep:@PTEST_DIR@/@PTEST_NAME@_aux.c} -print
+OPT: -cpp-extra-args="-DNNDD" %{dep:@PTEST_DIR@/@PTEST_NAME@_aux.c} -print
+OPT: -cpp-extra-args="-DNNDN" %{dep:@PTEST_DIR@/@PTEST_NAME@_aux.c} -print
*/
// OK (one global defined to 1)
diff --git a/tests/syntax/vdefined_bts1241.i b/tests/syntax/vdefined_bts1241.i
index fb57d75836e..77854d6e480 100644
--- a/tests/syntax/vdefined_bts1241.i
+++ b/tests/syntax/vdefined_bts1241.i
@@ -1,5 +1,5 @@
/* run.config
-STDOPT: +"@PTEST_DIR@/vdefined_bts1241_1.i"
+STDOPT: +"%{dep:@PTEST_DIR@/vdefined_bts1241_1.i}"
*/
int f();
--
GitLab