From 1640e5f0d2c3df275bea35e69e2625e76037a399 Mon Sep 17 00:00:00 2001
From: Patrick Baudin <patrick.baudin@cea.fr>
Date: Fri, 3 Dec 2021 13:59:47 +0100
Subject: [PATCH] [tests] more use of @PTEST_RESULT@ and @PTEST_DIR@ in order
 to ease dune migration

---
 src/plugins/aorai/tests/ya/saveload.i         |  4 +-
 .../markdown-report/tests/sarif/libc.c        |  4 +-
 .../markdown-report/tests/sarif/std_string.c  |  2 +-
 tests/dynamic/dynamic.i                       |  2 +-
 tests/fc_script/build-callgraph.i             |  2 +-
 tests/fc_script/recursions.i                  |  2 +-
 tests/jcdb/jcdb.c                             |  2 +-
 tests/libc/time_misc.c                        |  2 +-
 tests/metrics/libc.c                          |  2 +-
 tests/misc/bts0525-2.i                        |  2 +-
 tests/misc/bts0525.i                          |  2 +-
 tests/misc/bts0990_link.i                     |  2 +-
 tests/misc/mergestruct3.i                     |  4 +-
 tests/misc/my_visitor.c                       |  2 +-
 tests/pdg/call.c                              |  2 +-
 tests/pdg/doc_dot.c                           |  4 +-
 tests/pdg/loops.c                             |  8 +--
 tests/saveload/basic.i                        | 16 +++---
 tests/saveload/bool.c                         |  6 +--
 tests/saveload/callbacks.i                    |  4 +-
 tests/saveload/deps.i                         | 12 ++---
 tests/saveload/isset.c                        | 10 ++--
 tests/saveload/multi_project.i                |  4 +-
 tests/saveload/segfault_datatypes.i           |  4 +-
 tests/saveload/sparecode.i                    |  4 +-
 tests/scope/bts383.c                          |  2 +-
 tests/scope/scope.c                           |  6 +--
 tests/slicing/annot.i                         |  4 +-
 tests/slicing/bts0184.i                       |  2 +-
 tests/slicing/bts0190.i                       |  2 +-
 tests/slicing/bts0950_annot.i                 |  2 +-
 tests/slicing/bts1248.i                       |  2 +-
 tests/slicing/bts1445.i                       |  4 +-
 tests/slicing/bts1684.i                       |  2 +-
 tests/slicing/bts1768.i                       |  2 +-
 tests/slicing/bts179.i                        |  4 +-
 tests/slicing/bts283.i                        |  2 +-
 tests/slicing/bts326.i                        |  2 +-
 tests/slicing/bts335.i                        |  6 +--
 tests/slicing/bts335b.i                       |  2 +-
 tests/slicing/bts336.i                        | 16 +++---
 tests/slicing/bts341.i                        |  2 +-
 tests/slicing/bts344.i                        |  4 +-
 tests/slicing/bts345.i                        | 10 ++--
 tests/slicing/bts679.i                        |  2 +-
 tests/slicing/bts679b.i                       |  2 +-
 tests/slicing/bts709.c                        |  2 +-
 tests/slicing/bts808.i                        |  2 +-
 tests/slicing/bts827.i                        |  2 +-
 tests/slicing/call_accuracy.i                 |  2 +-
 tests/slicing/call_demo.i                     |  4 +-
 tests/slicing/callwise.i                      |  2 +-
 tests/slicing/csmith.i                        |  2 +-
 tests/slicing/filter.i                        |  2 +-
 tests/slicing/forall_loop_invariant.i         |  2 +-
 tests/slicing/if_many_values.i                |  2 +-
 tests/slicing/initialized.i                   |  2 +-
 tests/slicing/keep_annot.i                    | 10 ++--
 tests/slicing/loop_infinite.i                 |  2 +-
 tests/slicing/loop_simple.i                   |  2 +-
 tests/slicing/loops.i                         | 50 +++++++++----------
 tests/slicing/ptr_fct.i                       |  2 +-
 tests/slicing/same_sliced_name_bts1422.i      |  2 +-
 tests/slicing/select_calls.i                  |  4 +-
 tests/slicing/select_return.i                 | 44 ++++++++--------
 tests/slicing/select_return_bis.i             | 22 ++++----
 tests/slicing/sizeof.i                        | 26 +++++-----
 tests/slicing/slice_behavior.i                |  2 +-
 tests/slicing/slice_pragma_stmt.i             | 44 ++++++++--------
 tests/slicing/top.i                           |  6 +--
 tests/slicing/top2.i                          |  4 +-
 tests/slicing/undef-fun.i                     |  2 +-
 tests/slicing/unitialized.c                   |  8 +--
 tests/slicing/unravel-flavors.i               |  8 +--
 tests/slicing/unravel-point.i                 | 10 ++--
 tests/slicing/unravel-variance.i              | 10 ++--
 tests/slicing/unsupported.i                   |  2 +-
 tests/slicing/use_spec.i                      |  2 +-
 tests/spec/clash_double_file_bts1598.c        |  2 +-
 tests/spec/first.c                            |  2 +-
 tests/spec/merge_1.i                          |  2 +-
 tests/spec/merge_different_assigns.i          |  2 +-
 tests/spec/model2.c                           |  2 +-
 tests/spec/multiple_decl_def_1.c              |  2 +-
 tests/spec/multiple_file_1.c                  |  2 +-
 tests/spec/rm_qualifiers.i                    |  2 +-
 tests/syntax/bts0442-2.i                      |  2 +-
 tests/syntax/bts0442.i                        |  2 +-
 tests/syntax/bts0672_link.c                   |  4 +-
 tests/syntax/bts1553_2.i                      |  2 +-
 tests/syntax/formals_decl_leak_1.i            |  2 +-
 tests/syntax/inconsistent_decl.c              |  4 +-
 tests/syntax/inconsistent_decl_2.i            |  2 +-
 tests/syntax/label_decl.i                     |  2 +-
 tests/syntax/merge_attrs_align.c              | 12 ++---
 tests/syntax/merge_bts0948.i                  |  2 +-
 tests/syntax/no-print-libc-reparse.c          |  2 +-
 .../typedef_incorrect_pretty_print_bts1518.i  |  2 +-
 tests/syntax/typedef_multi_2.c                |  2 +-
 tests/syntax/vdefined_bts1241.i               |  2 +-
 tests/syntax/vdefined_bts1241_1.i             |  2 +-
 tests/value/CruiseControl.c                   |  2 +-
 102 files changed, 268 insertions(+), 268 deletions(-)

diff --git a/src/plugins/aorai/tests/ya/saveload.i b/src/plugins/aorai/tests/ya/saveload.i
index 18e950cc25e..0791b153a22 100644
--- a/src/plugins/aorai/tests/ya/saveload.i
+++ b/src/plugins/aorai/tests/ya/saveload.i
@@ -1,8 +1,8 @@
 /* run.config
 NOFRAMAC:
 LIBS:
-EXECNOW: LOG @PTEST_NAME@.res.0.log.txt BIN @PTEST_NAME@.sav @frama-c@ -aorai-automata %{dep:@PTEST_DIR@/@PTEST_NAME@.ya} @PTEST_FILE@ -save @PTEST_DIR@/result/@PTEST_NAME@.sav > @PTEST_DIR@/result/@PTEST_NAME@.res.0.log.txt
-EXECNOW: LOG @PTEST_NAME@.res.1.log.txt @frama-c@ -load @PTEST_DIR@/result/@PTEST_NAME@.sav -then-on aorai -eva > @PTEST_DIR@/result/@PTEST_NAME@.res.1.log.txt
+EXECNOW: LOG @PTEST_NAME@.res.0.log.txt BIN @PTEST_NAME@.sav @frama-c@ -aorai-automata %{dep:@PTEST_DIR@/@PTEST_NAME@.ya} @PTEST_FILE@ -save @PTEST_RESULT@/@PTEST_NAME@.sav > @PTEST_RESULT@/@PTEST_NAME@.res.0.log.txt
+EXECNOW: LOG @PTEST_NAME@.res.1.log.txt @frama-c@ -load @PTEST_RESULT@/@PTEST_NAME@.sav -then-on aorai -eva > @PTEST_RESULT@/@PTEST_NAME@.res.1.log.txt
 */
 /* run.config_prove
 DONTRUN:
diff --git a/src/plugins/markdown-report/tests/sarif/libc.c b/src/plugins/markdown-report/tests/sarif/libc.c
index ebddde12484..ccceac07367 100644
--- a/src/plugins/markdown-report/tests/sarif/libc.c
+++ b/src/plugins/markdown-report/tests/sarif/libc.c
@@ -1,9 +1,9 @@
 /* run.config
    CMD: @frama-c@ -eva -eva-no-results -mdr-gen sarif -mdr-sarif-deterministic
    LOG: with-libc.sarif
-   OPT: -mdr-out @PTEST_DIR@/result/with-libc.sarif
+   OPT: -mdr-out @PTEST_RESULT@/with-libc.sarif
    LOG: without-libc.sarif
-   OPT: -mdr-no-print-libc -mdr-out @PTEST_DIR@/result/without-libc.sarif
+   OPT: -mdr-no-print-libc -mdr-out @PTEST_RESULT@/without-libc.sarif
 */
 
 #include <string.h>
diff --git a/src/plugins/markdown-report/tests/sarif/std_string.c b/src/plugins/markdown-report/tests/sarif/std_string.c
index bc2bc89d0f4..f59bb9d1106 100644
--- a/src/plugins/markdown-report/tests/sarif/std_string.c
+++ b/src/plugins/markdown-report/tests/sarif/std_string.c
@@ -1,6 +1,6 @@
 /* run.config*
 LOG: @PTEST_NAME@.sarif
-OPT: -eva -then -mdr-sarif-deterministic -mdr-gen sarif -mdr-out @PTEST_DIR@/result/@PTEST_NAME@.sarif
+OPT: -eva -then -mdr-sarif-deterministic -mdr-gen sarif -mdr-out @PTEST_RESULT@/@PTEST_NAME@.sarif
 */
 
 #include "string.c"
diff --git a/tests/dynamic/dynamic.i b/tests/dynamic/dynamic.i
index c9cccd8e7c2..b33a41b88c7 100644
--- a/tests/dynamic/dynamic.i
+++ b/tests/dynamic/dynamic.i
@@ -1,5 +1,5 @@
 /*run.config
-  OPT: -add-path tests/dynamic/file_path -add-path tests/dynamic/directory_path -add-path tests/dynamic/none
+  OPT: -add-path @PTEST_DIR@/file_path -add-path @PTEST_DIR@/directory_path -add-path @PTEST_DIR@/none
  MODULE: empty abstract abstract2
   OPT:
  */
diff --git a/tests/fc_script/build-callgraph.i b/tests/fc_script/build-callgraph.i
index b8105502931..32d7f878503 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_DIR@/result/build-callgraph.res 2> @PTEST_DIR@/result/build-callgraph.err
+   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
  */
 
 #include <stdio.h>
diff --git a/tests/fc_script/recursions.i b/tests/fc_script/recursions.i
index 841d6099397..1a167347f75 100644
--- a/tests/fc_script/recursions.i
+++ b/tests/fc_script/recursions.i
@@ -1,6 +1,6 @@
 /* run.config
    NOFRAMAC: testing frama-c-script, not frama-c itself
-   EXECNOW: LOG recursions.res LOG recursions.err bin/frama-c-script heuristic-detect-recursion @PTEST_FILE@ > @PTEST_DIR@/result/recursions.res 2> @PTEST_DIR@/result/recursions.err
+   EXECNOW: LOG recursions.res LOG recursions.err bin/frama-c-script heuristic-detect-recursion @PTEST_FILE@ > @PTEST_RESULT@/recursions.res 2> @PTEST_RESULT@/recursions.err
 */
 
 volatile int v;
diff --git a/tests/jcdb/jcdb.c b/tests/jcdb/jcdb.c
index 4cc58e20430..aafa9112dc0 100644
--- a/tests/jcdb/jcdb.c
+++ b/tests/jcdb/jcdb.c
@@ -7,7 +7,7 @@
  MODULE: @PTEST_NAME@
    OPT: -json-compilation-database %{dep:@PTEST_DIR@/with_arguments.json}
  MODULE:
-   EXECNOW: LOG list_files.res LOG list_files.err %{bin:frama-c-script} list-files %{dep:@PTEST_DIR@/compile_commands_working.json} > @PTEST_DIR@/result/list_files.res 2> @PTEST_DIR@/result/list_files.err
+   EXECNOW: LOG list_files.res LOG list_files.err %{bin:frama-c-script} list-files %{dep:@PTEST_DIR@/compile_commands_working.json} > @PTEST_RESULT@/list_files.res 2> @PTEST_RESULT@/list_files.err
 */
 
 #include <stdio.h>
diff --git a/tests/libc/time_misc.c b/tests/libc/time_misc.c
index 8123a1641dc..da8e73a77ea 100644
--- a/tests/libc/time_misc.c
+++ b/tests/libc/time_misc.c
@@ -43,6 +43,6 @@ int main(int argc, char **argv)
 
 /*
 Local Variables:
-compile-command: "cd ../.. && ptests.byte -show -config gcc tests/libc/time.c"
+compile-command: "cd ../.. && ptests.byte -show -config gcc @PTEST_DIR@/time.c"
 End:
 */
diff --git a/tests/metrics/libc.c b/tests/metrics/libc.c
index 83556b3d9b4..a753efa3828 100644
--- a/tests/metrics/libc.c
+++ b/tests/metrics/libc.c
@@ -2,7 +2,7 @@
    STDOPT: #"-metrics-no-libc -metrics-eva-cover"
    STDOPT: #"-metrics-libc -metrics-eva-cover"
    LOG: libc.json
-   STDOPT: #"-metrics-libc -metrics-output @PTEST_DIR@/result/libc.json"
+   STDOPT: #"-metrics-libc -metrics-output @PTEST_RESULT@/libc.json"
 */
 #include <ctype.h>
 #include <stdio.h> // defines external variables
diff --git a/tests/misc/bts0525-2.i b/tests/misc/bts0525-2.i
index 7fde0cd019c..6949e4d4d03 100644
--- a/tests/misc/bts0525-2.i
+++ b/tests/misc/bts0525-2.i
@@ -1,5 +1,5 @@
 /* run.config
-   OPT: -typecheck tests/misc/bts0525.i
+   OPT: -typecheck @PTEST_DIR@/bts0525.i
 */
 
 typedef enum {E1=2, E2} T_EN1 ;
diff --git a/tests/misc/bts0525.i b/tests/misc/bts0525.i
index a594d4b3752..3869382c8c0 100644
--- a/tests/misc/bts0525.i
+++ b/tests/misc/bts0525.i
@@ -1,5 +1,5 @@
 /* run.config
-   OPT: tests/misc/bts0525-2.i
+   OPT: @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 5849909ecb6..667ab3eb1ad 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
-// tests/misc/bts0990_link_1.i
+// @PTEST_DIR@/bts0990_link_1.i
 
 char *s;
 
diff --git a/tests/misc/mergestruct3.i b/tests/misc/mergestruct3.i
index 63e1e1c40ea..ecc825733c7 100644
--- a/tests/misc/mergestruct3.i
+++ b/tests/misc/mergestruct3.i
@@ -1,6 +1,6 @@
 /* run.config
-   OPT: -print tests/misc/mergestruct1.i tests/misc/mergestruct2.i
-   OPT: -print tests/misc/mergestruct2.i tests/misc/mergestruct1.i
+   OPT: -print @PTEST_DIR@/mergestruct1.i @PTEST_DIR@/mergestruct2.i
+   OPT: -print @PTEST_DIR@/mergestruct2.i @PTEST_DIR@/mergestruct1.i
 */
 struct s { float a; } s2;
 
diff --git a/tests/misc/my_visitor.c b/tests/misc/my_visitor.c
index 0b717d84777..bce16648145 100644
--- a/tests/misc/my_visitor.c
+++ b/tests/misc/my_visitor.c
@@ -1,7 +1,7 @@
 /* run.config
  PLUGIN:
  MODULE: @PTEST_NAME@
-   EXECNOW: LOG my_visitor_sav.res LOG my_visitor_sav.err BIN my_visitor.sav @frama-c@ @PTEST_FILE@ -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 @frama-c@ @PTEST_FILE@ -main f -save @PTEST_DIR@/@PTEST_NAME@.sav > @PTEST_RESULT@/@PTEST_NAME@_sav.res 2> @PTEST_RESULT@/@PTEST_NAME@_sav.err
    OPT: -load %{dep:@PTEST_DIR@/@PTEST_NAME@.sav} -no-my-visitor -print
  MODULE:
    OPT: -load %{dep:@PTEST_DIR@/@PTEST_NAME@.sav} -print
diff --git a/tests/pdg/call.c b/tests/pdg/call.c
index b71d403e4ba..cb47bb43fd1 100644
--- a/tests/pdg/call.c
+++ b/tests/pdg/call.c
@@ -1,6 +1,6 @@
 /* run.config
    
-   STDOPT: +"-lib-entry -main g -pdg -pdg-dot tests/pdg/result/call "
+   STDOPT: +"-lib-entry -main g -pdg -pdg-dot @PTEST_RESULT@/call "
 */
 
 /* Ne pas modifier : exemple utilisé dans le rapport. */
diff --git a/tests/pdg/doc_dot.c b/tests/pdg/doc_dot.c
index 862b8bf8118..1b3f02807ad 100644
--- a/tests/pdg/doc_dot.c
+++ b/tests/pdg/doc_dot.c
@@ -1,8 +1,8 @@
 /* run.config
- STDOPT: +"-lib-entry -main g -fct-pdg g -pdg-dot tests/pdg/result/doc"
+ STDOPT: +"-lib-entry -main g -fct-pdg g -pdg-dot @PTEST_RESULT@/doc"
 */
 /* To build the svg file:
- * dot -Tsvg tests/pdg/result/doc.g.dot > tests/pdg/result/doc.g.svg
+ * dot -Tsvg @PTEST_RESULT@/doc.g.dot > @PTEST_RESULT@/doc.g.svg
  */
 int G1, G2, T[10];
 
diff --git a/tests/pdg/loops.c b/tests/pdg/loops.c
index 80a39aefa47..225fefc8c54 100644
--- a/tests/pdg/loops.c
+++ b/tests/pdg/loops.c
@@ -20,15 +20,15 @@ F=maybe_infinite
 
 Pour voir le CFG :
 
-bin/toplevel.opt -lib-entry -main $F -deps -verbose tests/pdg/loops.c
+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 tests/pdg/loops.c ;
+bin/toplevel.opt -lib-entry -main $F -fct-pdg $F -dot-postdom p @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 tests/pdg/loops.c ;
+bin/toplevel.opt -lib-entry -main $F -fct-pdg $F -pdg-dot pdg @PTEST_DIR@/loops.c ;
 zgrviewer ./pdg.$F.dot
 
 */
@@ -123,7 +123,7 @@ L :   n--;
     return n;
 }
 /* this function is similar to [test_ctrl_dpd_multiple] in
- * [tests/pdg/dpds_intra.c] but the value analysis converges,
+ * [@PTEST_DIR@/dpds_intra.c] but the value analysis converges,
  * so we can see that [x=x+2;] has a control dependency on both [n<0] and [x<n].
  */
 int non_natural_loop (int n) {
diff --git a/tests/saveload/basic.i b/tests/saveload/basic.i
index e420bac96d7..aa5e20c519e 100644
--- a/tests/saveload/basic.i
+++ b/tests/saveload/basic.i
@@ -1,18 +1,18 @@
 /* run.config
  MODULE: @PTEST_NAME@
-   EXECNOW: LOG basic_sav.res LOG basic_sav.err BIN basic.sav @frama-c@ -eva @EVA_OPTIONS@ -out -input -deps @PTEST_FILE@ -save ./tests/saveload/result/basic.sav > ./tests/saveload/result/basic_sav.res 2> ./tests/saveload/result/basic_sav.err
+   EXECNOW: LOG basic_sav.res LOG basic_sav.err BIN basic.sav @frama-c@ -eva @EVA_OPTIONS@ -out -input -deps @PTEST_FILE@ -save @PTEST_RESULT@/basic.sav > @PTEST_RESULT@/basic_sav.res 2> @PTEST_RESULT@/basic_sav.err
  MODULE:
-   EXECNOW: LOG basic_sav.1.res LOG basic_sav.1.err BIN basic.1.sav @frama-c@ -save ./tests/saveload/result/basic.1.sav @PTEST_FILE@ -eva @EVA_OPTIONS@ -out -input -deps > ./tests/saveload/result/basic_sav.1.res 2> ./tests/saveload/result/basic_sav.1.err
-   STDOPT: +"-load ./tests/saveload/result/basic.sav -eva @EVA_OPTIONS@ -out -input -deps"
+   EXECNOW: LOG basic_sav.1.res LOG basic_sav.1.err BIN basic.1.sav @frama-c@ -save @PTEST_RESULT@/basic.1.sav @PTEST_FILE@ -eva @EVA_OPTIONS@ -out -input -deps > @PTEST_RESULT@/basic_sav.1.res 2> @PTEST_RESULT@/basic_sav.1.err
+   STDOPT: +"-load @PTEST_RESULT@/basic.sav -eva @EVA_OPTIONS@ -out -input -deps"
  MODULE: @PTEST_NAME@
-   STDOPT: +"-load ./tests/saveload/result/basic.1.sav -eva @EVA_OPTIONS@ -out -input -deps -print"
+   STDOPT: +"-load @PTEST_RESULT@/basic.1.sav -eva @EVA_OPTIONS@ -out -input -deps -print"
  MODULE:
-   STDOPT: +"-load ./tests/saveload/result/basic.1.sav -eva @EVA_OPTIONS@ -out -input -deps"
+   STDOPT: +"-load @PTEST_RESULT@/basic.1.sav -eva @EVA_OPTIONS@ -out -input -deps"
  MODULE: status
-   EXECNOW: LOG status_sav.res LOG status_sav.err BIN status.sav @frama-c@ -save ./tests/saveload/result/status.sav @PTEST_FILE@ > ./tests/saveload/result/status_sav.res 2> ./tests/saveload/result/status_sav.err
-   STDOPT: +"-load ./tests/saveload/result/status.sav"
+   EXECNOW: LOG status_sav.res LOG status_sav.err BIN status.sav @frama-c@ -save @PTEST_RESULT@/status.sav @PTEST_FILE@ > @PTEST_RESULT@/status_sav.res 2> @PTEST_RESULT@/status_sav.err
+   STDOPT: +"-load @PTEST_RESULT@/status.sav"
  MODULE:
-   STDOPT: +"-load ./tests/saveload/result/status.sav"
+   STDOPT: +"-load @PTEST_RESULT@/status.sav"
 */
 int main() {
   int i,j; i=10; /*@ assert (i == 10); */
diff --git a/tests/saveload/bool.c b/tests/saveload/bool.c
index f942a8cae78..61013418386 100644
--- a/tests/saveload/bool.c
+++ b/tests/saveload/bool.c
@@ -1,7 +1,7 @@
 /* run.config
-   EXECNOW: BIN bool.sav LOG bool_sav.res LOG bool_sav.err @frama-c@ -save ./tests/saveload/result/bool.sav -machdep x86_32 -eva @EVA_OPTIONS@ ./tests/saveload/bool.c > tests/saveload/result/bool_sav.res 2> tests/saveload/result/bool_sav.err
-   STDOPT: +"-load ./tests/saveload/result/bool.sav -out -input -deps"
-   STDOPT: +"-load ./tests/saveload/result/bool.sav -eva @EVA_OPTIONS@"
+   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
+   STDOPT: +"-load @PTEST_RESULT@/bool.sav -out -input -deps"
+   STDOPT: +"-load @PTEST_RESULT@/bool.sav -eva @EVA_OPTIONS@"
  */
 
 #include "stdbool.h"
diff --git a/tests/saveload/callbacks.i b/tests/saveload/callbacks.i
index 672fc08788e..31080cb964b 100644
--- a/tests/saveload/callbacks.i
+++ b/tests/saveload/callbacks.i
@@ -1,6 +1,6 @@
 /* run.config
-   EXECNOW: LOG callbacks_initial.res LOG callbacks_initial.err BIN callbacks.sav @frama-c@ tests/saveload/callbacks.i -out -calldeps -eva-show-progress -main main1 -save ./tests/saveload/result/callbacks.sav > ./tests/saveload/result/callbacks_initial.res 2> ./tests/saveload/result/callbacks_initial.err
-   STDOPT: +"-load ./tests/saveload/result/callbacks.sav -main main2 -then -main main3"
+   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
+   STDOPT: +"-load @PTEST_RESULT@/callbacks.sav -main main2 -then -main main3"
 */
 
 /* This tests whether the callbacks for callwise inout and from survive after
diff --git a/tests/saveload/deps.i b/tests/saveload/deps.i
index 267cbfcdb30..02bc741da50 100644
--- a/tests/saveload/deps.i
+++ b/tests/saveload/deps.i
@@ -1,15 +1,15 @@
 /* run.config
  MODULE: deps_A
-   EXECNOW: LOG deps_sav.res LOG deps_sav.err BIN deps.sav @frama-c@ -eva @EVA_OPTIONS@ -out -input -deps @PTEST_FILE@ -save ./tests/saveload/result/deps.sav > ./tests/saveload/result/deps_sav.res 2> ./tests/saveload/result/deps_sav.err
-   STDOPT: +"-load ./tests/saveload/result/deps.sav -eva @EVA_OPTIONS@ -out -input -deps "
+   EXECNOW: LOG deps_sav.res LOG deps_sav.err BIN deps.sav @frama-c@ -eva @EVA_OPTIONS@ -out -input -deps @PTEST_FILE@ -save @PTEST_RESULT@/deps.sav > @PTEST_RESULT@/deps_sav.res 2> @PTEST_RESULT@/deps_sav.err
+   STDOPT: +"-load @PTEST_RESULT@/deps.sav -eva @EVA_OPTIONS@ -out -input -deps "
  MODULE: deps_B
-   STDOPT: +"-load ./tests/saveload/result/deps.sav  -out -input -deps "
+   STDOPT: +"-load @PTEST_RESULT@/deps.sav  -out -input -deps "
  MODULE: deps_C
-   STDOPT: +"-load ./tests/saveload/result/deps.sav  -out -input -deps "
+   STDOPT: +"-load @PTEST_RESULT@/deps.sav  -out -input -deps "
  MODULE: deps_D
-   STDOPT: +"-load ./tests/saveload/result/deps.sav  -out -input -deps "
+   STDOPT: +"-load @PTEST_RESULT@/deps.sav  -out -input -deps "
  MODULE: deps_E
-   STDOPT: +"-load ./tests/saveload/result/deps.sav  -out -input -deps "
+   STDOPT: +"-load @PTEST_RESULT@/deps.sav  -out -input -deps "
 */
 
 int main() {
diff --git a/tests/saveload/isset.c b/tests/saveload/isset.c
index 8cdfc876ef8..26c3f18e1fc 100644
--- a/tests/saveload/isset.c
+++ b/tests/saveload/isset.c
@@ -1,9 +1,9 @@
 /* run.config
-   EXECNOW: LOG isset_sav.res LOG isset_sav.err BIN isset.sav @frama-c@ -quiet -eva @EVA_OPTIONS@ -save tests/saveload/result/isset.sav tests/saveload/isset.c > ./tests/saveload/result/isset_sav.res 2> ./tests/saveload/result/isset_sav.err
-   STDOPT: +"-quiet -load ./tests/saveload/result/isset.sav"
-   STDOPT: +"-load ./tests/saveload/result/isset.sav"
-   STDOPT: +"-eva @EVA_OPTIONS@ -load ./tests/saveload/result/isset.sav"
-   STDOPT: +"-quiet -eva @EVA_OPTIONS@ -load ./tests/saveload/result/isset.sav"
+   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
+   STDOPT: +"-quiet -load @PTEST_RESULT@/isset.sav"
+   STDOPT: +"-load @PTEST_RESULT@/isset.sav"
+   STDOPT: +"-eva @EVA_OPTIONS@ -load @PTEST_RESULT@/isset.sav"
+   STDOPT: +"-quiet -eva @EVA_OPTIONS@ -load @PTEST_RESULT@/isset.sav"
 */
 
 int main() {
diff --git a/tests/saveload/multi_project.i b/tests/saveload/multi_project.i
index acdf9a01fe1..7631ac9cf43 100644
--- a/tests/saveload/multi_project.i
+++ b/tests/saveload/multi_project.i
@@ -1,7 +1,7 @@
 /* run.config
  PLUGIN: @EVA_PLUGINS@ constant_propagation
-   EXECNOW: BIN multi_project.sav LOG multi_project_sav.res LOG multi_project_sav.err @frama-c@ -save ./tests/saveload/result/multi_project.sav @EVA_OPTIONS@ -semantic-const-folding @PTEST_DIR@/@PTEST_NAME@.i > tests/saveload/result/multi_project_sav.res 2> tests/saveload/result/multi_project_sav.err
-   STDOPT: +"-load ./tests/saveload/result/multi_project.sav"
+   EXECNOW: BIN multi_project.sav LOG multi_project_sav.res LOG multi_project_sav.err @frama-c@ -save @PTEST_RESULT@/multi_project.sav @EVA_OPTIONS@ -semantic-const-folding @PTEST_DIR@/@PTEST_NAME@.i > @PTEST_RESULT@/multi_project_sav.res 2> @PTEST_RESULT@/multi_project_sav.err
+   STDOPT: +"-load @PTEST_RESULT@/multi_project.sav"
  MODULE: @PTEST_NAME@
    OPT: -eva @EVA_OPTIONS@
 */
diff --git a/tests/saveload/segfault_datatypes.i b/tests/saveload/segfault_datatypes.i
index af9a24fbb57..c9f3c903e9b 100644
--- a/tests/saveload/segfault_datatypes.i
+++ b/tests/saveload/segfault_datatypes.i
@@ -1,8 +1,8 @@
 /* run.config*
  MODULE: segfault_datatypes_A
-   EXECNOW: LOG segfault_datatypes_sav.res LOG segfault_datatypes_sav.err BIN segfault_datatypes.sav @frama-c@ -eva @EVA_OPTIONS@ -out -input -deps @PTEST_FILE@ -save ./tests/saveload/result/segfault_datatypes.sav > ./tests/saveload/result/segfault_datatypes_sav.res 2> ./tests/saveload/result/segfault_datatypes_sav.err
+   EXECNOW: LOG segfault_datatypes_sav.res LOG segfault_datatypes_sav.err BIN segfault_datatypes.sav @frama-c@ -eva @EVA_OPTIONS@ -out -input -deps @PTEST_FILE@ -save @PTEST_RESULT@/segfault_datatypes.sav > @PTEST_RESULT@/segfault_datatypes_sav.res 2> @PTEST_RESULT@/segfault_datatypes_sav.err
  MODULE: segfault_datatypes_B
-   STDOPT: +"-load ./tests/saveload/result/segfault_datatypes.sav -eva -out -input -deps"
+   STDOPT: +"-load @PTEST_RESULT@/segfault_datatypes.sav -eva -out -input -deps"
 */
 
 int main() {
diff --git a/tests/saveload/sparecode.i b/tests/saveload/sparecode.i
index b82bea7578d..31038cd6945 100644
--- a/tests/saveload/sparecode.i
+++ b/tests/saveload/sparecode.i
@@ -1,7 +1,7 @@
 /* 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 ./tests/saveload/result/sparecode.sav tests/saveload/sparecode.i -then-on 'Slicing export' -print > tests/saveload/result/sparecode_sav.res 2> tests/saveload/result/sparecode_sav.err
-   STDOPT: +"-load ./tests/saveload/result/sparecode.sav"
+   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
+   STDOPT: +"-load @PTEST_RESULT@/sparecode.sav"
 */
 int G;
 int f (int x, int y) {
diff --git a/tests/scope/bts383.c b/tests/scope/bts383.c
index 0793ea81d1b..5014bf4e045 100644
--- a/tests/scope/bts383.c
+++ b/tests/scope/bts383.c
@@ -3,7 +3,7 @@
 */
 /* 
    echo '!Db.Scope.check_asserts();;' \
-   | bin/toplevel.top -eva tests/scope/bts383.c 
+   | bin/toplevel.top -eva @PTEST_DIR@/bts383.c 
 */
 int v;
 void if1 (int * p) {
diff --git a/tests/scope/scope.c b/tests/scope/scope.c
index d901e4479b4..713fa01b7e3 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 tests/scope/scope.c -eva
- * bin/viewer.byte -main f2 tests/scope/scope.c -eva
- * bin/viewer.byte -main loop tests/scope/scope.c -eva
+ * 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
  */
 
 #include "__fc_builtin.h"
diff --git a/tests/slicing/annot.i b/tests/slicing/annot.i
index 1880234f9e2..16b203a069a 100644
--- a/tests/slicing/annot.i
+++ b/tests/slicing/annot.i
@@ -1,6 +1,6 @@
 /* run.config
-   STDOPT: +"-main f1 -slice-assert f1  -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
-   STDOPT: +"-main f2 -slice-assert f2  -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
+   STDOPT: +"-main f1 -slice-assert f1  -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
+   STDOPT: +"-main f2 -slice-assert f2  -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
 */
 
 extern int x, z;
diff --git a/tests/slicing/bts0184.i b/tests/slicing/bts0184.i
index a23828ff6b9..e31dc44d77a 100644
--- a/tests/slicing/bts0184.i
+++ b/tests/slicing/bts0184.i
@@ -1,5 +1,5 @@
 /* run.config
-   STDOPT: +"-slice-pragma x  -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
+   STDOPT: +"-slice-pragma x  -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
  **/
 int x(int y, int z)
 {
diff --git a/tests/slicing/bts0190.i b/tests/slicing/bts0190.i
index 1f4afde4725..75f8814a164 100644
--- a/tests/slicing/bts0190.i
+++ b/tests/slicing/bts0190.i
@@ -1,5 +1,5 @@
 /*  run.config
-STDOPT: +"-slicing-warn-key cmdline=active -slice-rd y -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 "
+STDOPT: +"-slicing-warn-key cmdline=active -slice-rd y -then-on 'Slicing export' -set-project-as-default -print -check -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
 */
 int z1(void);
 
diff --git a/tests/slicing/bts0950_annot.i b/tests/slicing/bts0950_annot.i
index 48bd82a5205..9ee94a7450f 100644
--- a/tests/slicing/bts0950_annot.i
+++ b/tests/slicing/bts0950_annot.i
@@ -1,5 +1,5 @@
 /* run.config
-   STDOPT: +"-eva -slice-value a -then-on 'Slicing export' -print -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check"
+   STDOPT: +"-eva -slice-value a -then-on 'Slicing export' -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check"
  */
 /*@ requires \valid(dest); */
 extern void cpy(int *dest, const int *src);
diff --git a/tests/slicing/bts1248.i b/tests/slicing/bts1248.i
index b1b634ca8b9..78d46f42b91 100644
--- a/tests/slicing/bts1248.i
+++ b/tests/slicing/bts1248.i
@@ -1,5 +1,5 @@
 /*  run.config
-STDOPT: +"-slice-rd x -main f -slicing-project-name p -then-on 'p export' -print -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i"
+STDOPT: +"-slice-rd x -main f -slicing-project-name p -then-on 'p export' -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i"
 */
 
 int f(void) {
diff --git a/tests/slicing/bts1445.i b/tests/slicing/bts1445.i
index 90953815c39..541654b7b8c 100644
--- a/tests/slicing/bts1445.i
+++ b/tests/slicing/bts1445.i
@@ -1,6 +1,6 @@
 /*  run.config
-STDOPT: +"-slice-calls main -then-on 'Slicing export' -print -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i"
-STDOPT: +"-slice-calls f -main f -then-on 'Slicing export' -print -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i"
+STDOPT: +"-slice-calls main -then-on 'Slicing export' -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i"
+STDOPT: +"-slice-calls f -main f -then-on 'Slicing export' -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i"
 */
 int x = 0;
 
diff --git a/tests/slicing/bts1684.i b/tests/slicing/bts1684.i
index de3db5c51ef..7f793d79351 100644
--- a/tests/slicing/bts1684.i
+++ b/tests/slicing/bts1684.i
@@ -1,5 +1,5 @@
 /* run.config
-   STDOPT: +"-slice-calls main -journal-enable -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i"
+   STDOPT: +"-slice-calls main -journal-enable -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i"
 */
 // one bug about JOURNALIZATION and another one about slicing CALLS TO MAIN function.
 double d1, d2, d3;
diff --git a/tests/slicing/bts1768.i b/tests/slicing/bts1768.i
index 09e11240630..2f0ede40527 100644
--- a/tests/slicing/bts1768.i
+++ b/tests/slicing/bts1768.i
@@ -1,5 +1,5 @@
 /* run.config
-   STDOPT: +"-main main -slice-pragma main -ulevel 10 -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i"
+   STDOPT: +"-main main -slice-pragma main -ulevel 10 -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i"
 */
 int choix ;
 int state = 1;
diff --git a/tests/slicing/bts179.i b/tests/slicing/bts179.i
index e389fa3409a..790b4207a13 100644
--- a/tests/slicing/bts179.i
+++ b/tests/slicing/bts179.i
@@ -1,6 +1,6 @@
 /* run.config
- STDOPT: +"-slice-return main -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i"
- STDOPT: +"-slice-pragma main -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i"
+ STDOPT: +"-slice-return main -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i"
+ STDOPT: +"-slice-pragma main -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i"
  STDOPT: +"-sparecode-analysis"
 */
 
diff --git a/tests/slicing/bts283.i b/tests/slicing/bts283.i
index 0f5226417ec..b22c8de9fc8 100644
--- a/tests/slicing/bts283.i
+++ b/tests/slicing/bts283.i
@@ -1,5 +1,5 @@
 /* run.config
-   STDOPT: +"-slice-return main -slice-undef-functions -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i"
+   STDOPT: +"-slice-return main -slice-undef-functions -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i"
 */
 
 int x,y,z;
diff --git a/tests/slicing/bts326.i b/tests/slicing/bts326.i
index 5b6b519cacc..75259064309 100644
--- a/tests/slicing/bts326.i
+++ b/tests/slicing/bts326.i
@@ -1,5 +1,5 @@
 /* run.config
-   STDOPT: +"-calldeps -slice-return main -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -no-calldeps"
+   STDOPT: +"-calldeps -slice-return main -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -no-calldeps"
 */
 /* Problem : f(1) should be sliced out. See BTS#326 */
 int t[2] ;
diff --git a/tests/slicing/bts335.i b/tests/slicing/bts335.i
index c312a7ffdd2..61e42e2ccc7 100644
--- a/tests/slicing/bts335.i
+++ b/tests/slicing/bts335.i
@@ -1,10 +1,10 @@
 /* run.config
-   STDOPT: +"-slice-pragma g -calldeps -slicing-level 3 -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -no-calldeps"
+   STDOPT: +"-slice-pragma g -calldeps -slicing-level 3 -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -no-calldeps"
 */
 
 /*
-bin/toplevel.opt -slice-pragma g -calldeps -slicing-level 3 tests/slicing/bts335.c -debug 2
-bin/toplevel.opt -pdg-debug -pdg -pdg-debug "-pdg-pot bts335" tests/slicing/bts335.c 
+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 
  */
 int T[2]  = {0, 0};
 void f (int i) { T[i]++; }
diff --git a/tests/slicing/bts335b.i b/tests/slicing/bts335b.i
index 368e0870ec1..2b0c2897869 100644
--- a/tests/slicing/bts335b.i
+++ b/tests/slicing/bts335b.i
@@ -1,5 +1,5 @@
 /* run.config
-   STDOPT: +"-slice-return main -calldeps -slicing-level 3 -slicing-verbose 2 -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -no-calldeps"
+   STDOPT: +"-slice-return main -calldeps -slicing-level 3 -slicing-verbose 2 -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -no-calldeps"
 */
 
 int X, Y;
diff --git a/tests/slicing/bts336.i b/tests/slicing/bts336.i
index 3a85248cb7a..52ca7d3c739 100644
--- a/tests/slicing/bts336.i
+++ b/tests/slicing/bts336.i
@@ -1,12 +1,12 @@
 /* run.config
-   STDOPT: +"-slice-return main -calldeps -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-calldeps"
-   STDOPT: +"-main main2 -slice-return main2 -calldeps -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-calldeps"
-   STDOPT: +"-main main3 -slice-return main3 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-calldeps"
-   STDOPT: +"-main main3 -inout -calldeps -slice-return main3  -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-calldeps -no-inout"
-   STDOPT: +"-main main -calldeps -slice-return main -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-calldeps"
-   STDOPT: +"-main main4 -calldeps -slice-return main4 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-calldeps"
-   STDOPT: +"-main main4 -calldeps -slice-return main4 -slicing-level 3 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-calldeps"
-   STDOPT: +"-main main5 -calldeps -slice-return main5 -then-on 'Slicing export' -set-project-as-default -print @EVA_OPTIONS@ -calldeps -slice-return main5 -then-on 'Slicing export 2' -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-calldeps"
+   STDOPT: +"-slice-return main -calldeps -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-calldeps"
+   STDOPT: +"-main main2 -slice-return main2 -calldeps -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-calldeps"
+   STDOPT: +"-main main3 -slice-return main3 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-calldeps"
+   STDOPT: +"-main main3 -inout -calldeps -slice-return main3  -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-calldeps -no-inout"
+   STDOPT: +"-main main -calldeps -slice-return main -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-calldeps"
+   STDOPT: +"-main main4 -calldeps -slice-return main4 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-calldeps"
+   STDOPT: +"-main main4 -calldeps -slice-return main4 -slicing-level 3 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-calldeps"
+   STDOPT: +"-main main5 -calldeps -slice-return main5 -then-on 'Slicing export' -set-project-as-default -print @EVA_OPTIONS@ -calldeps -slice-return main5 -then-on 'Slicing export 2' -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-calldeps"
 */
 // something to do to have better results...
 int T[10];
diff --git a/tests/slicing/bts341.i b/tests/slicing/bts341.i
index fcfad46402c..9aa1c496f71 100644
--- a/tests/slicing/bts341.i
+++ b/tests/slicing/bts341.i
@@ -1,5 +1,5 @@
 /* run.config
-   STDOPT: +"-slice-assert main -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check"
+   STDOPT: +"-slice-assert main -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check"
 */
 int main (int c) {
   if (c)
diff --git a/tests/slicing/bts344.i b/tests/slicing/bts344.i
index 0f21c9f6340..c502e144cb0 100644
--- a/tests/slicing/bts344.i
+++ b/tests/slicing/bts344.i
@@ -1,6 +1,6 @@
 /* run.config
-   STDOPT: +"-slice-return main -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-deps"
-   STDOPT: +"-slice-return main_bis -main main_bis -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-deps"
+   STDOPT: +"-slice-return main -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-deps"
+   STDOPT: +"-slice-return main_bis -main main_bis -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-deps"
 */
 
 int X, Y ;
diff --git a/tests/slicing/bts345.i b/tests/slicing/bts345.i
index 69b61b49e36..d25661d0786 100644
--- a/tests/slicing/bts345.i
+++ b/tests/slicing/bts345.i
@@ -1,9 +1,9 @@
 /* run.config
-   STDOPT: +"-slice-return call_top -main call_top -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
-   STDOPT: +"-slice-return top      -main top -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
-   STDOPT: +"-slice-return top      -main call_top -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
-   STDOPT: +"-slice-return called_by_top -main top -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
-   STDOPT: +"-slice-return called_by_top -main call_top -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
+   STDOPT: +"-slice-return call_top -main call_top -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
+   STDOPT: +"-slice-return top      -main top -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
+   STDOPT: +"-slice-return top      -main call_top -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
+   STDOPT: +"-slice-return called_by_top -main top -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
+   STDOPT: +"-slice-return called_by_top -main call_top -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
 */
 
 int called_indirectly_by_top (int x) {
diff --git a/tests/slicing/bts679.i b/tests/slicing/bts679.i
index 902dd771327..d90857629a1 100644
--- a/tests/slicing/bts679.i
+++ b/tests/slicing/bts679.i
@@ -1,5 +1,5 @@
 /*  run.config
-STDOPT: +"-slice-return main -then-on 'Slicing export' -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i"
+STDOPT: +"-slice-return main -then-on 'Slicing export' -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i"
 */
 void f(void) { return; }
 int X = 1 ;
diff --git a/tests/slicing/bts679b.i b/tests/slicing/bts679b.i
index 2e350641583..e14ba54a3c4 100644
--- a/tests/slicing/bts679b.i
+++ b/tests/slicing/bts679b.i
@@ -1,5 +1,5 @@
 /*  run.config
-STDOPT: +"-slice-assert main -then-on 'Slicing export' -print -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -no-deps"
+STDOPT: +"-slice-assert main -then-on 'Slicing export' -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -no-deps"
 */
 
 int X = 1 ;
diff --git a/tests/slicing/bts709.c b/tests/slicing/bts709.c
index 78246f44fd0..90c92abb06d 100644
--- a/tests/slicing/bts709.c
+++ b/tests/slicing/bts709.c
@@ -1,5 +1,5 @@
 /* run.config
-   STDOPT: +"-slice-pragma func -no-unicode -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -no-deps"
+   STDOPT: +"-slice-pragma func -no-unicode -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -no-deps"
  */
 
 #include <assert.h>
diff --git a/tests/slicing/bts808.i b/tests/slicing/bts808.i
index 8bf9d950575..7ab5e229ca6 100644
--- a/tests/slicing/bts808.i
+++ b/tests/slicing/bts808.i
@@ -1,5 +1,5 @@
 /* run.config
-*    STDOPT: +"-slice-return main -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i "
+*    STDOPT: +"-slice-return main -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i "
 */
 
 int f0 (void) {
diff --git a/tests/slicing/bts827.i b/tests/slicing/bts827.i
index e12046be012..7d3ce40999d 100644
--- a/tests/slicing/bts827.i
+++ b/tests/slicing/bts827.i
@@ -1,5 +1,5 @@
 /* run.config
-   STDOPT: +"-slice-return main -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -no-deps"
+   STDOPT: +"-slice-return main -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -no-deps"
 */
 
 /* The problem was a mix-up between f outputs and retrun value. */
diff --git a/tests/slicing/call_accuracy.i b/tests/slicing/call_accuracy.i
index 2c7e224e15d..8ee65b76abe 100644
--- a/tests/slicing/call_accuracy.i
+++ b/tests/slicing/call_accuracy.i
@@ -1,5 +1,5 @@
 /* run.config
-   STDOPT: +"-calldeps -slice-return main -slicing-level 3 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -no-calldeps"
+   STDOPT: +"-calldeps -slice-return main -slicing-level 3 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -no-calldeps"
  */
 int f_cond (int c, int a, int b) {
   ++a;
diff --git a/tests/slicing/call_demo.i b/tests/slicing/call_demo.i
index 33c6f3a401f..bb8df328eb6 100644
--- a/tests/slicing/call_demo.i
+++ b/tests/slicing/call_demo.i
@@ -1,6 +1,6 @@
 /* run.config
-   STDOPT: +"-slice-calls call1 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-deps"
-   STDOPT: +"-slice-calls call2 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-deps"
+   STDOPT: +"-slice-calls call1 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-deps"
+   STDOPT: +"-slice-calls call2 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-deps"
 */
 
 //@ assigns \result \from v;
diff --git a/tests/slicing/callwise.i b/tests/slicing/callwise.i
index 2e2e658d063..c9f593ac307 100644
--- a/tests/slicing/callwise.i
+++ b/tests/slicing/callwise.i
@@ -1,5 +1,5 @@
 /* run.config
-   STDOPT: +"-calldeps -slice-return main -slicing-level 2 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-calldeps"
+   STDOPT: +"-calldeps -slice-return main -slicing-level 2 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-calldeps"
 */
 
 int a = 1, b = 1, c = 1, d = 1, *p;
diff --git a/tests/slicing/csmith.i b/tests/slicing/csmith.i
index 80bde8a1d76..9e976974dd7 100644
--- a/tests/slicing/csmith.i
+++ b/tests/slicing/csmith.i
@@ -1,5 +1,5 @@
 /* run.config
-   STDOPT: +"-slice-return main -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
+   STDOPT: +"-slice-return main -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
 COMMENT:
    STDOPT: +"-main bts906b -fct-pdg bts906b -pdg-print -pdg-verbose 2"
    STDOPT: +"-main bts906c -fct-pdg bts906c -pdg-print -pdg-verbose 2"
diff --git a/tests/slicing/filter.i b/tests/slicing/filter.i
index ac7f0dd7857..0caf99c023c 100644
--- a/tests/slicing/filter.i
+++ b/tests/slicing/filter.i
@@ -1,5 +1,5 @@
 /* run.config
-   STDOPT: +"-slice-return main -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
+   STDOPT: +"-slice-return main -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
  **/
 /* TESTS: this is about [filter] optimisations since sometimes, 
  * slicing results are ok, but the generated new project is not correct. */
diff --git a/tests/slicing/forall_loop_invariant.i b/tests/slicing/forall_loop_invariant.i
index fc4891d0605..20ef37ca758 100644
--- a/tests/slicing/forall_loop_invariant.i
+++ b/tests/slicing/forall_loop_invariant.i
@@ -1,5 +1,5 @@
 /* run.config
-   STDOPT: +"-slice-assert main -then-on 'Slicing export' -print -then-on default -slice-value t -then-on 'Slicing export 2' -print -set-project-as-default -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"
+   STDOPT: +"-slice-assert main -then-on 'Slicing export' -print -then-on default -slice-value t -then-on 'Slicing export 2' -print -set-project-as-default -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check -no-deps"
  **/
 
 
diff --git a/tests/slicing/if_many_values.i b/tests/slicing/if_many_values.i
index 44bf6578c25..c3129a4ece7 100644
--- a/tests/slicing/if_many_values.i
+++ b/tests/slicing/if_many_values.i
@@ -1,5 +1,5 @@
 /* run.config
-   STDOPT: +"-slice-value r -eva-slevel 101 -then-on 'Slicing export' -set-project-as-default -print -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"
+   STDOPT: +"-slice-value r -eva-slevel 101 -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check -no-deps"
  **/
 
 int r=1;
diff --git a/tests/slicing/initialized.i b/tests/slicing/initialized.i
index 381ea05e739..5d74a46caff 100644
--- a/tests/slicing/initialized.i
+++ b/tests/slicing/initialized.i
@@ -1,5 +1,5 @@
 /* run.config
-   STDOPT: +"-slice-assert main -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
+   STDOPT: +"-slice-assert main -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
  **/
 
 void main() {
diff --git a/tests/slicing/keep_annot.i b/tests/slicing/keep_annot.i
index adbfac557cd..663d8dcbbaf 100644
--- a/tests/slicing/keep_annot.i
+++ b/tests/slicing/keep_annot.i
@@ -1,9 +1,9 @@
 /* run.config
-   STDOPT: +"-eva-context-valid-pointers -lib-entry -main f -slice-assert f  -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-deps"
-   STDOPT: +"-eva-context-valid-pointers -lib-entry -main f -slice-assert f -slicing-keep-annotations -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-deps"
-   STDOPT: +"-eva-context-valid-pointers -lib-entry -main L -slice-pragma L -slicing-keep-annotations -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-deps"
-   STDOPT: +"-eva-context-valid-pointers -lib-entry -main L -slice-pragma L -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-deps"
-   STDOPT: +"-slice-return bts1110 -main bts1110 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-deps"
+   STDOPT: +"-eva-context-valid-pointers -lib-entry -main f -slice-assert f  -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-deps"
+   STDOPT: +"-eva-context-valid-pointers -lib-entry -main f -slice-assert f -slicing-keep-annotations -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-deps"
+   STDOPT: +"-eva-context-valid-pointers -lib-entry -main L -slice-pragma L -slicing-keep-annotations -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-deps"
+   STDOPT: +"-eva-context-valid-pointers -lib-entry -main L -slice-pragma L -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-deps"
+   STDOPT: +"-slice-return bts1110 -main bts1110 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-deps"
 
 
 */
diff --git a/tests/slicing/loop_infinite.i b/tests/slicing/loop_infinite.i
index 143a83c6896..be4b3ddd3ff 100644
--- a/tests/slicing/loop_infinite.i
+++ b/tests/slicing/loop_infinite.i
@@ -1,5 +1,5 @@
 /* run.config
-   STDOPT: +"-deps -slice-return main -then-on 'Slicing export' -set-project-as-default -print -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"
+   STDOPT: +"-deps -slice-return main -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check -no-deps"
 */
 int main() {
   volatile int a=0,b,c;
diff --git a/tests/slicing/loop_simple.i b/tests/slicing/loop_simple.i
index cd962d228bd..8ce6b061e66 100644
--- a/tests/slicing/loop_simple.i
+++ b/tests/slicing/loop_simple.i
@@ -1,5 +1,5 @@
 /* run.config
-   STDOPT: +"-deps -slice-return main -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-deps"
+   STDOPT: +"-deps -slice-return main -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-deps"
 */
 int main() {
   int a,c; volatile int b = 0;
diff --git a/tests/slicing/loops.i b/tests/slicing/loops.i
index dad1b0d85f3..c090726af18 100644
--- a/tests/slicing/loops.i
+++ b/tests/slicing/loops.i
@@ -1,29 +1,29 @@
 /* run.config
-   STDOPT: +"-deps -lib-entry -main f1 -slice-pragma f1 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-deps"
-   STDOPT: +"-deps -lib-entry -main f1 -slice-assert f1 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-deps"
-   STDOPT: +"-deps -lib-entry -main f2 -slice-pragma f2 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-deps"
-   STDOPT: +"-deps -lib-entry -main f2 -slice-assert f2 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-deps"
-   STDOPT: +"-deps -main test_infinite_loop_3 -slice-value G -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-deps"
-   STDOPT: +"-deps -main test_infinite_loop_4 -slice-value G -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-deps"
-   STDOPT: +"-deps -main test_infinite_loop_5 -slice-value G -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-deps"
-   STDOPT: +"-deps -main loop -slice-value Z  -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-deps"
-   STDOPT: +"-deps -slice-calls loop -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-deps"
-   STDOPT: +"-deps -slice-pragma loop -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-deps"
-   STDOPT: +"-deps -slice-assert loop -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-deps"
-   STDOPT: +"-deps -main loop -slice-rd Y -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-deps"
-   STDOPT: +"-deps -main loop -slice-rd Z -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-deps"
-   STDOPT: +"-deps -main loop -slice-wr Y -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-deps"
-   STDOPT: +"-deps -main loop -slice-wr Z  -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-deps"
-   STDOPT: +"-deps -lib-entry -main stop_f1 -slice-pragma stop_f1 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-deps"
-   STDOPT: +"-deps -lib-entry -main stop_f1 -slice-assert stop_f1 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-deps"
-   STDOPT: +"-deps -lib-entry -main stop_f2 -slice-pragma stop_f2 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-deps"
-   STDOPT: +"-deps -lib-entry -main stop_f2 -slice-assert stop_f2  -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-deps"
-   STDOPT: +"-deps -slice-value Z  -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-deps"
-   STDOPT: +"-deps -slice-rd Y -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-deps"
-   STDOPT: +"-deps -slice-rd Z -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-deps"
-   STDOPT: +"-deps -slice-wr Y -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-deps"
-   STDOPT: +"-deps -slice-wr Z -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-deps"
-   STDOPT: +"-deps -lib-entry -main alarm -slice-threat alarm -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-deps"
+   STDOPT: +"-deps -lib-entry -main f1 -slice-pragma f1 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-deps"
+   STDOPT: +"-deps -lib-entry -main f1 -slice-assert f1 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-deps"
+   STDOPT: +"-deps -lib-entry -main f2 -slice-pragma f2 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-deps"
+   STDOPT: +"-deps -lib-entry -main f2 -slice-assert f2 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-deps"
+   STDOPT: +"-deps -main test_infinite_loop_3 -slice-value G -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-deps"
+   STDOPT: +"-deps -main test_infinite_loop_4 -slice-value G -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-deps"
+   STDOPT: +"-deps -main test_infinite_loop_5 -slice-value G -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-deps"
+   STDOPT: +"-deps -main loop -slice-value Z  -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-deps"
+   STDOPT: +"-deps -slice-calls loop -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-deps"
+   STDOPT: +"-deps -slice-pragma loop -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-deps"
+   STDOPT: +"-deps -slice-assert loop -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-deps"
+   STDOPT: +"-deps -main loop -slice-rd Y -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-deps"
+   STDOPT: +"-deps -main loop -slice-rd Z -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-deps"
+   STDOPT: +"-deps -main loop -slice-wr Y -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-deps"
+   STDOPT: +"-deps -main loop -slice-wr Z  -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-deps"
+   STDOPT: +"-deps -lib-entry -main stop_f1 -slice-pragma stop_f1 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-deps"
+   STDOPT: +"-deps -lib-entry -main stop_f1 -slice-assert stop_f1 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-deps"
+   STDOPT: +"-deps -lib-entry -main stop_f2 -slice-pragma stop_f2 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-deps"
+   STDOPT: +"-deps -lib-entry -main stop_f2 -slice-assert stop_f2  -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-deps"
+   STDOPT: +"-deps -slice-value Z  -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-deps"
+   STDOPT: +"-deps -slice-rd Y -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-deps"
+   STDOPT: +"-deps -slice-rd Z -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-deps"
+   STDOPT: +"-deps -slice-wr Y -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-deps"
+   STDOPT: +"-deps -slice-wr Z -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-deps"
+   STDOPT: +"-deps -lib-entry -main alarm -slice-threat alarm -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-deps"
 
 
  */
diff --git a/tests/slicing/ptr_fct.i b/tests/slicing/ptr_fct.i
index 4db437d74c4..ae0a6a538b9 100644
--- a/tests/slicing/ptr_fct.i
+++ b/tests/slicing/ptr_fct.i
@@ -1,5 +1,5 @@
 /* run.config
-  STDOPT: +"-main h -slice-return h -slicing-level 1 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i "
+  STDOPT: +"-main h -slice-return h -slicing-level 1 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i "
  */
 
 int X ;
diff --git a/tests/slicing/same_sliced_name_bts1422.i b/tests/slicing/same_sliced_name_bts1422.i
index d91e94e9781..ff052185f05 100644
--- a/tests/slicing/same_sliced_name_bts1422.i
+++ b/tests/slicing/same_sliced_name_bts1422.i
@@ -1,5 +1,5 @@
 /* run.config
-STDOPT: +"-main foo -slice-value y -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
+STDOPT: +"-main foo -slice-value y -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
 */
 
 int y;
diff --git a/tests/slicing/select_calls.i b/tests/slicing/select_calls.i
index 98211269bf1..1b09ac62bde 100644
--- a/tests/slicing/select_calls.i
+++ b/tests/slicing/select_calls.i
@@ -1,6 +1,6 @@
 /* run.config
-   STDOPT: +"-lib-entry -main f -slice-calls send -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
-   STDOPT: +"-lib-entry -main g -slice-calls nothing -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
+   STDOPT: +"-lib-entry -main f -slice-calls send -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
+   STDOPT: +"-lib-entry -main g -slice-calls nothing -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
    */
 
 void nothing (void);
diff --git a/tests/slicing/select_return.i b/tests/slicing/select_return.i
index 1df3acb7146..24f773f3581 100644
--- a/tests/slicing/select_return.i
+++ b/tests/slicing/select_return.i
@@ -1,26 +1,26 @@
 /* run.config
-  STDOPT: +"-slice-calls send -lib-entry -main g -slicing-level 0 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
-  STDOPT: +"-slice-calls send -lib-entry -main g -slicing-level 1 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
-  STDOPT: +"-slice-calls send -lib-entry -main g -slicing-level 2 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
-  STDOPT: +"-slice-calls send -lib-entry -main g -slicing-level 3 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
-  STDOPT: +"-slice-calls send,send_bis -lib-entry -main g -slicing-level 0 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
-  STDOPT: +"-slice-calls send,send_bis -lib-entry -main g -slicing-level 1 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
-  STDOPT: +"-slice-calls send,send_bis -lib-entry -main g -slicing-level 2 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
-  STDOPT: +"-slice-calls send,send_bis -lib-entry -main g -slicing-level 3 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
-  STDOPT: +"-slice-calls send,send_bis -lib-entry -main g -slicing-level 1 -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
-  STDOPT: +"-slice-calls send,send_bis -lib-entry -main g -slicing-level 2 -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
-  STDOPT: +"-slice-calls send,send_bis -lib-entry -main g -slicing-level 3 -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
-  STDOPT: +"-slice-return f   -lib-entry -main g -slicing-level 0 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
-  STDOPT: +"-slice-return f   -lib-entry -main g -slicing-level 1 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
-  STDOPT: +"-slice-return f   -lib-entry -main g -slicing-level 2 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
-  STDOPT: +"-slice-return f   -lib-entry -main g -slicing-level 3 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
-  STDOPT: +"-slice-pragma f   -lib-entry -main g -slicing-level 0 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
-  STDOPT: +"-slice-pragma f   -lib-entry -main g -slicing-level 1 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
-  STDOPT: +"-slice-pragma f   -lib-entry -main g -slicing-level 2 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
-  STDOPT: +"-slice-pragma f   -lib-entry -main g -slicing-level 3 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
-  STDOPT: +"-slice-value  H   -lib-entry -main g -slicing-level 1 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
-  STDOPT: +"-slice-value  H   -lib-entry -main g -slicing-level 2 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
-  STDOPT: +"-slice-value  H   -lib-entry -main g -slicing-level 3 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
+  STDOPT: +"-slice-calls send -lib-entry -main g -slicing-level 0 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
+  STDOPT: +"-slice-calls send -lib-entry -main g -slicing-level 1 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
+  STDOPT: +"-slice-calls send -lib-entry -main g -slicing-level 2 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
+  STDOPT: +"-slice-calls send -lib-entry -main g -slicing-level 3 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
+  STDOPT: +"-slice-calls send,send_bis -lib-entry -main g -slicing-level 0 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
+  STDOPT: +"-slice-calls send,send_bis -lib-entry -main g -slicing-level 1 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
+  STDOPT: +"-slice-calls send,send_bis -lib-entry -main g -slicing-level 2 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
+  STDOPT: +"-slice-calls send,send_bis -lib-entry -main g -slicing-level 3 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
+  STDOPT: +"-slice-calls send,send_bis -lib-entry -main g -slicing-level 1 -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
+  STDOPT: +"-slice-calls send,send_bis -lib-entry -main g -slicing-level 2 -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
+  STDOPT: +"-slice-calls send,send_bis -lib-entry -main g -slicing-level 3 -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
+  STDOPT: +"-slice-return f   -lib-entry -main g -slicing-level 0 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
+  STDOPT: +"-slice-return f   -lib-entry -main g -slicing-level 1 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
+  STDOPT: +"-slice-return f   -lib-entry -main g -slicing-level 2 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
+  STDOPT: +"-slice-return f   -lib-entry -main g -slicing-level 3 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
+  STDOPT: +"-slice-pragma f   -lib-entry -main g -slicing-level 0 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
+  STDOPT: +"-slice-pragma f   -lib-entry -main g -slicing-level 1 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
+  STDOPT: +"-slice-pragma f   -lib-entry -main g -slicing-level 2 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
+  STDOPT: +"-slice-pragma f   -lib-entry -main g -slicing-level 3 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
+  STDOPT: +"-slice-value  H   -lib-entry -main g -slicing-level 1 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
+  STDOPT: +"-slice-value  H   -lib-entry -main g -slicing-level 2 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
+  STDOPT: +"-slice-value  H   -lib-entry -main g -slicing-level 3 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
 */
 
 int G,H,I;
diff --git a/tests/slicing/select_return_bis.i b/tests/slicing/select_return_bis.i
index 5504e099d50..b4c1a38d5b5 100644
--- a/tests/slicing/select_return_bis.i
+++ b/tests/slicing/select_return_bis.i
@@ -1,15 +1,15 @@
 /* run.config
-  STDOPT: +"-slice-calls send -lib-entry -main g -slicing-level 0 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check"
-  STDOPT: +"-slice-calls send -lib-entry -main g -slicing-level 1 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check"
-  STDOPT: +"-slice-calls send -lib-entry -main g -slicing-level 2 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check"
-  STDOPT: +"-slice-calls send -lib-entry -main g -slicing-level 3 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check"
-  STDOPT: +"-slice-calls send,send_bis -lib-entry -main g -slicing-level 0 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check"
-  STDOPT: +"-slice-calls send,send_bis -lib-entry -main g -slicing-level 1 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check"
-  STDOPT: +"-slice-calls send,send_bis -lib-entry -main g -slicing-level 2 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check"
-  STDOPT: +"-slice-calls send,send_bis -lib-entry -main g -slicing-level 3 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check"
-  STDOPT: +"-slice-calls send,send_bis -lib-entry -main g -slicing-level 1 -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check"
-  STDOPT: +"-slice-calls send,send_bis -lib-entry -main g -slicing-level 2 -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check"
-  STDOPT: +"-slice-calls send,send_bis -lib-entry -main g -slicing-level 3 -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check"
+  STDOPT: +"-slice-calls send -lib-entry -main g -slicing-level 0 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check"
+  STDOPT: +"-slice-calls send -lib-entry -main g -slicing-level 1 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check"
+  STDOPT: +"-slice-calls send -lib-entry -main g -slicing-level 2 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check"
+  STDOPT: +"-slice-calls send -lib-entry -main g -slicing-level 3 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check"
+  STDOPT: +"-slice-calls send,send_bis -lib-entry -main g -slicing-level 0 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check"
+  STDOPT: +"-slice-calls send,send_bis -lib-entry -main g -slicing-level 1 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check"
+  STDOPT: +"-slice-calls send,send_bis -lib-entry -main g -slicing-level 2 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check"
+  STDOPT: +"-slice-calls send,send_bis -lib-entry -main g -slicing-level 3 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check"
+  STDOPT: +"-slice-calls send,send_bis -lib-entry -main g -slicing-level 1 -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check"
+  STDOPT: +"-slice-calls send,send_bis -lib-entry -main g -slicing-level 2 -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check"
+  STDOPT: +"-slice-calls send,send_bis -lib-entry -main g -slicing-level 3 -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check"
 */
 int G,H,I;
 
diff --git a/tests/slicing/sizeof.i b/tests/slicing/sizeof.i
index 9ab0d680436..415bcc38802 100644
--- a/tests/slicing/sizeof.i
+++ b/tests/slicing/sizeof.i
@@ -1,17 +1,17 @@
 /* run.config
-  STDOPT: +"-deps -slice-return main -then-on 'Slicing export' -set-project-as-default -print -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"
-  STDOPT: +"-deps -slice-return SizeOf_1 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -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"
-  STDOPT: +"-deps -slice-return SizeOf_2 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -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"
-  STDOPT: +"-deps -slice-return SizeOfE_pt1 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -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"
-  STDOPT: +"-deps -slice-return SizeOfE_pt2 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -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"
-  STDOPT: +"-deps -slice-return SizeOfE_pt3 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -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"
-  STDOPT: +"-deps -slice-return SizeOfE_pt_deref_1 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -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"
-  STDOPT: +"-deps -slice-return SizeOfE_tab_1 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -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"
-  STDOPT: +"-deps -slice-return SizeOfE_pt_tab_1 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -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"
-  STDOPT: +"-deps -slice-return SizeOfE_pt_tab_2 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -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"
-  STDOPT: +"-deps -slice-return SizeOfE_tab_acces_1 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -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"
-  STDOPT: +"-deps -slice-pragma main -then-on 'Slicing export' -set-project-as-default -print -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"
-  STDOPT: +"-deps -slice-assert main -then-on 'Slicing export' -set-project-as-default -print -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"
+  STDOPT: +"-deps -slice-return main -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check -no-deps"
+  STDOPT: +"-deps -slice-return SizeOf_1 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check -no-deps"
+  STDOPT: +"-deps -slice-return SizeOf_2 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check -no-deps"
+  STDOPT: +"-deps -slice-return SizeOfE_pt1 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check -no-deps"
+  STDOPT: +"-deps -slice-return SizeOfE_pt2 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check -no-deps"
+  STDOPT: +"-deps -slice-return SizeOfE_pt3 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check -no-deps"
+  STDOPT: +"-deps -slice-return SizeOfE_pt_deref_1 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check -no-deps"
+  STDOPT: +"-deps -slice-return SizeOfE_tab_1 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check -no-deps"
+  STDOPT: +"-deps -slice-return SizeOfE_pt_tab_1 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check -no-deps"
+  STDOPT: +"-deps -slice-return SizeOfE_pt_tab_2 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check -no-deps"
+  STDOPT: +"-deps -slice-return SizeOfE_tab_acces_1 -no-slice-callers -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check -no-deps"
+  STDOPT: +"-deps -slice-pragma main -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check -no-deps"
+  STDOPT: +"-deps -slice-assert main -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check -no-deps"
 */
 struct St { int i, *p, tab[5] ; } st ;
 
diff --git a/tests/slicing/slice_behavior.i b/tests/slicing/slice_behavior.i
index 7d4e0933645..17297d029f9 100644
--- a/tests/slicing/slice_behavior.i
+++ b/tests/slicing/slice_behavior.i
@@ -1,5 +1,5 @@
 /* run.config
-   STDOPT: +"-eva -slice-assert f -slicing-level 0 -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check -no-eva"
+   STDOPT: +"-eva -slice-assert f -slicing-level 0 -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check -no-eva"
 */
 /*@ requires a > 0; */
 int f(int a) {
diff --git a/tests/slicing/slice_pragma_stmt.i b/tests/slicing/slice_pragma_stmt.i
index 144c52eb223..6ad6d043f4b 100644
--- a/tests/slicing/slice_pragma_stmt.i
+++ b/tests/slicing/slice_pragma_stmt.i
@@ -1,27 +1,27 @@
 /* run.config
    STDOPT: +"-print "
-   STDOPT: +"-main nop1 -slice-pragma nop1 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
-   STDOPT: +"-main nop2 -slice-pragma nop2 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
-   STDOPT: +"-main nop3 -slice-pragma nop3 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
-   STDOPT: +"-main nop4 -slice-pragma nop4 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
-   STDOPT: +"-main nop5 -slice-pragma nop5 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
-   STDOPT: +"-main nop6 -slice-pragma nop6 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
-   STDOPT: +"-main nop7 -slice-pragma nop7 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
-   STDOPT: +"-main nop8 -slice-pragma nop8 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
-   STDOPT: +"-main double_effect1 -slice-pragma double_effect1 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
-   STDOPT: +"-main double_effect2 -slice-pragma double_effect2 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
-   STDOPT: +"-main double_effect3 -slice-pragma double_effect3 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
-   STDOPT: +"-main double_effect4 -slice-pragma double_effect4 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
-   STDOPT: +"-main double_effect5 -slice-pragma double_effect5 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
-   STDOPT: +"-main test1 -slice-pragma test1 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
-   STDOPT: +"-main test2 -slice-pragma test2 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
-   STDOPT: +"-main test3 -slice-pragma test3 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
-   STDOPT: +"-main test4 -slice-pragma test4 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
-   STDOPT: +"-main test5 -slice-pragma test5 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
-   STDOPT: +"-main test6 -slice-pragma test6 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
-   STDOPT: +"-main test7 -slice-pragma test7 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
-   STDOPT: +"-main test8 -slice-pragma test8 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
-   STDOPT: +"-main test9 -slice-pragma test9 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
+   STDOPT: +"-main nop1 -slice-pragma nop1 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
+   STDOPT: +"-main nop2 -slice-pragma nop2 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
+   STDOPT: +"-main nop3 -slice-pragma nop3 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
+   STDOPT: +"-main nop4 -slice-pragma nop4 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
+   STDOPT: +"-main nop5 -slice-pragma nop5 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
+   STDOPT: +"-main nop6 -slice-pragma nop6 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
+   STDOPT: +"-main nop7 -slice-pragma nop7 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
+   STDOPT: +"-main nop8 -slice-pragma nop8 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
+   STDOPT: +"-main double_effect1 -slice-pragma double_effect1 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
+   STDOPT: +"-main double_effect2 -slice-pragma double_effect2 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
+   STDOPT: +"-main double_effect3 -slice-pragma double_effect3 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
+   STDOPT: +"-main double_effect4 -slice-pragma double_effect4 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
+   STDOPT: +"-main double_effect5 -slice-pragma double_effect5 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
+   STDOPT: +"-main test1 -slice-pragma test1 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
+   STDOPT: +"-main test2 -slice-pragma test2 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
+   STDOPT: +"-main test3 -slice-pragma test3 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
+   STDOPT: +"-main test4 -slice-pragma test4 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
+   STDOPT: +"-main test5 -slice-pragma test5 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
+   STDOPT: +"-main test6 -slice-pragma test6 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
+   STDOPT: +"-main test7 -slice-pragma test7 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
+   STDOPT: +"-main test8 -slice-pragma test8 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
+   STDOPT: +"-main test9 -slice-pragma test9 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
 */
 typedef int stmt, expr, slice;
 int x, y ;
diff --git a/tests/slicing/top.i b/tests/slicing/top.i
index 46b2d695f9b..308641cde3f 100644
--- a/tests/slicing/top.i
+++ b/tests/slicing/top.i
@@ -1,7 +1,7 @@
 /* run.config
-* STDOPT: +"-eva-no-builtins-auto -slicing-level 0 -slice-return uncalled -no-slice-callers  -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"
-* STDOPT: +"-eva-no-builtins-auto -slicing-level 2 -slice-return main -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"
-* STDOPT: +"-eva-no-builtins-auto -slicing-level 2 -slice-return strlen -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"
+* STDOPT: +"-eva-no-builtins-auto -slicing-level 0 -slice-return uncalled -no-slice-callers  -then-on 'Slicing export' -set-project-as-default -print -check -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check"
+* STDOPT: +"-eva-no-builtins-auto -slicing-level 2 -slice-return main -then-on 'Slicing export' -set-project-as-default -print -check -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check"
+* STDOPT: +"-eva-no-builtins-auto -slicing-level 2 -slice-return strlen -then-on 'Slicing export' -set-project-as-default -print -check -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check"
 *
 *
 *
diff --git a/tests/slicing/top2.i b/tests/slicing/top2.i
index ecf64a7ff42..8c8486c1eb5 100644
--- a/tests/slicing/top2.i
+++ b/tests/slicing/top2.i
@@ -1,6 +1,6 @@
 /* run.config
-* STDOPT: +"-slicing-level 2 -slice-pragma main -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
-* STDOPT: +"-slicing-level 2 -slice-return main -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
+* STDOPT: +"-slicing-level 2 -slice-pragma main -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
+* STDOPT: +"-slicing-level 2 -slice-return main -then-on 'Slicing export' -set-project-as-default -print -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
 */
 
 
diff --git a/tests/slicing/undef-fun.i b/tests/slicing/undef-fun.i
index 7d17ff0c8db..2330657b9b4 100644
--- a/tests/slicing/undef-fun.i
+++ b/tests/slicing/undef-fun.i
@@ -1,5 +1,5 @@
 /* run.config
- STDOPT: +"-slice-undef-functions -slice-return f -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
+ STDOPT: +"-slice-undef-functions -slice-return f -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
 
 
 
diff --git a/tests/slicing/unitialized.c b/tests/slicing/unitialized.c
index 99901fa581c..af3f2903a46 100644
--- a/tests/slicing/unitialized.c
+++ b/tests/slicing/unitialized.c
@@ -1,8 +1,8 @@
 /* run.config
-   STDOPT: +"-slice-pragma g -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
-   STDOPT: +"-slice-assert g -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
-   STDOPT: +"-slice-assert main -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
-   STDOPT: +"-slice-return g -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
+   STDOPT: +"-slice-pragma g -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
+   STDOPT: +"-slice-assert g -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
+   STDOPT: +"-slice-assert main -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
+   STDOPT: +"-slice-return g -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
  */
 #ifdef __FRAMAC__
 //@ assigns \result \from \nothing;
diff --git a/tests/slicing/unravel-flavors.i b/tests/slicing/unravel-flavors.i
index 403988ae236..f9297a04745 100644
--- a/tests/slicing/unravel-flavors.i
+++ b/tests/slicing/unravel-flavors.i
@@ -1,8 +1,8 @@
 /* run.config
-   STDOPT: +"-slice-undef-functions -slice-return send1 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
-   STDOPT: +"-slice-undef-functions -slice-return send2 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
-   STDOPT: +"-slice-undef-functions -slice-return send3 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
-   STDOPT: +"-slice-undef-functions -slice-return send4 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
+   STDOPT: +"-slice-undef-functions -slice-return send1 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
+   STDOPT: +"-slice-undef-functions -slice-return send2 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
+   STDOPT: +"-slice-undef-functions -slice-return send3 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
+   STDOPT: +"-slice-undef-functions -slice-return send4 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
    */
 
 /* Small example derived from examples given for UNRAVEL tool : */
diff --git a/tests/slicing/unravel-point.i b/tests/slicing/unravel-point.i
index 84065e61154..eada3c1702e 100644
--- a/tests/slicing/unravel-point.i
+++ b/tests/slicing/unravel-point.i
@@ -1,9 +1,9 @@
 /* run.config
-   STDOPT: +"-calldeps -slice-return send1 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-calldeps"
-   STDOPT: +"-calldeps -slice-return send2 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-calldeps"
-   STDOPT: +"-calldeps -slice-return send3 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-calldeps"
-   STDOPT: +"-calldeps -slice-return send4 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-calldeps"
-   STDOPT: +"-calldeps -slice-return send1 -slice-return send4 -then-on 'Slicing export' @EVA_OPTIONS@ -calldeps -slice-return send1_slice_1 -print  -then-on 'Slicing export 2' -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-calldeps"
+   STDOPT: +"-calldeps -slice-return send1 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-calldeps"
+   STDOPT: +"-calldeps -slice-return send2 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-calldeps"
+   STDOPT: +"-calldeps -slice-return send3 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-calldeps"
+   STDOPT: +"-calldeps -slice-return send4 -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-calldeps"
+   STDOPT: +"-calldeps -slice-return send1 -slice-return send4 -then-on 'Slicing export' @EVA_OPTIONS@ -calldeps -slice-return send1_slice_1 -print  -then-on 'Slicing export 2' -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  -no-calldeps"
 
 
 
diff --git a/tests/slicing/unravel-variance.i b/tests/slicing/unravel-variance.i
index ca73d049b98..b8badd28f49 100644
--- a/tests/slicing/unravel-variance.i
+++ b/tests/slicing/unravel-variance.i
@@ -1,9 +1,9 @@
 /* run.config
-   STDOPT: +"-slice-calls printf1 -float-normal -eva-remove-redundant-alarms -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
-   STDOPT: +"-slice-calls printf2 -float-normal -eva-remove-redundant-alarms -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
-   STDOPT: +"-slice-calls printf3 -float-normal -eva-remove-redundant-alarms -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
-   STDOPT: +"-slice-calls printf4 -float-normal -eva-remove-redundant-alarms -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
-   STDOPT: +"-slice-calls printf5 -float-normal -eva-remove-redundant-alarms -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
+   STDOPT: +"-slice-calls printf1 -float-normal -eva-remove-redundant-alarms -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
+   STDOPT: +"-slice-calls printf2 -float-normal -eva-remove-redundant-alarms -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
+   STDOPT: +"-slice-calls printf3 -float-normal -eva-remove-redundant-alarms -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
+   STDOPT: +"-slice-calls printf4 -float-normal -eva-remove-redundant-alarms -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
+   STDOPT: +"-slice-calls printf5 -float-normal -eva-remove-redundant-alarms -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
    */
 /* Small example devired from examples given for UNRAVEL tool : */
 
diff --git a/tests/slicing/unsupported.i b/tests/slicing/unsupported.i
index 534219f8191..ba59346f8b1 100644
--- a/tests/slicing/unsupported.i
+++ b/tests/slicing/unsupported.i
@@ -1,5 +1,5 @@
 /* run.config
-   STDOPT: +"-slice-return main -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
+   STDOPT: +"-slice-return main -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i  "
    STDOPT: +"-sparecode"
 */
 
diff --git a/tests/slicing/use_spec.i b/tests/slicing/use_spec.i
index e24a0ba8e8b..3cd12852888 100644
--- a/tests/slicing/use_spec.i
+++ b/tests/slicing/use_spec.i
@@ -1,5 +1,5 @@
 /* run.config
- STDOPT: +" -eva-use-spec f -slice-return main -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i"
+ STDOPT: +" -eva-use-spec f -slice-return main -then-on 'Slicing export' -set-project-as-default -print  -then -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i"
  STDOPT: +"-main main2 -slicing-level 3 -slice-undef-functions -eva-use-spec h -slice-return main2 -slicing-keep-annotations -then-on 'Slicing export' -set-project-as-default -print  -eva @EVA_OPTIONS@ -eva-use-spec='-@all'"
 
 
diff --git a/tests/spec/clash_double_file_bts1598.c b/tests/spec/clash_double_file_bts1598.c
index b30f925efab..1c0b3c13774 100644
--- a/tests/spec/clash_double_file_bts1598.c
+++ b/tests/spec/clash_double_file_bts1598.c
@@ -1,7 +1,7 @@
 /* run.config
 COMMENT: checks that linking string.h and its FC-pretty-printed version
 COMMENT: does not get rejected by name clash in the logic. See bts 1598
-OPT: @PTEST_FILE@ -cpp-extra-args " -Ishare/libc -nostdinc" -print -then -ocode @PTEST_DIR@/result/foo.c -print -then @PTEST_FILE@ @PTEST_DIR@/result/foo.c -ocode="" -print
+OPT: @PTEST_FILE@ -cpp-extra-args " -Ishare/libc -nostdinc" -print -then -ocode @PTEST_RESULT@/foo.c -print -then @PTEST_FILE@ @PTEST_RESULT@/foo.c -ocode="" -print
 */
 
 #include "__fc_builtin.h"
diff --git a/tests/spec/first.c b/tests/spec/first.c
index acaee400a23..d0a021fbefb 100644
--- a/tests/spec/first.c
+++ b/tests/spec/first.c
@@ -1,5 +1,5 @@
 /* run.config
-   OPT: -print tests/spec/third.c tests/spec/second.c
+   OPT: -print @PTEST_DIR@/third.c @PTEST_DIR@/second.c
 */
 /*@ behavior b:
   requires \valid(first);
diff --git a/tests/spec/merge_1.i b/tests/spec/merge_1.i
index b9257978955..5781ff60a9d 100644
--- a/tests/spec/merge_1.i
+++ b/tests/spec/merge_1.i
@@ -1,5 +1,5 @@
 /* run.config
-   STDOPT: +"tests/spec/merge_2.i"
+   STDOPT: +"@PTEST_DIR@/merge_2.i"
  */
 /*@ requires \valid(s);
   @ assigns \nothing;
diff --git a/tests/spec/merge_different_assigns.i b/tests/spec/merge_different_assigns.i
index 282a3df7529..ff278513e6b 100644
--- a/tests/spec/merge_different_assigns.i
+++ b/tests/spec/merge_different_assigns.i
@@ -1,5 +1,5 @@
 /* run.config
-   STDOPT: +"tests/spec/merge_different_assigns_bis.i"
+   STDOPT: +"@PTEST_DIR@/merge_different_assigns_bis.i"
 */
 
 int x, z, t, u, v, w;
diff --git a/tests/spec/model2.c b/tests/spec/model2.c
index afe511b2750..c079e4fafb9 100644
--- a/tests/spec/model2.c
+++ b/tests/spec/model2.c
@@ -1,5 +1,5 @@
 /* run.config
-DONTRUN: main test is in tests/spec/model1.c
+DONTRUN: main test is in @PTEST_DIR@/model1.c
 */
 
 #include "model1.h"
diff --git a/tests/spec/multiple_decl_def_1.c b/tests/spec/multiple_decl_def_1.c
index b3124a7f7eb..02ca904b8ce 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 tests/spec/multiple_decl_def_2.c
+   OPT: -print @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 b78d817f6b8..f31326e8aea 100644
--- a/tests/spec/multiple_file_1.c
+++ b/tests/spec/multiple_file_1.c
@@ -1,5 +1,5 @@
 /* run.config
-   OPT: -print tests/spec/multiple_file_2.c
+   OPT: -print @PTEST_DIR@/multiple_file_2.c
 */
 
 /* see bug #43 */
diff --git a/tests/spec/rm_qualifiers.i b/tests/spec/rm_qualifiers.i
index 66d6d336519..c730e461a40 100644
--- a/tests/spec/rm_qualifiers.i
+++ b/tests/spec/rm_qualifiers.i
@@ -1,5 +1,5 @@
 /* run.config
-OPT: @PTEST_FILE@ -ocode @PTEST_DIR@/result/@PTEST_NAME@_res.i -print -then @PTEST_DIR@/result/@PTEST_NAME@_res.i -ocode="" -print
+OPT: @PTEST_FILE@ -ocode @PTEST_RESULT@/@PTEST_NAME@_res.i -print -then @PTEST_RESULT@/@PTEST_NAME@_res.i -ocode="" -print
 */
 extern void G(const void* p);
 typedef volatile int ARR[42][3];
diff --git a/tests/syntax/bts0442-2.i b/tests/syntax/bts0442-2.i
index 712eeb3cc42..c590a24098e 100644
--- a/tests/syntax/bts0442-2.i
+++ b/tests/syntax/bts0442-2.i
@@ -1,5 +1,5 @@
 /* run.config
-STDOPT: +"tests/syntax/bts0442.i"
+STDOPT: +"@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 83b2d1e87fe..6a0681975ea 100644
--- a/tests/syntax/bts0442.i
+++ b/tests/syntax/bts0442.i
@@ -1,4 +1,4 @@
 /* run.config
-STDOPT: +"tests/syntax/bts0442-2.i"
+STDOPT: +"@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 bfb461e3571..6fee817be92 100644
--- a/tests/syntax/bts0672_link.c
+++ b/tests/syntax/bts0672_link.c
@@ -1,6 +1,6 @@
 /* run.config
-   STDOPT: +"tests/syntax/bts0672_link_2.c"
-   STDOPT: +"tests/syntax/bts0672_link_2.c" +"-cpp-extra-args='-DPROTO'"
+   STDOPT: +"@PTEST_DIR@/bts0672_link_2.c"
+   STDOPT: +"@PTEST_DIR@/bts0672_link_2.c" +"-cpp-extra-args='-DPROTO'"
 */
 
 int Frama_C_entropy_source;
diff --git a/tests/syntax/bts1553_2.i b/tests/syntax/bts1553_2.i
index 25d256c28b7..f2623bcdfe2 100644
--- a/tests/syntax/bts1553_2.i
+++ b/tests/syntax/bts1553_2.i
@@ -1,5 +1,5 @@
 /* run.config
-   STDOPT: +"tests/syntax/bts1553.i -kernel-msg-key file -kernel-msg-key=-file:transformation"
+   STDOPT: +"@PTEST_DIR@/bts1553.i -kernel-msg-key file -kernel-msg-key=-file:transformation"
    COMMENT: this file is also parsed together with bts1553.i
 */
 
diff --git a/tests/syntax/formals_decl_leak_1.i b/tests/syntax/formals_decl_leak_1.i
index 157174c599d..3fb93c23877 100644
--- a/tests/syntax/formals_decl_leak_1.i
+++ b/tests/syntax/formals_decl_leak_1.i
@@ -1,5 +1,5 @@
 /* run.config
-DONTRUN: main test is located in tests/syntax/formals_decl_leak.i
+DONTRUN: main test is located in @PTEST_DIR@/formals_decl_leak.i
 */
 
 void f(int y);
diff --git a/tests/syntax/inconsistent_decl.c b/tests/syntax/inconsistent_decl.c
index c4cb37aa00a..43fe38e5c0e 100644
--- a/tests/syntax/inconsistent_decl.c
+++ b/tests/syntax/inconsistent_decl.c
@@ -1,7 +1,7 @@
 /* run.config
 EXIT: 1
-  STDOPT: +"tests/syntax/inconsistent_decl_2.i"
-  STDOPT: +"tests/syntax/inconsistent_decl_2.i"+"-cpp-extra-args='-DWITH_PROTO'"
+  STDOPT: +"@PTEST_DIR@/inconsistent_decl_2.i"
+  STDOPT: +"@PTEST_DIR@/inconsistent_decl_2.i"+"-cpp-extra-args='-DWITH_PROTO'"
 */
 
 #ifdef WITH_PROTO
diff --git a/tests/syntax/inconsistent_decl_2.i b/tests/syntax/inconsistent_decl_2.i
index e07dcf7e1c1..2452dc7cebe 100644
--- a/tests/syntax/inconsistent_decl_2.i
+++ b/tests/syntax/inconsistent_decl_2.i
@@ -1,5 +1,5 @@
 /* run.config
-DONTRUN: main test is at tests/syntax/inconsistent_decl.c
+DONTRUN: main test is at @PTEST_DIR@/inconsistent_decl.c
 */
 
 int f(double x);
diff --git a/tests/syntax/label_decl.i b/tests/syntax/label_decl.i
index f47ca2a64a6..c6a7fcb7949 100644
--- a/tests/syntax/label_decl.i
+++ b/tests/syntax/label_decl.i
@@ -1,5 +1,5 @@
 /* run.config
-MACRO: TMP @PTEST_DIR@/result/@PTEST_NAME@.i
+MACRO: TMP @PTEST_RESULT@/@PTEST_NAME@.i
 OPT: -print -then -print -ocode @TMP@ -then @TMP@ -print -ocode=""
 */
 struct s { int i; };
diff --git a/tests/syntax/merge_attrs_align.c b/tests/syntax/merge_attrs_align.c
index ef3528b0d15..c0d94d12f36 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" +"tests/syntax/merge_attrs_align1.c" +"tests/syntax/merge_attrs_align2.c"
-  STDOPT: +"-machdep x86_64" +"tests/syntax/merge_attrs_align1.c" +"tests/syntax/merge_attrs_align3.c"
+  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"
  EXIT: 0
-  STDOPT: +"-machdep x86_64" +"tests/syntax/merge_attrs_align1.c" +"tests/syntax/merge_attrs_align4.c"
-  STDOPT: +"-machdep x86_64" +"tests/syntax/merge_attrs_align2.c" +"tests/syntax/merge_attrs_align3.c"
+  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"
  EXIT: 1
-  STDOPT: +"-machdep x86_64" +"tests/syntax/merge_attrs_align2.c" +"tests/syntax/merge_attrs_align4.c"
-  STDOPT: +"-machdep x86_64" +"tests/syntax/merge_attrs_align3.c" +"tests/syntax/merge_attrs_align4.c"
+  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"
  */
 
 // for testing with GCC/Clang
diff --git a/tests/syntax/merge_bts0948.i b/tests/syntax/merge_bts0948.i
index 78aee9f8bce..38a8ae897bb 100644
--- a/tests/syntax/merge_bts0948.i
+++ b/tests/syntax/merge_bts0948.i
@@ -1,5 +1,5 @@
 /* run.config
-   STDOPT: +"tests/syntax/merge_bts0948_1.i" +"tests/syntax/merge_bts0948_2.i"
+   STDOPT: +"@PTEST_DIR@/merge_bts0948_1.i" +"@PTEST_DIR@/merge_bts0948_2.i"
 */
 
 /*@ requires \valid((char*)dest);
diff --git a/tests/syntax/no-print-libc-reparse.c b/tests/syntax/no-print-libc-reparse.c
index b7dea45f9df..daf1949eb41 100644
--- a/tests/syntax/no-print-libc-reparse.c
+++ b/tests/syntax/no-print-libc-reparse.c
@@ -1,5 +1,5 @@
 /*run.config
-  STDOPT: +"-no-print-libc -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.c -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.c"
+  STDOPT: +"-no-print-libc -print -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.c -then @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.c"
 */
 
 // tests that using -no-print-libc on a file with an enum produces output that
diff --git a/tests/syntax/typedef_incorrect_pretty_print_bts1518.i b/tests/syntax/typedef_incorrect_pretty_print_bts1518.i
index ce8d5fb7c50..8c36069cabb 100644
--- a/tests/syntax/typedef_incorrect_pretty_print_bts1518.i
+++ b/tests/syntax/typedef_incorrect_pretty_print_bts1518.i
@@ -1,7 +1,7 @@
 /* run.config
 DONTRUN: bug fix in progress
 MACRO: OUT @PTEST_NAME@_res.i
-EXECNOW: LOG @OUT@ @frama-c@ @PTEST_FILE@ -ocode @PTEST_DIR@/result/@OUT@ -print -then @PTEST_DIR@/result/@OUT@ -print
+EXECNOW: LOG @OUT@ @frama-c@ @PTEST_FILE@ -ocode @PTEST_RESULT@/@OUT@ -print -then @PTEST_RESULT@/@OUT@ -print
  */
 /* Generated by Frama-C */
 /* Generated by Frama-C */
diff --git a/tests/syntax/typedef_multi_2.c b/tests/syntax/typedef_multi_2.c
index 97f9547151e..3dfefa3de8e 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 tests/syntax/typedef_multi_1.c
+DONTRUN: main test is at @PTEST_DIR@/typedef_multi_1.c
 */
 
 #include "typedef_multi.h"
diff --git a/tests/syntax/vdefined_bts1241.i b/tests/syntax/vdefined_bts1241.i
index f14a5192f92..fb57d75836e 100644
--- a/tests/syntax/vdefined_bts1241.i
+++ b/tests/syntax/vdefined_bts1241.i
@@ -1,5 +1,5 @@
 /* run.config
-STDOPT: +"tests/syntax/vdefined_bts1241_1.i"
+STDOPT: +"@PTEST_DIR@/vdefined_bts1241_1.i"
  */
 
 int f();
diff --git a/tests/syntax/vdefined_bts1241_1.i b/tests/syntax/vdefined_bts1241_1.i
index 8397ca8114c..ad1dedd017b 100644
--- a/tests/syntax/vdefined_bts1241_1.i
+++ b/tests/syntax/vdefined_bts1241_1.i
@@ -1,5 +1,5 @@
 /* run.config
-DONTRUN: main test at tests/syntax/vdefined_bts1241.i
+DONTRUN: main test at @PTEST_DIR@/vdefined_bts1241.i
 */
 
 int f();
diff --git a/tests/value/CruiseControl.c b/tests/value/CruiseControl.c
index d595ecaf9ce..056242d9d39 100644
--- a/tests/value/CruiseControl.c
+++ b/tests/value/CruiseControl.c
@@ -1,6 +1,6 @@
 /* run.config*
  DEPS: CruiseControl.h CruiseControl_extern.h scade_types.h config_types.h definitions.h
-   STDOPT: #"-float-normal %{dep:tests/value/CruiseControl_const.c} -lib-entry -main CruiseControl -eva-context-depth 10 -eva-context-valid-pointers"
+   STDOPT: #"-float-normal %{dep:@PTEST_DIR@/CruiseControl_const.c} -lib-entry -main CruiseControl -eva-context-depth 10 -eva-context-valid-pointers"
 
 */
 /*$************* SCADE_KCG KCG Version 5.1.1 (build i10) **************
-- 
GitLab