diff --git a/bin/frama-c-script b/bin/frama-c-script
index a85fadf00fe3f4adbdc6816b343ad0e2b3056f6e..4a4c1d16e9c420bf663462df85fcfaa27dd044d7 100755
--- a/bin/frama-c-script
+++ b/bin/frama-c-script
@@ -21,13 +21,18 @@
# #
##########################################################################
-# Accept '-check' to avoid issues with ptests
-while [ $# -ge 1 ] && [ "$1" = "-check" ]; do
- shift
+WORKING_DIR="."
+while [ "$1" != "" ] ; do
+ case "$1" in
+ -check) shift;;
+ -C) shift; WORKING_DIR="$1";;
+ *) break;;
+ esac
+ shift
done
usage() {
- echo "usage: $0 cmd [args]"
+ echo "usage: $0 [-C working-dir] cmd [args]"
echo ""
echo " where cmd is:"
echo ""
@@ -111,6 +116,8 @@ if [ $# -lt 1 ]; then
fi
DIR="$( cd "$( dirname "$0" )" && pwd )"
+cd "$WORKING_DIR"
+
# All scripts called by frama-c-script may rely on FRAMAC_BIN pointing to the
# directory containing frama-c, frama-c-config and frama-c-script.
export FRAMAC_BIN="$DIR"
@@ -118,6 +125,7 @@ FRAMAC_SHARE=$("${DIR}/frama-c-config" -print-share-path)
if [ -z ${FRAMAC_SESSION+x} ]; then
FRAMAC_SESSION="./.frama-c";
fi
+
command="$1"
# [check_path_exists path]: if [path] exists,
diff --git a/ptests/ptests.ml b/ptests/ptests.ml
index 53fa1532520f800314ab31e82a4df7b00df1abb2..23858ad857bdc100449fb4c8c27b09cbc2e97e86 100644
--- a/ptests/ptests.ml
+++ b/ptests/ptests.ml
@@ -127,17 +127,19 @@ let str_split_list =
(* removes first blanks *)
let trim_right s =
- let n = ref (String.length s - 1) in
- let last_char_to_keep =
- try
- while !n > 0 do
- if String.get s !n <> ' ' then raise Exit;
- n := !n - 1
- done;
- 0
- with Exit -> !n
- in
- String.sub s 0 (last_char_to_keep+1)
+ if s = "" then s else begin
+ let n = ref (String.length s - 1) in
+ let last_char_to_keep =
+ try
+ while !n > 0 do
+ if String.get s !n <> ' ' then raise Exit;
+ n := !n - 1
+ done;
+ 0
+ with Exit -> !n
+ in
+ String.sub s 0 (last_char_to_keep+1)
+ end
let default_env = ref []
@@ -296,22 +298,27 @@ let example_msg =
FILEREG: <regexp> @[<v 0># Ignores the files in suites whose name doesn't matche the pattern.@]@ \
DONTRUN: @[<v 0># Ignores the file.@]@ \
EXECNOW: ([LOG|BIN] <file>)+ <command> @[<v 0># Defines the command to execute to build a 'LOG' (textual) 'BIN' (binary) targets.@ \
- # Note: the textual targets are compared to oracles.@]@ \
- MODULE: <module>... @[<v 0># Compile the module and set the @PTEST_MODULE@ macro.@]@ \
- LIBS: <module>... @[<v 0># Don't compile the module but set the @PTEST_LIBS@ macro.@]@ \
- PLUGIN: <plugin>... @[<v 0># Set the @PTEST_PLUGIN@ macro.@]@ \
- SCRIPT: <script>... @[<v 0># Set the @PTEST_SCRIPT@ macro.@]@ \
+ # NB: the textual targets are compared to oracles.@]@ \
+ MODULE: <module>... @[<v 0># Compile the module and set the @@PTEST_MODULE@@ macro.@]@ \
+ LIBS: <module>... @[<v 0># Don't compile the module but set the @@PTEST_LIBS@@ macro.@]@ \
+ PLUGIN: <plugin>... @[<v 0># Set the @@PTEST_PLUGIN@@ macro.@]@ \
+ SCRIPT: <script>... @[<v 0># Set the @@PTEST_SCRIPT@@ macro.@]@ \
+ DEPS: <dependency>...@[<v 0># Set the @@PTEST_DEPS@@ macro and adds a dependency to next sub-test and execnow commands (forward compatibility).@ \
+ # NB: a dependency to the included files can be added with this directive.@ \
+ # That is not necessary for files mentioned into the command or options when using the %%{dep:<file>} feature of dune.@]@ \
LOG: <file>... @[<v 0># Defines targets built by the next sub-test command.@]@ \
CMD: <command> @[<v 0># Defines the command to execute for all tests in order to get results to be compared to oracles.@]@ \
OPT: <options> @[<v 0># Defines a sub-test using the 'CMD' definition: <command> <options>@]@ \
- STDOPT: +<extra> @[<v 0># Defines a sub-test and append the extra to the current option.@]@ \
- STDOPT: #<extra> @[<v 0># Defines a sub-test and prepend the extra to the current option.@]@ \
+ STDOPT: -\"<extra>\" @[<v 0># Defines a sub-test and remove the extra from the current option.@ \
+ # NB: current version does not allow to remove a multiple-extra-argument.@]@ \
+ STDOPT: +\"<extra>\" @[<v 0># Defines a sub-test and appends the extra to the current option.@]@ \
+ STDOPT: #\"<extra>\" @[<v 0># Defines a sub-test and prepends the extra to the current option.@]@ \
EXIT: <number> @[<v 0># Defines the exit code required for the next sub-test commands.@]@ \
FILTER: <cmd> @[<v 0># Performs a transformation on the test result files before the comparison from the oracles.@ \
# The oracle will be compared from the standard output of the command: cat <test-output-file> | <cmd> .@ \
# Chaining multiple filter commands is possible by defining several FILTER directives.@ \
# An empty command drops the previous FILTER directives.@ \
- # Note: in such a command, the @@PTEST_ORACLE@@ macro is set to the basename of the oracle.@ \
+ # NB: in such a command, the @@PTEST_ORACLE@@ macro is set to the basename of the oracle.@ \
# This allows running a 'diff' command with the oracle of another test configuration:@ \
# FILTER: diff --new-file @@PTEST_DIR@@/oracle_configuration/@@PTEST_ORACLE@@ @]@ \
TIMEOUT: <delay> @[<v 0># Set a timeout for all sub-test.@]@ \
@@ -334,6 +341,7 @@ let example_msg =
@@PTEST_CONFIG@@ # Test configuration suffix.@ \
@@PTEST_RESULT@@ # Shorthand alias to '@@PTEST_DIR@@/result@@PTEST_CONFIG@@' (the result directory dedicated to the tested configuration).@ \
@@PTEST_ORACLE@@ # Basename of the current oracle file (macro only usable in FILTER directives).@ \
+ @@PTEST_DEPS@@ # Current list of dependencies defined by the DEPS directive.@ \
@@PTEST_LIBS@@ # Current list of modules defined by the LIBS directive.@ \
@@PTEST_MODULE@@ # Current list of modules defined by the MODULE directive.@ \
@@PTEST_PLUGIN@@ # Current list of plugins defined by the PLUGIN directive.@ \
@@ -819,6 +827,7 @@ end = struct
"PTEST_PRE_OPTIONS", !macro_pre_options;
"PTEST_POST_OPTIONS", !macro_post_options;
"PTEST_MAKE_MODULE", "make -s";
+ "PTEST_DEPS", "";
"PTEST_LIBS", "";
"PTEST_MODULE", "";
"PTEST_PLUGIN", "";
@@ -916,26 +925,23 @@ end = struct
Scanf.sscanf s "%_[ ]%1[+#\\-]%_[ ]%S%_[ ]%s@\n"
(fun c opt rem ->
match c with
- | "+" -> aux (opt :: opts) rem
- | "#" -> aux (opts @ [ opt ]) rem
+ | "+" -> aux (opts @ [ opt ]) rem (* appends [opt] *)
+ | "#" -> aux (opt :: opts) rem (* preppends [opt] *)
| "-" -> aux (List.filter (fun x -> x <> opt) opts) rem
| _ -> assert false (* format of scanned string disallow it *))
with
| Scanf.Scan_failure _ ->
if s <> "" then
- lock_eprintf "%s: unknown STDOPT configuration string: %s\n%!" file s;
+ lock_eprintf "%s: unknown STDOPT configuration string: %s@."
+ file s;
opts
| End_of_file -> opts
in
(* NB: current settings does not allow to remove a multiple-argument
option (e.g. -verbose 2).
*)
- (* revert the initial list, as it will be reverted back in the end. *)
- let opts =
- aux (List.rev (str_split space stdopts)) s
- in
- (* preserve options ordering *)
- List.fold_right (fun x s -> s ^ " " ^ x) opts ""
+ let opts = aux (str_split space stdopts) s in
+ String.concat " " opts
(* how to process options *)
let config_exec ~warn ~once ~file dir s current =
@@ -1008,6 +1014,14 @@ end = struct
let update_plugin_macros =
update_macros (fun name -> name) "-load-module=" "PTEST_PLUGIN" "PTEST_LOAD_PLUGIN"
+ let config_deps ~file dir s current =
+ let macro_def = "PTEST_DEPS" in
+ let def = Macros.expand_directive ~file current.dc_macros s in
+ if !verbosity >= 3 then Format.printf "%% %s: %s@." macro_def def ;
+ let dc_macros = Macros.add_list [ macro_def, def ;
+ ] current.dc_macros in
+ { current with dc_macros }
+
let config_module ~file dir s current =
let s = Macros.expand_directive ~file current.dc_macros s in
let deps = str_split_list s in
@@ -1103,6 +1117,8 @@ end = struct
"MODULE", config_module;
+ "DEPS", config_deps;
+
"LIBS", config_libs_script_plugin update_libs_macros;
"SCRIPT", config_libs_script_plugin update_script_macros;
"PLUGIN", config_libs_script_plugin update_plugin_macros;
@@ -1341,68 +1357,75 @@ end = struct
let get_ptest_file cmd = SubDir.make_file cmd.directory cmd.file
- let expand_macros ~defaults cmd =
- let ptest_config =
- if !special_config = "" then "" else "_" ^ !special_config
- in
- let ptest_file = get_ptest_file cmd in
- let ptest_name =
- try Filename.chop_extension cmd.file
- with Invalid_argument _ -> cmd.file
- in
- let ptest_file = Filename.sanitize ptest_file in
- let ptest_load_plugin = Macros.get "PTEST_LOAD_PLUGIN" cmd.macros in
- let ptest_load_module = Macros.get "PTEST_LOAD_MODULE" cmd.macros in
- let ptest_load_libs = Macros.get "PTEST_LOAD_LIBS" cmd.macros in
- let ptest_load_script = Macros.get "PTEST_LOAD_SCRIPT" cmd.macros in
- let macros =
- [ "PTEST_CONFIG", ptest_config;
- "PTEST_DIR", SubDir.get cmd.directory;
- "PTEST_RESULT",
- SubDir.get cmd.directory ^ "/" ^ redefine_name "result";
- "PTEST_FILE", ptest_file;
- "PTEST_NAME", ptest_name;
- "PTEST_NUMBER", string_of_int cmd.n;
- "PTEST_OPT", cmd.options;
- "PTEST_LOAD_OPTIONS", (String.concat " "
- [ ptest_load_plugin ;
- ptest_load_libs ;
- ptest_load_module ;
- ptest_load_script ; ])
- ]
- in
- let macros = Macros.add_list macros cmd.macros in
- let macros = Macros.add_defaults ~defaults macros in
- let process_macros s = Macros.expand macros s in
- let toplevel =
- let in_toplevel,toplevel= Macros.does_expand macros cmd.toplevel in
- if not cmd.execnow then begin
- let has_ptest_file, options =
- if in_toplevel.has_ptest_opt then in_toplevel.has_ptest_file, []
- else
- let in_option,options= Macros.does_expand macros cmd.options in
- (in_option.has_ptest_file || in_toplevel.has_ptest_file),
- (if in_toplevel.has_frama_c_exe then
- [ process_macros "@PTEST_PRE_OPTIONS@" ;
- options ;
- process_macros "@PTEST_POST_OPTIONS@" ;
- ]
- else [ options ])
- in
- String.concat " " (toplevel::(if has_ptest_file then options else ptest_file::options))
- end
- else toplevel
- in
- { cmd with
- macros;
- toplevel;
- options = ""; (* no more usable *)
- log_files = List.map process_macros cmd.log_files;
- filter =
- match cmd.filter with
- | None -> None
- | Some filter -> Some (process_macros filter)
- }
+ let expand_macros =
+ let dune_cmd_features = Str.regexp "%{[a-z][a-z-]*:\\([^}]*\\)}" in
+ let dune_bin_features = Str.regexp "%{bin:\\([^}]*\\)}" in
+ fun ~defaults cmd ->
+ let ptest_config =
+ if !special_config = "" then "" else "_" ^ !special_config
+ in
+ let ptest_file = get_ptest_file cmd in
+ let ptest_name =
+ try Filename.chop_extension cmd.file
+ with Invalid_argument _ -> cmd.file
+ in
+ let ptest_file = Filename.sanitize ptest_file in
+ let ptest_load_plugin = Macros.get "PTEST_LOAD_PLUGIN" cmd.macros in
+ let ptest_load_module = Macros.get "PTEST_LOAD_MODULE" cmd.macros in
+ let ptest_load_libs = Macros.get "PTEST_LOAD_LIBS" cmd.macros in
+ let ptest_load_script = Macros.get "PTEST_LOAD_SCRIPT" cmd.macros in
+ let macros =
+ [ "PTEST_CONFIG", ptest_config;
+ "PTEST_DIR", SubDir.get cmd.directory;
+ "PTEST_RESULT",
+ SubDir.get cmd.directory ^ "/" ^ redefine_name "result";
+ "PTEST_FILE", ptest_file;
+ "PTEST_NAME", ptest_name;
+ "PTEST_NUMBER", string_of_int cmd.n;
+ "PTEST_OPT", cmd.options;
+ "PTEST_LOAD_OPTIONS", (String.concat " "
+ [ ptest_load_plugin ;
+ ptest_load_libs ;
+ ptest_load_module ;
+ ptest_load_script ; ])
+ ]
+ in
+ let macros = Macros.add_list macros cmd.macros in
+ let macros = Macros.add_defaults ~defaults macros in
+ let process_macros s = Macros.expand macros s in
+ let toplevel =
+ let in_toplevel,toplevel= Macros.does_expand macros cmd.toplevel in
+ if not cmd.execnow then begin
+ let has_ptest_file, options =
+ if in_toplevel.has_ptest_opt then in_toplevel.has_ptest_file, []
+ else
+ let in_option,options= Macros.does_expand macros cmd.options in
+ (in_option.has_ptest_file || in_toplevel.has_ptest_file),
+ (if in_toplevel.has_frama_c_exe then
+ [ process_macros "@PTEST_PRE_OPTIONS@" ;
+ options ;
+ process_macros "@PTEST_POST_OPTIONS@" ;
+ ]
+ else [ options ])
+ in
+ String.concat " " (toplevel::(if has_ptest_file then options else ptest_file::options))
+ end
+ else toplevel
+ in
+ let toplevel = (* removes dune feature such as %{deps:...} *)
+ let x = str_global_replace dune_bin_features "./bin/\\1" toplevel in
+ str_global_replace dune_cmd_features "\\1" x
+ in
+ { cmd with
+ macros;
+ toplevel;
+ options = ""; (* no more usable *)
+ log_files = List.map process_macros cmd.log_files;
+ filter =
+ match cmd.filter with
+ | None -> None
+ | Some filter -> Some (process_macros filter)
+ }
let basic_command_string =
fun command ->
diff --git a/src/plugins/aorai/tests/ya/aorai_ptr_field.i b/src/plugins/aorai/tests/ya/aorai_ptr_field.i
index 2d543c276252230fbac9b7f809c4f9a8a8088a65..e8027df1368135e512015b0ae005748bf6a9911f 100644
--- a/src/plugins/aorai/tests/ya/aorai_ptr_field.i
+++ b/src/plugins/aorai/tests/ya/aorai_ptr_field.i
@@ -1,5 +1,5 @@
/* run.config*
- OPT: -aorai-automata @PTEST_DIR@/@PTEST_NAME@.ya -aorai-test-number @PTEST_NUMBER@ @PROVE_OPTIONS@
+ OPT: -aorai-automata %{dep:@PTEST_DIR@/@PTEST_NAME@.ya} -aorai-test-number @PTEST_NUMBER@ @PROVE_OPTIONS@
*/
struct S { int x; };
diff --git a/src/plugins/aorai/tests/ya/assigns.c b/src/plugins/aorai/tests/ya/assigns.c
index 0a7a6cf91977e1bcb753d88be504da18865fe491..2278fd5437c5daba126b9f9489bd8be909f467e3 100644
--- a/src/plugins/aorai/tests/ya/assigns.c
+++ b/src/plugins/aorai/tests/ya/assigns.c
@@ -1,9 +1,9 @@
/* run.config*
- OPT: -aorai-automata @PTEST_DIR@/@PTEST_NAME@.ya -aorai-test-number @PTEST_NUMBER@ @PROVE_OPTIONS@
- OPT: -aorai-automata @PTEST_DIR@/assigns_det.ya -aorai-test-number @PTEST_NUMBER@ @PROVE_OPTIONS@
+ OPT: -aorai-automata %{dep:@PTEST_DIR@/@PTEST_NAME@.ya} -aorai-test-number @PTEST_NUMBER@ @PROVE_OPTIONS@
+ OPT: -aorai-automata %{dep:@PTEST_DIR@/assigns_det.ya} -aorai-test-number @PTEST_NUMBER@ @PROVE_OPTIONS@
MODULE: name_projects
LIBS:
- OPT: -aorai-automata @PTEST_DIR@/@PTEST_NAME@.ya -then -print
+ OPT: -aorai-automata %{dep:@PTEST_DIR@/@PTEST_NAME@.ya} -then -print
*/
int X;
diff --git a/src/plugins/aorai/tests/ya/bts1289.i b/src/plugins/aorai/tests/ya/bts1289.i
index 4275cbc2ed34efdfff5758ee51b3674f69db7cd9..bfeffbded20b93980a36e8a3d1c23e3c53ce3847 100644
--- a/src/plugins/aorai/tests/ya/bts1289.i
+++ b/src/plugins/aorai/tests/ya/bts1289.i
@@ -1,6 +1,6 @@
/* run.config*
- OPT: -aorai-automata @PTEST_DIR@/@PTEST_NAME@.ya -aorai-test-number @PTEST_NUMBER@ @PROVE_OPTIONS@
- OPT: -aorai-automata @PTEST_DIR@/@PTEST_NAME@-2.ya -aorai-test-number @PTEST_NUMBER@ @PROVE_OPTIONS@
+ OPT: -aorai-automata %{dep:@PTEST_DIR@/@PTEST_NAME@.ya} -aorai-test-number @PTEST_NUMBER@ @PROVE_OPTIONS@
+ OPT: -aorai-automata %{dep:@PTEST_DIR@/@PTEST_NAME@-2.ya} -aorai-test-number @PTEST_NUMBER@ @PROVE_OPTIONS@
*/
void a(void) {}
@@ -11,4 +11,3 @@ void main(void)
for (int i=0; i<10; ++i)
a();
}
-
diff --git a/src/plugins/aorai/tests/ya/declared_function.i b/src/plugins/aorai/tests/ya/declared_function.i
index 0ec1fc04fbd007eedb740b539bd9eba427e85b8c..ffedbdef46601dc010287d2f383b37510a9411d9 100644
--- a/src/plugins/aorai/tests/ya/declared_function.i
+++ b/src/plugins/aorai/tests/ya/declared_function.i
@@ -1,5 +1,5 @@
/* run.config*
-OPT: -aorai-automata @PTEST_DIR@/@PTEST_NAME@.ya -aorai-test-number @PTEST_NUMBER@ @PROVE_OPTIONS@
+OPT: -aorai-automata %{dep:@PTEST_DIR@/@PTEST_NAME@.ya} -aorai-test-number @PTEST_NUMBER@ @PROVE_OPTIONS@
*/
int f(void);
diff --git a/src/plugins/aorai/tests/ya/deterministic.i b/src/plugins/aorai/tests/ya/deterministic.i
index af544b32ecbded109571cc925fe12dbaf06ad12e..17876336fef74716073ba4e2472e47476c0bbf3f 100644
--- a/src/plugins/aorai/tests/ya/deterministic.i
+++ b/src/plugins/aorai/tests/ya/deterministic.i
@@ -1,5 +1,5 @@
/* run.config*
- OPT: -aorai-automata @PTEST_DIR@/@PTEST_NAME@.ya -aorai-test-number @PTEST_NUMBER@ @PROVE_OPTIONS@
+ OPT: -aorai-automata %{dep:@PTEST_DIR@/@PTEST_NAME@.ya} -aorai-test-number @PTEST_NUMBER@ @PROVE_OPTIONS@
*/
int X;
diff --git a/src/plugins/aorai/tests/ya/formals.i b/src/plugins/aorai/tests/ya/formals.i
index 7339298dade9d1a44e608bd10f8cdb9810a761b1..e97c64c11e7d035e7905e10f9bd46e110ee552a0 100644
--- a/src/plugins/aorai/tests/ya/formals.i
+++ b/src/plugins/aorai/tests/ya/formals.i
@@ -1,5 +1,5 @@
/* run.config*
-OPT: -aorai-automata @PTEST_DIR@/@PTEST_NAME@.ya -aorai-test-number @PTEST_NUMBER@ @PROVE_OPTIONS@
+OPT: -aorai-automata %{dep:@PTEST_DIR@/@PTEST_NAME@.ya} -aorai-test-number @PTEST_NUMBER@ @PROVE_OPTIONS@
*/
int f(int x) { return x; }
diff --git a/src/plugins/aorai/tests/ya/generate_assigns_bts1290.i b/src/plugins/aorai/tests/ya/generate_assigns_bts1290.i
index 698e1549a526e24aaf660de1269c53af83a58c8b..87b0c3dbbd5dd4b42c312adb4c04d2710a531835 100644
--- a/src/plugins/aorai/tests/ya/generate_assigns_bts1290.i
+++ b/src/plugins/aorai/tests/ya/generate_assigns_bts1290.i
@@ -1,5 +1,5 @@
/* run.config*
- OPT: -aorai-automata @PTEST_DIR@/@PTEST_NAME@.ya -aorai-test-number @PTEST_NUMBER@ @PROVE_OPTIONS@
+ OPT: -aorai-automata %{dep:@PTEST_DIR@/@PTEST_NAME@.ya} -aorai-test-number @PTEST_NUMBER@ @PROVE_OPTIONS@
*/
void main(void)
{
diff --git a/src/plugins/aorai/tests/ya/hoare_seq.i b/src/plugins/aorai/tests/ya/hoare_seq.i
index be7428a41e3c3ef59275d627f79ab581289dcda1..4b8bf45a3e23a51be90717114945323d8d2d1673 100644
--- a/src/plugins/aorai/tests/ya/hoare_seq.i
+++ b/src/plugins/aorai/tests/ya/hoare_seq.i
@@ -1,5 +1,5 @@
/* run.config*
-OPT: -aorai-automata @PTEST_DIR@/@PTEST_NAME@.ya -aorai-acceptance -aorai-test-number @PTEST_NUMBER@ @PROVE_OPTIONS@
+OPT: -aorai-automata %{dep:@PTEST_DIR@/@PTEST_NAME@.ya} -aorai-acceptance -aorai-test-number @PTEST_NUMBER@ @PROVE_OPTIONS@
*/
void f(void) { }
diff --git a/src/plugins/aorai/tests/ya/incorrect.i b/src/plugins/aorai/tests/ya/incorrect.i
index 36dc2f005ae4865a67a59bcd3da3afff58da9854..50f7b06c4143b892c532db3cf64adc7457fc661c 100644
--- a/src/plugins/aorai/tests/ya/incorrect.i
+++ b/src/plugins/aorai/tests/ya/incorrect.i
@@ -1,5 +1,5 @@
/* run.config*
- OPT: -aorai-automata @PTEST_DIR@/@PTEST_NAME@.ya -aorai-test-number @PTEST_NUMBER@ @PROVE_OPTIONS@
+ OPT: -aorai-automata %{dep:@PTEST_DIR@/@PTEST_NAME@.ya} -aorai-test-number @PTEST_NUMBER@ @PROVE_OPTIONS@
*/
int f(void);
diff --git a/src/plugins/aorai/tests/ya/logical_operators.i b/src/plugins/aorai/tests/ya/logical_operators.i
index 12b25974ec2567d526869ec71462f45b65052bc6..c5284ed4423860f21cef346f4cfa26d866cc48e9 100644
--- a/src/plugins/aorai/tests/ya/logical_operators.i
+++ b/src/plugins/aorai/tests/ya/logical_operators.i
@@ -1,5 +1,5 @@
/* run.config*
- OPT: -aorai-automata @PTEST_DIR@/@PTEST_NAME@.ya -aorai-test-number @PTEST_NUMBER@ @PROVE_OPTIONS@
+ OPT: -aorai-automata %{dep:@PTEST_DIR@/@PTEST_NAME@.ya} -aorai-test-number @PTEST_NUMBER@ @PROVE_OPTIONS@
*/
void f(int x) {}
diff --git a/src/plugins/aorai/tests/ya/loop_bts1050.i b/src/plugins/aorai/tests/ya/loop_bts1050.i
index bb697cf3e49a862996f28a3d6169c19afc4d0b27..c2d0d1c6523c6cfb2182dcc652cf913d017e6bd7 100644
--- a/src/plugins/aorai/tests/ya/loop_bts1050.i
+++ b/src/plugins/aorai/tests/ya/loop_bts1050.i
@@ -1,5 +1,5 @@
/* run.config*
- OPT: -aorai-automata @PTEST_DIR@/@PTEST_NAME@.ya -aorai-acceptance -aorai-test-number @PTEST_NUMBER@ @PROVE_OPTIONS@
+ OPT: -aorai-automata %{dep:@PTEST_DIR@/@PTEST_NAME@.ya} -aorai-acceptance -aorai-test-number @PTEST_NUMBER@ @PROVE_OPTIONS@
*/
void f(){};
diff --git a/src/plugins/aorai/tests/ya/metavariables-incompatible.i b/src/plugins/aorai/tests/ya/metavariables-incompatible.i
index 56daa093e4eac7ecbd0e4526f4f5f2b78101d49a..6f41f2d43aba8f2ad19686cbed2f209e05daa35f 100644
--- a/src/plugins/aorai/tests/ya/metavariables-incompatible.i
+++ b/src/plugins/aorai/tests/ya/metavariables-incompatible.i
@@ -1,5 +1,5 @@
/* run.config*
EXIT: 1
- OPT: -aorai-automata @PTEST_DIR@/@PTEST_NAME@.ya -aorai-test-number @PTEST_NUMBER@ @PROVE_OPTIONS@
+ OPT: -aorai-automata %{dep:@PTEST_DIR@/@PTEST_NAME@.ya} -aorai-test-number @PTEST_NUMBER@ @PROVE_OPTIONS@
*/
void main(void) {}
diff --git a/src/plugins/aorai/tests/ya/metavariables-right.i b/src/plugins/aorai/tests/ya/metavariables-right.i
index 0be9f13ce1be8173b0ba9d32ffcb5bdf732bbce5..0ff8e12047ef50595f6ea275e5f13f752ded68c6 100644
--- a/src/plugins/aorai/tests/ya/metavariables-right.i
+++ b/src/plugins/aorai/tests/ya/metavariables-right.i
@@ -1,5 +1,5 @@
/* run.config*
- OPT: -aorai-automata @PTEST_DIR@/@PTEST_NAME@.ya -aorai-test-number @PTEST_NUMBER@ @PROVE_OPTIONS@
+ OPT: -aorai-automata %{dep:@PTEST_DIR@/@PTEST_NAME@.ya} -aorai-test-number @PTEST_NUMBER@ @PROVE_OPTIONS@
*/
void f(int x) {}
diff --git a/src/plugins/aorai/tests/ya/metavariables-wrong.i b/src/plugins/aorai/tests/ya/metavariables-wrong.i
index 23c49ad215000fad152c304b543748fcb92e669a..bfe546815b766c05c869c6ca92fb2a43b6f27bd8 100644
--- a/src/plugins/aorai/tests/ya/metavariables-wrong.i
+++ b/src/plugins/aorai/tests/ya/metavariables-wrong.i
@@ -1,6 +1,6 @@
/* run.config*
EXIT: 1
- OPT: -aorai-automata @PTEST_DIR@/@PTEST_NAME@.ya -aorai-test-number @PTEST_NUMBER@ @PROVE_OPTIONS@
+ OPT: -aorai-automata %{dep:@PTEST_DIR@/@PTEST_NAME@.ya} -aorai-test-number @PTEST_NUMBER@ @PROVE_OPTIONS@
*/
void f(int x) {}
void g(void) {}
diff --git a/src/plugins/aorai/tests/ya/monostate.i b/src/plugins/aorai/tests/ya/monostate.i
index 42e221ff638c60daf9e591c3673ad650368fe82e..554efa0a432a36bf02bc45d58475145a16294566 100644
--- a/src/plugins/aorai/tests/ya/monostate.i
+++ b/src/plugins/aorai/tests/ya/monostate.i
@@ -1,5 +1,5 @@
/* run.config
-OPT: -aorai-automata @PTEST_DIR@/@PTEST_NAME@.ya -aorai-test-number @PTEST_NUMBER@ @PROVE_OPTIONS@
+OPT: -aorai-automata %{dep:@PTEST_DIR@/@PTEST_NAME@.ya} -aorai-test-number @PTEST_NUMBER@ @PROVE_OPTIONS@
*/
void f(void) {}
diff --git a/src/plugins/aorai/tests/ya/not_prm.i b/src/plugins/aorai/tests/ya/not_prm.i
index e1133d9675a662c6c3841ccdb416808d8712e1c3..193f1d40a58814631991795b61431f968aab4475 100644
--- a/src/plugins/aorai/tests/ya/not_prm.i
+++ b/src/plugins/aorai/tests/ya/not_prm.i
@@ -1,5 +1,5 @@
/* run.config*
- OPT: -aorai-automata @PTEST_DIR@/@PTEST_NAME@.ya -aorai-acceptance -main f -aorai-test-number @PTEST_NUMBER@ @PROVE_OPTIONS@
+ OPT: -aorai-automata %{dep:@PTEST_DIR@/@PTEST_NAME@.ya} -aorai-acceptance -main f -aorai-test-number @PTEST_NUMBER@ @PROVE_OPTIONS@
*/
int f(int x) {
diff --git a/src/plugins/aorai/tests/ya/other.c b/src/plugins/aorai/tests/ya/other.c
index f395044d9538be9ac80ec6a176fa47061422d23a..31cbfb850314dee02b289ff26e43c2ba89fe798d 100644
--- a/src/plugins/aorai/tests/ya/other.c
+++ b/src/plugins/aorai/tests/ya/other.c
@@ -1,5 +1,5 @@
/* run.config*
- OPT: -aorai-automata @PTEST_DIR@/@PTEST_NAME@.ya -aorai-acceptance -aorai-test-number @PTEST_NUMBER@ @PROVE_OPTIONS@
+ OPT: -aorai-automata %{dep:@PTEST_DIR@/@PTEST_NAME@.ya} -aorai-acceptance -aorai-test-number @PTEST_NUMBER@ @PROVE_OPTIONS@
*/
int x=0;
diff --git a/src/plugins/aorai/tests/ya/saveload.i b/src/plugins/aorai/tests/ya/saveload.i
index f7fc1cf0ab6f5e12b6ba406495a38facedd3d4ce..0791b153a22327cd72ffe095920001fe5f0b28a6 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 @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/aorai/tests/ya/seq.i b/src/plugins/aorai/tests/ya/seq.i
index 96c875ed9bd51bce7df936007eda10fed4d5e13e..edee6f64841cd2adba02259e646b709d60566ef0 100644
--- a/src/plugins/aorai/tests/ya/seq.i
+++ b/src/plugins/aorai/tests/ya/seq.i
@@ -1,5 +1,5 @@
/* run.config*
- OPT: -aorai-automata @PTEST_DIR@/@PTEST_NAME@.ya -aorai-acceptance -aorai-test-number @PTEST_NUMBER@ @PROVE_OPTIONS@
+ OPT: -aorai-automata %{dep:@PTEST_DIR@/@PTEST_NAME@.ya} -aorai-acceptance -aorai-test-number @PTEST_NUMBER@ @PROVE_OPTIONS@
*/
void f() { }
diff --git a/src/plugins/aorai/tests/ya/seq_loop.i b/src/plugins/aorai/tests/ya/seq_loop.i
index ff634f0b1de6895ff941239f781d14e49c854771..5ea16e8dad7b9215efdb5ed5776ba26fd472f9c8 100644
--- a/src/plugins/aorai/tests/ya/seq_loop.i
+++ b/src/plugins/aorai/tests/ya/seq_loop.i
@@ -1,5 +1,5 @@
/* run.config*
- OPT: -aorai-automata @PTEST_DIR@/@PTEST_NAME@.ya -aorai-acceptance -aorai-test-number @PTEST_NUMBER@ @PROVE_OPTIONS@
+ OPT: -aorai-automata %{dep:@PTEST_DIR@/@PTEST_NAME@.ya} -aorai-acceptance -aorai-test-number @PTEST_NUMBER@ @PROVE_OPTIONS@
*/
void f() {}
diff --git a/src/plugins/aorai/tests/ya/serial.c b/src/plugins/aorai/tests/ya/serial.c
index e1aa4af00491ad5f5772d62fe0ca43bb33ecb30b..dfb83e2a08eeee5e862c55bea11ba991c57a4dec 100644
--- a/src/plugins/aorai/tests/ya/serial.c
+++ b/src/plugins/aorai/tests/ya/serial.c
@@ -1,5 +1,5 @@
/* run.config
- OPT: -aorai-automata @PTEST_DIR@/@PTEST_NAME@.ya -aorai-smoke-tests -aorai-test-number @PTEST_NUMBER@ -aorai-no-acceptance -aorai-instrumentation-history 2 -aorai-no-generate-annotations -aorai-no-generate-deterministic-lemmas -then-last -eva -eva-partition-value n -eva-ilevel 256
+ OPT: -aorai-automata %{dep:@PTEST_DIR@/@PTEST_NAME@.ya} -aorai-smoke-tests -aorai-test-number @PTEST_NUMBER@ -aorai-no-acceptance -aorai-instrumentation-history 2 -aorai-no-generate-annotations -aorai-no-generate-deterministic-lemmas -then-last -eva -eva-partition-value n -eva-ilevel 256
*/
/* run.config_prove
OPT: -cpp-extra-args="-DFOR_WP" -aorai-automata @PTEST_DIR@/@PTEST_NAME@_wp.ya -aorai-smoke-tests -aorai-test-number @PTEST_NUMBER@ -aorai-no-acceptance @PROVE_OPTIONS@
diff --git a/src/plugins/aorai/tests/ya/single_call.i b/src/plugins/aorai/tests/ya/single_call.i
index 015593d0f1fd2982d3dac34fba5bf407e7557b44..b705b3eaa487ea2107cef31356102331dd9b76bc 100644
--- a/src/plugins/aorai/tests/ya/single_call.i
+++ b/src/plugins/aorai/tests/ya/single_call.i
@@ -1,5 +1,5 @@
/* run.config*
- OPT: -aorai-automata @PTEST_DIR@/@PTEST_NAME@.ya -aorai-acceptance -aorai-test-number @PTEST_NUMBER@ @PROVE_OPTIONS@
+ OPT: -aorai-automata %{dep:@PTEST_DIR@/@PTEST_NAME@.ya} -aorai-acceptance -aorai-test-number @PTEST_NUMBER@ @PROVE_OPTIONS@
*/
int main () {}
diff --git a/src/plugins/aorai/tests/ya/singleassignment-right.i b/src/plugins/aorai/tests/ya/singleassignment-right.i
index 8d16f793ff23947bc17f2a975e0dbc168b645022..8d35fbd55759bdbb1283b9e8a09b192c1dc05526 100644
--- a/src/plugins/aorai/tests/ya/singleassignment-right.i
+++ b/src/plugins/aorai/tests/ya/singleassignment-right.i
@@ -1,5 +1,5 @@
/* run.config*
- OPT: -aorai-automata @PTEST_DIR@/@PTEST_NAME@.ya -aorai-test-number @PTEST_NUMBER@ @PROVE_OPTIONS@
+ OPT: -aorai-automata %{dep:@PTEST_DIR@/@PTEST_NAME@.ya} -aorai-test-number @PTEST_NUMBER@ @PROVE_OPTIONS@
*/
void main(int *x, int *y)
diff --git a/src/plugins/aorai/tests/ya/singleassignment-wrong.i b/src/plugins/aorai/tests/ya/singleassignment-wrong.i
index 3c61f3cb9e5ffc128a6056c13adeaa05b8c249f6..ea86f81ff969798b7918ef0713dcc60ad545e6ad 100644
--- a/src/plugins/aorai/tests/ya/singleassignment-wrong.i
+++ b/src/plugins/aorai/tests/ya/singleassignment-wrong.i
@@ -1,6 +1,6 @@
/* run.config*
EXIT: 1
- OPT: -aorai-automata @PTEST_DIR@/@PTEST_NAME@.ya -aorai-test-number @PTEST_NUMBER@ @PROVE_OPTIONS@
+ OPT: -aorai-automata %{dep:@PTEST_DIR@/@PTEST_NAME@.ya} -aorai-test-number @PTEST_NUMBER@ @PROVE_OPTIONS@
*/
int main(int x)
{
diff --git a/src/plugins/aorai/tests/ya/stack.i b/src/plugins/aorai/tests/ya/stack.i
index da30e1597e8d9232c7fad177f0bedcc4f24abec3..dbf9123b19db33bb210c845953aeb5e69e9d7e9e 100644
--- a/src/plugins/aorai/tests/ya/stack.i
+++ b/src/plugins/aorai/tests/ya/stack.i
@@ -1,5 +1,5 @@
/* run.config*
- OPT: -aorai-automata @PTEST_DIR@/@PTEST_NAME@.ya -aorai-test-number @PTEST_NUMBER@ @PROVE_OPTIONS@
+ OPT: -aorai-automata %{dep:@PTEST_DIR@/@PTEST_NAME@.ya} -aorai-test-number @PTEST_NUMBER@ @PROVE_OPTIONS@
*/
diff --git a/src/plugins/aorai/tests/ya/test_acces_params.c b/src/plugins/aorai/tests/ya/test_acces_params.c
index 3f7e08b1469bd631fea60bf591146e808e7099aa..c6bcf688213aeff1c2ecc32fee6fb977d2147726 100644
--- a/src/plugins/aorai/tests/ya/test_acces_params.c
+++ b/src/plugins/aorai/tests/ya/test_acces_params.c
@@ -1,5 +1,5 @@
/* run.config*
- OPT: -aorai-automata @PTEST_DIR@/@PTEST_NAME@.ya -aorai-test-number @PTEST_NUMBER@ @PROVE_OPTIONS@
+ OPT: -aorai-automata %{dep:@PTEST_DIR@/@PTEST_NAME@.ya} -aorai-test-number @PTEST_NUMBER@ @PROVE_OPTIONS@
*/
int status=0;
diff --git a/src/plugins/aorai/tests/ya/test_acces_params2.c b/src/plugins/aorai/tests/ya/test_acces_params2.c
index 597bd15931e8e0ab5ded73f9c40ab88a42592521..d37cb41f7a238d13ecc0df8d7ba9be1164e9d0a2 100644
--- a/src/plugins/aorai/tests/ya/test_acces_params2.c
+++ b/src/plugins/aorai/tests/ya/test_acces_params2.c
@@ -1,5 +1,5 @@
/* run.config*
- OPT: -aorai-automata @PTEST_DIR@/@PTEST_NAME@.ya -aorai-test-number @PTEST_NUMBER@ @PROVE_OPTIONS@
+ OPT: -aorai-automata %{dep:@PTEST_DIR@/@PTEST_NAME@.ya} -aorai-test-number @PTEST_NUMBER@ @PROVE_OPTIONS@
*/
diff --git a/src/plugins/aorai/tests/ya/test_boucle_rechercheTableau.c b/src/plugins/aorai/tests/ya/test_boucle_rechercheTableau.c
index 413b72d10ed4843d36ee08a6936a721e9d1e8b8e..07a1a808088774d892278326cdc066ff08cde802 100644
--- a/src/plugins/aorai/tests/ya/test_boucle_rechercheTableau.c
+++ b/src/plugins/aorai/tests/ya/test_boucle_rechercheTableau.c
@@ -1,5 +1,5 @@
/* run.config*
- OPT: -aorai-automata @PTEST_DIR@/@PTEST_NAME@.ya -aorai-acceptance -aorai-test-number @PTEST_NUMBER@ @PROVE_OPTIONS@
+ OPT: -aorai-automata %{dep:@PTEST_DIR@/@PTEST_NAME@.ya} -aorai-acceptance -aorai-test-number @PTEST_NUMBER@ @PROVE_OPTIONS@
*/
diff --git a/src/plugins/aorai/tests/ya/test_factorial.c b/src/plugins/aorai/tests/ya/test_factorial.c
index 87864af429ec3a84d1ecf52243da37193f6a43c2..904cd3c8674657f5d470f44b2f2c7a4e3ddec5bc 100644
--- a/src/plugins/aorai/tests/ya/test_factorial.c
+++ b/src/plugins/aorai/tests/ya/test_factorial.c
@@ -1,5 +1,5 @@
/* run.config*
- OPT: -aorai-automata @PTEST_DIR@/@PTEST_NAME@.ya -aorai-test-number @PTEST_NUMBER@ @PROVE_OPTIONS@
+ OPT: -aorai-automata %{dep:@PTEST_DIR@/@PTEST_NAME@.ya} -aorai-test-number @PTEST_NUMBER@ @PROVE_OPTIONS@
*/
diff --git a/src/plugins/aorai/tests/ya/test_recursion4.c b/src/plugins/aorai/tests/ya/test_recursion4.c
index 679c02692264b35ca08fef9b478577cdf67e726e..a6c468a723f10cd74880f6a43c0a65d8b478ed4a 100644
--- a/src/plugins/aorai/tests/ya/test_recursion4.c
+++ b/src/plugins/aorai/tests/ya/test_recursion4.c
@@ -1,5 +1,5 @@
/* run.config*
- OPT: -aorai-automata @PTEST_DIR@/@PTEST_NAME@.ya -aorai-acceptance -aorai-test-number @PTEST_NUMBER@ @PROVE_OPTIONS@
+ OPT: -aorai-automata %{dep:@PTEST_DIR@/@PTEST_NAME@.ya} -aorai-acceptance -aorai-test-number @PTEST_NUMBER@ @PROVE_OPTIONS@
*/
# pragma JessieIntegerModel(math)
diff --git a/src/plugins/aorai/tests/ya/test_recursion5.c b/src/plugins/aorai/tests/ya/test_recursion5.c
index b032ad61c1b7093e084727b1b3f9c11c00bf9cd3..7033403bcafb788fc64beebccc4ccff73b6a05c4 100644
--- a/src/plugins/aorai/tests/ya/test_recursion5.c
+++ b/src/plugins/aorai/tests/ya/test_recursion5.c
@@ -1,5 +1,5 @@
/* run.config*
- OPT: -aorai-automata @PTEST_DIR@/@PTEST_NAME@.ya -aorai-acceptance -aorai-test-number @PTEST_NUMBER@ @PROVE_OPTIONS@
+ OPT: -aorai-automata %{dep:@PTEST_DIR@/@PTEST_NAME@.ya} -aorai-acceptance -aorai-test-number @PTEST_NUMBER@ @PROVE_OPTIONS@
*/
diff --git a/src/plugins/aorai/tests/ya/test_struct.c b/src/plugins/aorai/tests/ya/test_struct.c
index d6476a3593a5e3d3afa76f5c2207747a39ae7d52..ecbdfe9fbff77cfe423148b7c8935ef888249f58 100644
--- a/src/plugins/aorai/tests/ya/test_struct.c
+++ b/src/plugins/aorai/tests/ya/test_struct.c
@@ -1,5 +1,5 @@
/* run.config*
- OPT: -aorai-automata @PTEST_DIR@/@PTEST_NAME@.ya -aorai-acceptance -aorai-test-number @PTEST_NUMBER@ @PROVE_OPTIONS@
+ OPT: -aorai-automata %{dep:@PTEST_DIR@/@PTEST_NAME@.ya} -aorai-acceptance -aorai-test-number @PTEST_NUMBER@ @PROVE_OPTIONS@
*/
struct People{
diff --git a/src/plugins/e-acsl/tests/special/e-acsl-external-print-value.c b/src/plugins/e-acsl/tests/special/e-acsl-external-print-value.c
index a7132d8744e98c550064232256caa87649879b70..1de231b4f1471ffc04034ec6f26b0309a1df7bf1 100644
--- a/src/plugins/e-acsl/tests/special/e-acsl-external-print-value.c
+++ b/src/plugins/e-acsl/tests/special/e-acsl-external-print-value.c
@@ -1,5 +1,5 @@
/* run.config_dev
- MACRO: ROOT_EACSL_GCC_OPTS_EXT --assert-print-data --external-print-value tests/special/e-acsl-external-print-value-fct.c
+ MACRO: ROOT_EACSL_GCC_OPTS_EXT --assert-print-data --external-print-value @PTEST_DIR@/e-acsl-external-print-value-fct.c
*/
int main() {
diff --git a/src/plugins/markdown-report/tests/md/cwe126.c b/src/plugins/markdown-report/tests/md/cwe126.c
index 412e50978a77322fdd2d3f5ac8140ac9a33dafc7..c25b4aaa78d04b224c468e63122591835baa353c 100644
--- a/src/plugins/markdown-report/tests/md/cwe126.c
+++ b/src/plugins/markdown-report/tests/md/cwe126.c
@@ -1,5 +1,5 @@
/* run.config
- OPT: -mdr-remarks @PTEST_DIR@/cwe126.remarks.md
+ OPT: -mdr-remarks %{dep:@PTEST_DIR@/@PTEST_NAME@.remarks.md}
*/
/* extracted from Juliet test suite v1.3 for C
diff --git a/src/plugins/markdown-report/tests/sarif/cwe125.c b/src/plugins/markdown-report/tests/sarif/cwe125.c
index be4e873fb8849e996300279cb3406d967de04147..f36a215aa2ed410ccddbf058b0d11a8874744e57 100644
--- a/src/plugins/markdown-report/tests/sarif/cwe125.c
+++ b/src/plugins/markdown-report/tests/sarif/cwe125.c
@@ -1,8 +1,8 @@
/* run.config
NOFRAMAC: use execnow for proper sequencing of executions
-EXECNOW: LOG @PTEST_NAME@.parse.log @frama-c@ @PTEST_FILE@ -save @PTEST_DIR@/result/@PTEST_NAME@_parse.sav > @PTEST_DIR@/result/@PTEST_NAME@.parse.log
-EXECNOW: LOG @PTEST_NAME@.eva.log @frama-c@ -load @PTEST_DIR@/result/@PTEST_NAME@_parse.sav -eva -save @PTEST_DIR@/result/@PTEST_NAME@_eva.sav > @PTEST_DIR@/result/@PTEST_NAME@.eva.log
-EXECNOW: LOG @PTEST_NAME@.sarif @frama-c@ -load @PTEST_DIR@/result/@PTEST_NAME@_eva.sav -then -mdr-out @PTEST_DIR@/result/@PTEST_NAME@.sarif -mdr-gen sarif -mdr-no-print-libc -mdr-sarif-deterministic
+EXECNOW: BIN @PTEST_NAME@_parse.sav LOG @PTEST_NAME@.parse.log LOG @PTEST_NAME@.parse.err @frama-c@ @PTEST_FILE@ -save @PTEST_RESULT@/@PTEST_NAME@_parse.sav > @PTEST_RESULT@/@PTEST_NAME@.parse.log 2> @PTEST_RESULT@/@PTEST_NAME@.parse.err
+EXECNOW: BIN @PTEST_NAME@_eva.sav LOG @PTEST_NAME@.eva.log LOG @PTEST_NAME@.eva.err @frama-c@ -load %{dep:@PTEST_RESULT@/@PTEST_NAME@_parse.sav} -eva -save @PTEST_RESULT@/@PTEST_NAME@_eva.sav > @PTEST_RESULT@/@PTEST_NAME@.eva.log 2> @PTEST_RESULT@/@PTEST_NAME@.eva.err
+EXECNOW: LOG @PTEST_NAME@.sarif LOG @PTEST_NAME@.sarif.log LOG @PTEST_NAME@.sarif.err @frama-c@ -load %{dep:@PTEST_RESULT@/@PTEST_NAME@_eva.sav} -then -mdr-out @PTEST_RESULT@/@PTEST_NAME@.sarif -mdr-gen sarif -mdr-no-print-libc -mdr-sarif-deterministic > @PTEST_RESULT@/@PTEST_NAME@.sarif.log 2> @PTEST_RESULT@/@PTEST_NAME@.sarif.err
*/
#include "__fc_builtin.h"
diff --git a/src/plugins/markdown-report/tests/sarif/libc.c b/src/plugins/markdown-report/tests/sarif/libc.c
index ebddde12484e96c3ce1921fe5432db3d83d87a5b..ccceac073671f0b697d0128e95f057940d0b119d 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/tests/jcdb/oracle/logic-pp-include.err b/src/plugins/markdown-report/tests/sarif/oracle/cwe125.eva.err
similarity index 100%
rename from tests/jcdb/oracle/logic-pp-include.err
rename to src/plugins/markdown-report/tests/sarif/oracle/cwe125.eva.err
diff --git a/src/plugins/markdown-report/tests/sarif/oracle/cwe125.parse.err b/src/plugins/markdown-report/tests/sarif/oracle/cwe125.parse.err
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/src/plugins/markdown-report/tests/sarif/oracle/cwe125.sarif.err b/src/plugins/markdown-report/tests/sarif/oracle/cwe125.sarif.err
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/src/plugins/markdown-report/tests/sarif/oracle/cwe125.sarif.log b/src/plugins/markdown-report/tests/sarif/oracle/cwe125.sarif.log
new file mode 100644
index 0000000000000000000000000000000000000000..7fe49562a792983f3a81cde36db666dbaf1338d1
--- /dev/null
+++ b/src/plugins/markdown-report/tests/sarif/oracle/cwe125.sarif.log
@@ -0,0 +1 @@
+[mdr] Report tests/sarif/result/cwe125.sarif generated
diff --git a/src/plugins/markdown-report/tests/sarif/std_string.c b/src/plugins/markdown-report/tests/sarif/std_string.c
index bc2bc89d0f4adc5bca5dddf01b9bbb17ad7f228d..f59bb9d1106d8645ea0700bbe533ec6eba4dee68 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/src/plugins/report/tests/report/classify.c b/src/plugins/report/tests/report/classify.c
index 53068d1fb7a6bb272020cde4a7cf821693cf6e5b..e51073e34a9f753ab2f18a9b5bfe1036cbb56345 100644
--- a/src/plugins/report/tests/report/classify.c
+++ b/src/plugins/report/tests/report/classify.c
@@ -9,11 +9,11 @@ EXIT: 1
LOG: classified.@PTEST_NUMBER@.json
OPT: -wp-prover qed -report-unclassified-warning ERROR -report-no-status -then -report-classify
LOG: classified.@PTEST_NUMBER@.json
- OPT: -wp-prover qed -report-rules @PTEST_DIR@/classify.json -report-unclassified-warning ERROR -then -report-classify
+ OPT: -wp-prover qed -report-rules %{dep:@PTEST_DIR@/classify.json} -report-unclassified-warning ERROR -then -report-classify
LOG: classified.@PTEST_NUMBER@.json
- OPT: -wp-prover qed -report-rules @PTEST_DIR@/classify.json -report-unclassified-untried REVIEW -then -report-classify
+ OPT: -wp-prover qed -report-rules %{dep:@PTEST_DIR@/classify.json} -report-unclassified-untried REVIEW -then -report-classify
LOG: classified.@PTEST_NUMBER@.json
- OPT: -wp-prover none -report-rules @PTEST_DIR@/classify.json -report-unclassified-untried REVIEW -then -report-classify
+ OPT: -wp-prover none -report-rules %{dep:@PTEST_DIR@/classify.json} -report-unclassified-untried REVIEW -then -report-classify
*/
int a ;
diff --git a/src/plugins/variadic/tests/known/print_libc.c b/src/plugins/variadic/tests/known/print_libc.c
index a7df6ff263a8daff3f836fa14a1d98b4e2e585ea..d837ececb50efcb3898ea7952fc9fd34e2f5f3d2 100644
--- a/src/plugins/variadic/tests/known/print_libc.c
+++ b/src/plugins/variadic/tests/known/print_libc.c
@@ -1,7 +1,7 @@
/* run.config
PLUGIN: variadic
- LOG: print_libc.pretty.c
- OPT: @PTEST_DIR@/empty.c -no-print-libc -print -ocode @PTEST_DIR@/result/@PTEST_NAME@.pretty.c -then @PTEST_DIR@/result/@PTEST_NAME@.pretty.c
+ LOG: @PTEST_NAME@.pretty.c
+ OPT: %{dep:@PTEST_DIR@/empty.c} -no-print-libc -print -ocode @PTEST_RESULT@/@PTEST_NAME@.pretty.c -then @PTEST_RESULT@/@PTEST_NAME@.pretty.c
*/
#include <stdio.h>
diff --git a/src/plugins/wp/tests/wp_acsl/chunk_typing_usable.i b/src/plugins/wp/tests/wp_acsl/chunk_typing_usable.i
index 28ffabaec02d2fef6f2b767e8cf9320b5e0c77a7..f74c36d4c224c0f792529bc703b3560a7ac70371 100644
--- a/src/plugins/wp/tests/wp_acsl/chunk_typing_usable.i
+++ b/src/plugins/wp/tests/wp_acsl/chunk_typing_usable.i
@@ -2,7 +2,7 @@
OPT: -wp-gen -wp-rte -wp-prover why3 -wp-msg-key print-generated
*/
/* run.config_qualif
- OPT: -wp-rte -wp-coq-script tests/wp_acsl/chunk_typing_usable.script -wp-prover alt-ergo,native:coq
+ OPT: -wp-rte -wp-coq-script @PTEST_DIR@/chunk_typing_usable.script -wp-prover alt-ergo,native:coq
*/
/*@
diff --git a/src/plugins/wp/tests/wp_acsl/classify_float.c b/src/plugins/wp/tests/wp_acsl/classify_float.c
index 570d50707379b44f32c2c6f1cb71d2723f202a35..d8defa956ed43e2b5cb2093be2a5b5242f8394fd 100644
--- a/src/plugins/wp/tests/wp_acsl/classify_float.c
+++ b/src/plugins/wp/tests/wp_acsl/classify_float.c
@@ -1,7 +1,7 @@
/* run.config_qualif
OPT: -wp-prover alt-ergo
OPT: -wp-prover native:alt-ergo
- OPT: -wp-prover native:coq -wp-coq-script tests/wp_acsl/classify_float.script
+ OPT: -wp-prover native:coq -wp-coq-script @PTEST_DIR@/classify_float.script
OPT: -wp-model real
*/
diff --git a/src/plugins/wp/tests/wp_acsl/tset.i b/src/plugins/wp/tests/wp_acsl/tset.i
index 1a8d3616255affc8528b54ed60eeffdfcdb259e3..208066a14375f6af2567fe81ff022c91a0838628 100644
--- a/src/plugins/wp/tests/wp_acsl/tset.i
+++ b/src/plugins/wp/tests/wp_acsl/tset.i
@@ -1,5 +1,5 @@
/* run.config_qualif
- OPT: -wp -wp-prover alt-ergo,native:coq -wp-coq-script tests/wp_acsl/tset.s
+ OPT: -wp -wp-prover alt-ergo,native:coq -wp-coq-script @PTEST_DIR@/tset.s
*/
/*@
diff --git a/src/plugins/wp/tests/wp_bts/bts_1174.i b/src/plugins/wp/tests/wp_bts/bts_1174.i
index da0bbc53889ea3e922863c157fefba16f2561866..f50673b933b25cf3f63ca15ff10fc7c6bef22604 100644
--- a/src/plugins/wp/tests/wp_bts/bts_1174.i
+++ b/src/plugins/wp/tests/wp_bts/bts_1174.i
@@ -1,5 +1,5 @@
/* run.config_qualif
- OPT: -wp -wp-prover native:coq -wp-coq-script tests/wp_bts/bts_1174.s -wp-model +real
+ OPT: -wp -wp-prover native:coq -wp-coq-script @PTEST_DIR@/bts_1174.s -wp-model +real
*/
/*@ requires -10. <= x && x <= 10.; */
diff --git a/src/plugins/wp/tests/wp_gallery/euclid.c b/src/plugins/wp/tests/wp_gallery/euclid.c
index 257d8c9ba2f410dd70b61383e0ac790ff004a95a..708ae7e8df94e667940e4727247cdcaa7fa1b55e 100644
--- a/src/plugins/wp/tests/wp_gallery/euclid.c
+++ b/src/plugins/wp/tests/wp_gallery/euclid.c
@@ -5,7 +5,7 @@
/*
run.config_qualif
- OPT: -wp-rte -wp-smoke-tests -wp-driver tests/wp_gallery/euclid.wp
+ OPT: -wp-rte -wp-smoke-tests -wp-driver @PTEST_DIR@/euclid.wp
*/
/*@
diff --git a/src/plugins/wp/tests/wp_manual/manual.i b/src/plugins/wp/tests/wp_manual/manual.i
index 9f3afd5d3ae753eb86fa336712f033cf4b64a825..c1a26e0440de5e9a9c513984e9456a08e4e7dc60 100644
--- a/src/plugins/wp/tests/wp_manual/manual.i
+++ b/src/plugins/wp/tests/wp_manual/manual.i
@@ -2,9 +2,9 @@
DONTRUN:
*/
/* run.config_qualif
- OPT: -wp-msg-key shell @PTEST_DIR@/working_dir/swap.c @PTEST_DIR@/working_dir/swap1.h
- OPT: -wp-msg-key shell -wp-rte @PTEST_DIR@/working_dir/swap.c @PTEST_DIR@/working_dir/swap2.h
+ OPT: -wp-msg-key shell %{dep:@PTEST_DIR@/working_dir/swap.c} %{dep:@PTEST_DIR@/working_dir/swap1.h}
+ OPT: -wp-msg-key shell -wp-rte %{dep:@PTEST_DIR@/working_dir/swap.c} %{dep:@PTEST_DIR@/working_dir/swap2.h}
PLUGIN: wp,rtegen,report
- OPT: -kernel-verbose 0 -wp-msg-key shell -wp-rte @PTEST_DIR@/working_dir/swap.c @PTEST_DIR@/working_dir/swap2.h -wp-verbose 0 -then -no-unicode -report
+ OPT: -kernel-verbose 0 -wp-msg-key shell -wp-rte %{dep:@PTEST_DIR@/working_dir/swap.c} %{dep:@PTEST_DIR@/working_dir/swap2.h} -wp-verbose 0 -then -no-unicode -report
*/
void look_at_working_dir(void);
diff --git a/src/plugins/wp/tests/wp_plugin/abs.i b/src/plugins/wp/tests/wp_plugin/abs.i
index 1697ccefd8ee4b92eb75798d33d238f27df347aa..321483c54b8ade7cb3782870de9e9a5cc49b0445 100644
--- a/src/plugins/wp/tests/wp_plugin/abs.i
+++ b/src/plugins/wp/tests/wp_plugin/abs.i
@@ -1,13 +1,15 @@
/* run.config
- OPT: -wp-driver tests/wp_plugin/abs.driver
+ COMMENT: depends from files mentionned into "abs.driver"
+ DEPS: abs.why abs.mlw abs.script Abs.v
+ OPT: -wp-driver %{dep:@PTEST_DIR@/abs.driver}
*/
-
/* run.config_qualif
- OPT: -wp -wp-driver tests/wp_plugin/abs.driver -wp-prover alt-ergo
- OPT: -wp -wp-driver tests/wp_plugin/abs.driver -wp-prover native:coq -wp-coq-script tests/wp_plugin/abs.script
- OPT: -wp -wp-driver tests/wp_plugin/abs.driver -wp-prover native:alt-ergo
+ COMMENT: depends from files mentionned into "abs.driver"
+ DEPS: abs.why abs.mlw abs.script Abs.v
+ OPT: -wp -wp-driver %{dep:@PTEST_DIR@/abs.driver} -wp-prover alt-ergo
+ OPT: -wp -wp-driver %{dep:@PTEST_DIR@/abs.driver} -wp-prover native:coq -wp-coq-script %{dep:@PTEST_DIR@/abs.script}
+ OPT: -wp -wp-driver %{dep:@PTEST_DIR@/abs.driver} -wp-prover native:alt-ergo
*/
-
/*@ axiomatic Absolute { logic integer ABS(integer x) ; } */
/*@ ensures \result == ABS(x) ; */
diff --git a/src/plugins/wp/tests/wp_plugin/bit_test.c b/src/plugins/wp/tests/wp_plugin/bit_test.c
index 96f24adfa142c51f5be4046ccd5abddc23671f08..15819e9315da6759b00a4365957933a128588053 100644
--- a/src/plugins/wp/tests/wp_plugin/bit_test.c
+++ b/src/plugins/wp/tests/wp_plugin/bit_test.c
@@ -1,9 +1,9 @@
/* run.config
- OPT: -wp-driver tests/wp_plugin/bit_test.driver
+ OPT: -wp-driver %{dep:@PTEST_DIR@/bit_test.driver}
*/
/* run.config_qualif
- OPT: -wp-driver tests/wp_plugin/bit_test.driver -wp-prover why3:alt-ergo
+ OPT: -wp-driver %{dep:@PTEST_DIR@/bit_test.driver} -wp-prover why3:alt-ergo
*/
/*@
diff --git a/src/plugins/wp/tests/wp_plugin/config.i b/src/plugins/wp/tests/wp_plugin/config.i
index 3653e881697196e82af4a05196d923fc730c67e0..07c0463b2c69dd4c2c347840dfa54da782a867ab 100644
--- a/src/plugins/wp/tests/wp_plugin/config.i
+++ b/src/plugins/wp/tests/wp_plugin/config.i
@@ -3,6 +3,6 @@
*/
/* run.config_qualif
- CMD: tests/wp_plugin/config.sh
+ CMD: %{dep:@PTEST_DIR@/config.sh}
OPT:
*/
diff --git a/src/plugins/wp/tests/wp_plugin/convert.i b/src/plugins/wp/tests/wp_plugin/convert.i
index 630c406f9676e288b6fedf7f56b5bd86006d5d1b..c09396fdda418ae62ac373fc6ebe4703b1560750 100644
--- a/src/plugins/wp/tests/wp_plugin/convert.i
+++ b/src/plugins/wp/tests/wp_plugin/convert.i
@@ -4,7 +4,7 @@
/* run.config_qualif
OPT:
- OPT: -wp-prover native:alt-ergo -wp-report=tests/native.report
+ OPT: -wp-prover native:alt-ergo -wp-report=%{dep:tests/native.report}
*/
// --------------------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_plugin/doomed_report_ko.i b/src/plugins/wp/tests/wp_plugin/doomed_report_ko.i
index 2189024b22ebf9d8292cfcc6b9aa7d7a6c7a9af6..a1d60e29660df66997e9044221d3fb83aa33eea6 100644
--- a/src/plugins/wp/tests/wp_plugin/doomed_report_ko.i
+++ b/src/plugins/wp/tests/wp_plugin/doomed_report_ko.i
@@ -3,7 +3,7 @@
*/
/* run.config_qualif
- OPT: -wp-smoke-tests -wp-report tests/wp_plugin/doomed.report
+ OPT: -wp-smoke-tests -wp-report %{dep:@PTEST_DIR@/doomed.report}
*/
/*@ axiomatic CFG {
diff --git a/src/plugins/wp/tests/wp_plugin/doomed_report_ok.i b/src/plugins/wp/tests/wp_plugin/doomed_report_ok.i
index 1b4f94519a27476677b15fee36c129bf4eb61e9a..0e9572ccf259f0ad0787b36ba8fbbb4209e5d984 100644
--- a/src/plugins/wp/tests/wp_plugin/doomed_report_ok.i
+++ b/src/plugins/wp/tests/wp_plugin/doomed_report_ok.i
@@ -3,7 +3,7 @@
*/
/* run.config_qualif
- OPT: -wp-smoke-tests -wp-report tests/wp_plugin/doomed.report
+ OPT: -wp-smoke-tests -wp-report %{dep:@PTEST_DIR@/doomed.report}
*/
/*@ axiomatic CFG {
diff --git a/src/plugins/wp/tests/wp_plugin/flash.c b/src/plugins/wp/tests/wp_plugin/flash.c
index ae46820c9da6cc9ce60f83f95658467c30344b27..957b7a677555f5350e219743644a4507973b389b 100644
--- a/src/plugins/wp/tests/wp_plugin/flash.c
+++ b/src/plugins/wp/tests/wp_plugin/flash.c
@@ -1,15 +1,19 @@
/* run.config
OPT:
- OPT: -wp-driver tests/wp_plugin/flash.driver,tests/wp_plugin/flash-ergo.driver
+ DEPS: flash.mlw
+ OPT: -wp-driver %{dep:@PTEST_DIR@/flash.driver},%{dep:@PTEST_DIR@/flash-ergo.driver}
SCRIPT: flash
- OPT: -wp-driver tests/wp_plugin/flash.driver
+ OPT: -wp-driver %{dep:@PTEST_DIR@/flash.driver}
*/
+
/* run.config_qualif
OPT: -wp-timeout 1
- OPT: -wp-driver tests/wp_plugin/flash.driver,tests/wp_plugin/flash-ergo.driver
-SCRIPT: flash
- OPT: -wp-driver tests/wp_plugin/flash.driver
+ DEPS: flash.mlw
+ OPT: -wp-driver %{dep:@PTEST_DIR@/flash.driver},%{dep:@PTEST_DIR@/flash-ergo.driver}
+SCRIPT: @PTEST_NAME@
+ OPT: -wp-driver %{dep:@PTEST_DIR@/flash.driver}
*/
+
/* -------------------------------------------------------------------------- */
/* --- Observation of Sequence of Reads and Writes --- */
/* -------------------------------------------------------------------------- */
diff --git a/src/plugins/wp/tests/wp_plugin/inductive.c b/src/plugins/wp/tests/wp_plugin/inductive.c
index a76e7864fb1428e2541c713b5a3bb3ff6ddf5f9d..fc52022bcb41ba6a0be668ad08de6a8d8a56406a 100644
--- a/src/plugins/wp/tests/wp_plugin/inductive.c
+++ b/src/plugins/wp/tests/wp_plugin/inductive.c
@@ -3,7 +3,7 @@
*/
/* run.config_qualif
- OPT: -wp-prover native:coq -wp-coq-script tests/wp_plugin/inductive.script -wp-timeout 240
+ OPT: -wp-prover native:coq -wp-coq-script %{dep:@PTEST_DIR@/inductive.script} -wp-timeout 240
*/
typedef struct _list { int element; struct _list* next; } list;
diff --git a/src/plugins/wp/tests/wp_plugin/init_extern.i b/src/plugins/wp/tests/wp_plugin/init_extern.i
index bffc36707c1eb0caac372542a470eeccb54caf86..79af3b5438b9341b0beafd00f4de99ee1f9f6ef6 100644
--- a/src/plugins/wp/tests/wp_plugin/init_extern.i
+++ b/src/plugins/wp/tests/wp_plugin/init_extern.i
@@ -1,9 +1,9 @@
/* run.config
- OPT: tests/wp_plugin/init_linker.i
+ OPT: %{dep:@PTEST_DIR@/init_linker.i}
*/
/* run.config_qualif
- OPT: tests/wp_plugin/init_linker.i
+ OPT: %{dep:@PTEST_DIR@/init_linker.i}
*/
// To be linked with init_linker that defines the initial value of 'a'
diff --git a/src/plugins/wp/tests/wp_plugin/math.i b/src/plugins/wp/tests/wp_plugin/math.i
index 160d94e7bee83c4caeeff4227a9a579d10c923a9..4a3905a7a75094fb219220189bb6b1fdfd180621 100644
--- a/src/plugins/wp/tests/wp_plugin/math.i
+++ b/src/plugins/wp/tests/wp_plugin/math.i
@@ -3,10 +3,10 @@
*/
/* run.config_qualif
- OPT: -wp-prover alt-ergo -wp-prop=-ko -wp-timeout 100 -wp-steps 1500
- OPT: -wp-prover native:alt-ergo -wp-report=tests/native.report -wp-prop=-ko -wp-timeout 100 -wp-steps 1500
- OPT: -wp-prover alt-ergo -wp-prop=ko -wp-timeout 100 -wp-steps 10
- OPT: -wp-prover native:alt-ergo -wp-report=tests/native.report -wp-prop=ko -wp-timeout 100 -wp-steps 10
+ OPT: -wp-prover alt-ergo -wp-prop=-ko -wp-timeout 100 -wp-steps 1500
+ OPT: -wp-prover native:alt-ergo -wp-report=%{dep:tests/native.report} -wp-prop=-ko -wp-timeout 100 -wp-steps 1500
+ OPT: -wp-prover alt-ergo -wp-prop=ko -wp-timeout 100 -wp-steps 10
+ OPT: -wp-prover native:alt-ergo -wp-report=%{dep:tests/native.report} -wp-prop=ko -wp-timeout 100 -wp-steps 10
*/
// --------------------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_plugin/no_step_limit.i b/src/plugins/wp/tests/wp_plugin/no_step_limit.i
index d1ad1d007aab8783123f81c1e3e37e9480154377..9f3b47813e5d5248effb9906fee3e8af9131caa5 100644
--- a/src/plugins/wp/tests/wp_plugin/no_step_limit.i
+++ b/src/plugins/wp/tests/wp_plugin/no_step_limit.i
@@ -2,10 +2,13 @@
DONTRUN:
*/
/* run.config_qualif
+ DEPS: @PTEST_NAME@.conf
CMD: WHY3CONFIG=@PTEST_DIR@/@PTEST_NAME@.conf @frama-c@
OPT: -wp -wp-prover no-steps -wp-steps 10 -wp-timeout 1 -wp-cache none -wp-no-cache-env -wp-msg-key shell
*/
+
// cache is locally deactivated to see the option
+
/*@
lemma truc: \false ;
*/
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/abs.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/abs.res.oracle
index 9a4cc9410828748161c0e18f9d4f8515b1f360ea..c13fb8b90149e9ec77bba3f000d7d2596f916b07 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/abs.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/abs.res.oracle
@@ -6,7 +6,7 @@
Function abs
------------------------------------------------------------
-Goal Post-condition (file tests/wp_plugin/abs.i, line 13) in 'abs':
+Goal Post-condition (file tests/wp_plugin/abs.i, line 15) in 'abs':
Assume {
Type: is_sint32(abs_0) /\ is_sint32(x).
If x < 0
diff --git a/src/plugins/wp/tests/wp_plugin/region_to_coq.i b/src/plugins/wp/tests/wp_plugin/region_to_coq.i
index 181b5891315053a6b1757046fec83385a9a6d3ac..1559385fdb5302d5b94264553758701e6e82385e 100644
--- a/src/plugins/wp/tests/wp_plugin/region_to_coq.i
+++ b/src/plugins/wp/tests/wp_plugin/region_to_coq.i
@@ -2,7 +2,7 @@
DONTRUN:
*/
/* run.config_qualif
- OPT: -wp-prover native:coq -wp-coq-script tests/wp_plugin/region_to_coq.script
+ OPT: -wp-prover native:coq -wp-coq-script @PTEST_DIR@/region_to_coq.script
*/
void copy(int* a, unsigned int n, int* b)
diff --git a/src/plugins/wp/tests/wp_region/annot.i b/src/plugins/wp/tests/wp_region/annot.i
index 93dd7b1cd7865ffb38467183c1273ba00ecb7b60..c202842576beca01e716dad17e042dc35f98f22a 100644
--- a/src/plugins/wp/tests/wp_region/annot.i
+++ b/src/plugins/wp/tests/wp_region/annot.i
@@ -1,9 +1,9 @@
/* run.config
PLUGIN: wp
OPT: -region-annot -print
- EXECNOW: BIN ocode_@PTEST_NAME@_1.i @frama-c@ @PTEST_DIR@/@PTEST_NAME@.i -region-annot -print -ocode @PTEST_RESULT@/ocode_@PTEST_NAME@_1.i > @DEV_NULL@ 2> @DEV_NULL@
- EXECNOW: BIN ocode_@PTEST_NAME@_2.i @frama-c@ @PTEST_RESULT@/ocode_@PTEST_NAME@_1.i -region-annot -print -ocode @PTEST_RESULT@/ocode_@PTEST_NAME@_2.i > @DEV_NULL@ 2> @DEV_NULL@
- EXECNOW: LOG diff_@PTEST_NAME@.txt diff @PTEST_RESULT@/ocode_@PTEST_NAME@_1.i @PTEST_RESULT@/ocode_@PTEST_NAME@_2.i &> @PTEST_RESULT@/diff_@PTEST_NAME@.txt
+ EXECNOW: BIN ocode_@PTEST_NAME@_1.i @frama-c@ %{dep:@PTEST_DIR@/@PTEST_NAME@.i} -region-annot -print -ocode @PTEST_RESULT@/ocode_@PTEST_NAME@_1.i > @DEV_NULL@ 2> @DEV_NULL@
+ EXECNOW: BIN ocode_@PTEST_NAME@_2.i @frama-c@ %{dep:@PTEST_RESULT@/ocode_@PTEST_NAME@_1.i} -region-annot -print -ocode @PTEST_RESULT@/ocode_@PTEST_NAME@_2.i > @DEV_NULL@ 2> @DEV_NULL@
+ EXECNOW: LOG diff_@PTEST_NAME@.txt diff %{dep:@PTEST_RESULT@/ocode_@PTEST_NAME@_1.i} %{dep:@PTEST_RESULT@/ocode_@PTEST_NAME@_2.i} &> @PTEST_RESULT@/diff_@PTEST_NAME@.txt
COMMENT: The file diff_@PTEST_NAME@.txt must be empty.
COMMENT: So, that file has not to be present into the oracle directory since absent files are considered such as empty files.
*/
diff --git a/src/plugins/wp/tests/wp_typed/unit_bitwise.c b/src/plugins/wp/tests/wp_typed/unit_bitwise.c
index 5176553ee138ade6a1bd996abdd4581adbb575dd..acb4398b437fd953eeae6b3d8f23e91a3557fcfb 100644
--- a/src/plugins/wp/tests/wp_typed/unit_bitwise.c
+++ b/src/plugins/wp/tests/wp_typed/unit_bitwise.c
@@ -1,13 +1,13 @@
/* run.config
+ DEPS: unit_bitwise.h
OPT:
*/
/* run.config_qualif
+ DEPS: unit_bitwise.h
OPT: -wp-prop="-ko"
OPT: -wp-prop="ko"
*/
-
-
#include "unit_bitwise.h"
//===============================================
//-- int
diff --git a/src/plugins/wp/tests/wp_usage/save_load.i b/src/plugins/wp/tests/wp_usage/save_load.i
index 72e3c2595a6d9d9bf219e0b22aa4cbe494b9cb4c..0e3111eeace52fb92fdba25217bebf8e1ec551e3 100644
--- a/src/plugins/wp/tests/wp_usage/save_load.i
+++ b/src/plugins/wp/tests/wp_usage/save_load.i
@@ -1,6 +1,6 @@
/* run.config
- EXECNOW: LOG save_load.sav.res LOG save_load.sav.err BIN @PTEST_NAME@.sav @frama-c@ -wp-warn-key pedantic-assigns=inactive -wp-share ./share -wp -wp-print -wp-prover none @PTEST_FILE@ -save @PTEST_DIR@/@PTEST_NAME@.sav > @PTEST_DIR@/result/@PTEST_NAME@.sav.res 2> @PTEST_DIR@/result/@PTEST_NAME@.sav.err
- CMD: @frama-c@ -load @PTEST_DIR@/@PTEST_NAME@.sav -wp-warn-key pedantic-assigns=inactive
+ EXECNOW: LOG save_load.sav.res LOG save_load.sav.err BIN @PTEST_NAME@.sav @frama-c@ -wp-warn-key pedantic-assigns=inactive -wp-share ./share -wp -wp-print -wp-prover none @PTEST_FILE@ -save @PTEST_RESULT@/@PTEST_NAME@.sav > @PTEST_RESULT@/@PTEST_NAME@.sav.res 2> @PTEST_RESULT@/@PTEST_NAME@.sav.err
+ CMD: @frama-c@ -load %{dep:@PTEST_RESULT@/@PTEST_NAME@.sav} -wp-warn-key pedantic-assigns=inactive
OPT: -print
OPT: -wp -wp-prover none -wp-print
*/
diff --git a/tests/cil/cpu_a.c b/tests/cil/cpu_a.c
index 121b3dbe13e41bb1e5b26acef7f66828e5883a5a..a97da066ed18deb30432c6b42417a8c56fe313bc 100644
--- a/tests/cil/cpu_a.c
+++ b/tests/cil/cpu_a.c
@@ -1,5 +1,5 @@
/* run.config
- OPT: tests/cil/cpu_b.c -machdep x86_16 -print
+ OPT: %{dep:@PTEST_DIR@/cpu_b.c} -machdep x86_16 -print
*/
typedef unsigned short DWORD ;
diff --git a/tests/cil/cpu_b.c b/tests/cil/cpu_b.c
index 66280560447f97a5913fc7accbcd946494a938ff..0835b42718b5ad83dbcee6b5b3fa4fd6edfb0725 100644
--- a/tests/cil/cpu_b.c
+++ b/tests/cil/cpu_b.c
@@ -1,5 +1,5 @@
/* run.config
- OPT: tests/cil/cpu_a.c -machdep x86_16 -print
+ OPT: %{dep:@PTEST_DIR@/cpu_a.c} -machdep x86_16 -print
*/
typedef unsigned int DWORD ;
diff --git a/tests/cil/merge.c b/tests/cil/merge.c
index 9444e898c78e497cd044587c1ce654263f3be829..4e108ad538cd625d35bed8cfc721ac313d571802 100644
--- a/tests/cil/merge.c
+++ b/tests/cil/merge.c
@@ -1,4 +1,4 @@
/* run.config
- OPT: tests/cil/merge2.c -print
+ STDOPT: +"%{dep:@PTEST_DIR@/merge2.c}"
*/
extern int x;
diff --git a/tests/cil/merge2.c b/tests/cil/merge2.c
index 41981de70158af0cbc9297dc1b6eba38788485d2..a354233ee0aa7ce674e80a4dfa060577128db3ce 100644
--- a/tests/cil/merge2.c
+++ b/tests/cil/merge2.c
@@ -1,4 +1,4 @@
/* run.config
- OPT: tests/cil/merge.c -print
+ STDOPT: +"%{dep:@PTEST_DIR@/merge.c}"
*/
int x =2;
diff --git a/tests/dynamic/dynamic.i b/tests/dynamic/dynamic.i
index c9cccd8e7c2e0e292cb9dab261eba0bae715624f..b33a41b88c7d881276220ab303231eba7d5e2b70 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 b8105502931616ce2861af2459303855112b449a..32d7f8785037ce143f729181fd7d3e8ef20d42ae 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/list_functions.i b/tests/fc_script/list_functions.i
index aab65784552e38fdecd78fed6fd1ead8744f654d..448f97a30909dda8da6e3d773ed34336bf46e4a6 100644
--- a/tests/fc_script/list_functions.i
+++ b/tests/fc_script/list_functions.i
@@ -1,4 +1,19 @@
/* run.config
- NOFRAMAC: testing frama-c-script, not frama-c itself
- EXECNOW: LOG heuristic_list_functions.res LOG heuristic_list_functions.err bin/frama-c-script heuristic-list-functions true true @PTEST_DIR@/*.c @PTEST_DIR@/*.i > @PTEST_DIR@/result/heuristic_list_functions.res 2> @PTEST_DIR@/result/heuristic_list_functions.err
+ NOFRAMAC: testing frama-c-script, not frama-c itself
+
+ DEPS: @PTEST_DEPS@ @PTEST_DIR@/for-find-fun.c
+ DEPS: @PTEST_DEPS@ @PTEST_DIR@/for-find-fun2.c
+ DEPS: @PTEST_DEPS@ @PTEST_DIR@/for-list-functions.c
+ DEPS: @PTEST_DEPS@ @PTEST_DIR@/list_functions.i
+ DEPS: @PTEST_DEPS@ @PTEST_DIR@/main.c
+ DEPS: @PTEST_DEPS@ @PTEST_DIR@/main2.c
+ DEPS: @PTEST_DEPS@ @PTEST_DIR@/main3.c
+ DEPS: @PTEST_DEPS@ @PTEST_DIR@/make-wrapper.c
+ DEPS: @PTEST_DEPS@ @PTEST_DIR@/make-wrapper2.c
+ DEPS: @PTEST_DEPS@ @PTEST_DIR@/make-wrapper3.c
+
+ DEPS: @PTEST_DEPS@ @PTEST_DIR@/build-callgraph.i
+ DEPS: @PTEST_DEPS@ @PTEST_DIR@/recursions.i
+
+ EXECNOW: LOG heuristic_list_functions.res LOG heuristic_list_functions.err %{bin:frama-c-script} heuristic-list-functions true true @PTEST_DEPS@ > @PTEST_RESULT@/heuristic_list_functions.res 2> @PTEST_RESULT@/heuristic_list_functions.err
*/
diff --git a/tests/fc_script/main.c b/tests/fc_script/main.c
index 9b26d5592ce3a64f3b8fc228cbc79d62de0ab25f..34a456e008ee9c04c99aec5dbe70560232a1201b 100644
--- a/tests/fc_script/main.c
+++ b/tests/fc_script/main.c
@@ -1,14 +1,21 @@
/* run.config
- NOFRAMAC: testing frama-c-script, not frama-c itself
- EXECNOW: LOG GNUmakefile LOG make_template.res LOG make_template.err cd @PTEST_DIR@ && PTESTS_TESTING= ../../bin/frama-c-script make-template result < make_template.input > result/make_template.res 2> result/make_template.err
- EXECNOW: LOG list_files.res LOG list_files.err bin/frama-c-script list-files @PTEST_DIR@/list_files.json > @PTEST_DIR@/result/list_files.res 2> @PTEST_DIR@/result/list_files.err
- EXECNOW: LOG find_fun1.res LOG find_fun1.err bin/frama-c-script find-fun main2 @PTEST_DIR@ > @PTEST_DIR@/result/find_fun1.res 2> @PTEST_DIR@/result/find_fun1.err
- EXECNOW: LOG find_fun2.res LOG find_fun2.err bin/frama-c-script find-fun main3 @PTEST_DIR@ > @PTEST_DIR@/result/find_fun2.res 2> @PTEST_DIR@/result/find_fun2.err
- EXECNOW: LOG find_fun3.res LOG find_fun3.err bin/frama-c-script find-fun false_positive @PTEST_DIR@ > @PTEST_DIR@/result/find_fun3.res 2> @PTEST_DIR@/result/find_fun3.err
- EXECNOW: LOG list_functions.res LOG list_functions.err bin/frama-c-script list-functions @PTEST_DIR@/for-find-fun2.c @PTEST_DIR@/for-list-functions.c > @PTEST_DIR@/result/list_functions.res 2> @PTEST_DIR@/result/list_functions.err
- EXECNOW: LOG list_functions2.res LOG list_functions2.err LOG list_functions2.json bin/frama-c-script list-functions @PTEST_DIR@/for-find-fun2.c @PTEST_DIR@/for-list-functions.c -list-functions-declarations -list-functions-output @PTEST_DIR@/result/list_functions2.json -list-functions-debug 1 > @PTEST_DIR@/result/list_functions2.res 2> @PTEST_DIR@/result/list_functions2.err
+ NOFRAMAC: testing frama-c-script, not frama-c itself
+ DEPS: for-find-fun2.c for-find-fun.c main.c main2.c main3.c
+ EXECNOW: LOG GNUmakefile LOG make_template.res LOG make_template.err PTESTS_TESTING= %{bin:frama-c-script} -C @PTEST_DIR@ make-template result < %{dep:@PTEST_DIR@/make_template.input} > @PTEST_RESULT@/make_template.res 2> @PTEST_RESULT@/make_template.err
+ DEPS: main2.c main3.c main.c
+ EXECNOW: LOG list_files.res LOG list_files.err %{bin:frama-c-script} list-files %{dep:@PTEST_DIR@/list_files.json} > @PTEST_RESULT@/list_files.res 2> @PTEST_RESULT@/list_files.err
+ DEPS: for-find-fun2.c for-find-fun.c for-list-functions.c main2.c main3.c main.c make-wrapper2.c make-wrapper3.c make-wrapper.c
+ EXECNOW: LOG find_fun1.res LOG find_fun1.err %{bin:frama-c-script} find-fun main2 @PTEST_DIR@ > @PTEST_RESULT@/find_fun1.res 2> @PTEST_RESULT@/find_fun1.err
+ EXECNOW: LOG find_fun2.res LOG find_fun2.err %{bin:frama-c-script} find-fun main3 @PTEST_DIR@ > @PTEST_RESULT@/find_fun2.res 2> @PTEST_RESULT@/find_fun2.err
+ EXECNOW: LOG find_fun3.res LOG find_fun3.err %{bin:frama-c-script} find-fun false_positive @PTEST_DIR@ > @PTEST_RESULT@/find_fun3.res 2> @PTEST_RESULT@/find_fun3.err
+ DEPS:
+ EXECNOW: LOG list_functions.res LOG list_functions.err %{bin:frama-c-script} list-functions %{dep:@PTEST_DIR@/for-find-fun2.c} %{dep:@PTEST_DIR@/for-list-functions.c} > @PTEST_RESULT@/list_functions.res 2> @PTEST_RESULT@/list_functions.err
+ EXECNOW: LOG list_functions2.res LOG list_functions2.err LOG list_functions2.json %{bin:frama-c-script} list-functions %{dep:@PTEST_DIR@/for-find-fun2.c} %{dep:@PTEST_DIR@/for-list-functions.c -list-functions-declarations} -list-functions-output @PTEST_RESULT@/list_functions2.json -list-functions-debug 1 > @PTEST_RESULT@/list_functions2.res 2> @PTEST_RESULT@/list_functions2.err
*/
+
+
void main() {
}
+// NB: Dependency to ./share directory where are script files used by %{bin:frama-c-script} is implicit with `dune` testing.
diff --git a/tests/fc_script/oracle/heuristic_list_functions.res b/tests/fc_script/oracle/heuristic_list_functions.res
index 32dba2e292db55b4813517058336a9e52cc76090..5eeb1a42fc008a7134b2992952d1981143a4e1f2 100644
--- a/tests/fc_script/oracle/heuristic_list_functions.res
+++ b/tests/fc_script/oracle/heuristic_list_functions.res
@@ -7,7 +7,7 @@ tests/fc_script/for-find-fun2.c:19:21: h (definition)
tests/fc_script/for-find-fun2.c:28:31: static_fun (definition)
tests/fc_script/for-list-functions.c:8:15: static_fun (definition)
tests/fc_script/for-list-functions.c:17:22: k (definition)
-tests/fc_script/main.c:12:14: main (definition)
+tests/fc_script/main.c:18:20: main (definition)
tests/fc_script/main2.c:6:8: fake_main (definition)
tests/fc_script/main2.c:10:12: domain (definition)
tests/fc_script/main2.c:14:16: main2 (definition)
diff --git a/tests/fc_script/recursions.i b/tests/fc_script/recursions.i
index 841d609939737908e7378823b9642e55af7fb2bb..1a167347f75321356a77c06c019f140bcca1791a 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/float/absorb.c b/tests/float/absorb.c
index dbc2c9be16eb08e8623adacb43484cee5e14f4b2..656a6b9bc1ee85ae90e3f525027d76edad9d7baf 100644
--- a/tests/float/absorb.c
+++ b/tests/float/absorb.c
@@ -1,10 +1,10 @@
/* run.config
COMMENT: run.config is intentionally not-*
PLUGIN:
- EXECNOW: BIN absorb.sav LOG absorb_sav.res LOG absorb_sav.err @frama-c@ -save @PTEST_DIR@/result/absorb.sav @PTEST_FILE@ > @PTEST_DIR@/result/absorb_sav.res 2> @PTEST_DIR@/result/absorb_sav.err
+ EXECNOW: BIN absorb.sav LOG absorb_sav.res LOG absorb_sav.err @frama-c@ -save @PTEST_RESULT@/absorb.sav @PTEST_FILE@ > @PTEST_RESULT@/absorb_sav.res 2> @PTEST_RESULT@/absorb_sav.err
PLUGIN: @EVA_PLUGINS@
- EXECNOW: BIN absorb.sav2 LOG absorb_sav2.res LOG absorb_sav2.err @frama-c@ -load @PTEST_DIR@/result/absorb.sav -eva @EVA_CONFIG@ -float-hex -save @PTEST_DIR@/result/absorb.sav2 > @PTEST_DIR@/result/absorb_sav2.res 2> @PTEST_DIR@/result/absorb_sav2.err
- OPT: -load @PTEST_DIR@/result/absorb.sav2 -deps -out -input
+ EXECNOW: BIN absorb.sav2 LOG absorb_sav2.res LOG absorb_sav2.err @frama-c@ -load %{dep:@PTEST_RESULT@/absorb.sav} -eva @EVA_CONFIG@ -float-hex -save @PTEST_RESULT@/absorb.sav2 > @PTEST_RESULT@/absorb_sav2.res 2> @PTEST_RESULT@/absorb_sav2.err
+ OPT: -load %{dep:@PTEST_RESULT@/absorb.sav2} -deps -out -input
*/
/* run.config*
DONTRUN:
diff --git a/tests/idct/ieee_1180_1990.c b/tests/idct/ieee_1180_1990.c
index 6d0489e1d4ce589606fcd823b5486dda05c01100..09a50b86bcd9148674788ad54409a47bc0a34235 100644
--- a/tests/idct/ieee_1180_1990.c
+++ b/tests/idct/ieee_1180_1990.c
@@ -1,6 +1,6 @@
/* run.config*
- PLUGIN: @PTEST_PLUGIN@ report
- STDOPT: +"-eva-msg-key=summary -float-normal -no-warn-signed-overflow tests/idct/idct.c -eva-remove-redundant-alarms -eva-memexec -eva-builtin sqrt:Frama_C_sqrt,cos:Frama_C_cos -then -report -report-print-properties"
+ PLUGIN: @PTEST_PLUGIN@ report
+ STDOPT: +"-eva-msg-key=summary -float-normal -no-warn-signed-overflow %{dep:@PTEST_DIR@/idct.c} -eva-remove-redundant-alarms -eva-memexec -eva-builtin sqrt:Frama_C_sqrt,cos:Frama_C_cos -then -report -report-print-properties"
*/
/* IEEE_1180_1990: a testbed for IDCT accuracy
* Copyright (C) 2001 Renaud Pacalet
diff --git a/tests/jcdb/jcdb.c b/tests/jcdb/jcdb.c
index c35dc80b7bfb0406a6653fcd8891cb2d7063b2a4..aafa9112dc0f1d77975668df0e71979441836727 100644
--- a/tests/jcdb/jcdb.c
+++ b/tests/jcdb/jcdb.c
@@ -1,11 +1,13 @@
/* run.config
+ DEPS: compile_commands.json
+ COMMENT: parsing option are defined in the default json file "compile_commands.json"
OPT: -json-compilation-database @PTEST_DIR@ -print
- OPT: @PTEST_DIR@/jcdb2.c -json-compilation-database @PTEST_DIR@/with_arguments.json -print
+ DEPS:
+ OPT: %{dep:@PTEST_DIR@/jcdb2.c} -json-compilation-database %{dep:@PTEST_DIR@/with_arguments.json} -print
MODULE: @PTEST_NAME@
- OPT: -json-compilation-database @PTEST_DIR@/with_arguments.json -no-autoload-plugins
+ OPT: -json-compilation-database %{dep:@PTEST_DIR@/with_arguments.json}
MODULE:
- EXECNOW: LOG list_files.res LOG list_files.err share/analysis-scripts/list_files.py @PTEST_DIR@/compile_commands_working.json > @PTEST_DIR@/result/list_files.res 2> @PTEST_DIR@/result/list_files.err
- EXECNOW: LOG logic-pp-include.res LOG logic-pp-include.err @frama-c@ -json-compilation-database @PTEST_DIR@/logic-pp-include @PTEST_DIR@/logic-pp-include/no-stdio.c -print > @PTEST_DIR@/result/logic-pp-include.res 2> @PTEST_DIR@/result/logic-pp-include.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/jcdb/logic-pp-include.c b/tests/jcdb/logic-pp-include.c
new file mode 100644
index 0000000000000000000000000000000000000000..b7b01d3df6c6355842b5d48358d3220c277fa14b
--- /dev/null
+++ b/tests/jcdb/logic-pp-include.c
@@ -0,0 +1,5 @@
+/* run.config
+ COMMENT: test related to a bugfix in the management of relative sub-directories:
+ DEPS: logic-pp-include/compile_commands.json
+ OPT: -json-compilation-database @PTEST_DIR@/logic-pp-include %{dep:@PTEST_DIR@/logic-pp-include/no-stdio.c} -print
+*/
diff --git a/tests/jcdb/logic-pp-include/no-stdio.c b/tests/jcdb/logic-pp-include/no-stdio.c
index 5dfc21439f01527a4f67a7a1ebcb44a153b668b7..1168462ce7702cf820f70484b7a59f92f9aeba7a 100644
--- a/tests/jcdb/logic-pp-include/no-stdio.c
+++ b/tests/jcdb/logic-pp-include/no-stdio.c
@@ -1,4 +1,8 @@
-// compile_commands.json must have "-includestdio.h" and define ZERO
+/* run.config
+ OPT: -json-compilation-database %{dep:@PTEST_DIR@/no-stdio.json} -print
+*/
+
+// no-stdio.json must have "-includestdio.h" and define ZERO
//@ ensures \result == ZERO;
int main(){
diff --git a/tests/jcdb/oracle/logic-pp-include.res b/tests/jcdb/oracle/logic-pp-include.res.oracle
similarity index 81%
rename from tests/jcdb/oracle/logic-pp-include.res
rename to tests/jcdb/oracle/logic-pp-include.res.oracle
index a8432079471806a65084e802c433a6492980d71e..df594829de8f12fded098a8ae6d1d12f1e627f89 100644
--- a/tests/jcdb/oracle/logic-pp-include.res
+++ b/tests/jcdb/oracle/logic-pp-include.res.oracle
@@ -1,3 +1,4 @@
+[kernel] Parsing tests/jcdb/logic-pp-include.c (with preprocessing)
[kernel] Parsing tests/jcdb/logic-pp-include/no-stdio.c (with preprocessing)
/* Generated by Frama-C */
#include "errno.h"
diff --git a/tests/journal/control.i b/tests/journal/control.i
index f51a9bb5b161ca2b2a797be2f5ea34282763b314..d531607a34cc031bf0d2d321097b44804624eacd 100644
--- a/tests/journal/control.i
+++ b/tests/journal/control.i
@@ -6,7 +6,7 @@
OPT:
MODULE:
SCRIPT: result/control_journal_bis.ml
- EXECNOW: BIN control_journal_bis.ml cp @PTEST_RESULT@/control_journal.ml @PTEST_RESULT@/control_journal_bis.ml > @DEV_NULL@ 2> @DEV_NULL@
+ EXECNOW: BIN control_journal_bis.ml cp %{dep:@PTEST_RESULT@/control_journal.ml} @PTEST_RESULT@/control_journal_bis.ml > @DEV_NULL@ 2> @DEV_NULL@
OPT: -calldeps
MODULE: abstract_cpt use_cpt
SCRIPT:
diff --git a/tests/libc/fc_libc.c b/tests/libc/fc_libc.c
index f570af584e763627215be81b17e69e67e05d6dd7..ad542ec311f9aae9dbb55704e12f9d45b0dfaa44 100644
--- a/tests/libc/fc_libc.c
+++ b/tests/libc/fc_libc.c
@@ -11,7 +11,7 @@
MODULE: check_compliance
OPT: -kernel-msg-key printer:attrs
MODULE:
- CMD: ./tests/libc/check_full_libc.sh
+ CMD: %{dep:@PTEST_DIR@/check_full_libc.sh}
OPT:
**/
#define __FC_REG_TEST
diff --git a/tests/libc/time_misc.c b/tests/libc/time_misc.c
index 8123a1641dc5e5ff829cde5f958e3b14d5f24656..da8e73a77eac1f10b3db3fa4e57bb18012647c7f 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 83556b3d9b4e6b4042873d240ba90e708637d16c..a753efa3828153397a9cc8869a58261701ab5f20 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 7fde0cd019cb0aaadd7913112dd5b38b517d2d68..6949e4d4d03de0004dab77e105a68ca5dda49772 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 a594d4b3752dbacef4f1142c054d91976719a06a..3869382c8c01316e2b4b917cc2c7149a0ea87646 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 84c8e1f479d6e530dff7066196fd1050826ae880..667ab3eb1add0ca9eebd65c5f739e16ae75fc749 100644
--- a/tests/misc/bts0990_link.i
+++ b/tests/misc/bts0990_link.i
@@ -1,9 +1,9 @@
/* run.config*
EXIT: 1
- OPT: tests/misc/bts0990_link_1.i
+ 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/cpp-extra-args-per-file1.c b/tests/misc/cpp-extra-args-per-file1.c
index a1f58ee5494a15795fded38853d461909d7fcf4d..b7e64abcf11b993f77b12f991e9e6c91494b69be 100644
--- a/tests/misc/cpp-extra-args-per-file1.c
+++ b/tests/misc/cpp-extra-args-per-file1.c
@@ -1,5 +1,5 @@
/* run.config
- OPT: -no-autoload-plugins -cpp-extra-args="-DGLOBAL" -cpp-extra-args-per-file @PTEST_DIR@/cpp-extra-args-per-file1.c:'-DFILE1 -DMACRO_WITH_QUOTES="\"hello world"\"',@PTEST_DIR@/cpp-extra-args-per-file2.c:"-DFILE2" -print -then @PTEST_DIR@/cpp-extra-args-per-file2.c -no-print
+ OPT: -no-autoload-plugins -cpp-extra-args="-DGLOBAL" -cpp-extra-args-per-file @PTEST_DIR@/@PTEST_NAME@.c:'-DFILE1 -DMACRO_WITH_QUOTES="\"hello world"\"',@PTEST_DIR@/cpp-extra-args-per-file2.c:"-DFILE2" -print -then %{dep:@PTEST_DIR@/cpp-extra-args-per-file2.c} -no-print
*/
#ifndef GLOBAL
diff --git a/tests/misc/custom_machdep.c b/tests/misc/custom_machdep.c
index 6bd79189bb526ec401434d6ea32580373a48de73..2de12207aa57799e9dccfc665cd76d419629bcba 100644
--- a/tests/misc/custom_machdep.c
+++ b/tests/misc/custom_machdep.c
@@ -1,7 +1,7 @@
/* run.config*
EXIT: 1
-
MODULE: @PTEST_NAME@.cmxs
+ DEPS: @PTEST_NAME@/__fc_machdep_custom.h
OPT: -cpp-extra-args="-I@PTEST_DIR@/@PTEST_NAME@ -D__FC_MACHDEP_CUSTOM" -machdep custom -print -then -print
COMMENT: we need a -then to test double registering of a machdep
*/
diff --git a/tests/misc/global_decl_loc.i b/tests/misc/global_decl_loc.i
index 8816b71f8528036ac6133651bb5a8b6ee6117370..7955b774e26b1c68c70f8451b9dd9b8463989b7d 100644
--- a/tests/misc/global_decl_loc.i
+++ b/tests/misc/global_decl_loc.i
@@ -1,7 +1,7 @@
/* run.config
- COMMENT: the script "global_decl_loc.ml" is also copied by the test "global_decl_loc2.i"
- MODULE: global_decl_loc
- OPT: @PTEST_DIR@/global_decl_loc2.i
+ COMMENT: with dune, the LIBS directive must be replaced by a MODULE directive (see also ./test_config file)
+ LIBS: global_decl_loc
+ OPT: %{dep:@PTEST_DIR@/global_decl_loc2.i}
*/
int g;
diff --git a/tests/misc/global_decl_loc2.i b/tests/misc/global_decl_loc2.i
index 10be90eef7338e6533bced0e88500c24d1000512..46a2d3bb568d4de20543ce39eed1043264de1101 100644
--- a/tests/misc/global_decl_loc2.i
+++ b/tests/misc/global_decl_loc2.i
@@ -1,8 +1,7 @@
/* run.config*
- COMMENT: todo in the future: removes the EXECNOW command and modifies the MODULE directive in order to reuse "global_decl_loc"
- COMMENT: the script "global_decl_loc.ml" is also used by the test "global_decl_loc.i"
- EXECNOW: BIN global_decl_loc2.ml cp @PTEST_DIR@/global_decl_loc.ml @PTEST_RESULT@/global_decl_loc2.ml > @DEV_NULL@ 2> @DEV_NULL@
- MODULE: result/global_decl_loc2
+ COMMENT: with dune, the LIBS directive must be replaced by a MODULE directive (see also ./test_config file)
+ LIBS: global_decl_loc
+ DEPS: @PTEST_DIR@/global_decl_loc.i
OPT: @PTEST_DIR@/global_decl_loc.i
*/
extern int g;
diff --git a/tests/misc/mergestruct2.i b/tests/misc/mergestruct2.i
index 440d750507fd948d258f60dbafa4ca7e23ff6674..4c8ac341c4cf9e00222c7079209b6c5746dd8745 100644
--- a/tests/misc/mergestruct2.i
+++ b/tests/misc/mergestruct2.i
@@ -1,5 +1,5 @@
/* run.config
- OPT: -print tests/misc/mergestruct3.i tests/misc/mergestruct1.i
+ OPT: -print %{dep:@PTEST_DIR@/mergestruct3.i} %{dep:@PTEST_DIR@/mergestruct1.i}
*/
struct s *p;
diff --git a/tests/misc/mergestruct3.i b/tests/misc/mergestruct3.i
index 63e1e1c40eaa3556bfcd2907f2e1506d6509866f..ecc825733c72bf679555e4ff0ea258493179c930 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 67f7b93d4e96b40a03ccf1b3824d21104de6992e..bce166481450f0a66eed8587199c2b960576cfa4 100644
--- a/tests/misc/my_visitor.c
+++ b/tests/misc/my_visitor.c
@@ -1,10 +1,10 @@
/* 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
- OPT: -load @PTEST_DIR@/@PTEST_NAME@.sav -no-my-visitor -print
+ 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 @PTEST_DIR@/@PTEST_NAME@.sav -print
+ OPT: -load %{dep:@PTEST_DIR@/@PTEST_NAME@.sav} -print
*/
int f() {
int y = 0;
diff --git a/tests/misc/pragma-pack.c b/tests/misc/pragma-pack.c
index 0eda8ce2f0b4ba0a2e56bab74f6477e2ea5780b4..4534d32c430d1c7bcaf4157ac811eab8d96fafb2 100644
--- a/tests/misc/pragma-pack.c
+++ b/tests/misc/pragma-pack.c
@@ -1,11 +1,11 @@
/*run.config
PLUGIN: @EVA_PLUGINS@
+ DEPS: pragma-pack-utils.h
STDOPT: +"-machdep gcc_x86_64 -kernel-msg-key typing:pragma"
STDOPT: +"-machdep gcc_x86_32"
STDOPT: +"-machdep msvc_x86_64"
*/
#include "pragma-pack-utils.h"
-
#include <stdint.h>
#include <stddef.h>
diff --git a/tests/misc/test_config b/tests/misc/test_config
index 2cfb7e2f9204e5c904f80f601742facf6608faaa..9ffa03dfdba09817f50d63d63f189cd1609cd7d8 100644
--- a/tests/misc/test_config
+++ b/tests/misc/test_config
@@ -1,5 +1,11 @@
PLUGIN:
+
+# COMMENT: The next directive is a hack because the module is used
+# COMMENT: by more than one test file (./global_decl_loc.i & ./global_decl_loc2.c)
+# COMMENT: and it can be compiled only once due to ptests concurency.
+# COMMENT: That line should be removed with dune and modifications have to be done in ./global_decl_loc.i and ./global_decl_loc2.c.
MODULE: global_decl_loc
+
MODULE:
STDOPT:
diff --git a/tests/pdg/call.c b/tests/pdg/call.c
index b71d403e4ba62559c40c7a8455ac0dac1ee673b0..cb47bb43fd1714890dba74abdd2be567f17948a0 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 862b8bf811874da0e718125e75017b876791d969..1b3f02807ad2149aea970de34ce39f3c74066f92 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 80a39aefa47ca21149f44accc431c6628836b04d..225fefc8c54dc405a2751e02ebdf3451022c66e6 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 e420bac96d786f3475907a4206da4b334ebfcfe9..aa5e20c519e90c4b82ee0e9cd9a8040912b818aa 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 f942a8cae78be9b6917f8909f0d2349e818aaee5..6101341838697f0bb957216bd1d532fa31e9fc68 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 672fc08788ee5ecc689372682a92e5814c3faa0e..31080cb964bc2de06d93c43bd6e278a695cd7666 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 267cbfcdb3029c1798d22195498207c2493c07f1..02bc741da501590b68ba789eb1a39e2add5a19c5 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 8cdfc876ef88218d1f1c70f547bd2254820fd3e2..26c3f18e1fc8a7c0627f9dcc29bfc678ddb0b2d4 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 acdf9a01fe1bca09b9aa63049dca4f9180e00298..7631ac9cf43acd82fd71b28101bf581c31ffdd67 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 af9a24fbb57274f132682e759096ddd5ebb3aa62..c9f3c903e9be03fb7df6ead50d84ace91cdea1bb 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 b82bea7578da014e9734244c1d6f95a0e62e3b30..31038cd694580d3273716dcd1e44736f2970aa30 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 0793ea81d1bb7fac0462dbed2946a10410b2060b..5014bf4e04504b965daec5f1c06c025a3b91a6f4 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 d901e4479b47c7a8bcbbd2e4cf2e20195a960e70..713fa01b7e39f2ced262ae48784728ed30d8eb74 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/adpcm.c b/tests/slicing/adpcm.c
index 726da844314cca33298f205c8723c701574e5664..d5a940af6ce4b3e0f38686b06bd58aaaa1ce7b32 100644
--- a/tests/slicing/adpcm.c
+++ b/tests/slicing/adpcm.c
@@ -1,7 +1,8 @@
/* run.config
LIBS: libSelect
MODULE: @PTEST_NAME@
- OPT: @EVA_OPTIONS@ -machdep x86_32 -ulevel -1 -deps -slicing-level 2
+ DEPS: ../test/adpcm.c
+ STDOPT: +"-ulevel -1 -deps -slicing-level 2"
*/
#include "../test/adpcm.c"
diff --git a/tests/slicing/annot.i b/tests/slicing/annot.i
index 1880234f9e22ccd7a084ebf27a213d3f4e045784..16b203a069a0bd805272007cebb754491df23f27 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 a23828ff6b9723d7961531c644e989c63c3950f2..e31dc44d77a27f9c98da31d218e7f9266efa7f91 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 1f4afde472566065ed71519e917d7fb680e9642c..75f8814a164f0d5092fa373cdfe26f1a94d15c03 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 48bd82a520506bcbede1e6ae0cc5b07a821e2546..9ee94a7450fb3944f7f8b7ae9aea144213b77ab5 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 b1b634ca8b90581cab435b19a4985a04d5f3de88..78d46f42b917f71edae00a90d4f84a49b999590c 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 90953815c397ad6768933e3a4fe6e926892d2143..541654b7b8c5930091c85a943046171c2d3f3ddf 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 de3db5c51eff1ea3843b2a110e1ef860e5898788..7f793d7935189ed69a6276f13c864585c5e64ad6 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 09e11240630b2c9c1f3429e6da007116224c0bde..2f0ede405278ce4946fc1e8a0c2e0d931edf5955 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 e389fa3409a1c534206e866f2d59db51e8634cfa..790b4207a137a762a6efbeb0cd63535efb0243ea 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 0f5226417ec6fc12cd9eaf9e764e414860e15990..b22c8de9fc8ddd070761f4f468a31302b3ff7424 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 5b6b519cacc309b8fefd0e7386afffbe3004b496..75259064309da53546193ec0fde9ad8c6c5f58ea 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 c312a7ffdd220a33e5d3a251ef657b770cdf9265..61e42e2ccc7ffe999288e4f668305412b9a35a3f 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 368e0870ec14ea80dabb61c65efb9b4004fb9bbf..2b0c2897869a9270c61219928480acfc55c91a58 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 3a85248cb7a9be425e853c09aafe428a84245285..52ca7d3c7395691f11617ca9358cc302d63aaf29 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 fcfad46402cb30ee14f8bab18ed60358eb7ffebb..9aa1c496f712949574a77413c4068ba48f3fef6c 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 0f21c9f6340186eb8ca49043a8c5206e7a92cb13..c502e144cb0c34c94ed8a09ebc2bbcb8d5e35e1f 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 69b61b49e36d26ec46ab40592d2ab85e823f5890..d25661d0786415f753f630961474b128d79cb940 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 902dd771327daeb279238eb309f36141c0340ff4..d90857629a1318c1131d282542f1446edc3dc976 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 2e350641583eff884e288450f2d1e95588e5f179..e14ba54a3c485b1d1fe6657ea8f791e1384f0e4e 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 78246f44fd01fa0add7c5bf04a00fdf3e6572278..90c92abb06d2938a2f333c68a1eb0e161a88f763 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 8bf9d950575e77aace8a02d254348a7d582b6d64..7ab5e229ca6a701ea9e60dcc83456235d346aa91 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 e12046be0128819a77d0f939f552701e2a14605d..7d3ce40999d094fad5231ed8902393a5d3044718 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 2c7e224e15d1a589a920417fc9d1a78c9a975593..8ee65b76abe0002753d1e649210cedf61fa471c6 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 33c6f3a401f488cdb77f21c6ed009f6699627bce..bb8df328eb6ca1d8e61da9f1037f99438afbf4a8 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 2e2e658d063ec26779bbb22107c96c54c1cad2fb..c9f593ac30752d10cb0552d4c9c887264c48ad70 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 80bde8a1d76b29523e7bef11ed9090dcd4bb648c..9e976974dd76934eb19d22ad3d5a7317691ea57b 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 ac7f0dd7857b60db6aea89ad7a969f93dae582bb..0caf99c023c81072a49e6aebf04c88792a092e85 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 fc4891d0605c7fe4ca2242c1fbc0e6179f9ac2ec..20ef37ca758ddf59bd967bd8662000cb83048802 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 44bf6578c25f5b91474a127891702885116e48ec..c3129a4ece7e2e8de06f2b15e2439095dd0c79cf 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 381ea05e7399fa9ef59c0a806c55bd1300a79aaa..5d74a46caff65813f38c6805f10d21f0c177fa59 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 adbfac557cdd72ec714389f10b6ff0cd2d834f07..663d8dcbbaf44c53b2664360430e55dd9245ccc9 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 143a83c68963e8dd92e7d0bb98562cce258fb220..be4b3ddd3ff2dcaa7592fd364b4bddf7e9bdcc66 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 cd962d228bd6a3c7d4fdad53087754b81a658045..8ce6b061e66a8b7a1648a7a030b818fd190ea830 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 dad1b0d85f310f10455343011e08459edc711142..c090726af1890f478af972a650a7445d939f899b 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/min_call.c b/tests/slicing/min_call.c
index d3c1555b7cfdb82b689402ed75e2aa8abfb38ca5..ceb4608903d2ae2e7eae158da95d9105bdd0e63d 100644
--- a/tests/slicing/min_call.c
+++ b/tests/slicing/min_call.c
@@ -1,6 +1,7 @@
/* run.config
LIBS: libSelect
MODULE: @PTEST_NAME@
+ DEPS: select_return.i
OPT: @EVA_OPTIONS@ -deps -lib-entry -main g -slicing-level 3
*/
diff --git a/tests/slicing/ptr_fct.i b/tests/slicing/ptr_fct.i
index 4db437d74c4dc296fb41c114e14d39fbba64b252..ae0a6a538b9d91dea642cd7c3ed072db81655dfd 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 d91e94e9781158a9782b53cfcc34e85510065b22..ff052185f05512c3c457d6a1f1c7fa30a4b951cf 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 98211269bf12cb570cbff63cf3faeb5edbb8cec0..1b09ac62bde4f363c2b22387c6a4be3fc36f4b5e 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 1df3acb7146a3ede39969498b0a9ef558ed968c8..24f773f35814abf3c5bd31aed00c3b09d8d71007 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 5504e099d5020d17a4cbfdbb810ad87d306c6445..b4c1a38d5b58a13bd6afa893e222fead03de3363 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/select_simple.c b/tests/slicing/select_simple.c
index f100a6b5c32b2cc9d844e7b04a4ebe0fa7be539c..7310af446e08d615628137c403b97c04ea434782 100644
--- a/tests/slicing/select_simple.c
+++ b/tests/slicing/select_simple.c
@@ -1,6 +1,7 @@
/* run.config
LIBS: libSelect
MODULE: @PTEST_NAME@
+ DEPS: simple_intra_slice.i
OPT: @EVA_OPTIONS@ -deps
*/
diff --git a/tests/slicing/sizeof.i b/tests/slicing/sizeof.i
index 9ab0d680436b4bee6d9d935ac7f595828727f521..415bcc3880242b5ee9c0b02cc78c0489c32ee85e 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 7d4e0933645ad60eda4a2496a936dff24601e021..17297d029f94f725b3a892516cb6da2758495ba4 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 144c52eb223deb37e05705d7c9680808b60be483..6ad6d043f4b52cfa1e010f6fe019c06c4bc9a627 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 46b2d695f9baf8642370511ec5930fab9e6fd422..308641cde3f34c78336e851c9b7005219c5a7f17 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 ecf64a7ff4291ca7f5034ab14aeb378f24dedd5e..8c8486c1eb5161d7c0cdabcc627b4bba2c80e7bb 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 7d17ff0c8db4b00999a03458b0397aae21049045..2330657b9b42827acd9b4e5724a15b540b34cd39 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 99901fa581cf71e77a3380bc2b46fa598bdb7e5f..af3f2903a469f00b93b686805a89e4882b43fd0c 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 403988ae236a8be7218deadc43d41225252fa18b..f9297a0474522609097ca8ded955c47a5a43c150 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 84065e611549ed6640aa3b28fe38af6645b419aa..eada3c1702ee6b909dc0453f142ec7f5aeeebec3 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 ca73d049b98a0987c732cbd993d71a0590185ddf..b8badd28f49dd8640f125b5a274da992d96087ad 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 534219f819117444c495a0ae3dda3e56abe10ec3..ba59346f8b1602e4ccf5aa2ea98d87241ec2e7ac 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 e24a0ba8e8bd20bf87725da742c972be92bcf11e..3cd1285288822ec4ad0b9c24858c4aee0e2e942a 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/slicing/variadic.c b/tests/slicing/variadic.c
index 3f9fded1a05705d7385276e3e6d8d21dd33fb04b..d22dce051c6785a206bee4e44b59c914293a7b45 100644
--- a/tests/slicing/variadic.c
+++ b/tests/slicing/variadic.c
@@ -1,4 +1,5 @@
/* run.config
+ DEPS: ../pdg/variadic.c
STDOPT: +"-slice-return f3 -no-slice-callers -then-on 'Slicing export' -print"
STDOPT: +"-slice-return f3 -no-slice-callers -variadic-no-translation -then-last -print"
STDOPT: +"-slice-return f3 -then-on 'Slicing export' -print"
diff --git a/tests/spec/axiom_included.c b/tests/spec/axiom_included.c
index f10f0a86488cc7f2bbc3043c1c26b394fd13eab5..a3a8be2d7a5ea2b0ce62db228ba4b4aee4d93387 100644
--- a/tests/spec/axiom_included.c
+++ b/tests/spec/axiom_included.c
@@ -1,5 +1,6 @@
/* run.config
- STDOPT: +"tests/spec/axiom_included_1.c"
+ DEPS: axiom_included.h
+ STDOPT: +"%{dep:@PTEST_DIR@/axiom_included_1.c}"
*/
#include "axiom_included.h"
diff --git a/tests/spec/clash_double_file_bts1598.c b/tests/spec/clash_double_file_bts1598.c
index b30f925efab799c5b1c0a2e6306285564e878cac..1c0b3c1377459c07c1d872c32b7cfbd8cbe004c4 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 acaee400a23cdf498f524b101087fee389d791d0..d0a021fbefb80deb01d75b8f8b5cf12bbb6c9ca3 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 b9257978955ca299fb8337f48c90cd7d5428e63e..5781ff60a9d687e7f0067c8ad05b458130553ef2 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_bts938.c b/tests/spec/merge_bts938.c
index 895091f24348f18b115f4553e2652261a9b88725..9616f9bca200e73b68a7321d784108f443364fad 100644
--- a/tests/spec/merge_bts938.c
+++ b/tests/spec/merge_bts938.c
@@ -1,5 +1,5 @@
/* run.config
- STDOPT: +"tests/spec/merge_bts938_1.c"
+ STDOPT: +"@PTEST_DIR@/merge_bts938_1.c"
*/
#include "merge_bts938.h"
diff --git a/tests/spec/merge_different_assigns.i b/tests/spec/merge_different_assigns.i
index 282a3df7529a997180bb8b44cdd33fa8d6bc69fd..ff278513e6bdd0346793466453e1b698f5a9f02d 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/merge_logic_globals_1.c b/tests/spec/merge_logic_globals_1.c
index a8da203173372acc1cb00e21f0a41252b38ab551..e0c4f38410ceda566614f088291f0d25306c791c 100644
--- a/tests/spec/merge_logic_globals_1.c
+++ b/tests/spec/merge_logic_globals_1.c
@@ -1,6 +1,8 @@
/* run.config
-OPT: -print @PTEST_DIR@/merge_logic_globals_2.c -cpp-extra-args="-I@PTEST_DIR@"
+ DEPS: merge_logic_globals.h
+ OPT: -print %{dep:@PTEST_DIR@/merge_logic_globals_2.c} -cpp-extra-args="-I@PTEST_DIR@"
*/
+
#include "merge_logic_globals.h"
int main() { test(); /*@ assert p((int)li); */ }
diff --git a/tests/spec/model1.c b/tests/spec/model1.c
index cbb6027b55c34e9aaa0690a0f30a82363be509a8..21245d1606668b2dee63c70f3621dfb84b26a090 100644
--- a/tests/spec/model1.c
+++ b/tests/spec/model1.c
@@ -1,5 +1,6 @@
/* run.config
-STDOPT: +"tests/spec/model2.c"
+ DEPS: model1.h
+ STDOPT: +"@PTEST_DIR@/model2.c"
*/
#include "model1.h"
@@ -13,5 +14,3 @@ void main () {
while (is_pos(&s)) dec(&s);
/*@ assert s.foo <= 0; */
}
-
-
diff --git a/tests/spec/model2.c b/tests/spec/model2.c
index afe511b2750c30f6352f6ddb62b78e604d69284b..c079e4fafb9f6e0274b07b1c10b82e9b878fb571 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 b3124a7f7ebda3939e2554221480c06725f026fd..02ca904b8ceeda28a0dc91e1eae925b884fc6f4e 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 b78d817f6b809a37afa2c4271508d5cf7ee19c4c..f31326e8aea1df3e8be3c0d6f7b0751623258f9a 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/multiple_include_2.c b/tests/spec/multiple_include_2.c
index 9d421be0fa3d6188535d1e69c42fa53b12def7eb..43291fec8c9ece98b6ee82c52e1091f1bf0b26c0 100644
--- a/tests/spec/multiple_include_2.c
+++ b/tests/spec/multiple_include_2.c
@@ -1,7 +1,7 @@
/* run.config
EXIT: 1
-
- OPT: -kernel-warn-key=annot-error=active -print tests/spec/multiple_include_1.c
+ DEPS: multiple_include.h
+ OPT: -kernel-warn-key=annot-error=active -print %{dep:@PTEST_DIR@/multiple_include_1.c}
*/
#include "multiple_include.h"
diff --git a/tests/spec/preprocess.c b/tests/spec/preprocess.c
index 5047548c8ecacacc9a172e81fc4cd7f069841aa2..6cbed03e88681511e8a479461665ce45f1acdc9a 100644
--- a/tests/spec/preprocess.c
+++ b/tests/spec/preprocess.c
@@ -1,10 +1,10 @@
/* run.config
-PLUGIN: eva,scope
+ PLUGIN: eva,scope
+ DEPS: preprocess.h
OPT: -eva @EVA_CONFIG@ -print
*/
// see bts 1357
#define assert(x) (x)?1:0
-
int x = 1;
#define FOO 1
diff --git a/tests/spec/rm_qualifiers.i b/tests/spec/rm_qualifiers.i
index 66d6d336519ad00ab153d800784078580d692d82..c730e461a4005ab5333372e54e64508659853078 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/spec/source_annot.c b/tests/spec/source_annot.c
index ad85f6c8dc7eb874e30fe2478ca9a6dbbd8478ba..2468d5176542764333f31f620780c976cea00196 100644
--- a/tests/spec/source_annot.c
+++ b/tests/spec/source_annot.c
@@ -1,4 +1,5 @@
/* run.config
+ DEPS: prec_i.h
DONTRUN: static local variables & specifications
*/
typedef int INTEGER;
diff --git a/tests/spec/use.c b/tests/spec/use.c
index 2cb544a89d28c33aa3b3a8f31c7e6dd4814a18a9..31add8c1753526097d60c7959ea716859a42db9d 100644
--- a/tests/spec/use.c
+++ b/tests/spec/use.c
@@ -1,5 +1,6 @@
/* run.config
- STDOPT: +"tests/spec/use2.c"
+ DEPS: dec.h
+ STDOPT: +"@PTEST_DIR@/use2.c"
*/
// BTS 0887
diff --git a/tests/spec/volatile.c b/tests/spec/volatile.c
index d01a2689624af10118c6328ebe2104f6c707d071..4dc57c87695ebe011c5274e9110348efaabf1215 100644
--- a/tests/spec/volatile.c
+++ b/tests/spec/volatile.c
@@ -1,7 +1,7 @@
/* run.config
- OPT: tests/spec/volatile_aux.c -print -copy
+ DEPS: volatile.h
+ OPT: %{dep:@PTEST_DIR@/volatile_aux.c} -print -copy
*/
-
#include "volatile.h"
//@volatile x,y writes w ;
diff --git a/tests/syntax/anon_enum_libc.c b/tests/syntax/anon_enum_libc.c
index 395f5dc1ea3bdedb2a14f7a463bc8cbe03f09871..55a1a952097df987ce611d8a2d446e7de9815e28 100644
--- a/tests/syntax/anon_enum_libc.c
+++ b/tests/syntax/anon_enum_libc.c
@@ -1,10 +1,8 @@
/* run.config
-
-OPT: -cpp-extra-args="-I @PTEST_DIR@" -ocode @PTEST_DIR@/result/@PTEST_NAME@.c -print -then -ocode="" @PTEST_DIR@/result/@PTEST_NAME@.c -print
+ DEPS: anon_enum_libc.h
+ OPT: -cpp-extra-args="-I @PTEST_DIR@" -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.c -print -then -ocode="" @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.c -print
*/
-
struct { int x; float y; } s1;
-
enum { BLA=4, BLI=12 };
#include "anon_enum_libc.h"
diff --git a/tests/syntax/assert_location.c b/tests/syntax/assert_location.c
index b9575ad6a324872dcae8e455980260682fb84217..b881053726ae735c79c76358ca71d98c2bf6933e 100644
--- a/tests/syntax/assert_location.c
+++ b/tests/syntax/assert_location.c
@@ -1,3 +1,8 @@
+/* run.config
+ DEPS: assert_location.h
+ STDOPT:
+*/
+
#include "assert_location.h"
void c() {
diff --git a/tests/syntax/bts0323.c b/tests/syntax/bts0323.c
index 1819554667c7489811717ef62af5453f8efddb1b..7f624018539a1740b0a89d5e9f330562e98e2c09 100644
--- a/tests/syntax/bts0323.c
+++ b/tests/syntax/bts0323.c
@@ -1,5 +1,6 @@
/* run.config
- STDOPT: +"tests/syntax/bts0323-2.c"
+ DEPS: bts0323.h
+ STDOPT: +"%{dep:@PTEST_DIR@/bts0323-2.c}"
*/
#include "bts0323.h"
void f() { x = 0; }
diff --git a/tests/syntax/bts0442-2.i b/tests/syntax/bts0442-2.i
index 712eeb3cc42aed661546675114d91d1c37e793ba..c590a24098eec704369194c0ae312dcdc41d318d 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 83b2d1e87fee94a6649c85e59249bb5ee66158b1..6a0681975ea63f797833df107ca4810471a274a2 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 bfb461e35714c0529d31404abc44e1c296997bb0..6fee817be92f8abffc57e6e981ebcc22dc39f0c9 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 25d256c28b7f9a8b439061798488b38bb1cf71d6..f2623bcdfe29a434bb4a74f7c46eac10791505be 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/enum1.c b/tests/syntax/enum1.c
index 7945576234e0a5c30e6817f42590e6a944f51dab..1e851c556fdd00c4c2644a20f650ab46525da5d7 100644
--- a/tests/syntax/enum1.c
+++ b/tests/syntax/enum1.c
@@ -1,5 +1,6 @@
/* run.config
- STDOPT: +"tests/syntax/enum2.c"
+ DEPS: enum.h
+ STDOPT: +"%{dep:@PTEST_DIR@/enum2.c}"
*/
diff --git a/tests/syntax/formals_decl_leak_1.i b/tests/syntax/formals_decl_leak_1.i
index 157174c599dceafe1973002a3cd729993e3f7be7..3fb93c23877dd2b9fe2e7e83eecb6be9ad947bad 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 c4cb37aa00a73bc53063c83f98aee526abe69a9e..43fe38e5c0edbbdd94b658b77acac715fe4809a2 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 e07dcf7e1c12d5a848dcf4fa08b367eed5392b10..2452dc7cebee5a83a3db1bcd198f8b165ed4d67d 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 f47ca2a64a658bbc9161ae8faf0e7a852c480b19..c6a7fcb79492044085cf80ecbee80f69eacb2e63 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 ef3528b0d15513a1ec11b866e6a4bd481b0fb74f..c0d94d12f36b9278000f0511a096b7c125cc6946 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 78aee9f8bce6692868a3e8bc065cdfecd81bf59f..38a8ae897bbf6d9ebd3f27f2a9b891413591b448 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/merge_union.c b/tests/syntax/merge_union.c
index 97f4311fa2c2676824c7646573861614d6438b3d..ca5392d9dbd0e224516dbe15e737fc4a055c064e 100644
--- a/tests/syntax/merge_union.c
+++ b/tests/syntax/merge_union.c
@@ -1,7 +1,7 @@
/* run.config
-OPT: -cpp-extra-args="-I @PTEST_DIR@" @PTEST_DIR@/@PTEST_NAME@_2.c @PTEST_DIR@/@PTEST_NAME@_3.c -print
-OPT: -cpp-extra-args="-I @PTEST_DIR@" @PTEST_DIR@/@PTEST_NAME@_2.c @PTEST_DIR@/@PTEST_NAME@_3.c -print -kernel-warn-key="linker:drop-conflicting-unused=inactive"
+ DEPS: merge_union.h
+ OPT: -cpp-extra-args="-I @PTEST_DIR@" %{dep:@PTEST_DIR@/@PTEST_NAME@_2.c} %{dep:@PTEST_DIR@/@PTEST_NAME@_3.c} -print
+ OPT: -cpp-extra-args="-I @PTEST_DIR@" %{dep:@PTEST_DIR@/@PTEST_NAME@_2.c} %{dep:@PTEST_DIR@/@PTEST_NAME@_3.c} -print -kernel-warn-key="linker:drop-conflicting-unused=inactive"
*/
-
#include "merge_union.h"
int f(un* u);
diff --git a/tests/syntax/merge_unused.c b/tests/syntax/merge_unused.c
index d8a15d22f663965e8bdd03effb49ed31d5b71b1d..349921c0430dd43c9c8581c9aea91c14b5abfd7f 100644
--- a/tests/syntax/merge_unused.c
+++ b/tests/syntax/merge_unused.c
@@ -1,7 +1,7 @@
/* run.config*
-EXIT: 1
-
- OPT: -cpp-extra-args="-I@PTEST_DIR@" @PTEST_DIR@/@PTEST_NAME@_2.c -print
+ EXIT: 1
+ DEPS: merge_unused.h
+ OPT: -cpp-extra-args="-I@PTEST_DIR@" %{dep:@PTEST_DIR@/@PTEST_NAME@_2.c} -print
*/
#pragma pack(1)
diff --git a/tests/syntax/no-print-libc-reparse.c b/tests/syntax/no-print-libc-reparse.c
index b7dea45f9df034e9d1d84b0063324b19c1364cff..daf1949eb41ec1a798e5f67e562588933d453d30 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/oracle/anon_enum_libc.res.oracle b/tests/syntax/oracle/anon_enum_libc.res.oracle
index 163f0857f8473958e0d7acb027c5e4eae18f20e2..0a1b205830e4b5c8beb765cd8c90a002f3657ef8 100644
--- a/tests/syntax/oracle/anon_enum_libc.res.oracle
+++ b/tests/syntax/oracle/anon_enum_libc.res.oracle
@@ -1,5 +1,5 @@
[kernel] Parsing tests/syntax/anon_enum_libc.c (with preprocessing)
-[kernel] Parsing tests/syntax/result/anon_enum_libc.c (with preprocessing)
+[kernel] Parsing tests/syntax/result/ocode_0_anon_enum_libc.c (with preprocessing)
/* Generated by Frama-C */
#include "tests/syntax/anon_enum_libc.h"
struct __anonstruct_s1_1 {
diff --git a/tests/syntax/oracle/assert_location.res.oracle b/tests/syntax/oracle/assert_location.res.oracle
index 330495a75d028e011333663a694d7bcaa435c18f..05d1c21f6d8a54dd48aa0bb347e4ba6a4c63568e 100644
--- a/tests/syntax/oracle/assert_location.res.oracle
+++ b/tests/syntax/oracle/assert_location.res.oracle
@@ -12,7 +12,7 @@ void h(void)
void c(void)
{
__FC_assert("I\'m in assert_location.c" != (char const *)0,
- "tests/syntax/assert_location.c",4,
+ "tests/syntax/assert_location.c",9,
"\"I\'m in assert_location.c\"");
return;
}
diff --git a/tests/syntax/static_formals_1.c b/tests/syntax/static_formals_1.c
index 97cfbca9a65701a0dfebf4cab8f8550af431ebbf..56662240c4673a7af126f709860d22910cf07502 100644
--- a/tests/syntax/static_formals_1.c
+++ b/tests/syntax/static_formals_1.c
@@ -1,6 +1,6 @@
/* run.config
-STDOPT: +"@PTEST_DIR@/static_formals_2.c" +"-cpp-extra-args=\"-I @PTEST_DIR@\"" +"-kernel-msg-key printer:vid"
+ DEPS: static_formals.h
+ STDOPT: +"%{dep:@PTEST_DIR@/static_formals_2.c}" +"-cpp-extra-args=\"-I @PTEST_DIR@\"" +"-kernel-msg-key printer:vid"
*/
#include "static_formals.h"
-
int g() { return f(4); }
diff --git a/tests/syntax/typedef_incorrect_pretty_print_bts1518.i b/tests/syntax/typedef_incorrect_pretty_print_bts1518.i
index ce8d5fb7c501c54454ec795114ada76504e5578a..8c36069cabb9cf2ce5a8153f32dfef8c4cbd00b7 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_1.c b/tests/syntax/typedef_multi_1.c
index 3749c3f6e498d3498b09ade7dafbcca304d89e90..b5052ec59a08e6033a8d32e14b423079027bb9c7 100644
--- a/tests/syntax/typedef_multi_1.c
+++ b/tests/syntax/typedef_multi_1.c
@@ -1,8 +1,8 @@
/* run.config
MODULE: typedef_multi
- OPT: -no-autoload-plugins tests/syntax/typedef_multi_2.c
+ DEPS: typedef_multi.h
+ OPT: -no-autoload-plugins %{dep:@PTEST_DIR@/typedef_multi_2.c}
*/
-
#include "typedef_multi.h"
void f () { while(x<y) x++; }
diff --git a/tests/syntax/typedef_multi_2.c b/tests/syntax/typedef_multi_2.c
index 97f9547151e0df7d66409784e26a6487e6c0f082..3dfefa3de8e7f251465b75053d6ab37da8bb9947 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 f14a5192f9228e7e80bed0cfbcf2e8952c746251..fb57d75836e844c708592e005026036ec42fc08f 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 8397ca8114c4d9e4f6d0173bda212c143d67075c..ad1dedd017b1d635af8e870655920a9b343a9d80 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 c87b609b671d46da52683dc874939453dc364058..056242d9d39652b045248d5cf94e8fa50bfe03cb 100644
--- a/tests/value/CruiseControl.c
+++ b/tests/value/CruiseControl.c
@@ -1,6 +1,6 @@
/* run.config*
-
- STDOPT: #"-float-normal tests/value/CruiseControl_const.c -lib-entry -main CruiseControl -eva-context-depth 10 -eva-context-valid-pointers"
+ DEPS: CruiseControl.h CruiseControl_extern.h scade_types.h config_types.h definitions.h
+ 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) **************
diff --git a/tests/value/CruiseControl_const.c b/tests/value/CruiseControl_const.c
index 15ed6f9e7577c757fddc80c3d010ea8f4383d6fb..c6abfa21e414df8aafbb7570cb6ff3bdb1605f3c 100644
--- a/tests/value/CruiseControl_const.c
+++ b/tests/value/CruiseControl_const.c
@@ -1,5 +1,5 @@
/* run.config*
-
+ DEPS: CruiseControl.h
DONTRUN:
*/
/*$************* SCADE_KCG KCG Version 5.1.1 (build i10) **************
diff --git a/tests/value/abstract_struct_1.c b/tests/value/abstract_struct_1.c
index c764cc4dbbdecd2a85578be37e23df9397bb3415..a91af23f78194ea52ef06b9bf7e823d5a71ca11f 100644
--- a/tests/value/abstract_struct_1.c
+++ b/tests/value/abstract_struct_1.c
@@ -1,5 +1,5 @@
/* run.config*
- STDOPT: #"tests/value/abstract_struct_2.c -lib-entry -eva-msg-key initial-state"
+ STDOPT: #"%{dep:@PTEST_DIR@/abstract_struct_2.c} -lib-entry -eva-msg-key initial-state"
*/
#include "stdlib.h"
diff --git a/tests/value/inline.c b/tests/value/inline.c
index b0264d3f0cbc015f8dc61dd30edc4eea20cf543d..171cf756079317aeff5af85eab61cfecf1eefa96 100644
--- a/tests/value/inline.c
+++ b/tests/value/inline.c
@@ -1,4 +1,5 @@
/* run.config*
+ DEPS: inline.h
DONTRUN: test for the gui only
*/