diff --git a/tests/builtins/Longinit_sequencer.i b/tests/builtins/Longinit_sequencer.i
index 2998da18c7d5bfa4f9e0d48f067fde4c44a6b860..9545fae2592a075fa0d79a0edb852d033414fdff 100644
--- a/tests/builtins/Longinit_sequencer.i
+++ b/tests/builtins/Longinit_sequencer.i
@@ -1,4 +1,4 @@
/* run.config*
-EXECNOW: make tests/builtins/Longinit_sequencer.cmxs
-OPT: -load-module tests/builtins/Longinit_sequencer.cmxs -eva-show-progress -res-file @PTEST_RESULT@
+EXECNOW: make @PTEST_DIR@/@PTEST_NAME@.cmxs
+OPT: -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs -eva-show-progress -res-file @PTEST_RESULT@
*/
diff --git a/tests/callgraph/function_pointer.i b/tests/callgraph/function_pointer.i
index be249adbd33ce25d7fd82f7a52247bcc42cf0f7f..27202a3c7ff81ca4bb705292cca04588b6a29beb 100644
--- a/tests/callgraph/function_pointer.i
+++ b/tests/callgraph/function_pointer.i
@@ -1,10 +1,10 @@
/* run.config
COMMENT: Test option -cg-function-pointers
EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
- OPT: -cg-function-pointers -load-module @PTEST_DIR@/@PTEST_NAME@
- OPT: -cg-no-services -cg-function-pointers -load-module @PTEST_DIR@/@PTEST_NAME@
- OPT: -cg-no-function-pointers -load-module @PTEST_DIR@/@PTEST_NAME@
- OPT: -cg-no-services -cg-no-function-pointers -load-module @PTEST_DIR@/@PTEST_NAME@
+ OPT: -cg-function-pointers -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
+ OPT: -cg-no-services -cg-function-pointers -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
+ OPT: -cg-no-function-pointers -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
+ OPT: -cg-no-services -cg-no-function-pointers -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
*/
int (*fptr)(int);
diff --git a/tests/cil/mkBinOp.i b/tests/cil/mkBinOp.i
index caa9dd0c396370d25700c25ca86ae605882e0348..64f2a643d8c7c198185bf883dbbc6fe5d0e4b4c3 100644
--- a/tests/cil/mkBinOp.i
+++ b/tests/cil/mkBinOp.i
@@ -1,6 +1,6 @@
/* run.config
EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
-OPT: -load-module @PTEST_DIR@/@PTEST_NAME@ -print -constfold
+OPT: -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs -print -constfold
*/
int main(void) {
diff --git a/tests/journal/intra.i b/tests/journal/intra.i
index 07b7d59e05d59bbd4faf62d28c0e24e6d255c004..dea5fdbface5e49569a2d52996e69ac8b4d52f06 100644
--- a/tests/journal/intra.i
+++ b/tests/journal/intra.i
@@ -1,7 +1,7 @@
/* run.config
EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
- EXECNOW: BIN intra_journal.ml @frama-c@ -eva-show-progress -load-module ./@PTEST_DIR@/@PTEST_NAME@ -journal-enable -journal-name tests/journal/result/intra_journal.ml tests/journal/intra.i > /dev/null 2> /dev/null
- CMD: @frama-c@ -load-module ./@PTEST_DIR@/@PTEST_NAME@
+ EXECNOW: BIN intra_journal.ml @frama-c@ -eva-show-progress -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs -journal-enable -journal-name tests/journal/result/intra_journal.ml @PTEST_DIR@/@PTEST_NAME@.i > /dev/null 2> /dev/null
+ CMD: @frama-c@ -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
OPT: -load-script tests/journal/result/intra_journal -journal-disable
*/
diff --git a/tests/misc/copy_kf.i b/tests/misc/copy_kf.i
index 029cbd00d67d6d1580476a8703c235814ecc057c..f5d849a338452eb28c875bb865f656cd6132dff4 100644
--- a/tests/misc/copy_kf.i
+++ b/tests/misc/copy_kf.i
@@ -1,6 +1,6 @@
/* run.config
EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
-OPT: -load-module @PTEST_DIR@/@PTEST_NAME@
+OPT: -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
*/
/*@ requires \valid(p); assigns *p; ensures *p == x; */
diff --git a/tests/misc/copy_machdep.i b/tests/misc/copy_machdep.i
index 3c150a094ff67a252ea8c3875e854a75b839b327..cfc77294f14fa769d77b6bd1a6ce812215992649 100644
--- a/tests/misc/copy_machdep.i
+++ b/tests/misc/copy_machdep.i
@@ -1,6 +1,6 @@
/* run.config
EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
-OPT: -load-module @PTEST_DIR@/@PTEST_NAME@ -machdep x86_64 -enums int -no-unicode
+OPT: -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs -machdep x86_64 -enums int -no-unicode
*/
int main () { return 0; }
diff --git a/tests/misc/exception.i b/tests/misc/exception.i
index 4b73ec776649d824fae164bf23655cd6ab7c26c1..1c10993b286b9005804ad22dd3d1fefc1863374d 100644
--- a/tests/misc/exception.i
+++ b/tests/misc/exception.i
@@ -1,7 +1,7 @@
/* run.config
EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
- OPT: -load-module @PTEST_DIR@/@PTEST_NAME@ -print
- OPT: -load-module @PTEST_DIR@/@PTEST_NAME@ -remove-exn -print
+ OPT: -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs -print
+ OPT: -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs -remove-exn -print
*/
struct my_exn { int e; };
diff --git a/tests/misc/global_decl_loc.i b/tests/misc/global_decl_loc.i
index 3da30326dde49e4dacd4027a5ac9515fe448b0b5..62de46c9540fda0a8744f70a0437e771cb964231 100644
--- a/tests/misc/global_decl_loc.i
+++ b/tests/misc/global_decl_loc.i
@@ -1,4 +1,4 @@
/* run.config
- OPT: @PTEST_DIR@/global_decl_loc2.i -load-module @PTEST_DIR@/global_decl_loc.cmxs
+ OPT: @PTEST_DIR@/global_decl_loc2.i -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
*/
int g;
diff --git a/tests/misc/my_visitor.c b/tests/misc/my_visitor.c
index 921a82c24c416653c44b705dedb7d86cb431dd12..ce79f9d6fd4dd8c23415388047d4e034c3808337 100644
--- a/tests/misc/my_visitor.c
+++ b/tests/misc/my_visitor.c
@@ -1,6 +1,6 @@
/* run.config
EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
-EXECNOW: LOG my_visitor_sav.res LOG my_visitor_sav.err BIN my_visitor.sav FRAMAC_PLUGIN=./lib/plugins @frama-c@ @PTEST_FILE@ -load-module @PTEST_DIR@/@PTEST_NAME@ -main f -save @PTEST_DIR@/@PTEST_NAME@.sav > @PTEST_DIR@/result/@PTEST_NAME@_sav.res 2> @PTEST_DIR@/result/@PTEST_NAME@_sav.err
+EXECNOW: LOG my_visitor_sav.res LOG my_visitor_sav.err BIN my_visitor.sav FRAMAC_PLUGIN=./lib/plugins @frama-c@ @PTEST_FILE@ -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs -main f -save @PTEST_DIR@/@PTEST_NAME@.sav > @PTEST_DIR@/result/@PTEST_NAME@_sav.res 2> @PTEST_DIR@/result/@PTEST_NAME@_sav.err
OPT: -load @PTEST_DIR@/@PTEST_NAME@.sav -print
*/
int f() {
diff --git a/tests/saveload/basic.i b/tests/saveload/basic.i
index 3b6a7040f3408157f470d4c05ade9eb9fb199eee..0a37b04868e6eb4a445e152669dc49e7ee6ba869 100644
--- a/tests/saveload/basic.i
+++ b/tests/saveload/basic.i
@@ -1,12 +1,12 @@
/* run.config
- EXECNOW: make -s ./@PTEST_DIR@/@PTEST_NAME@.cmxs
- EXECNOW: LOG basic_sav.res LOG basic_sav.err BIN basic.sav @frama-c@ -load-module ./@PTEST_DIR@/@PTEST_NAME@ -eva -out -input -deps -eva-show-progress ./tests/saveload/basic.i -save ./tests/saveload/result/basic.sav > ./tests/saveload/result/basic_sav.res 2> ./tests/saveload/result/basic_sav.err
- EXECNOW: LOG basic_sav.1.res LOG basic_sav.1.err BIN basic.1.sav ./bin/toplevel.opt -save ./tests/saveload/result/basic.1.sav ./@PTEST_DIR@/@PTEST_NAME@.i -eva -out -input -deps -eva-show-progress > ./tests/saveload/result/basic_sav.1.res 2> ./tests/saveload/result/basic_sav.1.err
+ EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+ EXECNOW: LOG basic_sav.res LOG basic_sav.err BIN basic.sav @frama-c@ -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs -eva -out -input -deps -eva-show-progress ./@PTEST_DIR@/@PTEST_NAME@.i -save ./tests/saveload/result/basic.sav > ./tests/saveload/result/basic_sav.res 2> ./tests/saveload/result/basic_sav.err
+ EXECNOW: LOG basic_sav.1.res LOG basic_sav.1.err BIN basic.1.sav ./bin/toplevel.opt -save ./tests/saveload/result/basic.1.sav @PTEST_DIR@/@PTEST_NAME@.i -eva -out -input -deps -eva-show-progress > ./tests/saveload/result/basic_sav.1.res 2> ./tests/saveload/result/basic_sav.1.err
OPT: -load ./tests/saveload/result/basic.sav -eva -out -input -deps -journal-disable
- CMD: @frama-c@ -load-module ./@PTEST_DIR@/@PTEST_NAME@
+ CMD: @frama-c@ -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
OPT: -load ./tests/saveload/result/basic.1.sav -eva -out -input -deps -journal-disable -print
OPT: -load ./tests/saveload/result/basic.1.sav -eva -out -input -deps -journal-disable
- EXECNOW: LOG status_sav.res LOG status_sav.err BIN status.sav @frama-c@ -load-script tests/saveload/status.ml -save ./tests/saveload/result/status.sav ./@PTEST_DIR@/@PTEST_NAME@.i > ./tests/saveload/result/status_sav.res 2> ./tests/saveload/result/status_sav.err
+ EXECNOW: LOG status_sav.res LOG status_sav.err BIN status.sav @frama-c@ -load-script tests/saveload/status.ml -save ./tests/saveload/result/status.sav @PTEST_DIR@/@PTEST_NAME@.i > ./tests/saveload/result/status_sav.res 2> ./tests/saveload/result/status_sav.err
OPT: -load-script tests/saveload/status.ml -load ./tests/saveload/result/status.sav
OPT: -load ./tests/saveload/result/status.sav
*/
diff --git a/tests/saveload/multi_project.i b/tests/saveload/multi_project.i
index b3a6c55cc1ba9915f315ba8f5d8273e37f63a6bc..e8c3589515cd3bdca84e5679e3a52330cfbbbb50 100644
--- a/tests/saveload/multi_project.i
+++ b/tests/saveload/multi_project.i
@@ -1,8 +1,8 @@
/* run.config
- EXECNOW: BIN multi_project.sav LOG multi_project_sav.res LOG multi_project_sav.err ./bin/toplevel.opt -save ./tests/saveload/result/multi_project.sav -eva-show-progress -semantic-const-folding ./tests/saveload/multi_project.i > tests/saveload/result/multi_project_sav.res 2> tests/saveload/result/multi_project_sav.err
- EXECNOW: make -s ./tests/saveload/multi_project.cmxs
+ EXECNOW: BIN multi_project.sav LOG multi_project_sav.res LOG multi_project_sav.err ./bin/toplevel.opt -save ./tests/saveload/result/multi_project.sav -eva-show-progress -semantic-const-folding @PTEST_DIR@/@PTEST_NAME@.i > tests/saveload/result/multi_project_sav.res 2> tests/saveload/result/multi_project_sav.err
+ EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
OPT: -load ./tests/saveload/result/multi_project.sav -journal-disable
- CMD: @frama-c@ -load-module ./tests/saveload/multi_project
+ CMD: @frama-c@ -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
OPT: -eva -eva-show-progress
*/
int f(int x) {
diff --git a/tests/slicing/adpcm.c b/tests/slicing/adpcm.c
index 3ca387a3406fa599e26887b96303c2ae4bc6f396..88dbc4dbda0d8a796d81743dfda2b7dfab5b14e1 100644
--- a/tests/slicing/adpcm.c
+++ b/tests/slicing/adpcm.c
@@ -1,6 +1,6 @@
/* run.config
- EXECNOW: make -s tests/slicing/adpcm.cmxs
- OPT: -eva-show-progress -load-module ./tests/slicing/libSelect.cmxs -load-module ./tests/slicing/adpcm.cmxs -ulevel -1 -deps -slicing-level 2 -journal-disable
+ EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+ OPT: -eva-show-progress -load-module ./tests/slicing/libSelect.cmxs -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs -ulevel -1 -deps -slicing-level 2 -journal-disable
*/
#include "tests/test/adpcm.c"
diff --git a/tests/slicing/combine.i b/tests/slicing/combine.i
index 983a97af1402259919d337a17cf10b82544f227b..16d12c1adcd6a2813d481d626b1535c4714bb64f 100644
--- a/tests/slicing/combine.i
+++ b/tests/slicing/combine.i
@@ -1,6 +1,6 @@
/* run.config
- EXECNOW: make -s tests/slicing/combine.cmxs
- CMD: @frama-c@ -load-module tests/slicing/libSelect.cmxs -load-module tests/slicing/combine.cmxs
+ EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+ CMD: @frama-c@ -load-module tests/slicing/libSelect.cmxs -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
OPT: -eva-show-progress -deps -journal-disable
*/
diff --git a/tests/slicing/ex_spec_interproc.i b/tests/slicing/ex_spec_interproc.i
index 9f6d8ca13606bc64e5756bdca896f27205dc580f..962dd869e61cbda26e097423225fba45df9b3713 100644
--- a/tests/slicing/ex_spec_interproc.i
+++ b/tests/slicing/ex_spec_interproc.i
@@ -1,6 +1,6 @@
/* run.config
- EXECNOW: make -s tests/slicing/ex_spec_interproc.cmxs
- CMD: @frama-c@ -load-module tests/slicing/libSelect.cmxs -load-module tests/slicing/ex_spec_interproc.cmxs
+ EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+ CMD: @frama-c@ -load-module tests/slicing/libSelect.cmxs -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
OPT: -eva-show-progress -deps -journal-disable
*/
diff --git a/tests/slicing/horwitz.i b/tests/slicing/horwitz.i
index 3cc83fb2dd7b2f056e084b53fc52f6c15b18ed94..0178857313f549f260b26554f05c18a927bde711 100644
--- a/tests/slicing/horwitz.i
+++ b/tests/slicing/horwitz.i
@@ -1,12 +1,12 @@
/* run.config
- EXECNOW: make -s tests/slicing/horwitz.cmxs
- CMD: @frama-c@ -load-module tests/slicing/libSelect.cmxs -load-module tests/slicing/horwitz.cmxs
+ EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+ CMD: @frama-c@ -load-module tests/slicing/libSelect.cmxs -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
OPT: -eva-show-progress -deps -slicing-level 0 -journal-disable
*/
-/* bin/toplevel.opt -deps -eva tests/slicing/horwitz.c */
-/* bin/toplevel.opt -deps -pdg-debug -pdg tests/slicing/horwitz.c */
-/* cf aussi tests/slicing/horwitz.ml */
+/* bin/toplevel.opt -deps -eva @PTEST_DIR@/@PTEST_NAME@.c */
+/* bin/toplevel.opt -deps -pdg-debug -pdg @PTEST_DIR@/@PTEST_NAME@.c */
+/* cf aussi @PTEST_DIR@/@PTEST_NAME@.ml */
int add (int a, int b) {
return a+b;
diff --git a/tests/slicing/mark_all_slices.i b/tests/slicing/mark_all_slices.i
index 3454c9e2befc3c6b0162dc468a7115f5e1d2c9a8..d25812226596c855a7380ef38ddc9520f0f0c405 100644
--- a/tests/slicing/mark_all_slices.i
+++ b/tests/slicing/mark_all_slices.i
@@ -1,6 +1,6 @@
/* run.config
- EXECNOW: make -s tests/slicing/mark_all_slices.cmxs
- CMD: @frama-c@ -load-module tests/slicing/libSelect.cmxs -load-module tests/slicing/mark_all_slices.cmxs
+ EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+ CMD: @frama-c@ -load-module tests/slicing/libSelect.cmxs -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
OPT: -eva-show-progress -deps -slicing-level 3 -no-slice-callers -journal-disable
*/
int A, B, C, D;
diff --git a/tests/slicing/merge.i b/tests/slicing/merge.i
index b25108129ad6606803c84d0febb9df5497bea6d5..bf0509784e30e9adfe5159b4e8cff4be9597d3b9 100644
--- a/tests/slicing/merge.i
+++ b/tests/slicing/merge.i
@@ -1,6 +1,6 @@
/* run.config
- EXECNOW: make -s tests/slicing/merge.cmxs
- CMD: @frama-c@ -load-module tests/slicing/libSelect.cmxs -load-module tests/slicing/libAnim.cmxs -load-module tests/slicing/merge.cmxs
+ EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+ CMD: @frama-c@ -load-module tests/slicing/libSelect.cmxs -load-module tests/slicing/libAnim.cmxs -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
OPT: -eva-show-progress -deps -slicing-level 3 -journal-disable
*/
diff --git a/tests/slicing/min_call.i b/tests/slicing/min_call.i
index bb033d1fc639504a1224b21697fc0ff03975a26d..f7cc89e6a8dd1b8e1b9b580e0a2bdc2dc0457a75 100644
--- a/tests/slicing/min_call.i
+++ b/tests/slicing/min_call.i
@@ -1,6 +1,6 @@
/* run.config
- EXECNOW: make -s tests/slicing/min_call.cmxs
- CMD: @frama-c@ -load-module tests/slicing/libSelect.cmxs -load-module tests/slicing/min_call.cmxs
+ EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+ CMD: @frama-c@ -load-module tests/slicing/libSelect.cmxs -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
OPT: -eva-show-progress -deps -lib-entry -main g -journal-disable -slicing-level 3
*/
diff --git a/tests/slicing/select_by_annot.i b/tests/slicing/select_by_annot.i
index fe285f2541c43f31036a42f891208315269498bb..a0cd4471cf1e72b7b7e5ecfc74212bbc83f1bfb2 100644
--- a/tests/slicing/select_by_annot.i
+++ b/tests/slicing/select_by_annot.i
@@ -1,6 +1,6 @@
/* run.config
- EXECNOW: make -s tests/slicing/select_by_annot.cmxs
- CMD: @frama-c@ -load-module tests/slicing/libSelect.cmxs -load-module tests/slicing/select_by_annot.cmxs
+ EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+ CMD: @frama-c@ -load-module tests/slicing/libSelect.cmxs -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
OPT: -eva-show-progress -deps -lib-entry -main main -journal-disable
CMD: bin/toplevel.opt
OPT: -eva-show-progress -check -deps -lib-entry -main main -slice-pragma main -journal-disable -then-on 'Slicing export' -set-project-as-default -print -check -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check -no-deps
diff --git a/tests/slicing/select_simple.i b/tests/slicing/select_simple.i
index 9e30123cd9bd1662a26cdb7c74e287e2aaa2e79f..9883f3ff5832c4114b5d9af361e3bdc732257829 100644
--- a/tests/slicing/select_simple.i
+++ b/tests/slicing/select_simple.i
@@ -1,6 +1,6 @@
/* run.config
- EXECNOW: make -s tests/slicing/select_simple.cmxs
- CMD: @frama-c@ -load-module tests/slicing/libSelect.cmxs -load-module tests/slicing/select_simple.cmxs
+ EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+ CMD: @frama-c@ -load-module tests/slicing/libSelect.cmxs -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
OPT: -eva-show-progress -deps -journal-disable
*/
diff --git a/tests/slicing/simple_intra_slice.i b/tests/slicing/simple_intra_slice.i
index 065111000339285f6f469292a3d992d89d795d98..e335e824fe8810dc5832f1d524f0a9f00728b079 100644
--- a/tests/slicing/simple_intra_slice.i
+++ b/tests/slicing/simple_intra_slice.i
@@ -1,6 +1,6 @@
/* run.config
- EXECNOW: make -s tests/slicing/simple_intra_slice.cmxs
- CMD: @frama-c@ -load-module tests/slicing/libSelect.cmxs -load-module tests/slicing/simple_intra_slice.cmxs
+ EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+ CMD: @frama-c@ -load-module tests/slicing/libSelect.cmxs -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
OPT: -eva-show-progress -deps -no-slice-callers -journal-disable
*/
int Unknown;
diff --git a/tests/slicing/slice_no_body.i b/tests/slicing/slice_no_body.i
index 0f261cfc5c8e0be129134359987f92540895e34e..9c249f20d9f10a391b1ad939bb7e8605473596a7 100644
--- a/tests/slicing/slice_no_body.i
+++ b/tests/slicing/slice_no_body.i
@@ -1,6 +1,6 @@
/* run.config
- EXECNOW: make -s tests/slicing/slice_no_body.cmxs
- CMD: @frama-c@ -load-module tests/slicing/libSelect.cmxs -load-module tests/slicing/slice_no_body.cmxs
+ EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+ CMD: @frama-c@ -load-module tests/slicing/libSelect.cmxs -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
OPT: -eva-show-progress -deps -lib-entry -main h -journal-disable
*/
diff --git a/tests/slicing/switch.i b/tests/slicing/switch.i
index 11e453ccb719566980ce711bea9d90cdd5d820cd..0b1ca36ce07a809cf0c2cbbaec82b11bd2150ed1 100644
--- a/tests/slicing/switch.i
+++ b/tests/slicing/switch.i
@@ -1,6 +1,6 @@
/* run.config
- EXECNOW: make -s tests/slicing/switch.cmxs
- CMD: @frama-c@ -load-module tests/slicing/libSelect.cmxs -load-module tests/slicing/switch.cmxs
+ EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+ CMD: @frama-c@ -load-module tests/slicing/libSelect.cmxs -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
OPT: -eva-show-progress -deps -journal-disable
*/
int main (char choix) {
diff --git a/tests/spec/Extend.i b/tests/spec/Extend.i
index dd42b2180708242016365f0c6c3518062ca0b972..fc594736698850c7b4478cc134fc91664c096b2f 100644
--- a/tests/spec/Extend.i
+++ b/tests/spec/Extend.i
@@ -1,6 +1,6 @@
/* run.config
EXECNOW: make @PTEST_DIR@/@PTEST_NAME@.cmxs
-OPT: -load-module @PTEST_DIR@/@PTEST_NAME@ -copy -kernel-warn-key=annot-error=active
+OPT: -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs -copy -kernel-warn-key=annot-error=active
*/
/*@ foo x == 0;
diff --git a/tests/syntax/Refresh_visitor.i b/tests/syntax/Refresh_visitor.i
index 07ebc38f1b1206f7404b2cb9c4aa0c4782d79e89..0786760a68f8f6abcb244f9485e74fdeac8cbee5 100644
--- a/tests/syntax/Refresh_visitor.i
+++ b/tests/syntax/Refresh_visitor.i
@@ -1,6 +1,6 @@
/* run.config
EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
-OPT: -load-module @PTEST_DIR@/@PTEST_NAME@ -eva-show-progress
+OPT: -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs -eva-show-progress
*/
struct S { int i; };
diff --git a/tests/syntax/formals_decl_leak.i b/tests/syntax/formals_decl_leak.i
index f7167558fe3e482ae739ceb3a839f1d73f161e13..f1e96e698a8f678653413426a4f448f78a0c1cfd 100644
--- a/tests/syntax/formals_decl_leak.i
+++ b/tests/syntax/formals_decl_leak.i
@@ -1,6 +1,6 @@
/* run.config
EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
-OPT: -print -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs tests/syntax/formals_decl_leak_1.i
+OPT: -print -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs @PTEST_DIR@/@PTEST_NAME@_1.i
*/
void f(int x);