diff --git a/ptests/ptests.ml b/ptests/ptests.ml
index 72fd317083e7c4ad675a4df986780e588e4ed2e9..53fa1532520f800314ab31e82a4df7b00df1abb2 100644
--- a/ptests/ptests.ml
+++ b/ptests/ptests.ml
@@ -673,23 +673,37 @@ struct
in
String.concat "" (List.map expand_macro (Str.full_split macro_regex s))
in
- try
- Mutex.lock str_mutex;
- let r = aux s in
- Mutex.unlock str_mutex;
- if !verbosity >= 4 then lock_printf "%% Expansion result: %s@." r;
- { has_ptest_file= !has_ptest_file;
- has_ptest_opt= !has_ptest_opt;
- has_frama_c_exe= !has_frama_c_exe;
- }, r
- with e ->
- lock_eprintf "Uncaught exception %s\n%!" (Printexc.to_string e);
- Mutex.unlock str_mutex;
- raise e
+ Mutex.lock str_mutex;
+ let r = try aux s
+ with e ->
+ Mutex.unlock str_mutex;
+ lock_eprintf "Uncaught exception %s\n%!" (Printexc.to_string e);
+ raise e
+ in
+ Mutex.unlock str_mutex;
+ if !verbosity >= 4 then lock_printf "%% Expansion result: %s@." r;
+ { has_ptest_file= !has_ptest_file;
+ has_ptest_opt= !has_ptest_opt;
+ has_frama_c_exe= !has_frama_c_exe;
+ }, r
let expand macros s =
snd (does_expand macros s)
+ let expand_directive =
+ let deprecated_opts = "(-load-module|-load-script)" in
+ let re = Str.regexp "\\(-load-module\\|-load-script\\)" in
+ fun ~file macros s ->
+ Mutex.lock str_mutex;
+ let contains =
+ try ignore (Str.search_forward re s 0); true
+ with Not_found -> false
+ in
+ Mutex.unlock str_mutex;
+ if contains then lock_eprintf "%s: DEPRECATED direct use of %s option: %s@.Please use PLUGIN, MODULE, SCRIPT or LIBS directive instead of the deprecated option.@." file deprecated_opts s;
+ expand macros s
+
+
let get ?(default="") name macros =
try find name macros with Not_found -> default
@@ -896,7 +910,7 @@ end = struct
let make_custom_opts =
let space = Str.regexp " " in
- fun stdopts s ->
+ fun ~file stdopts s ->
let rec aux opts s =
try
Scanf.sscanf s "%_[ ]%1[+#\\-]%_[ ]%S%_[ ]%s@\n"
@@ -909,7 +923,7 @@ end = struct
with
| Scanf.Scan_failure _ ->
if s <> "" then
- lock_eprintf "unknown STDOPT configuration string: %s\n%!" s;
+ lock_eprintf "%s: unknown STDOPT configuration string: %s\n%!" file s;
opts
| End_of_file -> opts
in
@@ -925,27 +939,30 @@ end = struct
(* how to process options *)
let config_exec ~warn ~once ~file dir s current =
+ let s = Macros.expand_directive ~file current.dc_macros s in
{ current with
dc_execnow =
scan_execnow ~warn ~once ~file dir current.dc_macros current.dc_timeout s :: current.dc_execnow }
- let config_macro ~file _dir s current =
+ let config_macro =
let regex = Str.regexp "[ \t]*\\([^ \t@]+\\)\\([ \t]+\\(.*\\)\\|$\\)" in
- Mutex.lock str_mutex;
- if Str.string_match regex s 0 then begin
- let name = Str.matched_group 1 s in
- let def =
- try Str.matched_group 3 s with Not_found -> (* empty text *) ""
- in
- Mutex.unlock str_mutex;
- if !verbosity >= 4 then
- lock_printf "%% - New macro %s with definition %s\n%!" name def;
- { current with dc_macros = Macros.add_expand name def current.dc_macros }
- end else begin
- Mutex.unlock str_mutex;
- lock_eprintf "%s: cannot understand MACRO definition: %s\n%!" file s;
- current
- end
+ fun ~file _dir s current ->
+ let s = Macros.expand_directive ~file current.dc_macros s in
+ Mutex.lock str_mutex;
+ if Str.string_match regex s 0 then begin
+ let name = Str.matched_group 1 s in
+ let def =
+ try Str.matched_group 3 s with Not_found -> (* empty text *) ""
+ in
+ Mutex.unlock str_mutex;
+ if !verbosity >= 4 then
+ lock_printf "%% - New macro %s with definition %s\n%!" name def;
+ { current with dc_macros = Macros.add_expand name def current.dc_macros }
+ end else begin
+ Mutex.unlock str_mutex;
+ lock_eprintf "%s: cannot understand MACRO definition: %s\n%!" file s;
+ current
+ end
let update_module_libs_name s =
"@PTEST_DIR@/" ^ (Filename.remove_extension s) ^ (if !use_byte then ".cmo" else ".cmxs")
@@ -992,17 +1009,21 @@ end = struct
update_macros (fun name -> name) "-load-module=" "PTEST_PLUGIN" "PTEST_LOAD_PLUGIN"
let config_module ~file dir s current =
- let deps = str_split_list (Macros.expand current.dc_macros s) in
+ let s = Macros.expand_directive ~file current.dc_macros s in
+ let deps = str_split_list s in
let current = update_module_macros current deps in
add_make_modules ~file dir deps current
let config_libs_script_plugin update ~file dir s current =
- let deps = str_split_list (Macros.expand current.dc_macros s) in
+ let s = Macros.expand_directive ~file current.dc_macros s in
+ let deps = str_split_list s in
update current deps
let config_options =
[ "CMD",
- (fun ~file:_ _ s current -> { current with dc_default_toplevel = s});
+ (fun ~file _ s current ->
+ let s = Macros.expand_directive ~file current.dc_macros s in
+ { current with dc_default_toplevel = s});
"OPT",
(fun ~file _ s current ->
@@ -1010,6 +1031,7 @@ end = struct
lock_eprintf
"%s: a NOFRAMAC directive has been defined before a sub-test defined by a 'OPT' directive (That NOFRAMAC directive could be misleading.).@."
file;
+ let s = Macros.expand_directive ~file current.dc_macros s in
let t =
{ toplevel= current.dc_default_toplevel;
opts= s;
@@ -1028,11 +1050,12 @@ end = struct
lock_eprintf
"%s: a NOFRAMAC directive has been defined before a sub-test defined by a 'STDOPT' directive (That NOFRAMAC directive could be misleading.).@."
file;
+ let s = Macros.expand_directive ~file current.dc_macros s in
let new_top =
List.map
(fun command ->
{ toplevel = current.dc_default_toplevel;
- opts= make_custom_opts command.opts s;
+ opts= make_custom_opts ~file command.opts s;
logs= command.logs @ current.dc_default_log;
macros= current.dc_macros;
exit_code = current.dc_exit_code;
@@ -1044,10 +1067,13 @@ end = struct
dc_default_log = !default_parsing_env.current_default_log });
"FILEREG",
- (fun ~file:_ _ s current -> { current with dc_test_regexp = s });
+ (fun ~file _ s current ->
+ let s = Macros.expand_directive ~file current.dc_macros s in
+ { current with dc_test_regexp = s });
"FILTER",
- (fun ~file:_ _ s current ->
+ (fun ~file _ s current ->
+ let s = Macros.expand_directive ~file current.dc_macros s in
let s = trim_right s in
match current.dc_filter with
| None when s="" -> { current with dc_filter = None }
@@ -1055,7 +1081,9 @@ end = struct
| Some filter -> { current with dc_filter = Some (s ^ " | " ^ filter) });
"EXIT",
- (fun ~file:_ _ s current -> { current with dc_exit_code = Some s });
+ (fun ~file _ s current ->
+ let s = Macros.expand_directive ~file current.dc_macros s in
+ { current with dc_exit_code = Some s });
"GCC",
(fun ~file _ _ acc ->
@@ -1080,10 +1108,14 @@ end = struct
"PLUGIN", config_libs_script_plugin update_plugin_macros;
"LOG",
- (fun ~file:_ _ s current -> { current with dc_default_log = s :: current.dc_default_log });
+ (fun ~file _ s current ->
+ let s = Macros.expand_directive ~file current.dc_macros s in
+ { current with dc_default_log = s :: current.dc_default_log });
"TIMEOUT",
- (fun ~file:_ _ s current -> { current with dc_timeout = s });
+ (fun ~file _ s current ->
+ let s = Macros.expand_directive ~file current.dc_macros s in
+ { current with dc_timeout = s });
"NOFRAMAC",
(fun ~file _ _ current ->
diff --git a/src/plugins/dive/tests/test_config b/src/plugins/dive/tests/test_config
index b5de8cfbedf81997ee828999794f2b0c93025bed..2d0ddaaf0293d6066350e8148f331836380d44af 100644
--- a/src/plugins/dive/tests/test_config
+++ b/src/plugins/dive/tests/test_config
@@ -1,3 +1,4 @@
LOG: @PTEST_NAME@.dot
-OPT: -no-autoload-plugins -load-module from,inout,eva,variadic,scope,dive -check -eva-msg-key=-initial-state -eva-no-show-progress -dive-output-dot @PTEST_RESULT@/@PTEST_NAME@.dot
+PLUGIN: from,inout,eva,variadic,scope,dive
+OPT: -eva-msg-key=-initial-state -eva-no-show-progress -dive-output-dot @PTEST_RESULT@/@PTEST_NAME@.dot
FILTER: perl -0777 -pe 's/\[server[^[]*//g'
diff --git a/src/plugins/variadic/tests/erroneous/test_config b/src/plugins/variadic/tests/erroneous/test_config
index d42e13c1ae8463c3923c3ff795491571140e2a2f..f2f2794309187398f71293be723d862378917bf0 100644
--- a/src/plugins/variadic/tests/erroneous/test_config
+++ b/src/plugins/variadic/tests/erroneous/test_config
@@ -1 +1,2 @@
-OPT: -no-autoload-plugins -load-module variadic -check -kernel-verbose 0 -variadic-verbose 2
+PLUGIN: variadic
+OPT: -kernel-verbose 0 -variadic-verbose 2
diff --git a/src/plugins/wp/tests/wp_plugin/flash.c b/src/plugins/wp/tests/wp_plugin/flash.c
index 829f2e439c4b9d3dd25481ed80fd463ed9ec3884..ae46820c9da6cc9ce60f83f95658467c30344b27 100644
--- a/src/plugins/wp/tests/wp_plugin/flash.c
+++ b/src/plugins/wp/tests/wp_plugin/flash.c
@@ -1,15 +1,15 @@
/* run.config
OPT:
OPT: -wp-driver tests/wp_plugin/flash.driver,tests/wp_plugin/flash-ergo.driver
- OPT: -wp-driver tests/wp_plugin/flash.driver -load-module tests/wp_plugin/flash.ml
+SCRIPT: flash
+ OPT: -wp-driver tests/wp_plugin/flash.driver
*/
-
/* run.config_qualif
OPT: -wp-timeout 1
OPT: -wp-driver tests/wp_plugin/flash.driver,tests/wp_plugin/flash-ergo.driver
- OPT: -wp-driver tests/wp_plugin/flash.driver -load-module tests/wp_plugin/flash.ml
+SCRIPT: flash
+ OPT: -wp-driver tests/wp_plugin/flash.driver
*/
-
/* -------------------------------------------------------------------------- */
/* --- Observation of Sequence of Reads and Writes --- */
/* -------------------------------------------------------------------------- */
diff --git a/tests/builtins/big_local_array.i b/tests/builtins/big_local_array.i
index 7c0854e14ae028bfb36a286b0aff0c94f6139784..ad98efe4eb72920096492c7677ec739e3d8b2161 100644
--- a/tests/builtins/big_local_array.i
+++ b/tests/builtins/big_local_array.i
@@ -1,11 +1,11 @@
/* run.config*
PLUGIN: @EVA_PLUGINS@ report
- OPT: @EVA_OPTIONS@ -print -journal-disable -eva -report
+ OPT: @EVA_OPTIONS@ -print -eva -report
MODULE: big_local_array_script
OPT: @EVA_OPTIONS@ -then-on prj -print -report
PLUGIN: @EVA_PLUGINS@
MODULE:
- OPT: @EVA_OPTIONS@ -print -journal-disable -no-initialized-padding-locals -eva
+ OPT: @EVA_OPTIONS@ -print -no-initialized-padding-locals -eva
*/
struct S {
diff --git a/tests/builtins/from_result.c b/tests/builtins/from_result.c
index 89e1f89ae0d5a0a1eab68b623367bad8f9dcccb1..c7e6b87f2e2c9119c98dbda36a09634b8760e081 100644
--- a/tests/builtins/from_result.c
+++ b/tests/builtins/from_result.c
@@ -1,5 +1,5 @@
/* run.config*
- OPT: @EVA_CONFIG@ -eva-alloc-builtin fresh -deps -journal-disable
+ OPT: @EVA_CONFIG@ -eva-alloc-builtin fresh -deps
*/
#include "../../share/libc/stdlib.c"
diff --git a/tests/builtins/linked_list.c b/tests/builtins/linked_list.c
index dfa85bbfb98d8203d21c9e88aef1012bfc63a6f1..d702a2e91153013ad10fa29a62386dcabfa0d0b7 100644
--- a/tests/builtins/linked_list.c
+++ b/tests/builtins/linked_list.c
@@ -1,7 +1,7 @@
/* run.config*
- STDOPT: #"-load-module variadic -eva-no-builtins-auto"
- STDOPT: #"-load-module variadic -eva-plevel 100 -big-ints-hex 257 -eva-no-builtins-auto"
- STDOPT: #"-load-module variadic -eva-slevel 12 -big-ints-hex 257 -eva-no-builtins-auto"
+ STDOPT: #"-eva-no-builtins-auto"
+ STDOPT: #"-eva-plevel 100 -big-ints-hex 257 -eva-no-builtins-auto"
+ STDOPT: #"-eva-slevel 12 -big-ints-hex 257 -eva-no-builtins-auto"
*/
#include "__fc_define_size_t.h"
diff --git a/tests/builtins/memcpy.c b/tests/builtins/memcpy.c
index 97d2feee02e28b3480fb59d201ccdef64954943e..ef418d90402f55388a6f9088619cd2963e6cfa19 100644
--- a/tests/builtins/memcpy.c
+++ b/tests/builtins/memcpy.c
@@ -1,12 +1,12 @@
/* run.config*
- STDOPT: +"-calldeps -eva-slevel-function init:2000 -eva-msg-key imprecision -eva-plevel 150 -main main_all -inout -no-deps -absolute-valid-range 100000-100001 -then -load-module report -report"
+ PLUGIN: @PTEST_PLUGIN@ report
+ STDOPT: +"-calldeps -eva-slevel-function init:2000 -eva-msg-key imprecision -eva-plevel 150 -main main_all -inout -no-deps -absolute-valid-range 100000-100001 -then -report"
*/
#include "string.h"
volatile int i;
char src[20];
-char dst1[20], dst2[20], dst3[20];
-char dst4[20], dst5[100];
+char dst1[20], dst2[20], dst3[20], dst4[20], dst5[100];
void init () {
int j;
diff --git a/tests/builtins/memcpy_invalid.c b/tests/builtins/memcpy_invalid.c
index cd0a7b35cf7952616fe681aa8959b5bca7feab6e..b85add2c2cc1902f6dca207f512a16cdc36fb780 100644
--- a/tests/builtins/memcpy_invalid.c
+++ b/tests/builtins/memcpy_invalid.c
@@ -1,5 +1,5 @@
/* run.config*
- OPT: -eva @EVA_CONFIG@ -journal-disable -calldeps
+ OPT: -eva @EVA_CONFIG@ -calldeps
*/
/*@ assigns \result \from min, max;
diff --git a/tests/builtins/write-const.c b/tests/builtins/write-const.c
index 89dfcdd91ae135416df8d7ce0d91a279f41d1235..9d3a32913c9956c22d03d0ce7892e9b4367dcc96 100644
--- a/tests/builtins/write-const.c
+++ b/tests/builtins/write-const.c
@@ -1,5 +1,5 @@
/* run.config*
- OPT: -eva @EVA_CONFIG@ -journal-disable -eva-builtins-auto -calldeps
+ OPT: -eva @EVA_CONFIG@ -eva-builtins-auto -calldeps
*/
// This test verifies that writing in a memory location that may be const
diff --git a/tests/cil/duplicate-labels.c b/tests/cil/duplicate-labels.c
index 526e45d32c0f0e9328221d720ffc4367ff41f575..a8ca252343fb5eedfbd9e9e219a2afb8abe46fcb 100644
--- a/tests/cil/duplicate-labels.c
+++ b/tests/cil/duplicate-labels.c
@@ -1,5 +1,5 @@
/* run.config
- OPT: -keep-switch -print -journal-disable
+ OPT: -keep-switch -print
*/
int foo18(int a) {
diff --git a/tests/constant_propagation/bts-1787-bis.i b/tests/constant_propagation/bts-1787-bis.i
index cd70cec18f7a82dee41709f2bb73044d8ee44d09..c319f461976faac2349004e586a728313f65ab25 100644
--- a/tests/constant_propagation/bts-1787-bis.i
+++ b/tests/constant_propagation/bts-1787-bis.i
@@ -1,5 +1,5 @@
/* run.config
- OPT: -print -journal-disable
+ OPT: -print
STDOPT:
STDOPT: +"-scf-allow-cast"
*/
diff --git a/tests/constant_propagation/const_globals.c b/tests/constant_propagation/const_globals.c
index 355a01b498734788a754838b8bde297d78ced63c..c0661d55d4f2a4006517e7881ef04f181f7ea550 100644
--- a/tests/constant_propagation/const_globals.c
+++ b/tests/constant_propagation/const_globals.c
@@ -1,5 +1,5 @@
/* run.config
- OPT: -constfold -print -journal-disable -machdep x86_32
+ OPT: -constfold -print -machdep x86_32
*/
#include <stddef.h>
diff --git a/tests/constant_propagation/const_propagate.c b/tests/constant_propagation/const_propagate.c
index 2e5e3f728eb889020c6c3f66a94155cfb7eecb2b..c9a65bcc33bc3291cde3802cb13e8a9dd5d0022b 100644
--- a/tests/constant_propagation/const_propagate.c
+++ b/tests/constant_propagation/const_propagate.c
@@ -1,7 +1,7 @@
/* run.config
PLUGIN: @CONSTANT_PROPAGATION_PLUGINS@ from inout
OPT: -eva @EVA_OPTIONS@ -deps -out -input -scf
- OPT: -scf @EVA_OPTIONS@ -main init -journal-disable -cast-from-constant -semantic-const-fold add3
+ OPT: -scf @EVA_OPTIONS@ -main init -cast-from-constant -semantic-const-fold add3
*/
int x,y,z, TAB[10];
struct st { int a, b ; } s1, s2;
diff --git a/tests/constant_propagation/declaration2.c b/tests/constant_propagation/declaration2.c
index f44053abbdf2bfc33b6fca16e20033e8155f84b9..cfde5c962b55e8486361ddbb4d15852764d0f956 100644
--- a/tests/constant_propagation/declaration2.c
+++ b/tests/constant_propagation/declaration2.c
@@ -1,5 +1,5 @@
/* run.config
- OPT: -eva @EVA_OPTIONS@ -scf -journal-disable
+ OPT: -eva @EVA_OPTIONS@ -scf
*/
void f(int *x) { (*x)++; }
diff --git a/tests/constant_propagation/introduction_of_non_explicit_cast.c b/tests/constant_propagation/introduction_of_non_explicit_cast.c
index a9778533534d5e510cdeea361db9ffe7682b488b..bd95af567f0900dc0a96bf490449d0af886ffd6a 100644
--- a/tests/constant_propagation/introduction_of_non_explicit_cast.c
+++ b/tests/constant_propagation/introduction_of_non_explicit_cast.c
@@ -1,6 +1,6 @@
/* run.config
MODULE: @PTEST_NAME@
- OPT: -eva @EVA_OPTIONS@ -deps -journal-disable
+ OPT: -eva @EVA_OPTIONS@ -deps
*/
int x,y,z;
diff --git a/tests/float/cond.c b/tests/float/cond.c
index 89cc751c13707df7addc5024e5e5b5aae556091e..713b5b4b1fdb1623aeb41f8aaf3219ab8e5b47ec 100644
--- a/tests/float/cond.c
+++ b/tests/float/cond.c
@@ -1,5 +1,5 @@
/* run.config*
- OPT: -eva @EVA_CONFIG@ -journal-disable -float-hex
+ OPT: -eva @EVA_CONFIG@ -float-hex
*/
#include "__fc_builtin.h"
diff --git a/tests/float/const.i b/tests/float/const.i
index 9e47e611f885b5ad64dbcd15eaeb52c02cde7d27..ee5cbc9b58c86f7f6f443cb77a92a04f49cfbbb0 100644
--- a/tests/float/const.i
+++ b/tests/float/const.i
@@ -1,5 +1,5 @@
/* run.config*
- OPT: -eva @EVA_CONFIG@ -float-hex -warn-decimal-float all -journal-disable -then -out -deps
+ OPT: -eva @EVA_CONFIG@ -float-hex -warn-decimal-float all -then -out -deps
*/
typedef double mydouble;
diff --git a/tests/float/init_float.i b/tests/float/init_float.i
index 83d69d1336e42e0cdb64c82e99409c770eba553f..58dc5e8a3bd127c96839b82ea470cd1efcb07211 100644
--- a/tests/float/init_float.i
+++ b/tests/float/init_float.i
@@ -1,5 +1,5 @@
/* run.config*
- OPT: -eva @EVA_CONFIG@ -journal-disable -float-normal -lib-entry
+ OPT: -eva @EVA_CONFIG@ -float-normal -lib-entry
*/
typedef struct S { float y; } S;
diff --git a/tests/float/nonlin.c b/tests/float/nonlin.c
index d210fe4a31538f2594517d4668c813392b557e6b..3de9d18e9d559ff2c3868ff6ce63efcd4e6ff17b 100644
--- a/tests/float/nonlin.c
+++ b/tests/float/nonlin.c
@@ -1,10 +1,10 @@
/* run.config*
- OPT: -eva-msg-key nonlin -eva-slevel 30 -eva @EVA_CONFIG@ -cpp-extra-args="-DFLOAT=double" -float-hex -journal-disable -eva-subdivide-non-linear 0
- OPT: -eva-msg-key nonlin -eva-slevel 30 -eva @EVA_CONFIG@ -cpp-extra-args="-DFLOAT=double" -float-hex -journal-disable -eva-subdivide-non-linear 10
- OPT: -eva-msg-key nonlin -eva-slevel 30 -eva @EVA_CONFIG@ -cpp-extra-args="-DFLOAT=double" -float-hex -journal-disable -eva-subdivide-non-linear 10 -warn-special-float none
- OPT: -eva-msg-key nonlin -eva-slevel 30 -eva @EVA_CONFIG@ -cpp-extra-args="-DFLOAT=float" -float-hex -journal-disable -eva-subdivide-non-linear 0
- OPT: -eva-msg-key nonlin -eva-slevel 30 -eva @EVA_CONFIG@ -cpp-extra-args="-DFLOAT=float" -float-hex -journal-disable -eva-subdivide-non-linear 10
- OPT: -eva-msg-key nonlin -eva-slevel 30 -eva @EVA_CONFIG@ -cpp-extra-args="-DFLOAT=float" -float-hex -journal-disable -eva-subdivide-non-linear 10 -warn-special-float none
+ OPT: -eva-msg-key nonlin -eva-slevel 30 -eva @EVA_CONFIG@ -cpp-extra-args="-DFLOAT=double" -float-hex -eva-subdivide-non-linear 0
+ OPT: -eva-msg-key nonlin -eva-slevel 30 -eva @EVA_CONFIG@ -cpp-extra-args="-DFLOAT=double" -float-hex -eva-subdivide-non-linear 10
+ OPT: -eva-msg-key nonlin -eva-slevel 30 -eva @EVA_CONFIG@ -cpp-extra-args="-DFLOAT=double" -float-hex -eva-subdivide-non-linear 10 -warn-special-float none
+ OPT: -eva-msg-key nonlin -eva-slevel 30 -eva @EVA_CONFIG@ -cpp-extra-args="-DFLOAT=float" -float-hex -eva-subdivide-non-linear 0
+ OPT: -eva-msg-key nonlin -eva-slevel 30 -eva @EVA_CONFIG@ -cpp-extra-args="-DFLOAT=float" -float-hex -eva-subdivide-non-linear 10
+ OPT: -eva-msg-key nonlin -eva-slevel 30 -eva @EVA_CONFIG@ -cpp-extra-args="-DFLOAT=float" -float-hex -eva-subdivide-non-linear 10 -warn-special-float none
*/
#include "__fc_builtin.h"
diff --git a/tests/float/precise_cos_sin.c b/tests/float/precise_cos_sin.c
index f6e6f36e9077b0036d3ebd983c20cc6a0e5f4eb0..cee74467f216fea00b30688d2bde37f2e017d43f 100644
--- a/tests/float/precise_cos_sin.c
+++ b/tests/float/precise_cos_sin.c
@@ -1,5 +1,5 @@
/* run.config*
- OPT: -eva @EVA_CONFIG@ -eva-slevel 1000 -journal-disable -float-normal
+ OPT: -eva @EVA_CONFIG@ -eva-slevel 1000 -float-normal
*/
#include <__fc_builtin.h>
diff --git a/tests/float/round10d.i b/tests/float/round10d.i
index 1d6ebe39de506c8e31fe6ea441ba25cfbd408cbd..4dfa2710f349811eb8a9063e035a7a5041fee846 100644
--- a/tests/float/round10d.i
+++ b/tests/float/round10d.i
@@ -1,5 +1,5 @@
/* run.config*
- OPT: -eva @EVA_CONFIG@ -float-normal -journal-disable -eva-no-results
+ OPT: -eva @EVA_CONFIG@ -float-normal -eva-no-results
*/
int main()
diff --git a/tests/float/some.c b/tests/float/some.c
index 8eb3f38ea73da66b5c52a6779382e274a9a6a3ee..3c5d5e4c0215f094f0178d44f1e420d3f32ded7e 100644
--- a/tests/float/some.c
+++ b/tests/float/some.c
@@ -1,6 +1,6 @@
/* run.config*
- OPT: -eva-show-slevel 10 -eva-slevel 100 -eva @EVA_CONFIG@ -cpp-extra-args="-DFLOAT=double -DN=55" -float-normal -journal-disable -eva-no-results
- OPT: -eva-slevel 100 -eva @EVA_CONFIG@ -cpp-extra-args="-DFLOAT=float -DN=26" -float-normal -journal-disable -eva-no-results
+ OPT: -eva-show-slevel 10 -eva-slevel 100 -eva @EVA_CONFIG@ -cpp-extra-args="-DFLOAT=double -DN=55" -float-normal -eva-no-results
+ OPT: -eva-slevel 100 -eva @EVA_CONFIG@ -cpp-extra-args="-DFLOAT=float -DN=26" -float-normal -eva-no-results
*/
FLOAT t[N] = { 1. } ;
diff --git a/tests/idct/ieee_1180_1990.c b/tests/idct/ieee_1180_1990.c
index 9a881a72975775b334751e5b0979d34b3618b33a..6d0489e1d4ce589606fcd823b5486dda05c01100 100644
--- a/tests/idct/ieee_1180_1990.c
+++ b/tests/idct/ieee_1180_1990.c
@@ -1,6 +1,6 @@
/* run.config*
-
- STDOPT: +"-eva-msg-key=summary -load-module report,scope,variadic -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 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"
*/
/* IEEE_1180_1990: a testbed for IDCT accuracy
* Copyright (C) 2001 Renaud Pacalet
diff --git a/tests/metrics/func_ptr.c b/tests/metrics/func_ptr.c
index a120dc650f915d5c3415a71b91e53e1f3f33e1df..7752cc707be171e28642746b6df6b779420c90e7 100644
--- a/tests/metrics/func_ptr.c
+++ b/tests/metrics/func_ptr.c
@@ -1,6 +1,6 @@
/* run.config
- STDOPT: +"-metrics-eva-cover -metrics-cover main -load-module scope"
- STDOPT: +"-metrics-eva-cover -main foobar -metrics-cover foobar -load-module scope"
+ STDOPT: +"-metrics-eva-cover -metrics-cover main"
+ STDOPT: +"-metrics-eva-cover -main foobar -metrics-cover foobar"
**/
void (*bar) (int); extern void (*bar_extern) (int);
diff --git a/tests/metrics/reach.c b/tests/metrics/reach.c
index 6d97321828cf790d4313ec54b1560163b17639f5..1fdcc0eb74536cacfed37f44d9c914779a35c886 100644
--- a/tests/metrics/reach.c
+++ b/tests/metrics/reach.c
@@ -1,5 +1,5 @@
/* run.config
- STDOPT: +"-metrics-by-function -metrics-eva-cover -load-module scope"
+ STDOPT: +"-metrics-by-function -metrics-eva-cover"
**/
void (*bar) (int); void (*t[2])(int);
diff --git a/tests/metrics/unreachable.c b/tests/metrics/unreachable.c
index f841cf08abe275fffd5102b56b992829a7beed1e..8d46f2b591860b1402790d9205bd30451362da92 100644
--- a/tests/metrics/unreachable.c
+++ b/tests/metrics/unreachable.c
@@ -1,11 +1,11 @@
/* run.config
- STDOPT: +"-load-module scope -metrics-eva-cover -then -main foo"
-**/
+ PLUGIN: @PTEST_PLUGIN@ scope
+ STDOPT: +"-metrics-eva-cover -then -main foo"
+*/
void foo () {
int i = 0;
return;
}
-
/* foo is unreachable since j is always 0 */
int main() {
int j = 0;
diff --git a/tests/misc/add_assigns.i b/tests/misc/add_assigns.i
index 18665b1b0e4bfdff1a28b8e42db78a97ebbcdb7a..5a84f6d4edcf694f123c8ce4ba020e407964a4e6 100644
--- a/tests/misc/add_assigns.i
+++ b/tests/misc/add_assigns.i
@@ -1,8 +1,8 @@
/* run.config
+ PLUGIN: report
MODULE: @PTEST_NAME@
- OPT: -no-autoload-plugins -load-module report -then -report -then -print
+ OPT: -then -report -then -print
*/
-
/*@ assigns *x; */
int f(int* x, int* y) {
*x++;
diff --git a/tests/misc/long_ident.c b/tests/misc/long_ident.c
index 58136fd73650e7c2a9171d569c57cf3a9c6e1600..f05e27a6a7c88a356d8f73888378b95cd42b4d2a 100644
--- a/tests/misc/long_ident.c
+++ b/tests/misc/long_ident.c
@@ -1,6 +1,6 @@
/* run.config
PLUGIN: obfuscator
- OPT: -obfuscate -journal-disable
+ OPT: -obfuscate
*/
/*@ ensures \valid(q); // <-- obfuscation error [bts#404]
diff --git a/tests/misc/mergestruct2.i b/tests/misc/mergestruct2.i
index dac32235cbb00201662be6404c41759ec6a5472b..440d750507fd948d258f60dbafa4ca7e23ff6674 100644
--- a/tests/misc/mergestruct2.i
+++ b/tests/misc/mergestruct2.i
@@ -1,5 +1,5 @@
/* run.config
- OPT: -print -journal-disable tests/misc/mergestruct3.i tests/misc/mergestruct1.i
+ OPT: -print tests/misc/mergestruct3.i tests/misc/mergestruct1.i
*/
struct s *p;
diff --git a/tests/misc/mergestruct3.i b/tests/misc/mergestruct3.i
index 0ea89c56666d2aa0780fc63785360b1caeb5bb74..63e1e1c40eaa3556bfcd2907f2e1506d6509866f 100644
--- a/tests/misc/mergestruct3.i
+++ b/tests/misc/mergestruct3.i
@@ -1,6 +1,6 @@
/* run.config
- OPT: -print -journal-disable tests/misc/mergestruct1.i tests/misc/mergestruct2.i
- OPT: -print -journal-disable tests/misc/mergestruct2.i tests/misc/mergestruct1.i
+ OPT: -print tests/misc/mergestruct1.i tests/misc/mergestruct2.i
+ OPT: -print tests/misc/mergestruct2.i tests/misc/mergestruct1.i
*/
struct s { float a; } s2;
diff --git a/tests/misc/with-space.i b/tests/misc/with-space.i
index 4a95be9e4e5c347bb9637e6d5e1dc2002f0d0dad..4e9efa5b156b97abc144bd790cb390794976c275 100644
--- a/tests/misc/with-space.i
+++ b/tests/misc/with-space.i
@@ -1,3 +1,4 @@
/* run.config
- OPT: -load-module @PTEST_DIR@/with\ space/module.ml
+ SCRIPT: with\ space/module
+ OPT:
*/
diff --git a/tests/misc/wstring_phase6.c b/tests/misc/wstring_phase6.c
index c364cd912c972d11721d70b0295354cd5e22d3b5..fdbb402565e67e867ec67b22b122bb934eb00584 100644
--- a/tests/misc/wstring_phase6.c
+++ b/tests/misc/wstring_phase6.c
@@ -1,7 +1,7 @@
/* run.config
PLUGIN: variadic
MODULE: @PTEST_NAME@
- OPT: -journal-disable -print -variadic-no-translation
+ OPT: -print -variadic-no-translation
*/
#include <stdio.h>
// See http://stackoverflow.com/questions/18102502/mixing-wide-and-narrow-string-literals-in-c
diff --git a/tests/pdg/globals.c b/tests/pdg/globals.c
index 390e3f947b760072a8ac520c6c617e20483410eb..295b43bb0a0f846d276d872bad508ef5d4ff3f20 100644
--- a/tests/pdg/globals.c
+++ b/tests/pdg/globals.c
@@ -1,8 +1,8 @@
/* run.config
-
- STDOPT: #"-load-module pdg -eva -out -input -deps -main g"
- STDOPT: #"-load-module pdg -eva -out -input -deps -main h"
- STDOPT: #"-load-module pdg -eva -out -input -deps -main f"
+
+ STDOPT: #"-eva -out -input -deps -main g"
+ STDOPT: #"-eva -out -input -deps -main h"
+ STDOPT: #"-eva -out -input -deps -main f"
*/
struct Tstr;
extern int X;
diff --git a/tests/pdg/top_pdg_input.c b/tests/pdg/top_pdg_input.c
index 1fa9bc5856422277ce593946c82f6b026885afe5..f0414696dc945a899e01bacc2b1a7e6368ba928e 100644
--- a/tests/pdg/top_pdg_input.c
+++ b/tests/pdg/top_pdg_input.c
@@ -1,5 +1,5 @@
/* run.config
- STDOPT: +"-eva -pdg -out -input -deps -eva-no-results-function no_results -eva-no-builtins-auto -load-module pdg -pdg -then -main main_asm"
+ STDOPT: +"-eva -pdg -out -input -deps -eva-no-results-function no_results -eva-no-builtins-auto -pdg -then -main main_asm"
*/
volatile int nondet;
int no_results() {return 1;}
diff --git a/tests/rte/addsub.c b/tests/rte/addsub.c
index 233850c5339edebeac058110d31ea7cbc87757c4..af24e4ba52d02e2fd9ea9734190ac7aa4aa92611 100644
--- a/tests/rte/addsub.c
+++ b/tests/rte/addsub.c
@@ -1,5 +1,5 @@
/* run.config
- OPT: -rte -warn-signed-overflow -print -machdep x86_32
+ STDOPT: #" -warn-signed-overflow -print -machdep x86_32"
*/
int main() {
diff --git a/tests/rte/addsub_typedef.c b/tests/rte/addsub_typedef.c
index 14ce47db5684b16685929a9bed6040718b3ee346..5ecb4a39ef9569e0cfbad135b5b762f8b5d18cd5 100644
--- a/tests/rte/addsub_typedef.c
+++ b/tests/rte/addsub_typedef.c
@@ -1,5 +1,5 @@
/* run.config
- OPT: -rte -warn-signed-overflow -print -machdep x86_32
+ STDOPT: #" -warn-signed-overflow -print -machdep x86_32"
*/
typedef int tint;
diff --git a/tests/rte/addsub_unsigned.c b/tests/rte/addsub_unsigned.c
index ba7903afe1c36e5f007a40b9b84cda0312a8c39e..30a6b0a0afaf0ab679f497ce6dea804ec820b7d4 100644
--- a/tests/rte/addsub_unsigned.c
+++ b/tests/rte/addsub_unsigned.c
@@ -1,6 +1,6 @@
/* run.config
- OPT: -rte -warn-signed-overflow -print -machdep x86_32
- OPT: -rte -warn-signed-overflow -warn-unsigned-overflow -print -machdep x86_32
+ STDOPT: #" -warn-signed-overflow -print -machdep x86_32"
+ STDOPT: #" -warn-signed-overflow -warn-unsigned-overflow -print -machdep x86_32 "
*/
int main() {
diff --git a/tests/rte/addsub_unsigned_typedef.c b/tests/rte/addsub_unsigned_typedef.c
index d1c33d01ea6879cebfce34030f656151ec660e5c..4276053fa498d76fcbaef4a2704ea090b5444e60 100644
--- a/tests/rte/addsub_unsigned_typedef.c
+++ b/tests/rte/addsub_unsigned_typedef.c
@@ -1,6 +1,6 @@
/* run.config
- OPT: -rte -warn-signed-overflow -print -machdep x86_32
- OPT: -rte -warn-signed-overflow -warn-unsigned-overflow -print -machdep x86_32
+ STDOPT: #" -warn-signed-overflow -print -machdep x86_32"
+ STDOPT: #" -warn-signed-overflow -warn-unsigned-overflow -print -machdep x86_32 "
*/
typedef unsigned int uint;
diff --git a/tests/rte/array_index.c b/tests/rte/array_index.c
index 77df7919a2332a91172e6cb5790e609d1ff02aad..0a53bd2e42a757e3c4767578e0e24d5ab60ffc8b 100644
--- a/tests/rte/array_index.c
+++ b/tests/rte/array_index.c
@@ -1,6 +1,6 @@
/* run.config
- OPT: -machdep x86_32 -rte -warn-signed-overflow -print -then -rte-trivial-annotations
- OPT: -machdep x86_32 -rte -warn-signed-overflow -print -unsafe-arrays
+ STDOPT: +"-machdep x86_32 -warn-signed-overflow -print -then -rte-trivial-annotations"
+ STDOPT: +"-machdep x86_32 -warn-signed-overflow -print -unsafe-arrays"
*/
int t[10];
diff --git a/tests/rte/assign.c b/tests/rte/assign.c
index 1bf221224071dc258275993937cd98009fe6f844..c1e227e2258713d57353cefce3ac9a2dd7d6e73a 100644
--- a/tests/rte/assign.c
+++ b/tests/rte/assign.c
@@ -1,5 +1,5 @@
/* run.config
- OPT: -rte -warn-signed-overflow -print -journal-disable
+ STDOPT: #" -warn-signed-overflow -print"
*/
int global_x, global_y;
diff --git a/tests/rte/assign2.c b/tests/rte/assign2.c
index 6534dfb159ce7b8585cf9ed26f734c209dfb5e05..d2284b3738e8955d1d05357306ea7963c7b82189 100644
--- a/tests/rte/assign2.c
+++ b/tests/rte/assign2.c
@@ -1,5 +1,5 @@
/* run.config
- OPT: -rte -warn-signed-overflow -rte-no-mem -print
+ STDOPT: #" -warn-signed-overflow -rte-no-mem -print"
*/
int i;
diff --git a/tests/rte/assign3.c b/tests/rte/assign3.c
index d18d96d1af3fa1f099efb86c54f134abd31bf1a3..aa2dff8baa5726750ca1b34aa5ab2c6cd27542d2 100644
--- a/tests/rte/assign3.c
+++ b/tests/rte/assign3.c
@@ -1,5 +1,5 @@
/* run.config
- OPT: -rte -warn-signed-overflow -rte-no-mem -print -journal-disable
+ STDOPT: #" -warn-signed-overflow -rte-no-mem -print"
*/
// if f() assigns i there might be a problem
diff --git a/tests/rte/assign4.c b/tests/rte/assign4.c
index ffbee611f42077bedf0e08b1ac10510e1f5e8f35..e749649af54c4cb945ed34658e69e03d5171f059 100644
--- a/tests/rte/assign4.c
+++ b/tests/rte/assign4.c
@@ -1,5 +1,5 @@
/* run.config
- OPT: -rte -warn-signed-overflow -print -journal-disable
+ STDOPT: #" -warn-signed-overflow -print"
*/
//@ assigns \result \from min, max;
diff --git a/tests/rte/assign5.c b/tests/rte/assign5.c
index 41359fad7580a113daa651da79e175faa99f5758..78682ecd001e532e0f8e817e69349631c0a4f6f9 100644
--- a/tests/rte/assign5.c
+++ b/tests/rte/assign5.c
@@ -1,5 +1,5 @@
/* run.config
- OPT: -rte -warn-signed-overflow -print -journal-disable
+ STDOPT: #" -warn-signed-overflow -print"
*/
/* the assigns of f shouldn't parse:
diff --git a/tests/rte/assign6.c b/tests/rte/assign6.c
index 1f9b3dfa30671de1b2019cab3ad74da75f6f2779..63f250692a9af03a2479b9d2c08fc8fc698af54b 100644
--- a/tests/rte/assign6.c
+++ b/tests/rte/assign6.c
@@ -1,5 +1,5 @@
/* run.config
- OPT: -rte -warn-signed-overflow -print -journal-disable
+ STDOPT: #" -warn-signed-overflow -print"
*/
int z;
diff --git a/tests/rte/assign7.c b/tests/rte/assign7.c
index 7a3d10e5bf4fc465e74b6278d3bd4fa568a28de5..b88640367df022dcee8ed1907192411338cdab71 100644
--- a/tests/rte/assign7.c
+++ b/tests/rte/assign7.c
@@ -1,5 +1,5 @@
/* run.config
- OPT: -rte -warn-signed-overflow -print -journal-disable
+ STDOPT: #" -warn-signed-overflow -print"
*/
//@ assigns *p \from \union(*(char*)p,*q);
diff --git a/tests/rte/bool.i b/tests/rte/bool.i
index 4c0f20d8595943bbabac9f0bbc3823d3cf308e39..f48966952f143693d09a8a371ef57edfdc7842d5 100644
--- a/tests/rte/bool.i
+++ b/tests/rte/bool.i
@@ -1,5 +1,5 @@
/* run.config
-OPT: -warn-invalid-bool -rte -print -then -rte-trivial-annotations -rte -print
+OPT: -warn-invalid-bool @RTE_TEST@ -print -then -rte-trivial-annotations @RTE_TEST@ -print
*/
/* The test asks for two executions of RTE plug-in:
diff --git a/tests/rte/bts0567.c b/tests/rte/bts0567.c
index caa257ed11cc0ce2bb7d721a994f82ff4a7555ae..4d4366e00f898ecaa4ef33ffcd4b7cc9c807d652 100644
--- a/tests/rte/bts0567.c
+++ b/tests/rte/bts0567.c
@@ -1,5 +1,5 @@
/* run.config
- OPT: -rte -warn-signed-overflow -print
+ STDOPT: #" -warn-signed-overflow -print"
*/
int tab [2] ;
diff --git a/tests/rte/bts0576.c b/tests/rte/bts0576.c
index 3e39f999ce9169b73b933438f70b9414f50f94df..72536204f4bbe2361fd2d87bbee136c1ea94ea66 100644
--- a/tests/rte/bts0576.c
+++ b/tests/rte/bts0576.c
@@ -1,5 +1,5 @@
/* run.config
- OPT: -rte -warn-signed-overflow -warn-special-float none -print
+ STDOPT: #" -warn-signed-overflow -warn-special-float none -print"
*/
typedef double typetab[2];
diff --git a/tests/rte/bts0580.i b/tests/rte/bts0580.i
index e53882131c992ca059b1aaf42e2ba73fd489e4d1..21db2fe79c428d2bbe349817e7b8adf4ca16887d 100644
--- a/tests/rte/bts0580.i
+++ b/tests/rte/bts0580.i
@@ -1,5 +1,5 @@
/* run.config
- OPT: -rte -warn-signed-overflow -rte-mem -print
+ STDOPT: #" -warn-signed-overflow -rte-mem -print"
*/
struct ArrayStruct {
int data[10];
diff --git a/tests/rte/bts0580_2.c b/tests/rte/bts0580_2.c
index 86c1f81401ce287abfef25475851911f6b3e7cae..1abbd4f8330fa97163db00dd72629c33f1911dfa 100644
--- a/tests/rte/bts0580_2.c
+++ b/tests/rte/bts0580_2.c
@@ -1,5 +1,5 @@
/* run.config
- OPT: -rte -warn-signed-overflow -rte-mem -rte-no-pointer-call -print
+ STDOPT: #" -warn-signed-overflow -rte-mem -rte-no-pointer-call -print"
*/
typedef int (*fptr)(int);
diff --git a/tests/rte/bts1052.c b/tests/rte/bts1052.c
index 1d14dc7a09e8190eb9f186e03a4a62c2c1261ac3..0d10364b19dc4458e6924e545b648e15b42bceca 100644
--- a/tests/rte/bts1052.c
+++ b/tests/rte/bts1052.c
@@ -1,5 +1,5 @@
/* run.config
- OPT: -rte -warn-signed-overflow -print -journal-disable
+ STDOPT: #" -warn-signed-overflow -print"
*/
/*@ assigns \nothing;
diff --git a/tests/rte/bts2314.i b/tests/rte/bts2314.i
index c9d92910b8bee8646639176d746fe82d925e2cdc..de1113b8004efc93bb6b8f47360fca790d66bdc7 100644
--- a/tests/rte/bts2314.i
+++ b/tests/rte/bts2314.i
@@ -1,5 +1,5 @@
/* run.config
- OPT: -rte -warn-signed-downcast -print -machdep x86_32
+ STDOPT: #" -warn-signed-downcast -print -machdep x86_32"
*/
struct STR { int num : 7; };
diff --git a/tests/rte/bts621.c b/tests/rte/bts621.c
index 5bceeeddce699bc5a3084090c18ab1688df12417..1b8d9890826e8697291ab5d038815e43580ed1a1 100644
--- a/tests/rte/bts621.c
+++ b/tests/rte/bts621.c
@@ -1,5 +1,5 @@
/* run.config
- OPT: -print -then -no-print -rte -warn-signed-overflow -then -print
+ OPT: -print -then -no-print @RTE_TEST@ -warn-signed-overflow -then -print
*/
/*@ ghost
/@ assigns *p; @/
diff --git a/tests/rte/castoncall.c b/tests/rte/castoncall.c
index 65401d7a0354fe74e0e8ff61326915dd4e4a5856..1f444a7471c74adee332e7dd349d6e1c114246ad 100644
--- a/tests/rte/castoncall.c
+++ b/tests/rte/castoncall.c
@@ -1,6 +1,6 @@
/* run.config
- OPT: -machdep x86_32 -rte -warn-signed-overflow -warn-signed-downcast -print
- OPT: -machdep x86_32 -rte -warn-signed-overflow -warn-signed-downcast -no-collapse-call-cast -print
+ STDOPT: +"-machdep x86_32 -warn-signed-overflow -warn-signed-downcast -print"
+ STDOPT: +"-machdep x86_32 -warn-signed-overflow -warn-signed-downcast -no-collapse-call-cast -print"
*/
/*@
diff --git a/tests/rte/divmod.c b/tests/rte/divmod.c
index 13d9737ece5480dad993959c2eb136eecb831545..2a8edbd7cd86bd42a65a551be0301babfea952a9 100644
--- a/tests/rte/divmod.c
+++ b/tests/rte/divmod.c
@@ -1,5 +1,5 @@
/* run.config
- OPT: -rte -warn-signed-overflow -warn-signed-downcast -print -machdep x86_32 -journal-disable
+ STDOPT: #" -warn-signed-overflow -warn-signed-downcast -print -machdep x86_32"
*/
#include "limits.h"
diff --git a/tests/rte/divmod_typedef.c b/tests/rte/divmod_typedef.c
index d3c6b330e52951b1c3354e94ea756efdcf1e8d9b..e376f7b74dda2f644f121dbb1ddcb13a4d4ab293 100644
--- a/tests/rte/divmod_typedef.c
+++ b/tests/rte/divmod_typedef.c
@@ -1,5 +1,5 @@
/* run.config
- OPT: -rte -warn-signed-overflow -warn-signed-downcast -print -machdep x86_32 -journal-disable
+ STDOPT: #" -warn-signed-overflow -warn-signed-downcast -print -machdep x86_32"
*/
#include "limits.h"
diff --git a/tests/rte/downcast.c b/tests/rte/downcast.c
index 9870059fa7d81b6ff7c7d824dfa6ab59be57a88c..91b81381e7dd51acb284027d8befca093d7bdfce 100644
--- a/tests/rte/downcast.c
+++ b/tests/rte/downcast.c
@@ -1,7 +1,7 @@
/* run.config
- OPT: -rte -warn-signed-overflow -warn-signed-downcast -print -machdep x86_32
- OPT: -rte -warn-signed-overflow -print -warn-signed-overflow -machdep x86_32
- OPT: -rte -warn-signed-overflow -print -warn-signed-downcast -warn-unsigned-downcast -machdep x86_32
+ STDOPT: #" -warn-signed-overflow -warn-signed-downcast -print -machdep x86_32"
+ STDOPT: #" -warn-signed-overflow -print -warn-signed-overflow -machdep x86_32"
+ STDOPT: #" -warn-signed-overflow -print -warn-signed-downcast -warn-unsigned-downcast -machdep x86_32"
*/
int main(void) {
signed char sx,sy,sz;
diff --git a/tests/rte/finite_float.c b/tests/rte/finite_float.c
index e5cb5ce805943ff01d62d99c17de1903db43707c..c62a18aad048d4a7fb0217c90fc1a9af5bea3aaf 100644
--- a/tests/rte/finite_float.c
+++ b/tests/rte/finite_float.c
@@ -1,5 +1,5 @@
/* run.config
- OPT: -rte -warn-special-float non-finite -print -machdep x86_32 -journal-disable
+ STDOPT: #" -warn-special-float non-finite -print -machdep x86_32"
*/
#define _ISOC99_SOURCE
#include <math.h>
diff --git a/tests/rte/float_to_int.c b/tests/rte/float_to_int.c
index e8782db9e9bbaa72514bb59cd5a098e51fddb3a7..8166852ee619edc723be5d81cd2391a2fd95d8ca 100644
--- a/tests/rte/float_to_int.c
+++ b/tests/rte/float_to_int.c
@@ -1,5 +1,5 @@
/* run.config
- OPT: -rte -rte-float-to-int -warn-special-float none -print -machdep x86_32 -journal-disable
+ STDOPT: #" -rte-float-to-int -warn-special-float none -print -machdep x86_32"
*/
void main() {
diff --git a/tests/rte/fptr_assert.c b/tests/rte/fptr_assert.c
index 2a7dda531e72cc76596e468a923e80c61fc96959..e4899291e0d87534e80f515710191dc2a43a6739 100644
--- a/tests/rte/fptr_assert.c
+++ b/tests/rte/fptr_assert.c
@@ -1,5 +1,5 @@
/* run.config
- OPT: -rte -print
+ STDOPT: #" -print"
*/
typedef int (*fptr)(int);
diff --git a/tests/rte/gnu_zero_length.c b/tests/rte/gnu_zero_length.c
index aa429fa0858924e6852c1982bfc1e6ff4e190ae0..87e7291fa76b4ade1347c61eed635a4aab08a6e1 100644
--- a/tests/rte/gnu_zero_length.c
+++ b/tests/rte/gnu_zero_length.c
@@ -1,5 +1,5 @@
/* run.config
- OPT: -rte -print -machdep gcc_x86_32 -journal-disable
+ STDOPT: #" -print -machdep gcc_x86_32"
*/
#include <stdlib.h>
diff --git a/tests/rte/initialized-ignore-fct.i b/tests/rte/initialized-ignore-fct.i
index af2e03209b9f14dba64a1a48c7c00dd2a8fa6f0a..20fcb3d0623bb730ad90b91f00c2d154260061fa 100644
--- a/tests/rte/initialized-ignore-fct.i
+++ b/tests/rte/initialized-ignore-fct.i
@@ -1,6 +1,6 @@
/* run.config
- OPT: -rte -rte-initialized="@all" -print
- OPT: -rte -rte-initialized="@all,-f1" -print
+ STDOPT: #" -rte-initialized=@all -print"
+ STDOPT: #" -rte-initialized='@all,-f1' -print"
*/
int f1(void){
diff --git a/tests/rte/initialized.c b/tests/rte/initialized.c
index ea9c6ed25e034a6a793d9bb3ddcc78d1bd87009e..dfe86e75fd30b49be7a3c2e038d8cde5cea7c132 100644
--- a/tests/rte/initialized.c
+++ b/tests/rte/initialized.c
@@ -1,5 +1,5 @@
/* run.config
- OPT: -rte -rte-initialized="@all" -warn-signed-overflow -print
+ STDOPT: #" -rte-initialized=@all -warn-signed-overflow -print"
*/
struct R {
diff --git a/tests/rte/initialized_union.c b/tests/rte/initialized_union.c
index 666907264d3d2227cd1ab0c80ac51d140e3cae86..b4d042385be3bc33c0d9ad0a45545563699ae9a8 100644
--- a/tests/rte/initialized_union.c
+++ b/tests/rte/initialized_union.c
@@ -1,6 +1,6 @@
/* run.config
- OPT: -rte -rte-initialized="@all" -warn-signed-overflow -print
- OPT: -cpp-extra-args="-DEMPTY" -machdep gcc_x86_64 -rte -rte-initialized="@all" -warn-signed-overflow -print
+ STDOPT: #" -rte-initialized=@all -warn-signed-overflow -print"
+ STDOPT: #" -cpp-extra-args=-DEMPTY -machdep gcc_x86_64 -rte-initialized=@all -warn-signed-overflow -print"
*/
union U {
diff --git a/tests/rte/invalid_fptr.i b/tests/rte/invalid_fptr.i
index c28d93b0ed1dfc232e053144dd4998f834f8b5f0..5321e177f81b6ef0d7348de4857caf4335ecb2b3 100644
--- a/tests/rte/invalid_fptr.i
+++ b/tests/rte/invalid_fptr.i
@@ -1,5 +1,5 @@
/* run.config
-OPT: -c11 -rte -warn-invalid-pointer -print
+STDOPT: +"-c11 -warn-invalid-pointer -print"
*/
struct S { void (*f)(void); } s;
diff --git a/tests/rte/malloc.c b/tests/rte/malloc.c
index 5c7c4c2816cccf8f507c7906fb35b8871d6539cd..8f5c8db3bef886fe7bdd115ac479d65791334c9a 100644
--- a/tests/rte/malloc.c
+++ b/tests/rte/malloc.c
@@ -1,5 +1,5 @@
/* run.config
- OPT: -rte -warn-signed-overflow -print
+ STDOPT: #" -warn-signed-overflow -print"
*/
/*@ allocates \result;
diff --git a/tests/rte/memaccess.c b/tests/rte/memaccess.c
index b867a96adf17b258c122f59a58cb3561cdc981fc..89d45a0f22288a5bdf03cafb506f60456b6af54b 100644
--- a/tests/rte/memaccess.c
+++ b/tests/rte/memaccess.c
@@ -1,5 +1,5 @@
/* run.config
- OPT: -rte -warn-signed-overflow -print -machdep x86_32
+ STDOPT: #" -warn-signed-overflow -print -machdep x86_32"
*/
int main(int x) {
diff --git a/tests/rte/minus.c b/tests/rte/minus.c
index b15b5f60426c888d5d8a868c07ac18bd995832ff..4cdcbe6b5f95f139dafd7e0c08efc9f349d7625e 100644
--- a/tests/rte/minus.c
+++ b/tests/rte/minus.c
@@ -1,6 +1,6 @@
/* run.config
- OPT: -rte -warn-signed-overflow -warn-signed-downcast -print -machdep x86_32
- OPT: -rte -rte-trivial-annotations -warn-signed-overflow -warn-signed-downcast -print -machdep x86_32
+ STDOPT: #" -warn-signed-overflow -warn-signed-downcast -print -machdep x86_32"
+ STDOPT: #" -rte-trivial-annotations -warn-signed-overflow -warn-signed-downcast -print -machdep x86_32"
*/
int main() {
int x=0,y=0,z=0;
diff --git a/tests/rte/mul.c b/tests/rte/mul.c
index 098f3cff98f672f7ca605dddf1571b2a1b8e2302..20ae96520ae8b7239a5a78687cf6df67981f6c9d 100644
--- a/tests/rte/mul.c
+++ b/tests/rte/mul.c
@@ -1,5 +1,5 @@
/* run.config
- OPT: -rte -warn-signed-overflow -warn-signed-downcast -print -machdep x86_32
+ STDOPT: #" -warn-signed-overflow -warn-signed-downcast -print -machdep x86_32"
*/
int main() {
diff --git a/tests/rte/noresult.c b/tests/rte/noresult.c
index 431a8f85c5a89ce4bd6a3c25da7f72670d7c3d8c..87382c7426309b41b0d0b29ee4d8cea5e0f16716 100644
--- a/tests/rte/noresult.c
+++ b/tests/rte/noresult.c
@@ -1,5 +1,5 @@
/* run.config
- OPT: -rte -warn-signed-overflow -print
+ STDOPT: #" -warn-signed-overflow -print"
*/
int x ;
diff --git a/tests/rte/postcond.c b/tests/rte/postcond.c
index 88ada7bd0b3c3b979c2d4803b693c9fc869e4463..cd5b4dad0cfa597de2926d9d817205e4e6eb2581 100644
--- a/tests/rte/postcond.c
+++ b/tests/rte/postcond.c
@@ -1,5 +1,5 @@
/* run.config
- OPT: -rte -warn-signed-overflow -rte-no-mem -print
+ STDOPT: #" -warn-signed-overflow -rte-no-mem -print"
*/
/*@
diff --git a/tests/rte/postcond2.c b/tests/rte/postcond2.c
index 9b2994ccb2cd09675cdef615429a8da20de6035b..b6601f4f1575258ac3ea916d356cc5c72f4f66c2 100644
--- a/tests/rte/postcond2.c
+++ b/tests/rte/postcond2.c
@@ -1,5 +1,5 @@
/* run.config
- OPT: -rte -warn-signed-overflow -print
+ STDOPT: #" -warn-signed-overflow -print"
*/
/*@
diff --git a/tests/rte/precond.c b/tests/rte/precond.c
index 52e3e8d9d7f52cec2a89b327f3d08c77c649d517..c45a916225a8b2ad1dba05d222b8d85e7cf79fb2 100644
--- a/tests/rte/precond.c
+++ b/tests/rte/precond.c
@@ -1,5 +1,5 @@
/* run.config
- OPT: -rte -warn-signed-overflow -warn-special-float none -print -journal-disable
+ STDOPT: #" -warn-signed-overflow -warn-special-float none -print"
*/
int global = 15;
diff --git a/tests/rte/precond2.c b/tests/rte/precond2.c
index 1998f41545b7cd9700fd8e864a0693c9c5c0861f..ede3e7fcd388d82cf7dfce6681ca743f0661d4ab 100644
--- a/tests/rte/precond2.c
+++ b/tests/rte/precond2.c
@@ -1,6 +1,6 @@
/* run.config
MODULE: compute_annot
- OPT: -warn-special-float none -journal-disable
+ OPT: -warn-special-float none
*/
int global = 15;
diff --git a/tests/rte/reqlabl.c b/tests/rte/reqlabl.c
index b1bd920b1b3b7a598d96cf6fd50ed85dfc5379fb..0f6da2787a23382d8ffc2c81baec007ec196b833 100644
--- a/tests/rte/reqlabl.c
+++ b/tests/rte/reqlabl.c
@@ -1,5 +1,5 @@
/* run.config
- OPT: -rte -warn-signed-overflow -print -journal-disable
+ STDOPT: #" -warn-signed-overflow -print"
*/
//@ requires PROP_SUR_982: x>0;
diff --git a/tests/rte/reqlabl2.c b/tests/rte/reqlabl2.c
index 47e617193f22808d5bd3c68fef7678dcbf22342b..6c3f39292172ae79ea2fe3d3ad590a410da7c7a7 100644
--- a/tests/rte/reqlabl2.c
+++ b/tests/rte/reqlabl2.c
@@ -1,5 +1,5 @@
/* run.config
- OPT: -rte -warn-signed-overflow -print
+ STDOPT: #" -warn-signed-overflow -print"
*/
/*@
diff --git a/tests/rte/s64.c b/tests/rte/s64.c
index 67f694f833fb3ca91da6206310241c34287073ee..48254be2b00e21e78b492734dd4ba4d313efbb91 100644
--- a/tests/rte/s64.c
+++ b/tests/rte/s64.c
@@ -1,5 +1,5 @@
/* run.config
- OPT: -rte -warn-signed-overflow -print -machdep x86_32
+ STDOPT: #" -warn-signed-overflow -print -machdep x86_32"
*/
diff --git a/tests/rte/shift.c b/tests/rte/shift.c
index 9fa4fb1e47ed13603eb6447f6117e9c0eab4d8dc..037a1a72dee7ddcfd9114ceea119f2467062130a 100644
--- a/tests/rte/shift.c
+++ b/tests/rte/shift.c
@@ -1,6 +1,6 @@
/* run.config
- OPT: -rte -warn-signed-overflow -print -machdep x86_32
- OPT: -rte -warn-right-shift-negative -no-warn-left-shift-negative -print -machdep x86_32
+ STDOPT: #" -warn-signed-overflow -print -machdep x86_32"
+ STDOPT: #" -warn-right-shift-negative -no-warn-left-shift-negative -print -machdep x86_32"
*/
int main() {
diff --git a/tests/rte/shift_machdep.c b/tests/rte/shift_machdep.c
index a2dbd18dcc7eff3e47086de2a8bd09057519ad3d..a0b635e2670812409017ed373ad33453129f2148 100644
--- a/tests/rte/shift_machdep.c
+++ b/tests/rte/shift_machdep.c
@@ -1,6 +1,6 @@
/* run.config
- OPT: -rte -warn-signed-overflow -print -machdep x86_32
- OPT: -rte -warn-signed-overflow -print -machdep x86_64
+ STDOPT: #" -warn-signed-overflow -print -machdep x86_32"
+ STDOPT: #" -warn-signed-overflow -print -machdep x86_64"
*/
diff --git a/tests/rte/shift_unsigned.c b/tests/rte/shift_unsigned.c
index 43969846c47819c2f63388dd16f71ea1df5f9385..508133b185ba9b3fdb6d54c8b1e68d5e15ec2d5a 100644
--- a/tests/rte/shift_unsigned.c
+++ b/tests/rte/shift_unsigned.c
@@ -1,6 +1,6 @@
/* run.config
- OPT: -rte -warn-signed-overflow -print -machdep x86_32
- OPT: -rte -warn-signed-overflow -warn-unsigned-overflow -print -machdep x86_32
+ STDOPT: #" -warn-signed-overflow -print -machdep x86_32"
+ STDOPT: #" -warn-signed-overflow -warn-unsigned-overflow -print -machdep x86_32"
*/
int main () {
diff --git a/tests/rte/sizeof.c b/tests/rte/sizeof.c
index 900bd7b3eaafa30a880a796c61786a41c6988b84..5dc0979ff67ecacfe110eb97e4fa025cd1419103 100644
--- a/tests/rte/sizeof.c
+++ b/tests/rte/sizeof.c
@@ -1,5 +1,5 @@
/* run.config
- OPT: -rte -warn-signed-overflow -print
+ STDOPT: #" -warn-signed-overflow -print"
*/
int main() {
diff --git a/tests/rte/tab.c b/tests/rte/tab.c
index cdaa8333deafbba9e84a938768fecda79f4c5e40..3703f7e68c05365019fbf76b91f75f64d8389274 100644
--- a/tests/rte/tab.c
+++ b/tests/rte/tab.c
@@ -1,5 +1,5 @@
/* run.config
- OPT: -rte -warn-signed-overflow -warn-special-float none -print
+ STDOPT: #" -warn-signed-overflow -warn-special-float none -print"
*/
typedef double typetab[2];
diff --git a/tests/rte/test_config b/tests/rte/test_config
index 8351f51e855ecf8f8f4951813caf7b5d2bdbc455..7632a75b5593e38c4dfd76f983fe38891b6cb987 100644
--- a/tests/rte/test_config
+++ b/tests/rte/test_config
@@ -1,2 +1,3 @@
PLUGIN: rtegen
-STDOPT:
+
+OPT: @RTE_TEST@
diff --git a/tests/rte/twofunc3.c b/tests/rte/twofunc3.c
index 883964687b8bd296c95f4bd3ee6046c2af5d4ed9..748d93659c088981f7b18e1886088e6b5de1b39d 100644
--- a/tests/rte/twofunc3.c
+++ b/tests/rte/twofunc3.c
@@ -1,6 +1,6 @@
/* run.config
MODULE: rte_get_annot
- OPT: -rte-select @@all -journal-disable
+ STDOPT: -"-rte" #"-rte-select @all"
*/
diff --git a/tests/rte/u64.i b/tests/rte/u64.i
index 8f23354dfb741c264df216e93520a3d94097ec5d..9179d8c4b6388059745c55b473d4bec87c985dbc 100644
--- a/tests/rte/u64.i
+++ b/tests/rte/u64.i
@@ -1,6 +1,6 @@
/* run.config
- OPT: -rte -warn-unsigned-overflow -print -journal-disable -machdep x86_32
- OPT: -rte -warn-unsigned-overflow -print -journal-disable -machdep x86_64
+ STDOPT: #" -warn-unsigned-overflow -print -machdep x86_32"
+ STDOPT: #" -warn-unsigned-overflow -print -machdep x86_64"
*/
unsigned long f(unsigned int n)
{
diff --git a/tests/rte/unspecified_sequence.i b/tests/rte/unspecified_sequence.i
index 63e60f119cf1b11b66d6bd7f0736be514624a28a..86eb9db77e2f81198972b8932dd4063e55bf8d5e 100644
--- a/tests/rte/unspecified_sequence.i
+++ b/tests/rte/unspecified_sequence.i
@@ -1,6 +1,6 @@
/* run.config
PLUGIN: @EVA_PLUGINS@
- STDOPT:
+ OPT: @EVA_TEST@
*/
unsigned long long f(int x) {
diff --git a/tests/rte/valid.c b/tests/rte/valid.c
index a938a80f2741a344bbf7637f51f0d989f1974b71..0bddcb9206d86d1f98684b9e1586c536c5042370 100644
--- a/tests/rte/valid.c
+++ b/tests/rte/valid.c
@@ -1,5 +1,5 @@
/* run.config
- OPT: -rte -warn-signed-overflow -print -machdep x86_32 -then -unsafe-arrays
+ STDOPT: #"-warn-signed-overflow -print -machdep x86_32" +"-then -unsafe-arrays"
*/
struct R {
diff --git a/tests/rte/value_rte.c b/tests/rte/value_rte.c
index 9d2ee91f6686a741f5b2dcb0fd5e23e0fad09c30..9b02ec848fa5662a68815c4640f243edec1e540b 100644
--- a/tests/rte/value_rte.c
+++ b/tests/rte/value_rte.c
@@ -1,6 +1,6 @@
/* run.config
-PLUGIN: eva,scope rtegen report
-OPT: -rte -then -eva @EVA_OPTIONS@ -then -report
+PLUGIN: @PTEST_PLUGIN@ eva,scope report
+STDOPT: +"-then -eva @EVA_OPTIONS@ -then -report"
*/
#include "stdio.h"
diff --git a/tests/rte_manual/bitwise.i b/tests/rte_manual/bitwise.i
index f99f0b558f68f4111dfd23fa576a7d3e3ed37b78..9a0fad3e4308aa52fbeb16849d3a9f4b09b10fd9 100644
--- a/tests/rte_manual/bitwise.i
+++ b/tests/rte_manual/bitwise.i
@@ -1,5 +1,5 @@
/* run.config
- OPT: -rte -then -print
+ STDOPT:
*/
int main(void) {
diff --git a/tests/rte_manual/contract.i b/tests/rte_manual/contract.i
index 5c38c2f058d6e9b0511a053a0aeefc2a97599469..6674e20a4d93663029c830cc8e7cbf3543ca4b06 100644
--- a/tests/rte_manual/contract.i
+++ b/tests/rte_manual/contract.i
@@ -1,5 +1,5 @@
/* run.config
- OPT: -rte -then -print
+ STDOPT:
*/
/*@ ensures \result == -\at(x,Old);
diff --git a/tests/rte_manual/div.i b/tests/rte_manual/div.i
index b0129f4b27126e673b67e8a667ad4f479b295499..29c012a1b619335549bc0eca5b0b04c6e08c0d30 100644
--- a/tests/rte_manual/div.i
+++ b/tests/rte_manual/div.i
@@ -1,5 +1,5 @@
/* run.config
- OPT: -rte -then -print
+ STDOPT:
*/
void f(void) {
diff --git a/tests/rte_manual/float.i b/tests/rte_manual/float.i
index 9cc15c469731db923d3fde2a664817ea71e80bef..08c7211b546ca2dcaef7cc9d7334e1a06cdda865 100644
--- a/tests/rte_manual/float.i
+++ b/tests/rte_manual/float.i
@@ -1,5 +1,5 @@
/* run.config
- OPT: -rte -rte-float-to-int -warn-special-float none -then -print
+ STDOPT: #"-rte-float-to-int -warn-special-float none "
*/
int f(float v) {
diff --git a/tests/rte_manual/machdep.i b/tests/rte_manual/machdep.i
index 65edbbb4caa30e2af31b9c85d4d01e6a68804a54..3602fefaffb7781f61b94281856a363fd72d8084 100644
--- a/tests/rte_manual/machdep.i
+++ b/tests/rte_manual/machdep.i
@@ -1,6 +1,6 @@
/* run.config
- OPT: -machdep x86_32 -rte -then -print
- OPT: -machdep x86_64 -rte -then -print
+ STDOPT: #"-machdep x86_32 "
+ STDOPT: #"-machdep x86_64 "
*/
int main(void) {
diff --git a/tests/rte_manual/memaccess.i b/tests/rte_manual/memaccess.i
index 5ff7866135dc28c39ef50619a748f7649acd6941..75fe71075359e91f0c3b0c08c938acb84051f453 100644
--- a/tests/rte_manual/memaccess.i
+++ b/tests/rte_manual/memaccess.i
@@ -1,5 +1,5 @@
/* run.config
- OPT: -rte -then -print
+ STDOPT:
*/
extern void f(int* p);
diff --git a/tests/rte_manual/oracle/sizeof.res.oracle b/tests/rte_manual/oracle/sizeof.res.oracle
index a7fcca8cd7626e68801b5b34dcdf8bd6d35b8f7c..b64bd6ee37ef72591229f45e1976f80f7f40bff7 100644
--- a/tests/rte_manual/oracle/sizeof.res.oracle
+++ b/tests/rte_manual/oracle/sizeof.res.oracle
@@ -5,14 +5,15 @@
[eva:initial-state] Values of globals at initialization
[eva] computing for function fsize3 <- main.
- Called from tests/rte_manual/sizeof.c:9.
-[eva] tests/rte_manual/sizeof.c:4: assertion 'alloca_bounds' got status valid.
-[eva] tests/rte_manual/sizeof.c:4: Call to builtin __fc_vla_alloc
-[eva] tests/rte_manual/sizeof.c:4: allocating variable __malloc_fsize3_l4
-[eva] tests/rte_manual/sizeof.c:4: Call to builtin __fc_vla_free
+ Called from tests/rte_manual/sizeof.c:14.
+[eva] tests/rte_manual/sizeof.c:9: assertion 'alloca_bounds' got status valid.
+[eva] tests/rte_manual/sizeof.c:9: Call to builtin __fc_vla_alloc
+[eva] tests/rte_manual/sizeof.c:9: allocating variable __malloc_fsize3_l9
+[eva] tests/rte_manual/sizeof.c:9: Call to builtin __fc_vla_free
[eva] Recording results for fsize3
[eva] Done for function fsize3
-[eva] tests/rte_manual/sizeof.c:9: freeing automatic bases: {__malloc_fsize3_l4}
+[eva] tests/rte_manual/sizeof.c:14:
+ freeing automatic bases: {__malloc_fsize3_l9}
[eva] Recording results for main
[eva] done for function main
[eva] ====== VALUES COMPUTED ======
diff --git a/tests/rte_manual/safearrays.i b/tests/rte_manual/safearrays.i
index 8b374bdf947d78cf8f3b586afbfc6aea7c0ba7eb..f3af5e4c71e8c68e10f6aa3b64d5081820fc6a97 100644
--- a/tests/rte_manual/safearrays.i
+++ b/tests/rte_manual/safearrays.i
@@ -1,5 +1,5 @@
/* run.config
- OPT: -safe-arrays -rte -then -print
+ STDOPT: #"-safe-arrays "
*/
struct S {
diff --git a/tests/rte_manual/signed_downcast.i b/tests/rte_manual/signed_downcast.i
index 371ca22c4c4b9259436297202280aca74d24aa56..4c7580e801c6317a21706b021f91cd6aeca920bc 100644
--- a/tests/rte_manual/signed_downcast.i
+++ b/tests/rte_manual/signed_downcast.i
@@ -1,6 +1,6 @@
/* run.config
- OPT: -rte -then -print
- OPT: -warn-signed-downcast -rte -then -print
+ STDOPT:
+ STDOPT: #"-warn-signed-downcast "
*/
int main(void) {
diff --git a/tests/rte_manual/sizeof.c b/tests/rte_manual/sizeof.c
index 4231bae6deac497f1d5812530b67c518e21f1c11..0bf1c5f95e5ead3bdf73a7312cdb3f91c3cd5ad6 100644
--- a/tests/rte_manual/sizeof.c
+++ b/tests/rte_manual/sizeof.c
@@ -1,3 +1,8 @@
+/* run.config
+ COMMENT: does not check RTE plugin!
+ PLUGIN: @EVA_PLUGINS@
+ OPT: @EVA_TEST@
+*/
#include <stddef.h>
size_t fsize3(int n) {
diff --git a/tests/rte_manual/test_config b/tests/rte_manual/test_config
index 7455cf5899e3ce3e7270344ef8217b1c06f9f2ee..acff8601dfd1d530afa3099d1a489a940fc46b0e 100644
--- a/tests/rte_manual/test_config
+++ b/tests/rte_manual/test_config
@@ -1,2 +1,3 @@
-PLUGIN: @EVA_PLUGINS@ rtegen
-STDOPT:
+PLUGIN: rtegen
+
+OPT: @RTE_TEST@ -then -print
diff --git a/tests/rte_manual/unary_minus.i b/tests/rte_manual/unary_minus.i
index 69a2294776a0a9d5c38512c171271baec5fc9d31..795f86dcc9c78907bffcd8888a72375a17dbabf6 100644
--- a/tests/rte_manual/unary_minus.i
+++ b/tests/rte_manual/unary_minus.i
@@ -1,5 +1,5 @@
/* run.config
- OPT: -rte -then -print
+ STDOPT:
*/
int main(void) {
diff --git a/tests/rte_manual/unsigned.i b/tests/rte_manual/unsigned.i
index fa37bb33499bdea1d644457e375563d834565b02..8c7b89e3ac408ae41339966c215af4c407cd57f9 100644
--- a/tests/rte_manual/unsigned.i
+++ b/tests/rte_manual/unsigned.i
@@ -1,6 +1,6 @@
/* run.config
- OPT: -rte -then -print
- OPT: -warn-unsigned-overflow -rte -then -print
+ STDOPT:
+ STDOPT: #"-warn-unsigned-overflow "
*/
unsigned int f(unsigned int a, unsigned int b) {
diff --git a/tests/rte_manual/unsigned_downcast.i b/tests/rte_manual/unsigned_downcast.i
index 17b0fe8dd1c931e04dca95e0306cc73f90902598..02fc1d9ca44f4bf0788df9bc3ebdc43af8402b4d 100644
--- a/tests/rte_manual/unsigned_downcast.i
+++ b/tests/rte_manual/unsigned_downcast.i
@@ -1,5 +1,5 @@
/* run.config
- OPT: -rte -warn-unsigned-downcast -then -print
+ STDOPT: #"-warn-unsigned-downcast "
*/
unsigned char f(int a, int b) {
diff --git a/tests/saveload/basic.i b/tests/saveload/basic.i
index 4c9fc76e904c0a440e172fe92979741020451fd3..e420bac96d786f3475907a4206da4b334ebfcfe9 100644
--- a/tests/saveload/basic.i
+++ b/tests/saveload/basic.i
@@ -3,11 +3,11 @@
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
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 -journal-disable"
+ STDOPT: +"-load ./tests/saveload/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 -journal-disable -print"
+ STDOPT: +"-load ./tests/saveload/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 -journal-disable"
+ STDOPT: +"-load ./tests/saveload/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"
diff --git a/tests/scope/bts383.c b/tests/scope/bts383.c
index 1f9c07e1e441d144e289dbb78e776694a126d944..0793ea81d1bb7fac0462dbed2946a10410b2060b 100644
--- a/tests/scope/bts383.c
+++ b/tests/scope/bts383.c
@@ -1,5 +1,5 @@
/* run.config
- OPT: -eva @EVA_CONFIG@ -print -journal-disable -scope-verbose 1 -eva-remove-redundant-alarms -eva-context-width 3
+ OPT: -eva @EVA_CONFIG@ -print -scope-verbose 1 -eva-remove-redundant-alarms -eva-context-width 3
*/
/*
echo '!Db.Scope.check_asserts();;' \
diff --git a/tests/scope/no-effect.i b/tests/scope/no-effect.i
index 7b75f9e1d9f28d1b4893aa62a97fa4c8ca2eb3a7..7b45e2e39243460fe094b68c6a3d377eb67deafb 100644
--- a/tests/scope/no-effect.i
+++ b/tests/scope/no-effect.i
@@ -1,5 +1,5 @@
/* run.config
- OPT: @EVA_CONFIG@ -eva -print -journal-disable -scope-verbose 1 -eva-remove-redundant-alarms
+ OPT: @EVA_CONFIG@ -eva -print -scope-verbose 1 -eva-remove-redundant-alarms
*/
typedef struct {
diff --git a/tests/scope/scope.c b/tests/scope/scope.c
index 8cb6670e5eea8871fb05c146036b79b19fcdd450..d901e4479b47c7a8bcbbd2e4cf2e20195a960e70 100644
--- a/tests/scope/scope.c
+++ b/tests/scope/scope.c
@@ -1,7 +1,7 @@
/* run.config
- OPT: -eva @EVA_CONFIG@ -main f -journal-disable
- OPT: -eva @EVA_CONFIG@ -main f2 -journal-disable
- OPT: -eva @EVA_CONFIG@ -main loop -journal-disable
+ OPT: -eva @EVA_CONFIG@ -main f
+ OPT: -eva @EVA_CONFIG@ -main f2
+ OPT: -eva @EVA_CONFIG@ -main loop
*/
/*
* bin/viewer.byte -main f tests/scope/scope.c -eva
diff --git a/tests/slicing/annot.i b/tests/slicing/annot.i
index ae8621780d40f807eb8b8cc6373613b8447a8576..1880234f9e22ccd7a084ebf27a213d3f4e045784 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 -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: +"-main f2 -slice-assert f2 -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: +"-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 "
*/
extern int x, z;
diff --git a/tests/slicing/bts0184.i b/tests/slicing/bts0184.i
index f4e31d0e286fea142d40fc5b737aa7ae3b40c90e..a23828ff6b9723d7961531c644e989c63c3950f2 100644
--- a/tests/slicing/bts0184.i
+++ b/tests/slicing/bts0184.i
@@ -1,5 +1,5 @@
/* run.config
- STDOPT: +"-slice-pragma x -journal-disable -then-on 'Slicing export' -set-project-as-default -print -check -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
+ 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 "
**/
int x(int y, int z)
{
diff --git a/tests/slicing/bts0190.i b/tests/slicing/bts0190.i
index 1cec1079cde8eddfbcd5ab3d7e4c261c2769f12e..1f4afde472566065ed71519e917d7fb680e9642c 100644
--- a/tests/slicing/bts0190.i
+++ b/tests/slicing/bts0190.i
@@ -1,5 +1,5 @@
/* run.config
-STDOPT: +"-slicing-warn-key cmdline=active -check -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_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/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 5b0af4a955d6b575a63b83c2590a36d021ee5b9a..48bd82a520506bcbede1e6ae0cc5b07a821e2546 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 -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 -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"
*/
/*@ requires \valid(dest); */
extern void cpy(int *dest, const int *src);
diff --git a/tests/slicing/bts1768.i b/tests/slicing/bts1768.i
index 4f8d7725029efb6a79923752a60d6aa412e7e2f1..09e11240630b2c9c1f3429e6da007116224c0bde 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 -journal-disable -then-on 'Slicing export' -set-project-as-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_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/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 f3c27eeb3d4a59acfa6be2bc18b709c8da80530b..e389fa3409a1c534206e866f2d59db51e8634cfa 100644
--- a/tests/slicing/bts179.i
+++ b/tests/slicing/bts179.i
@@ -1,7 +1,7 @@
/* run.config
- STDOPT: +"-slice-return main -journal-disable -then-on 'Slicing export' -set-project-as-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 -journal-disable -then-on 'Slicing export' -set-project-as-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: +"-sparecode-analysis -journal-disable"
+ 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: +"-sparecode-analysis"
*/
struct {int a; int ab; int b; int c ; int d;} S;
diff --git a/tests/slicing/bts283.i b/tests/slicing/bts283.i
index 95c10baf058b9ef65528a343d11dd3a5006a8a29..0f5226417ec6fc12cd9eaf9e764e414860e15990 100644
--- a/tests/slicing/bts283.i
+++ b/tests/slicing/bts283.i
@@ -1,5 +1,5 @@
/* run.config
- STDOPT: +"-slice-return main -slice-undef-functions -journal-disable -then-on 'Slicing export' -set-project-as-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_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i"
*/
int x,y,z;
diff --git a/tests/slicing/bts326.i b/tests/slicing/bts326.i
index 48f60d41072374c23556b017c0609cba491b0d5f..5b6b519cacc309b8fefd0e7386afffbe3004b496 100644
--- a/tests/slicing/bts326.i
+++ b/tests/slicing/bts326.i
@@ -1,5 +1,5 @@
/* run.config
- STDOPT: +"-calldeps -slice-return main -journal-disable -then-on 'Slicing export' -set-project-as-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_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/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 11ca698199d18bd2ce253c7d6f7c249773c6d1e0..c312a7ffdd220a33e5d3a251ef657b770cdf9265 100644
--- a/tests/slicing/bts335.i
+++ b/tests/slicing/bts335.i
@@ -1,5 +1,5 @@
/* run.config
- STDOPT: +"-slice-pragma g -calldeps -slicing-level 3 -journal-disable -then-on 'Slicing export' -set-project-as-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_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -no-calldeps"
*/
/*
diff --git a/tests/slicing/bts335b.i b/tests/slicing/bts335b.i
index d63ae4eea19a27e9d3b5c9e29135bc4c271571a3..368e0870ec14ea80dabb61c65efb9b4004fb9bbf 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 -journal-disable -then-on 'Slicing export' -set-project-as-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_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/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 ddeee83be06b686bfe260bd8d0ee16cf9d59d907..3a85248cb7a9be425e853c09aafe428a84245285 100644
--- a/tests/slicing/bts336.i
+++ b/tests/slicing/bts336.i
@@ -1,12 +1,12 @@
/* run.config
- STDOPT: +"-slice-return main -calldeps -journal-disable -then-on 'Slicing export' -set-project-as-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 -journal-disable -then-on 'Slicing export' -set-project-as-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 -journal-disable -then-on 'Slicing export' -set-project-as-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: +"-journal-disable -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: +"-journal-disable -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: +"-journal-disable -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: +"-journal-disable -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: +"-journal-disable -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_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"
*/
// something to do to have better results...
int T[10];
diff --git a/tests/slicing/bts341.i b/tests/slicing/bts341.i
index af5b43d5a31e603a48a6f80e08274a36ab795d04..fcfad46402cb30ee14f8bab18ed60358eb7ffebb 100644
--- a/tests/slicing/bts341.i
+++ b/tests/slicing/bts341.i
@@ -1,5 +1,5 @@
/* run.config
- STDOPT: +"-slice-assert main -journal-disable -then-on 'Slicing export' -set-project-as-default -print -check -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check"
+ 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"
*/
int main (int c) {
if (c)
diff --git a/tests/slicing/bts344.i b/tests/slicing/bts344.i
index a560db415505a8f644ce713676aac0a0c462c019..0f21c9f6340186eb8ca49043a8c5206e7a92cb13 100644
--- a/tests/slicing/bts344.i
+++ b/tests/slicing/bts344.i
@@ -1,6 +1,6 @@
/* run.config
- STDOPT: +"-slice-return main -journal-disable -then-on 'Slicing export' -set-project-as-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 -journal-disable -then-on 'Slicing export' -set-project-as-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_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"
*/
int X, Y ;
diff --git a/tests/slicing/bts345.i b/tests/slicing/bts345.i
index 76db76d7b5fe2958408d2450c5359dbfcab0a005..69b61b49e36d26ec46ab40592d2ab85e823f5890 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 -journal-disable -then-on 'Slicing export' -set-project-as-default -print -check -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
- STDOPT: +"-slice-return top -main top -journal-disable -then-on 'Slicing export' -set-project-as-default -print -check -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
- STDOPT: +"-slice-return top -main call_top -journal-disable -then-on 'Slicing export' -set-project-as-default -print -check -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
- STDOPT: +"-slice-return called_by_top -main top -journal-disable -then-on 'Slicing export' -set-project-as-default -print -check -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
- STDOPT: +"-slice-return called_by_top -main call_top -journal-disable -then-on 'Slicing export' -set-project-as-default -print -check -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
+ 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 "
*/
int called_indirectly_by_top (int x) {
diff --git a/tests/slicing/bts709.c b/tests/slicing/bts709.c
index 325e6ba28661753469776de28c3d337255b0523f..78246f44fd01fa0add7c5bf04a00fdf3e6572278 100644
--- a/tests/slicing/bts709.c
+++ b/tests/slicing/bts709.c
@@ -1,5 +1,5 @@
/* run.config
- STDOPT: +"-slice-pragma func -no-unicode -journal-disable -then-on 'Slicing export' -set-project-as-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_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/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 74fb4cf1e22df2e29a2c09e76e00df0b8e415c98..8bf9d950575e77aace8a02d254348a7d582b6d64 100644
--- a/tests/slicing/bts808.i
+++ b/tests/slicing/bts808.i
@@ -1,5 +1,5 @@
/* run.config
-* STDOPT: +"-slice-return main -journal-disable -then-on 'Slicing export' -set-project-as-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_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i "
*/
int f0 (void) {
diff --git a/tests/slicing/bts827.i b/tests/slicing/bts827.i
index cd0ec9d931f304471ebc5ae220897ba7e9b98ea8..e12046be0128819a77d0f939f552701e2a14605d 100644
--- a/tests/slicing/bts827.i
+++ b/tests/slicing/bts827.i
@@ -1,5 +1,5 @@
/* run.config
- STDOPT: +"-slice-return main -journal-disable -then-on 'Slicing export' -set-project-as-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_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/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 cecb3ba3a5eba24681d18f6e50cbec16dabdbeb9..2c7e224e15d1a589a920417fc9d1a78c9a975593 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 -journal-disable -then-on 'Slicing export' -set-project-as-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_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/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 b391349193dbe7e581939966ba604e6d12d8ee99..33c6f3a401f488cdb77f21c6ed009f6699627bce 100644
--- a/tests/slicing/call_demo.i
+++ b/tests/slicing/call_demo.i
@@ -1,6 +1,6 @@
/* run.config
- STDOPT: +"-slice-calls call1 -journal-disable -then-on 'Slicing export' -set-project-as-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 -journal-disable -then-on 'Slicing export' -set-project-as-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_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"
*/
//@ assigns \result \from v;
diff --git a/tests/slicing/callwise.i b/tests/slicing/callwise.i
index 35c6b5f9f2208a1fab0da9eb44fa00e9d60e966e..2e2e658d063ec26779bbb22107c96c54c1cad2fb 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 -journal-disable -then-on 'Slicing export' -set-project-as-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_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/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 822f71d984f2fe0141487ebb3f4ea06f85c81151..80bde8a1d76b29523e7bef11ed9090dcd4bb648c 100644
--- a/tests/slicing/csmith.i
+++ b/tests/slicing/csmith.i
@@ -1,5 +1,5 @@
/* run.config
- STDOPT: +"-slice-return main -journal-disable -then-on 'Slicing export' -set-project-as-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_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/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 6c100e071154a75119c61db99cb0a4599a5fc489..ac7f0dd7857b60db6aea89ad7a969f93dae582bb 100644
--- a/tests/slicing/filter.i
+++ b/tests/slicing/filter.i
@@ -1,5 +1,5 @@
/* run.config
- STDOPT: +"-slice-return main -journal-disable -then-on 'Slicing export' -set-project-as-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_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/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 a959f703b524493cfa0d4c1560c65ed5cc7c7bd7..fc4891d0605c7fe4ca2242c1fbc0e6179f9ac2ec 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 -check -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_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check -no-deps"
**/
diff --git a/tests/slicing/horwitz.i b/tests/slicing/horwitz.i
index a3ab70083b9ff0c99dda21edfcab9d6ff0a08aa3..1d78afc6949995143065990be039f5c1d4cf614f 100644
--- a/tests/slicing/horwitz.i
+++ b/tests/slicing/horwitz.i
@@ -1,7 +1,7 @@
/* run.config
LIBS: libSelect
MODULE: @PTEST_NAME@
- OPT: @EVA_OPTIONS@ -deps -slicing-level 0 -journal-disable
+ OPT: @EVA_OPTIONS@ -deps -slicing-level 0
*/
/* bin/toplevel.opt -deps -eva @PTEST_DIR@/@PTEST_NAME@.c */
diff --git a/tests/slicing/if_many_values.i b/tests/slicing/if_many_values.i
index 55807dadf286d3685bc3ee45af146cde7b69d55c..44bf6578c25f5b91474a127891702885116e48ec 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 -journal-disable -eva-slevel 101 -then-on 'Slicing export' -set-project-as-default -print -check -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check -no-deps"
+ 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"
**/
int r=1;
diff --git a/tests/slicing/initialized.i b/tests/slicing/initialized.i
index f1f2fd51e921bd12e3bfe8d221d839c726b24001..381ea05e7399fa9ef59c0a806c55bd1300a79aaa 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 -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: +"-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 "
**/
void main() {
diff --git a/tests/slicing/loop_infinite.i b/tests/slicing/loop_infinite.i
index 5b3b69abc0755098050aaf3257ff1693be2b1be7..143a83c68963e8dd92e7d0bb98562cce258fb220 100644
--- a/tests/slicing/loop_infinite.i
+++ b/tests/slicing/loop_infinite.i
@@ -1,5 +1,5 @@
/* run.config
- STDOPT: +"-deps -slice-return main -journal-disable -then-on 'Slicing export' -set-project-as-default -print -check -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check -no-deps"
+ 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"
*/
int main() {
volatile int a=0,b,c;
diff --git a/tests/slicing/loop_simple.i b/tests/slicing/loop_simple.i
index 210466de5c7b3476236e23f62dfeb5932306b5cf..cd962d228bd6a3c7d4fdad53087754b81a658045 100644
--- a/tests/slicing/loop_simple.i
+++ b/tests/slicing/loop_simple.i
@@ -1,5 +1,5 @@
/* run.config
- STDOPT: +"-deps -slice-return main -journal-disable -then-on 'Slicing export' -set-project-as-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_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/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 2c87381695469c4e081392e9abba0f876c44a2b8..dad1b0d85f310f10455343011e08459edc711142 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 -journal-disable -then-on 'Slicing export' -set-project-as-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 -journal-disable -then-on 'Slicing export' -set-project-as-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 -journal-disable -then-on 'Slicing export' -set-project-as-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 -journal-disable -then-on 'Slicing export' -set-project-as-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 -journal-disable -then-on 'Slicing export' -set-project-as-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 -journal-disable -then-on 'Slicing export' -set-project-as-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 -journal-disable -then-on 'Slicing export' -set-project-as-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 -journal-disable -then-on 'Slicing export' -set-project-as-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 -journal-disable -then-on 'Slicing export' -set-project-as-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 -journal-disable -then-on 'Slicing export' -set-project-as-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 -journal-disable -then-on 'Slicing export' -set-project-as-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 -journal-disable -then-on 'Slicing export' -set-project-as-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 -journal-disable -then-on 'Slicing export' -set-project-as-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 -journal-disable -then-on 'Slicing export' -set-project-as-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 -journal-disable -then-on 'Slicing export' -set-project-as-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 -journal-disable -then-on 'Slicing export' -set-project-as-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 -journal-disable -then-on 'Slicing export' -set-project-as-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 -journal-disable -then-on 'Slicing export' -set-project-as-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 -journal-disable -then-on 'Slicing export' -set-project-as-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 -journal-disable -then-on 'Slicing export' -set-project-as-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 -journal-disable -then-on 'Slicing export' -set-project-as-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 -journal-disable -then-on 'Slicing export' -set-project-as-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 -journal-disable -then-on 'Slicing export' -set-project-as-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 -journal-disable -then-on 'Slicing export' -set-project-as-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 -journal-disable -then-on 'Slicing export' -set-project-as-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_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"
*/
diff --git a/tests/slicing/ptr_fct.i b/tests/slicing/ptr_fct.i
index c972063ed05fbbcd0b6374104b6d54a49ffeba24..4db437d74c4dc296fb41c114e14d39fbba64b252 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 -journal-disable -then-on 'Slicing export' -set-project-as-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_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/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 e16a0f6bf0bfabbd83fd7c1fbe519c572c4e8d68..d91e94e9781158a9782b53cfcc34e85510065b22 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 -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: +"-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 "
*/
int y;
diff --git a/tests/slicing/select_by_annot.i b/tests/slicing/select_by_annot.i
index d0e952f02e66c933293b2e0ddb02560dee66153d..b3a6edc99a83b8681b349298b942e5888ca817a0 100644
--- a/tests/slicing/select_by_annot.i
+++ b/tests/slicing/select_by_annot.i
@@ -4,20 +4,20 @@
OPT: @EVA_OPTIONS@ -deps -lib-entry -main main
MODULE:
- OPT: @EVA_OPTIONS@ -check -deps -lib-entry -main main -slice-pragma 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 -no-deps
- OPT: @EVA_OPTIONS@ -check -deps -lib-entry -main main -slice-assert 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 -no-deps
- OPT: @EVA_OPTIONS@ -check -deps -lib-entry -main main -slice-pragma modifS -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 -no-deps
- OPT: @EVA_OPTIONS@ -check -deps -lib-entry -main main -slice-pragma f1 -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 -no-deps
- OPT: @EVA_OPTIONS@ -check -deps -lib-entry -main main -slice-pragma f2 -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 -no-deps
- OPT: @EVA_OPTIONS@ -check -deps -lib-entry -main main -slice-pragma f3 -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 -no-deps
- OPT: @EVA_OPTIONS@ -check -deps -lib-entry -main main -slice-pragma f4 -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 -no-deps
- OPT: @EVA_OPTIONS@ -check -deps -lib-entry -main main -slice-pragma f5 -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 -no-deps
- OPT: @EVA_OPTIONS@ -check -deps -lib-entry -main main -slice-pragma f6 -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 -no-deps
- OPT: @EVA_OPTIONS@ -check -deps -lib-entry -main main -slice-pragma f7 -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 -no-deps
- OPT: @EVA_OPTIONS@ -check -deps -lib-entry -main main -slice-loop-inv f8 -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 -no-deps
- OPT: @EVA_OPTIONS@ -check -deps -lib-entry -main main -slice-pragma f8 -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 -no-deps
- OPT: @EVA_OPTIONS@ -check -deps -lib-entry -main main -slice-assert f8 -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 -no-deps
- OPT: @EVA_OPTIONS@ -check -deps -lib-entry -main main -slice-pragma f9 -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 -no-deps
+ OPT: @EVA_OPTIONS@ -deps -lib-entry -main main -slice-pragma 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 -no-deps
+ OPT: @EVA_OPTIONS@ -deps -lib-entry -main main -slice-assert 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 -no-deps
+ OPT: @EVA_OPTIONS@ -deps -lib-entry -main main -slice-pragma modifS -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 -no-deps
+ OPT: @EVA_OPTIONS@ -deps -lib-entry -main main -slice-pragma f1 -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 -no-deps
+ OPT: @EVA_OPTIONS@ -deps -lib-entry -main main -slice-pragma f2 -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 -no-deps
+ OPT: @EVA_OPTIONS@ -deps -lib-entry -main main -slice-pragma f3 -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 -no-deps
+ OPT: @EVA_OPTIONS@ -deps -lib-entry -main main -slice-pragma f4 -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 -no-deps
+ OPT: @EVA_OPTIONS@ -deps -lib-entry -main main -slice-pragma f5 -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 -no-deps
+ OPT: @EVA_OPTIONS@ -deps -lib-entry -main main -slice-pragma f6 -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 -no-deps
+ OPT: @EVA_OPTIONS@ -deps -lib-entry -main main -slice-pragma f7 -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 -no-deps
+ OPT: @EVA_OPTIONS@ -deps -lib-entry -main main -slice-loop-inv f8 -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 -no-deps
+ OPT: @EVA_OPTIONS@ -deps -lib-entry -main main -slice-pragma f8 -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 -no-deps
+ OPT: @EVA_OPTIONS@ -deps -lib-entry -main main -slice-assert f8 -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 -no-deps
+ OPT: @EVA_OPTIONS@ -deps -lib-entry -main main -slice-pragma f9 -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 -no-deps
*/
struct Tstr { int a; int b; } S;
diff --git a/tests/slicing/select_calls.i b/tests/slicing/select_calls.i
index 3377326ccb50246fe19de789f1ca0c078ea81eff..98211269bf12cb570cbff63cf3faeb5edbb8cec0 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 -journal-disable -then-on 'Slicing export' -set-project-as-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 -journal-disable -then-on 'Slicing export' -set-project-as-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_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 "
*/
void nothing (void);
diff --git a/tests/slicing/select_return.i b/tests/slicing/select_return.i
index f2455c4f86e04b184a52d0a7408c9f6f5d1f1e38..1df3acb7146a3ede39969498b0a9ef558ed968c8 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 -journal-disable -then-on 'Slicing export' -set-project-as-default -print -check -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
- STDOPT: +"-slice-calls send -lib-entry -main g -slicing-level 1 -no-slice-callers -journal-disable -then-on 'Slicing export' -set-project-as-default -print -check -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
- STDOPT: +"-slice-calls send -lib-entry -main g -slicing-level 2 -no-slice-callers -journal-disable -then-on 'Slicing export' -set-project-as-default -print -check -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
- STDOPT: +"-slice-calls send -lib-entry -main g -slicing-level 3 -no-slice-callers -journal-disable -then-on 'Slicing export' -set-project-as-default -print -check -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
- STDOPT: +"-slice-calls send,send_bis -lib-entry -main g -slicing-level 0 -no-slice-callers -journal-disable -then-on 'Slicing export' -set-project-as-default -print -check -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
- STDOPT: +"-slice-calls send,send_bis -lib-entry -main g -slicing-level 1 -no-slice-callers -journal-disable -then-on 'Slicing export' -set-project-as-default -print -check -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
- STDOPT: +"-slice-calls send,send_bis -lib-entry -main g -slicing-level 2 -no-slice-callers -journal-disable -then-on 'Slicing export' -set-project-as-default -print -check -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
- STDOPT: +"-slice-calls send,send_bis -lib-entry -main g -slicing-level 3 -no-slice-callers -journal-disable -then-on 'Slicing export' -set-project-as-default -print -check -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
- STDOPT: +"-slice-calls send,send_bis -lib-entry -main g -slicing-level 1 -journal-disable -then-on 'Slicing export' -set-project-as-default -print -check -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
- STDOPT: +"-slice-calls send,send_bis -lib-entry -main g -slicing-level 2 -journal-disable -then-on 'Slicing export' -set-project-as-default -print -check -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
- STDOPT: +"-slice-calls send,send_bis -lib-entry -main g -slicing-level 3 -journal-disable -then-on 'Slicing export' -set-project-as-default -print -check -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
- STDOPT: +"-slice-return f -lib-entry -main g -slicing-level 0 -no-slice-callers -journal-disable -then-on 'Slicing export' -set-project-as-default -print -check -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
- STDOPT: +"-slice-return f -lib-entry -main g -slicing-level 1 -no-slice-callers -journal-disable -then-on 'Slicing export' -set-project-as-default -print -check -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
- STDOPT: +"-slice-return f -lib-entry -main g -slicing-level 2 -no-slice-callers -journal-disable -then-on 'Slicing export' -set-project-as-default -print -check -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
- STDOPT: +"-slice-return f -lib-entry -main g -slicing-level 3 -no-slice-callers -journal-disable -then-on 'Slicing export' -set-project-as-default -print -check -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
- STDOPT: +"-slice-pragma f -lib-entry -main g -slicing-level 0 -no-slice-callers -journal-disable -then-on 'Slicing export' -set-project-as-default -print -check -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
- STDOPT: +"-slice-pragma f -lib-entry -main g -slicing-level 1 -no-slice-callers -journal-disable -then-on 'Slicing export' -set-project-as-default -print -check -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
- STDOPT: +"-slice-pragma f -lib-entry -main g -slicing-level 2 -no-slice-callers -journal-disable -then-on 'Slicing export' -set-project-as-default -print -check -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
- STDOPT: +"-slice-pragma f -lib-entry -main g -slicing-level 3 -no-slice-callers -journal-disable -then-on 'Slicing export' -set-project-as-default -print -check -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
- STDOPT: +"-slice-value H -lib-entry -main g -slicing-level 1 -no-slice-callers -journal-disable -then-on 'Slicing export' -set-project-as-default -print -check -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
- STDOPT: +"-slice-value H -lib-entry -main g -slicing-level 2 -no-slice-callers -journal-disable -then-on 'Slicing export' -set-project-as-default -print -check -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
- STDOPT: +"-slice-value H -lib-entry -main g -slicing-level 3 -no-slice-callers -journal-disable -then-on 'Slicing export' -set-project-as-default -print -check -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
+ 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 "
*/
int G,H,I;
diff --git a/tests/slicing/select_return_bis.i b/tests/slicing/select_return_bis.i
index d156bfe29a6da127f4a819892677803a1b7ff7a0..5504e099d5020d17a4cbfdbb810ad87d306c6445 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 -journal-disable -then-on 'Slicing export' -set-project-as-default -print -check -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check"
- STDOPT: +"-slice-calls send -lib-entry -main g -slicing-level 1 -no-slice-callers -journal-disable -then-on 'Slicing export' -set-project-as-default -print -check -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check"
- STDOPT: +"-slice-calls send -lib-entry -main g -slicing-level 2 -no-slice-callers -journal-disable -then-on 'Slicing export' -set-project-as-default -print -check -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check"
- STDOPT: +"-slice-calls send -lib-entry -main g -slicing-level 3 -no-slice-callers -journal-disable -then-on 'Slicing export' -set-project-as-default -print -check -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check"
- STDOPT: +"-slice-calls send,send_bis -lib-entry -main g -slicing-level 0 -no-slice-callers -journal-disable -then-on 'Slicing export' -set-project-as-default -print -check -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check"
- STDOPT: +"-slice-calls send,send_bis -lib-entry -main g -slicing-level 1 -no-slice-callers -journal-disable -then-on 'Slicing export' -set-project-as-default -print -check -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check"
- STDOPT: +"-slice-calls send,send_bis -lib-entry -main g -slicing-level 2 -no-slice-callers -journal-disable -then-on 'Slicing export' -set-project-as-default -print -check -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check"
- STDOPT: +"-slice-calls send,send_bis -lib-entry -main g -slicing-level 3 -no-slice-callers -journal-disable -then-on 'Slicing export' -set-project-as-default -print -check -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check"
- STDOPT: +"-slice-calls send,send_bis -lib-entry -main g -slicing-level 1 -journal-disable -then-on 'Slicing export' -set-project-as-default -print -check -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check"
- STDOPT: +"-slice-calls send,send_bis -lib-entry -main g -slicing-level 2 -journal-disable -then-on 'Slicing export' -set-project-as-default -print -check -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check"
- STDOPT: +"-slice-calls send,send_bis -lib-entry -main g -slicing-level 3 -journal-disable -then-on 'Slicing export' -set-project-as-default -print -check -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check"
+ 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"
*/
int G,H,I;
diff --git a/tests/slicing/sizeof.i b/tests/slicing/sizeof.i
index 7595f180d7bf239a2a9f7ab201492c6a88849f80..9ab0d680436b4bee6d9d935ac7f595828727f521 100644
--- a/tests/slicing/sizeof.i
+++ b/tests/slicing/sizeof.i
@@ -1,17 +1,17 @@
/* run.config
- STDOPT: +"-deps -slice-return main -journal-disable -then-on 'Slicing export' -set-project-as-default -print -check -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check -no-deps"
- STDOPT: +"-deps -slice-return SizeOf_1 -no-slice-callers -journal-disable -then-on 'Slicing export' -set-project-as-default -print -check -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check -no-deps"
- STDOPT: +"-deps -slice-return SizeOf_2 -no-slice-callers -journal-disable -then-on 'Slicing export' -set-project-as-default -print -check -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check -no-deps"
- STDOPT: +"-deps -slice-return SizeOfE_pt1 -no-slice-callers -journal-disable -then-on 'Slicing export' -set-project-as-default -print -check -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check -no-deps"
- STDOPT: +"-deps -slice-return SizeOfE_pt2 -no-slice-callers -journal-disable -then-on 'Slicing export' -set-project-as-default -print -check -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check -no-deps"
- STDOPT: +"-deps -slice-return SizeOfE_pt3 -no-slice-callers -journal-disable -then-on 'Slicing export' -set-project-as-default -print -check -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check -no-deps"
- STDOPT: +"-deps -slice-return SizeOfE_pt_deref_1 -no-slice-callers -journal-disable -then-on 'Slicing export' -set-project-as-default -print -check -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check -no-deps"
- STDOPT: +"-deps -slice-return SizeOfE_tab_1 -no-slice-callers -journal-disable -then-on 'Slicing export' -set-project-as-default -print -check -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check -no-deps"
- STDOPT: +"-deps -slice-return SizeOfE_pt_tab_1 -no-slice-callers -journal-disable -then-on 'Slicing export' -set-project-as-default -print -check -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check -no-deps"
- STDOPT: +"-deps -slice-return SizeOfE_pt_tab_2 -no-slice-callers -journal-disable -then-on 'Slicing export' -set-project-as-default -print -check -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check -no-deps"
- STDOPT: +"-deps -slice-return SizeOfE_tab_acces_1 -no-slice-callers -journal-disable -then-on 'Slicing export' -set-project-as-default -print -check -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check -no-deps"
- STDOPT: +"-deps -slice-pragma main -journal-disable -then-on 'Slicing export' -set-project-as-default -print -check -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check -no-deps"
- STDOPT: +"-deps -slice-assert main -journal-disable -then-on 'Slicing export' -set-project-as-default -print -check -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check -no-deps"
+ 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"
*/
struct St { int i, *p, tab[5] ; } st ;
diff --git a/tests/slicing/slice_behavior.i b/tests/slicing/slice_behavior.i
index f5d52985ed95aa8cc8226b68f7d236d27e5d3452..7d4e0933645ad60eda4a2496a936dff24601e021 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 -journal-disable -then-on 'Slicing export' -set-project-as-default -print -check -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check -no-eva"
+ 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"
*/
/*@ requires a > 0; */
int f(int a) {
diff --git a/tests/slicing/slice_pragma_stmt.i b/tests/slicing/slice_pragma_stmt.i
index fee7a33722ddebefddbb2d453838a5861b03d7c8..144c52eb223deb37e05705d7c9680808b60be483 100644
--- a/tests/slicing/slice_pragma_stmt.i
+++ b/tests/slicing/slice_pragma_stmt.i
@@ -1,27 +1,27 @@
/* run.config
- STDOPT: +"-print -journal-disable"
- STDOPT: +"-main nop1 -slice-pragma nop1 -journal-disable -then-on 'Slicing export' -set-project-as-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 -journal-disable -then-on 'Slicing export' -set-project-as-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 -journal-disable -then-on 'Slicing export' -set-project-as-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 -journal-disable -then-on 'Slicing export' -set-project-as-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 -journal-disable -then-on 'Slicing export' -set-project-as-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 -journal-disable -then-on 'Slicing export' -set-project-as-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 -journal-disable -then-on 'Slicing export' -set-project-as-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 -journal-disable -then-on 'Slicing export' -set-project-as-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 -journal-disable -then-on 'Slicing export' -set-project-as-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 -journal-disable -then-on 'Slicing export' -set-project-as-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 -journal-disable -then-on 'Slicing export' -set-project-as-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 -journal-disable -then-on 'Slicing export' -set-project-as-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 -journal-disable -then-on 'Slicing export' -set-project-as-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 -journal-disable -then-on 'Slicing export' -set-project-as-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 -journal-disable -then-on 'Slicing export' -set-project-as-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 -journal-disable -then-on 'Slicing export' -set-project-as-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 -journal-disable -then-on 'Slicing export' -set-project-as-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 -journal-disable -then-on 'Slicing export' -set-project-as-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 -journal-disable -then-on 'Slicing export' -set-project-as-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 -journal-disable -then-on 'Slicing export' -set-project-as-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 -journal-disable -then-on 'Slicing export' -set-project-as-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 -journal-disable -then-on 'Slicing export' -set-project-as-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: +"-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 "
*/
typedef int stmt, expr, slice;
int x, y ;
diff --git a/tests/slicing/top.i b/tests/slicing/top.i
index 7dac65d4ec60080d9923253f50bcab5439029a02..46b2d695f9baf8642370511ec5930fab9e6fd422 100644
--- a/tests/slicing/top.i
+++ b/tests/slicing/top.i
@@ -1,7 +1,7 @@
/* run.config
-* STDOPT: +"-eva-no-builtins-auto -check -slicing-level 0 -slice-return uncalled -no-slice-callers -journal-disable -then-on 'Slicing export' -set-project-as-default -print -check -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check"
-* STDOPT: +"-eva-no-builtins-auto -check -slicing-level 2 -slice-return main -journal-disable -then-on 'Slicing export' -set-project-as-default -print -check -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check"
-* STDOPT: +"-eva-no-builtins-auto -check -slicing-level 2 -slice-return strlen -journal-disable -then-on 'Slicing export' -set-project-as-default -print -check -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check"
+* 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"
*
*
*
diff --git a/tests/slicing/top2.i b/tests/slicing/top2.i
index b84b8b994252dcf043460f2d9419cc76ae247b60..ecf64a7ff4291ca7f5034ab14aeb378f24dedd5e 100644
--- a/tests/slicing/top2.i
+++ b/tests/slicing/top2.i
@@ -1,6 +1,6 @@
/* run.config
-* STDOPT: +"-slicing-level 2 -slice-pragma main -journal-disable -then-on 'Slicing export' -set-project-as-default -print -check -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
-* STDOPT: +"-slicing-level 2 -slice-return main -journal-disable -then-on 'Slicing export' -set-project-as-default -print -check -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check "
+* 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 "
*/
diff --git a/tests/slicing/undef-fun.i b/tests/slicing/undef-fun.i
index 59ac0c5e6482e4d83b4491ebd8f042665080c043..7d17ff0c8db4b00999a03458b0397aae21049045 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 -journal-disable -then-on 'Slicing export' -set-project-as-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_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i "
diff --git a/tests/slicing/unitialized.c b/tests/slicing/unitialized.c
index ed41732199c096ccf6de91d770fbc71a187316ec..99901fa581cf71e77a3380bc2b46fa598bdb7e5f 100644
--- a/tests/slicing/unitialized.c
+++ b/tests/slicing/unitialized.c
@@ -1,8 +1,8 @@
/* run.config
- STDOPT: +"-slice-pragma g -journal-disable -then-on 'Slicing export' -set-project-as-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 -journal-disable -then-on 'Slicing export' -set-project-as-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 -journal-disable -then-on 'Slicing export' -set-project-as-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 -journal-disable -then-on 'Slicing export' -set-project-as-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_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 "
*/
#ifdef __FRAMAC__
//@ assigns \result \from \nothing;
diff --git a/tests/slicing/unravel-flavors.i b/tests/slicing/unravel-flavors.i
index 29815de861cc7622c718d4113c506235222aec6c..403988ae236a8be7218deadc43d41225252fa18b 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 -journal-disable -then-on 'Slicing export' -set-project-as-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 -journal-disable -then-on 'Slicing export' -set-project-as-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 -journal-disable -then-on 'Slicing export' -set-project-as-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 -journal-disable -then-on 'Slicing export' -set-project-as-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_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 "
*/
/* Small example derived from examples given for UNRAVEL tool : */
diff --git a/tests/slicing/unravel-point.i b/tests/slicing/unravel-point.i
index dc07a8049c2ceb736ad00d0ea289b81c8a5393e6..84065e611549ed6640aa3b28fe38af6645b419aa 100644
--- a/tests/slicing/unravel-point.i
+++ b/tests/slicing/unravel-point.i
@@ -1,9 +1,9 @@
/* run.config
- STDOPT: +"-calldeps -slice-return send1 -journal-disable -then-on 'Slicing export' -set-project-as-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 -journal-disable -then-on 'Slicing export' -set-project-as-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 -journal-disable -then-on 'Slicing export' -set-project-as-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 -journal-disable -then-on 'Slicing export' -set-project-as-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 -journal-disable -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_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"
diff --git a/tests/slicing/unravel-variance.i b/tests/slicing/unravel-variance.i
index 554c7a94398639cd00d2809946b0248bb1bb4726..ca73d049b98a0987c732cbd993d71a0590185ddf 100644
--- a/tests/slicing/unravel-variance.i
+++ b/tests/slicing/unravel-variance.i
@@ -1,9 +1,9 @@
/* run.config
- STDOPT: +"-slice-calls printf1 -journal-disable -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 -journal-disable -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 -journal-disable -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 -journal-disable -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 -journal-disable -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_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 "
*/
/* Small example devired from examples given for UNRAVEL tool : */
diff --git a/tests/slicing/unsupported.i b/tests/slicing/unsupported.i
index c7c3afd735d40652698ba492ebea0fba5f503b85..534219f819117444c495a0ae3dda3e56abe10ec3 100644
--- a/tests/slicing/unsupported.i
+++ b/tests/slicing/unsupported.i
@@ -1,5 +1,5 @@
/* run.config
- STDOPT: +"-slice-return main -journal-disable -then-on 'Slicing export' -set-project-as-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_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i "
STDOPT: +"-sparecode"
*/
diff --git a/tests/slicing/use_spec.i b/tests/slicing/use_spec.i
index 72c572818b14025c278fec1863331efcaa55f49a..e24a0ba8e8bd20bf87725da742c972be92bcf11e 100644
--- a/tests/slicing/use_spec.i
+++ b/tests/slicing/use_spec.i
@@ -1,6 +1,6 @@
/* run.config
- STDOPT: +" -eva-use-spec f -slice-return main -journal-disable -then-on 'Slicing export' -set-project-as-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 main2 -slicing-level 3 -slice-undef-functions -eva-use-spec h -slice-return main2 -journal-disable -slicing-keep-annotations -then-on 'Slicing export' -set-project-as-default -print -eva @EVA_OPTIONS@ -eva-use-spec='-@all'"
+ 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: +"-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 9de40fa3f8165c58332963c040dfa604669dd68a..3f9fded1a05705d7385276e3e6d8d21dd33fb04b 100644
--- a/tests/slicing/variadic.c
+++ b/tests/slicing/variadic.c
@@ -1,9 +1,9 @@
/* run.config
- STDOPT: +"-slice-return f3 -no-slice-callers -journal-disable -then-on 'Slicing export' -print"
- STDOPT: +"-slice-return f3 -no-slice-callers -journal-disable -variadic-no-translation -then-last -print"
- STDOPT: +"-slice-return f3 -journal-disable -then-on 'Slicing export' -print"
- STDOPT: +"-slice-return main -journal-disable -then-on 'Slicing export' -print"
- STDOPT: +"-slice-return main -slicing-level 3 -journal-disable -then-on 'Slicing export' -print"
+ 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"
+ STDOPT: +"-slice-return main -then-on 'Slicing export' -print"
+ STDOPT: +"-slice-return main -slicing-level 3 -then-on 'Slicing export' -print"
*/
#include "../pdg/variadic.c"
diff --git a/tests/spec/behavior_assert.c b/tests/spec/behavior_assert.c
index 7d0ce3885199a400d456597f6083bdf51a3470c2..fcac94b1f6d0fe3a01a4e743e861633243a1cbc9 100644
--- a/tests/spec/behavior_assert.c
+++ b/tests/spec/behavior_assert.c
@@ -1,7 +1,7 @@
/* run.config
PLUGIN: eva,from,inout,scope
- OPT: -eva @EVA_CONFIG@ -deps -out -input -journal-disable -lib-entry
- OPT: -eva @EVA_CONFIG@ -deps -out -input -journal-disable
+ OPT: -eva @EVA_CONFIG@ -deps -out -input -lib-entry
+ OPT: -eva @EVA_CONFIG@ -deps -out -input
*/
int e;
diff --git a/tests/spec/bts1068.i b/tests/spec/bts1068.i
index 85357e021b9c61b677a4c5fb1b0872850ad75107..5f7b4c6a1d5f2c725cfc2b8b17cb4c88d6edae90 100644
--- a/tests/spec/bts1068.i
+++ b/tests/spec/bts1068.i
@@ -1,5 +1,5 @@
/* run.config
- OPT: -print -journal-disable -kernel-warn-key=annot-error=active
+ OPT: -print -kernel-warn-key=annot-error=active
*/
// test of label inference into
diff --git a/tests/spec/first.c b/tests/spec/first.c
index a913c33481fece4e96f1ab0da82c72a49d08e8ba..acaee400a23cdf498f524b101087fee389d791d0 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 -journal-disable
+ OPT: -print tests/spec/third.c tests/spec/second.c
*/
/*@ behavior b:
requires \valid(first);
diff --git a/tests/spec/lib.c b/tests/spec/lib.c
index 8a1d566beafbbde7c3b41ff08a7f0546b83ab707..67e220163062cea5c601ac3f2892bfa5e015fdff 100644
--- a/tests/spec/lib.c
+++ b/tests/spec/lib.c
@@ -1,5 +1,5 @@
/* run.config
- OPT: -cpp-extra-args="-Itests/spec" -cpp-extra-args="-include lib.h" -print -journal-disable
+ OPT: -cpp-extra-args="-Itests/spec" -cpp-extra-args="-include lib.h" -print
*/
/*@ ensures f((int)0) == (int)0; */
diff --git a/tests/spec/multiple_decl_def_1.c b/tests/spec/multiple_decl_def_1.c
index 9036c019d2f4c88c33d3d79f9b305764b810abc5..b3124a7f7ebda3939e2554221480c06725f026fd 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 -journal-disable
+ OPT: -print tests/spec/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 093cb78144924edc2061f2091f04562faed60410..b78d817f6b809a37afa2c4271508d5cf7ee19c4c 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 -journal-disable
+ OPT: -print tests/spec/multiple_file_2.c
*/
/* see bug #43 */
diff --git a/tests/spec/multiple_include_2.c b/tests/spec/multiple_include_2.c
index 942e22769090299b995e4dc7faa2d941d907a4f3..9d421be0fa3d6188535d1e69c42fa53b12def7eb 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 -journal-disable
+ OPT: -kernel-warn-key=annot-error=active -print tests/spec/multiple_include_1.c
*/
#include "multiple_include.h"
diff --git a/tests/test_config b/tests/test_config
index f188ff4072509a1f23ce78441acaac71a8d02cf9..997a6c54b93356a25a034a6a18cc58a0b4769da0 100644
--- a/tests/test_config
+++ b/tests/test_config
@@ -1,6 +1,11 @@
-MACRO: EVA_PLUGINS from,inout,eva,scope,variadic
+MACRO: EVA_MAIN_PLUGINS eva,scope
+MACRO: EVA_PLUGINS from,inout @EVA_MAIN_PLUGINS@ variadic
MACRO: EVA_OPTIONS -eva-show-progress -eva-msg-key=-summary -eva-auto-loop-unroll 0
MACRO: EVA_CONFIG @EVA_OPTIONS@ -machdep x86_32
+MACRO: EVA_TEST -eva @EVA_CONFIG@ -out -input -deps
+
+MACRO: RTE_TEST -rte -no-warn-invalid-pointer
+
PLUGIN: @EVA_PLUGINS@
-OPT: -eva @EVA_CONFIG@ -out -input -deps
+OPT: @EVA_TEST@
diff --git a/tests/test_config_apron b/tests/test_config_apron
index 411673ceafcafde7b9e20b8a40abe841a1cbd1a5..3da27e2a2ef973e561bf30f4da5b776a334d68bb 100644
--- a/tests/test_config_apron
+++ b/tests/test_config_apron
@@ -1,9 +1,13 @@
-MACRO: EVA_PLUGINS from,inout,eva,scope,variadic
+MACRO: EVA_MAIN_PLUGINS eva,scope
+MACRO: EVA_PLUGINS from,inout @EVA_MAIN_PLUGINS@ variadic
MACRO: EVA_OPTIONS -eva-show-progress -eva-msg-key=-summary -eva-auto-loop-unroll 0 -eva-domains apron-octagon -eva-warn-key experimental=inactive
MACRO: EVA_CONFIG @EVA_OPTIONS@ -machdep x86_32
+MACRO: EVA_TEST -eva @EVA_CONFIG@ -out -input -deps
+
+MACRO: RTE_TEST -rte -no-warn-invalid-pointer
# Compare the result with the oracle of the default config.
FILTER: diff --new-file @PTEST_DIR@/oracle/@PTEST_ORACLE@ -
PLUGIN: @EVA_PLUGINS@
-OPT: -eva @EVA_CONFIG@ -out -input -deps
+OPT: @EVA_TEST@
diff --git a/tests/test_config_bitwise b/tests/test_config_bitwise
index 19dd5d40c9f00151a44d21a20b5cb797d1c1fe6c..c234708a10793096e2773baa50cf00ba2696340c 100644
--- a/tests/test_config_bitwise
+++ b/tests/test_config_bitwise
@@ -1,8 +1,13 @@
-MACRO: EVA_PLUGINS from,inout,eva,scope,variadic
+MACRO: EVA_MAIN_PLUGINS eva,scope
+MACRO: EVA_PLUGINS from,inout @EVA_MAIN_PLUGINS@ variadic
MACRO: EVA_OPTIONS -eva-show-progress -eva-msg-key=-summary -eva-auto-loop-unroll 0 -eva-domains bitwise
-MACRO: EVA_CONFIG @EVA_OPTIONS@ -no-autoload-plugins -load-module from,inout,eva,scope,variadic -machdep x86_32
+MACRO: EVA_CONFIG @EVA_OPTIONS@ -machdep x86_32
+MACRO: EVA_TEST -eva @EVA_CONFIG@ -out -input -deps
+
+MACRO: RTE_TEST -rte -no-warn-invalid-pointer
# Compare the result with the oracle of the default config.
FILTER: diff --new-file @PTEST_DIR@/oracle/@PTEST_ORACLE@ -
-OPT: -eva @EVA_CONFIG@ -journal-disable -out -input -deps
+PLUGIN: @EVA_PLUGINS@
+OPT: @EVA_TEST@
diff --git a/tests/test_config_equality b/tests/test_config_equality
index fff8c6fb43f010c4d22835dbf0a4e5c43f2a249f..b631fa9d65f22f66a0453dcd5a787f4f78255a64 100644
--- a/tests/test_config_equality
+++ b/tests/test_config_equality
@@ -1,9 +1,13 @@
-MACRO: EVA_PLUGINS from,inout,eva,scope,variadic
+MACRO: EVA_MAIN_PLUGINS eva,scope
+MACRO: EVA_PLUGINS from,inout @EVA_MAIN_PLUGINS@ variadic
MACRO: EVA_OPTIONS -eva-show-progress -eva-msg-key=-summary -eva-auto-loop-unroll 0 -eva-domains equality
MACRO: EVA_CONFIG @EVA_OPTIONS@ -machdep x86_32
+MACRO: EVA_TEST -eva @EVA_CONFIG@ -out -input -deps
+
+MACRO: RTE_TEST -rte -no-warn-invalid-pointer
# Compare the result with the oracle of the default config.
FILTER: diff --new-file @PTEST_DIR@/oracle/@PTEST_ORACLE@ -
PLUGIN: @EVA_PLUGINS@
-OPT: -eva @EVA_CONFIG@ -out -input -deps
+OPT: @EVA_TEST@
diff --git a/tests/test_config_gauges b/tests/test_config_gauges
index 37ea7dfeb18c677bbb3d58d199a4d7030cd5dcac..177f05dbccdf68c101fdc0a0d54c8e3a708c7705 100644
--- a/tests/test_config_gauges
+++ b/tests/test_config_gauges
@@ -1,9 +1,13 @@
-MACRO: EVA_PLUGINS from,inout,eva,scope,variadic
+MACRO: EVA_MAIN_PLUGINS eva,scope
+MACRO: EVA_PLUGINS from,inout @EVA_MAIN_PLUGINS@ variadic
MACRO: EVA_OPTIONS -eva-show-progress -eva-msg-key=-summary -eva-auto-loop-unroll 0 -eva-domains gauges
MACRO: EVA_CONFIG @EVA_OPTIONS@ -machdep x86_32
+MACRO: EVA_TEST -eva @EVA_CONFIG@ -out -input -deps
+
+MACRO: RTE_TEST -rte -no-warn-invalid-pointer
# Compare the result with the oracle of the default config.
FILTER: diff --new-file @PTEST_DIR@/oracle/@PTEST_ORACLE@ -
PLUGIN: @EVA_PLUGINS@
-OPT: -eva @EVA_CONFIG@ -out -input -deps
+OPT: @EVA_TEST@
diff --git a/tests/test_config_octagon b/tests/test_config_octagon
index a63c091418a391a00eee6a9f0bb681358a49d7c5..e72845bbe14aa428519172c4a1fdd9ee55a00af7 100644
--- a/tests/test_config_octagon
+++ b/tests/test_config_octagon
@@ -1,9 +1,13 @@
-MACRO: EVA_PLUGINS from,inout,eva,scope,variadic
+MACRO: EVA_MAIN_PLUGINS eva,scope
+MACRO: EVA_PLUGINS from,inout @EVA_MAIN_PLUGINS@ variadic
MACRO: EVA_OPTIONS -eva-show-progress -eva-msg-key=-summary -eva-domains octagon
MACRO: EVA_CONFIG @EVA_OPTIONS@ -machdep x86_32
+MACRO: EVA_TEST -eva @EVA_CONFIG@ -out -input -deps
+
+MACRO: RTE_TEST -rte -no-warn-invalid-pointer
# Compare the result with the oracle of the default config.
FILTER: diff --new-file @PTEST_DIR@/oracle/@PTEST_ORACLE@ -
PLUGIN: @EVA_PLUGINS@
-OPT: -eva @EVA_CONFIG@ -out -input -deps
+OPT: @EVA_TEST@
diff --git a/tests/test_config_symblocs b/tests/test_config_symblocs
index 3b082f3869cd61f8bb7baf1944ea34ca3eb2e66f..6910404f9a855d0e334e60a4f6cbbb83534a6a75 100644
--- a/tests/test_config_symblocs
+++ b/tests/test_config_symblocs
@@ -1,9 +1,13 @@
-MACRO: EVA_PLUGINS from,inout,eva,scope,variadic
+MACRO: EVA_MAIN_PLUGINS eva,scope
+MACRO: EVA_PLUGINS from,inout @EVA_MAIN_PLUGINS@ variadic
MACRO: EVA_OPTIONS -eva-show-progress -eva-msg-key=-summary -eva-auto-loop-unroll 0 -eva-domains symbolic-locations
MACRO: EVA_CONFIG @EVA_OPTIONS@ -machdep x86_32
+MACRO: EVA_TEST -eva @EVA_CONFIG@ -out -input -deps
+
+MACRO: RTE_TEST -rte -no-warn-invalid-pointer
# Compare the result with the oracle of the default config.
FILTER: diff --new-file @PTEST_DIR@/oracle/@PTEST_ORACLE@ -
PLUGIN: @EVA_PLUGINS@
-OPT: -eva @EVA_CONFIG@ -out -input -deps
+OPT: @EVA_TEST@
diff --git a/tests/value/ai_annot.i b/tests/value/ai_annot.i
index 16034a0e0f48ea1185d1aca2066ddbc5c08bdcde..8b344d612e4d1bf211d505a5113f6259abd0c35e 100644
--- a/tests/value/ai_annot.i
+++ b/tests/value/ai_annot.i
@@ -1,5 +1,5 @@
/* run.config*
- STDOPT: #"-load-module scope -scope-verbose 2 -eva-remove-redundant-alarms -eva-context-width 3"
+ STDOPT: #"-scope-verbose 2 -eva-remove-redundant-alarms -eva-context-width 3"
*/
diff --git a/tests/value/align_char_array.c b/tests/value/align_char_array.c
index de692f2f709f3533998e31d902afee308ad011df..7c62d4cef2dd1a3473b43222e7383e7cff08d27e 100644
--- a/tests/value/align_char_array.c
+++ b/tests/value/align_char_array.c
@@ -1,9 +1,9 @@
/* run.config*
- OPT: -no-autoload-plugins -load-module inout,eva -eva @EVA_CONFIG@ -cpp-extra-args="-DPTEST" -journal-disable
+ PLUGIN: @EVA_MAIN_PLUGINS@
+ OPT: -eva @EVA_CONFIG@ -cpp-extra-args="-DPTEST"
*/
-
#ifndef PTEST
#include <stdio.h>
#endif
diff --git a/tests/value/array_initializer.i b/tests/value/array_initializer.i
index 04029accd9cbbc52b82684a435bb807b5c29d50a..2b815ae1da68fe36d0e467584cbc8b3a664f5906 100644
--- a/tests/value/array_initializer.i
+++ b/tests/value/array_initializer.i
@@ -1,7 +1,7 @@
/* run.config*
- OPT: -no-autoload-plugins -load-module inout,eva -eva @EVA_CONFIG@ -then -eva-initialization-padding-globals maybe
+ PLUGIN: @EVA_MAIN_PLUGINS@
+ OPT: -eva @EVA_CONFIG@ -then -eva-initialization-padding-globals maybe
*/
-
int t[5] = { [2] = 3 };
struct { char a; int t[5]; } s = { 'a' , { [2] = 3 } };
diff --git a/tests/value/array_zero_length.i b/tests/value/array_zero_length.i
index 98d5d3527c9c68817323dbc5cd45ac47a16e355a..567f1f654992ce400acdff528a1bfa1d78f754f2 100644
--- a/tests/value/array_zero_length.i
+++ b/tests/value/array_zero_length.i
@@ -1,10 +1,10 @@
/* run.config*
- OPT: -no-autoload-plugins -load-module inout,eva -eva @EVA_CONFIG@ -journal-disable -machdep gcc_x86_32
- OPT: -no-autoload-plugins -load-module inout,eva -eva @EVA_CONFIG@ -lib-entry -journal-disable -machdep gcc_x86_32
+ PLUGIN: @EVA_MAIN_PLUGINS@
+ OPT: -eva @EVA_CONFIG@ -machdep gcc_x86_32
+ OPT: -eva @EVA_CONFIG@ -lib-entry -machdep gcc_x86_32
EXIT: 1
- OPT: -no-autoload-plugins -load-module inout,eva -eva @EVA_CONFIG@ -lib-entry -journal-disable
+ OPT: -eva @EVA_CONFIG@ -lib-entry
*/
-
char T[];
char U[0];
char V[][2];
diff --git a/tests/value/base_addr_offset_block_length.i b/tests/value/base_addr_offset_block_length.i
index b3aad4d14b7a622e69f1e547cd8f84ef8434dfbd..b67eccb47f9ed40945fca405e35261fddf66262f 100644
--- a/tests/value/base_addr_offset_block_length.i
+++ b/tests/value/base_addr_offset_block_length.i
@@ -1,8 +1,8 @@
/* run.config*
- OPT: -no-autoload-plugins -load-module inout,eva -eva @EVA_CONFIG@ -eva-context-width 3 -then -eva-slevel 3
+ PLUGIN: @EVA_MAIN_PLUGINS@
+ OPT: -eva @EVA_CONFIG@ -eva-context-width 3 -then -eva-slevel 3
*/
-
int x, y;
short z;
diff --git a/tests/value/big_lib_entry.i b/tests/value/big_lib_entry.i
index 0c2770eab0fefe3254629223350644dbbf8493e2..a6ee597b2fc58dc57ca2d6d79bb5201fc0769a78 100644
--- a/tests/value/big_lib_entry.i
+++ b/tests/value/big_lib_entry.i
@@ -1,7 +1,7 @@
/* run.config*
- OPT: -no-autoload-plugins -load-module inout,eva -eva @EVA_CONFIG@ -lib-entry -eva-context-width 4 -eva-initialization-padding-globals no
+ PLUGIN: @EVA_MAIN_PLUGINS@
+ OPT: -eva @EVA_CONFIG@ -lib-entry -eva-context-width 4 -eva-initialization-padding-globals no
*/
-
typedef struct {
int f1;
float f2;
diff --git a/tests/value/bitfield_longlong.c b/tests/value/bitfield_longlong.c
index c2bdb9d6234e025769ac59c269deac5d6f03ec7e..808dfad6cde7a637ad75c4769c626fbe16500ac5 100644
--- a/tests/value/bitfield_longlong.c
+++ b/tests/value/bitfield_longlong.c
@@ -1,15 +1,15 @@
/* run.config*
- OPT: -no-autoload-plugins -load-module inout,eva -eva @EVA_CONFIG@ -cpp-extra-args="-Dprintf=Frama_C_show_each" -journal-disable
+ PLUGIN: @EVA_MAIN_PLUGINS@
+ OPT: -eva @EVA_CONFIG@ -cpp-extra-args="-Dprintf=Frama_C_show_each"
*/
struct X50 {
long long int z:50;
} s50 = { 2 };
-
+
struct X10 {
long long int z:10;
} s10 = { 2 };
-
struct U32 {
unsigned long z:32;
} u32 = { -1 };
diff --git a/tests/value/bts1306.i b/tests/value/bts1306.i
index 81f9cc8f329ead372748ebd5eea97821b99bc0bd..d9e1e351994fb153ec8df0fa999b6ddbf620cb32 100644
--- a/tests/value/bts1306.i
+++ b/tests/value/bts1306.i
@@ -1,5 +1,6 @@
/* run.config*
- OPT: -no-autoload-plugins -load-module from,inout,eva -constfold -eva-slevel 0 -eva @EVA_CONFIG@ -print -then -eva-slevel 10 -eva -print
+ PLUGIN: @EVA_MAIN_PLUGINS@
+ OPT: -constfold -eva-slevel 0 -eva @EVA_CONFIG@ -print -then -eva-slevel 10 -eva -print
*/
void g(double x) { double y= x*x; }
diff --git a/tests/value/case_analysis.i b/tests/value/case_analysis.i
index 40be501257b9f1b5edca5e3a305db685148deb04..52c07928dbf9094f9167ae7cfd158cfa245716f8 100644
--- a/tests/value/case_analysis.i
+++ b/tests/value/case_analysis.i
@@ -1,6 +1,6 @@
/* run.config*
- OPT: -no-autoload-plugins -load-module inout,eva -eva @EVA_CONFIG@ -eva-slevel 30 -journal-disable -float-normal
-
+ PLUGIN: @EVA_MAIN_PLUGINS@
+ OPT: -eva @EVA_CONFIG@ -eva-slevel 30 -float-normal
*/
int sq,s;
diff --git a/tests/value/cond_integer_cast_of_float.i b/tests/value/cond_integer_cast_of_float.i
index 9d1350ea671348d2759998a9ec5b3f9a2473455b..4d45148d1817638006da5620d1f0eb6c4561f7cc 100644
--- a/tests/value/cond_integer_cast_of_float.i
+++ b/tests/value/cond_integer_cast_of_float.i
@@ -1,9 +1,9 @@
/* run.config*
- OPT: -no-autoload-plugins -load-module eva -eva @EVA_CONFIG@ -eva-no-results -then -float-hex -main mainbis
+ PLUGIN: @EVA_MAIN_PLUGINS@
+ OPT: -eva @EVA_CONFIG@ -eva-no-results -then -float-hex -main mainbis
*/
typedef double D;
typedef float F;
-
int b;
extern F f1, f2, f3, f4;
extern D d1, d2, d3;
diff --git a/tests/value/const_typedef.i b/tests/value/const_typedef.i
index a2a0a3544f0c7304e5a2073be6bde7d35663e549..3fbf8a4b93486e12f3ccfcf89e442b8a3c2dba62 100644
--- a/tests/value/const_typedef.i
+++ b/tests/value/const_typedef.i
@@ -1,7 +1,7 @@
/* run.config*
- OPT: -machdep x86_32 -no-autoload-plugins -load-module inout,eva -print -then -eva @EVA_CONFIG@ -lib-entry -no-print
+ PLUGIN: @EVA_MAIN_PLUGINS@
+ OPT: -machdep x86_32 -print -then -eva @EVA_CONFIG@ -lib-entry -no-print
*/
-
typedef int INT[3][3];
typedef int INT2[][3];
typedef int INT3[2][7];
diff --git a/tests/value/constarraystructlibentry.i b/tests/value/constarraystructlibentry.i
index 96049bcde852de75c8e5efabe6c11fa5d73aca84..6d0f14ef2932f0caf465b4536d66985eaac15254 100644
--- a/tests/value/constarraystructlibentry.i
+++ b/tests/value/constarraystructlibentry.i
@@ -1,7 +1,7 @@
/* run.config*
- OPT: -no-autoload-plugins -load-module inout,eva -eva @EVA_CONFIG@ -lib-entry -eva-initialization-padding-globals yes -then -eva-initialization-padding-globals no
+ PLUGIN: @EVA_MAIN_PLUGINS@
+ OPT: -eva @EVA_CONFIG@ -lib-entry -eva-initialization-padding-globals yes -then -eva-initialization-padding-globals no
*/
-
const int t[] = { 1, 2, 3, 4, 5 } ;
const int t2[3][3] = { 1, 2, 3, 4, 5, 6, 7, 8, 9 } ;
diff --git a/tests/value/context_free.i b/tests/value/context_free.i
index cfc75576d264513eebd2a2d2bd9c37be34ba7322..34acfece1658df804eb072aeab7fc753bc0069e2 100644
--- a/tests/value/context_free.i
+++ b/tests/value/context_free.i
@@ -1,6 +1,6 @@
/* run.config*
-
- OPT: -no-autoload-plugins -load-module inout,eva -eva @EVA_CONFIG@ -lib-entry -main f -absolute-valid-range 0x200-0x199 -eva-msg-key initial-state -journal-disable
+ PLUGIN: @EVA_MAIN_PLUGINS@
+ OPT: -eva @EVA_CONFIG@ -lib-entry -main f -absolute-valid-range 0x200-0x199 -eva-msg-key initial-state
*/
diff --git a/tests/value/dead_inout.i b/tests/value/dead_inout.i
index 8cf0b0271e64bd950206a33e0f67093c1e6bc6c2..ced55e90b8b19df22a5b83c9a3f5834d079c96b7 100644
--- a/tests/value/dead_inout.i
+++ b/tests/value/dead_inout.i
@@ -1,7 +1,7 @@
/* run.config*
- OPT: -no-autoload-plugins -load-module from,inout @EVA_CONFIG@ -out -input -inout -inout -main main_all
+PLUGIN: @EVA_MAIN_PLUGINS@ inout
+ OPT: @EVA_CONFIG@ -out -input -inout -inout -main main_all
*/
-
// This tests a potential imprecision with the computation of input and outputs if one forgets to test that a statement is dead
int a, b;
diff --git a/tests/value/dead_statuses.i b/tests/value/dead_statuses.i
index e3233596af7078ab4303cd8a1d5b829e58ce1299..2a64874e2dffe31b15dfeea7389604c00462cfa3 100644
--- a/tests/value/dead_statuses.i
+++ b/tests/value/dead_statuses.i
@@ -1,7 +1,7 @@
/* run.config*
- STDOPT: +"-load-module report -then -report"
+ PLUGIN: @PTEST_PLUGIN@ report
+ STDOPT: +"-then -report"
*/
-
//@ requires \true; assigns \nothing;
void f(void);
diff --git a/tests/value/disjoint_status.i b/tests/value/disjoint_status.i
index 8ef72525727bd2c35c83c549d7fdcc35ee0be4ad..82e2db2a5a2baca5b2db2d9113c45c12d0ec0227 100644
--- a/tests/value/disjoint_status.i
+++ b/tests/value/disjoint_status.i
@@ -1,7 +1,7 @@
/* run.config*
- STDOPT: +"-then -load-module report -report"
+ PLUGIN: @PTEST_PLUGIN@ report
+ STDOPT: +" -report"
*/
-
int x;
//@ requires ReqTrue: \true; ensures PostTrue: \true; // Test printing of ACSL names
void f(unsigned int c, unsigned int d) {
diff --git a/tests/value/div.i b/tests/value/div.i
index 04ff9505aa3095d18d08dc320a2ae1b7ec1966b0..55857e727f928c53392e6edb8dae1ec056a31a7d 100644
--- a/tests/value/div.i
+++ b/tests/value/div.i
@@ -1,14 +1,14 @@
/* run.config*
- STDOPT: #"-load-module scope -eva-remove-redundant-alarms"
- OPT: -machdep x86_32 -no-autoload-plugins -load-module eva,inout -rte -then -eva @EVA_CONFIG@
+ STDOPT: #"-eva-remove-redundant-alarms"
+ PLUGIN: @PTEST_PLUGIN@ rtegen
+ OPT: -machdep x86_32 @RTE_TEST@ -then -eva @EVA_CONFIG@
*/
int X,Y,Z1,Z2,T,U1,U2,V,W1,W2;
int a,b,d1,d2,d0,e;
int t[5]={1,2,3};
int *p;
-void main (void)
-{
+void main (void) {
int i;
volatile int c=0;
while (c+1)
diff --git a/tests/value/fptr.i b/tests/value/fptr.i
index 1984eed4eee5dec75c10c60b1c4faed1567d9852..0df6d85d2077a6f0d221c4db0d34beb2af5a60ae 100644
--- a/tests/value/fptr.i
+++ b/tests/value/fptr.i
@@ -1,7 +1,7 @@
/* run.config*
-
- OPT: -no-autoload-plugins -load-module from,inout,eva -eva @EVA_CONFIG@ -journal-disable -then -deps -out
- OPT: -no-autoload-plugins -load-module from,inout,eva -eva @EVA_CONFIG@ -main main_uninit -journal-disable -then -deps -out
+ PLUGIN: @EVA_MAIN_PLUGINS@ from,inout
+ OPT: -eva @EVA_CONFIG@ -then -deps -out
+ OPT: -eva @EVA_CONFIG@ -main main_uninit -then -deps -out
*/
int R=77; volatile int v; int n;
diff --git a/tests/value/from_call.i b/tests/value/from_call.i
index c510dd876084aec37a27264ef03de9b99b79a65f..7e979f0b83d058231cb0c433e14b7f9528d06077 100644
--- a/tests/value/from_call.i
+++ b/tests/value/from_call.i
@@ -1,10 +1,10 @@
/* run.config*
- OPT: -no-autoload-plugins -load-module from,inout,users,eva -calldeps -eva @EVA_CONFIG@ -journal-disable -users -then -input
- OPT: -no-autoload-plugins -load-module from,eva @EVA_CONFIG@ -deps -show-indirect-deps -journal-disable
+ PLUGIN: @EVA_MAIN_PLUGINS@ from,users
+ OPT: -calldeps -eva @EVA_CONFIG@ -users -then -input
+ PLUGIN: @EVA_MAIN_PLUGINS@ from
+ OPT: @EVA_CONFIG@ -deps -show-indirect-deps
*/
-int a,b,c,d;
-int x,y,z,t;
-
+int a,b,c,d, x,y,z,t;
int g(int w)
{
return w + t;
diff --git a/tests/value/global_bug.i b/tests/value/global_bug.i
index f6c48882b9efde40cfcfc601d9065935ae75a435..d3acbecbae02ff5b5570e403986fd6668a4664a6 100644
--- a/tests/value/global_bug.i
+++ b/tests/value/global_bug.i
@@ -1,9 +1,9 @@
/* run.config*
- STDOPT: +"-load-module report -then -report"
+ PLUGIN: @PTEST_PLUGIN@ report
+ STDOPT: +"-report"
*/
-
int i = 1;
-int G[2] =
+int G[2] =
{99<<63, 1};
int j = 2;
diff --git a/tests/value/ilevel.i b/tests/value/ilevel.i
index 9cb65bf87964896f8b7a5eb3a95918842bd296e8..30aaf6a78b8fe2795a46249604b5e0e6f7028aa7 100644
--- a/tests/value/ilevel.i
+++ b/tests/value/ilevel.i
@@ -1,10 +1,10 @@
/* run.config*
- OPT: -no-autoload-plugins -load-module inout,slicing,sparecode,eva -eva @EVA_CONFIG@ -slice-return main -then-on "Slicing export" -eva -eva-ilevel 16 -eva-show-progress -then-on "default" -eva-ilevel 17 -then -eva-ilevel 48
+ PLUGIN: @EVA_MAIN_PLUGINS@ inout,slicing
+ OPT: -eva @EVA_CONFIG@ -slice-return main -then-on "Slicing export" -eva -eva-ilevel 16 -eva-show-progress -then-on "default" -eva-ilevel 17 -then -eva-ilevel 48
*/
// Test in particular that ilevel is by-project, even though it is an ocaml ref
volatile int v;
int i, j, k, l;
-
int main () {
do { i = v; }
while (! (0 <= i && i < 8));
diff --git a/tests/value/incorrect_reduce_expr.i b/tests/value/incorrect_reduce_expr.i
index 0c7f22f6219efabde4f3dfd99e6eb8e74a44315c..48f7f83e12fc2b2e59dddeea3657f57f1250dfca 100644
--- a/tests/value/incorrect_reduce_expr.i
+++ b/tests/value/incorrect_reduce_expr.i
@@ -1,7 +1,7 @@
/* run.config*
- OPT: -no-autoload-plugins -load-module inout,eva -eva @EVA_CONFIG@ -absolute-valid-range 32-36
+ PLUGIN: @EVA_MAIN_PLUGINS@
+ OPT: -eva @EVA_CONFIG@ -absolute-valid-range 32-36
*/
-
char t[5];
int *p;
int x;
diff --git a/tests/value/init_const_guard.i b/tests/value/init_const_guard.i
index d97dd6d96f88cf3e73d3d6fbdc432a0118ada978..517c8278b6173200f7c93d86dbd098e0451cde83 100644
--- a/tests/value/init_const_guard.i
+++ b/tests/value/init_const_guard.i
@@ -1,7 +1,7 @@
/*run.config*
- STDOPT: +"-load-module report -main f -report -then -main g -then -lib-entry -main f -then -main g"
+ PLUGIN: @PTEST_PLUGIN@ report
+ STDOPT: +"-main f -report -then -main g -then -lib-entry -main f -then -main g"
*/
-
/** Same test exists in WP tests. Please keep synchronized */
diff --git a/tests/value/inout.i b/tests/value/inout.i
index 847c21c656a0509ef7a57d55b5b9ff60d53997f8..3dd92638e0edfb92381e1443e37e63507e33c560 100644
--- a/tests/value/inout.i
+++ b/tests/value/inout.i
@@ -1,10 +1,10 @@
/* run.config*
-
- OPT: -no-autoload-plugins -load-module from,inout @EVA_CONFIG@ -inout -deps -main inout_11_0 -journal-disable
- OPT: -no-autoload-plugins -load-module from,inout @EVA_CONFIG@ -inout -deps -main inout_11_3 -journal-disable
- OPT: -no-autoload-plugins -load-module from,inout @EVA_CONFIG@ -inout -deps -main never_terminate -journal-disable
- OPT: -no-autoload-plugins -load-module from,inout @EVA_CONFIG@ -inout -deps -main may_not_terminate -journal-disable
- OPT: -no-autoload-plugins -load-module from,inout @EVA_CONFIG@ -inout -deps -main call_may_not_terminate -journal-disable
+PLUGIN: @EVA_MAIN_PLUGINS@ from,inout
+ OPT: @EVA_CONFIG@ -inout -deps -main inout_11_0
+ OPT: @EVA_CONFIG@ -inout -deps -main inout_11_3
+ OPT: @EVA_CONFIG@ -inout -deps -main never_terminate
+ OPT: @EVA_CONFIG@ -inout -deps -main may_not_terminate
+ OPT: @EVA_CONFIG@ -inout -deps -main call_may_not_terminate
*/
int Xt, Xs, Xs_I, Ys, Ys_I, Z, I;
diff --git a/tests/value/inout_formals.i b/tests/value/inout_formals.i
index 96883b0436b0ba18a4cf72be2e6d664b4aabe98e..0add77d5252956a8a21599a3c4b8a6bbe3dd07e7 100644
--- a/tests/value/inout_formals.i
+++ b/tests/value/inout_formals.i
@@ -1,8 +1,8 @@
/*run.config*
- OPT: -no-autoload-plugins -load-module from,inout @EVA_CONFIG@ -inout -input-with-formals -inout-with-formals
+PLUGIN: @EVA_MAIN_PLUGINS@ inout
+ OPT: @EVA_CONFIG@ -inout -input-with-formals -inout-with-formals
*/
int x, y;
-
void main(int * const i) {
*i=0;
Frama_C_show_each(i);
diff --git a/tests/value/inout_proto.i b/tests/value/inout_proto.i
index 977b1591fed06b16f136349a8e77f54120595216..5e573ee3abfce63cecbad2b3e2d869b15fbcc125 100644
--- a/tests/value/inout_proto.i
+++ b/tests/value/inout_proto.i
@@ -1,7 +1,7 @@
/*run.config*
- OPT: -no-autoload-plugins -load-module from,inout @EVA_CONFIG@ -inout -input-with-formals -inout-with-formals -main main_main
+PLUGIN: @EVA_MAIN_PLUGINS@ inout
+ OPT: @EVA_CONFIG@ -inout -input-with-formals -inout-with-formals -main main_main
*/
-
typedef unsigned char BYTE;
typedef BYTE * MESSAGE_ADDR_TYPE;
diff --git a/tests/value/limits.c b/tests/value/limits.c
index 965d689d1099207749cd4e1caab99964a83a2d44..c8da28460996b8f66fe42b398790ec7e020e570d 100644
--- a/tests/value/limits.c
+++ b/tests/value/limits.c
@@ -1,7 +1,7 @@
/* run.config*
- OPT: -no-autoload-plugins -load-module inout,eva -eva @EVA_CONFIG@ -warn-signed-overflow
+ PLUGIN: @EVA_MAIN_PLUGINS@
+ OPT: -eva @EVA_CONFIG@ -warn-signed-overflow
*/
-
#include <limits.h>
int cl, cu, ucu;
diff --git a/tests/value/local_slevel.i b/tests/value/local_slevel.i
index f8a28e1829933eca449024a9d5c635fb03a98f24..d40c3caf0477abdabcdbefad413537242c25ce91 100644
--- a/tests/value/local_slevel.i
+++ b/tests/value/local_slevel.i
@@ -1,7 +1,7 @@
/* run.config*
- STDOPT: +" -load-module frama-c-constant_propagation -eva-slevel-function main2:100000 -print -then -scf -then-on propagated -eva -eva-show-progress -no-scf"
+ PLUGIN: @EVA_MAIN_PLUGINS@ constant_propagation
+ STDOPT: +" -eva-slevel-function main2:100000 -print -then -scf -then-on propagated -eva -eva-show-progress -no-scf"
*/
-
int *p;
void main1() {
diff --git a/tests/value/logic_ptr_cast.i b/tests/value/logic_ptr_cast.i
index 64eb43489d69f0c135df3a29dda3d8eee22bb6c2..9120beca2e45a6dd113f6207c27794a8c8c53bf4 100644
--- a/tests/value/logic_ptr_cast.i
+++ b/tests/value/logic_ptr_cast.i
@@ -1,9 +1,9 @@
/* run.config*
- OPT: -no-autoload-plugins -load-module eva -eva @EVA_CONFIG@ -print -journal-disable -eva-no-results
+ PLUGIN: @EVA_MAIN_PLUGINS@
+ OPT: -eva @EVA_CONFIG@ -print -eva-no-results
*/
int *p;
int t[90];
-
int main(){
p = (int*) (((unsigned long)t + 7) & ~7UL);
/*@ assert p == (int*)t || p == (int*)((char*)t+1) ||
diff --git a/tests/value/loop_test.i b/tests/value/loop_test.i
index 6b1e166139c0aad1abf2f61f4b99233d4639dba5..4ada1eb53646ed306e8825c76a34488443b8e0fb 100644
--- a/tests/value/loop_test.i
+++ b/tests/value/loop_test.i
@@ -1,9 +1,9 @@
/* run.config*
- OPT: -no-autoload-plugins -load-module from,inout,eva -eva @EVA_CONFIG@ -main test_onzes -journal-disable
- OPT: -no-autoload-plugins -load-module from,inout,eva -eva @EVA_CONFIG@ -main test_cent_onzes -journal-disable
+ PLUGIN: @EVA_MAIN_PLUGINS@
+ OPT: -eva @EVA_CONFIG@ -main test_onzes
+ OPT: -eva @EVA_CONFIG@ -main test_cent_onzes
*/
-
/***************** var CMP cste **********************/
int onze_0 (void) {
int onze; for (onze=1000; onze >= 12 ; onze--) ; return onze ;
diff --git a/tests/value/loop_wvar.i b/tests/value/loop_wvar.i
index 341e446a0ad758d60a6c278b8609dc472a3ccf8b..892c3948c3b14d244e7ff27e122adeb37a1ed8ad 100644
--- a/tests/value/loop_wvar.i
+++ b/tests/value/loop_wvar.i
@@ -1,11 +1,11 @@
/* run.config*
- OPT: -no-autoload-plugins -load-module eva,inout -no-annot -eva @EVA_CONFIG@ -then -kernel-warn-key=annot-error=active -annot -eva -journal-disable
- OPT: -no-autoload-plugins -load-module from,inout,eva -kernel-warn-key=annot-error=active -eva @EVA_CONFIG@ -main main3 -journal-disable
- OPT: -no-autoload-plugins -load-module eva,inout -kernel-warn-key=annot-error=active -eva @EVA_CONFIG@ -main main_err1 -journal-disable
- OPT: -no-autoload-plugins -load-module eva,inout -kernel-warn-key=annot-error=active -eva @EVA_CONFIG@ -main main_err2 -journal-disable
+ PLUGIN: @EVA_MAIN_PLUGINS@
+ OPT: -no-annot -eva @EVA_CONFIG@ -then -kernel-warn-key=annot-error=active -annot -eva
+ OPT: -kernel-warn-key=annot-error=active -eva @EVA_CONFIG@ -main main3
+ OPT: -kernel-warn-key=annot-error=active -eva @EVA_CONFIG@ -main main_err1
+ OPT: -kernel-warn-key=annot-error=active -eva @EVA_CONFIG@ -main main_err2
*/
-
void main(void)
{ int n = 13;
int i,j;
diff --git a/tests/value/loopinv.c b/tests/value/loopinv.c
index 65683a6dc3f2b34a56ba55b85401f73079b53371..eb9adc45a75296c5c516c511e6ce0252c68ba875 100644
--- a/tests/value/loopinv.c
+++ b/tests/value/loopinv.c
@@ -1,7 +1,7 @@
/* run.config*
-OPT: @EVA_CONFIG@ -no-autoload-plugins -load-module from,inout,eva,report -eva-slevel-function main2:20 -pp-annot -eva -then -report
+PLUGIN: @EVA_MAIN_PLUGINS@ report
+ OPT: @EVA_CONFIG@ -eva-slevel-function main2:20 -pp-annot -eva -then -report
*/
-
/*@ requires valid: \valid(&t[0..s-1]);
requires c: 1 <= c < s; */
void init (int *t, int c, int s) {
diff --git a/tests/value/machdep.c b/tests/value/machdep.c
index b901879416538caefa4fafda266ad349c17d7790..4c9f8816313be40f88fb2cdc46bd03a566c966f2 100644
--- a/tests/value/machdep.c
+++ b/tests/value/machdep.c
@@ -1,7 +1,7 @@
/* run.config*
- OPT: -no-autoload-plugins -load-module from,inout,eva -eva @EVA_CONFIG@ -cpp-extra-args="-DPTEST" -journal-disable -then -machdep x86_64 -then -machdep x86_16
+ PLUGIN: @EVA_MAIN_PLUGINS@
+ OPT: -eva @EVA_CONFIG@ -cpp-extra-args="-DPTEST" -then -machdep x86_64 -then -machdep x86_16
*/
-
#ifndef PTEST
#include <stdio.h>
#endif
diff --git a/tests/value/memexec.c b/tests/value/memexec.c
index 1023354a4332f15a43204c40d955c226bf5699be..bb6bb912db9935c2a1a631b9b398d127236419f3 100644
--- a/tests/value/memexec.c
+++ b/tests/value/memexec.c
@@ -1,5 +1,5 @@
/* run.config*
- STDOPT: +"-rte-select fbug -rte -then -eva"
+ STDOPT: +"-rte-select fbug @RTE_TEST@ -then -eva"
*/
int x1, y1, z1, z2; volatile int c, nondet;
diff --git a/tests/value/nested_struct_init.i b/tests/value/nested_struct_init.i
index f73a3e08021154c466c6ed2c8201e05a41043ace..67dd151b1c9fe7f87847383b30ece376e769a718 100644
--- a/tests/value/nested_struct_init.i
+++ b/tests/value/nested_struct_init.i
@@ -1,5 +1,6 @@
/* run.config*
- OPT: -no-autoload-plugins -load-module inout,eva -eva @EVA_CONFIG@ -then -eva-initialization-padding-globals no -then -eva-initialization-padding-globals maybe -then -lib-entry -then -eva-initialization-padding-globals no -then -eva-initialization-padding-globals yes
+ PLUGIN: @EVA_MAIN_PLUGINS@
+ OPT: -eva @EVA_CONFIG@ -then -eva-initialization-padding-globals no -then -eva-initialization-padding-globals maybe -then -lib-entry -then -eva-initialization-padding-globals no -then -eva-initialization-padding-globals yes
*/
typedef signed char int8_t;
diff --git a/tests/value/oracle/bts1306.res.oracle b/tests/value/oracle/bts1306.res.oracle
index f0036f751b5313034ee6be275ecd516dc6b0d154..18c9b265a6ef92421ac67746730b375a87fc602f 100644
--- a/tests/value/oracle/bts1306.res.oracle
+++ b/tests/value/oracle/bts1306.res.oracle
@@ -5,8 +5,8 @@
[eva:initial-state] Values of globals at initialization
[eva] computing for function g <- main.
- Called from tests/value/bts1306.i:9.
-[eva:alarm] tests/value/bts1306.i:5: Warning:
+ Called from tests/value/bts1306.i:10.
+[eva:alarm] tests/value/bts1306.i:6: Warning:
non-finite double value. assert \is_finite(\mul_double(x, x));
[eva] Recording results for g
[eva] Done for function g
@@ -40,8 +40,8 @@ int main(double x)
[eva:initial-state] Values of globals at initialization
[eva] computing for function g <- main.
- Called from tests/value/bts1306.i:9.
-[eva:alarm] tests/value/bts1306.i:5: Warning:
+ Called from tests/value/bts1306.i:10.
+[eva:alarm] tests/value/bts1306.i:6: Warning:
non-finite double value. assert \is_finite(\mul_double(x, x));
[eva] Recording results for g
[eva] Done for function g
diff --git a/tests/value/oracle/pointer_comparison.0.res.oracle b/tests/value/oracle/pointer_comparison.0.res.oracle
index 0202337ff61b091c94af6196bc605e43313ef656..24cd0a1cf29cc72506aa30fe1232cf729b33430c 100644
--- a/tests/value/oracle/pointer_comparison.0.res.oracle
+++ b/tests/value/oracle/pointer_comparison.0.res.oracle
@@ -6,33 +6,33 @@
x ∈ {0}
y ∈ {0}
p ∈ {0}
-[eva] tests/value/pointer_comparison.c:8: Frama_C_show_each_1t: {{ &x + {4} }}
-[eva:pointer-comparison] tests/value/pointer_comparison.c:10:
+[eva] tests/value/pointer_comparison.c:13: Frama_C_show_each_1t: {{ &x + {4} }}
+[eva:pointer-comparison] tests/value/pointer_comparison.c:15:
invalid pointer comparison: invalid pointer(s)
-[eva] tests/value/pointer_comparison.c:10: Frama_C_show_each_2: {{ &x + {8} }}
-[eva:pointer-comparison] tests/value/pointer_comparison.c:12:
+[eva] tests/value/pointer_comparison.c:15: Frama_C_show_each_2: {{ &x + {8} }}
+[eva:pointer-comparison] tests/value/pointer_comparison.c:17:
invalid pointer comparison: invalid pointer(s)
-[eva] tests/value/pointer_comparison.c:12: Frama_C_show_each_3: {{ &x + {12} }}
-[eva:pointer-comparison] tests/value/pointer_comparison.c:14:
+[eva] tests/value/pointer_comparison.c:17: Frama_C_show_each_3: {{ &x + {12} }}
+[eva:pointer-comparison] tests/value/pointer_comparison.c:19:
invalid pointer comparison: invalid pointer(s)
-[eva] tests/value/pointer_comparison.c:14: Frama_C_show_each_4: {{ &x + {16} }}
-[eva:pointer-comparison] tests/value/pointer_comparison.c:16:
+[eva] tests/value/pointer_comparison.c:19: Frama_C_show_each_4: {{ &x + {16} }}
+[eva:pointer-comparison] tests/value/pointer_comparison.c:21:
invalid pointer comparison: invalid pointer(s)
-[eva:alarm] tests/value/pointer_comparison.c:16: Warning:
+[eva:alarm] tests/value/pointer_comparison.c:21: Warning:
pointer downcast. assert (unsigned int)p ≤ 2147483647;
-[eva:alarm] tests/value/pointer_comparison.c:16: Warning:
+[eva:alarm] tests/value/pointer_comparison.c:21: Warning:
pointer downcast. assert (unsigned int)(&y) ≤ 2147483647;
-[eva] tests/value/pointer_comparison.c:16: Frama_C_show_each_5: {{ &x + {16} }}
-[eva] tests/value/pointer_comparison.c:17: Frama_C_show_each_5e: {{ &x + {16} }}
-[eva:pointer-comparison] tests/value/pointer_comparison.c:18:
+[eva] tests/value/pointer_comparison.c:21: Frama_C_show_each_5: {{ &x + {16} }}
+[eva] tests/value/pointer_comparison.c:22: Frama_C_show_each_5e: {{ &x + {16} }}
+[eva:pointer-comparison] tests/value/pointer_comparison.c:23:
invalid pointer comparison: invalid pointer(s)
-[eva] tests/value/pointer_comparison.c:18: Frama_C_show_each_6: {{ &x + {20} }}
-[eva] tests/value/pointer_comparison.c:18: starting to merge loop iterations
-[eva] tests/value/pointer_comparison.c:18:
+[eva] tests/value/pointer_comparison.c:23: Frama_C_show_each_6: {{ &x + {20} }}
+[eva] tests/value/pointer_comparison.c:23: starting to merge loop iterations
+[eva] tests/value/pointer_comparison.c:23:
Frama_C_show_each_6: {{ &x + {20; 24} }}
-[eva] tests/value/pointer_comparison.c:18:
+[eva] tests/value/pointer_comparison.c:23:
Frama_C_show_each_6: {{ &x + {20; 24; 28} }}
-[eva] tests/value/pointer_comparison.c:18:
+[eva] tests/value/pointer_comparison.c:23:
Frama_C_show_each_6: {{ &x + [20..--],0%4 }}
[eva] Recording results for main
[eva] done for function main
@@ -57,10 +57,10 @@
--- Properties of Function 'main'
--------------------------------------------------------------------------------
-[ - ] Assertion 'Eva,pointer_downcast' (file tests/value/pointer_comparison.c, line 16)
+[ - ] Assertion 'Eva,pointer_downcast' (file tests/value/pointer_comparison.c, line 21)
assert Eva: pointer_downcast: (unsigned int)p ≤ 2147483647;
tried with Eva.
-[ - ] Assertion 'Eva,pointer_downcast' (file tests/value/pointer_comparison.c, line 16)
+[ - ] Assertion 'Eva,pointer_downcast' (file tests/value/pointer_comparison.c, line 21)
assert Eva: pointer_downcast: (unsigned int)(&y) ≤ 2147483647;
tried with Eva.
@@ -77,38 +77,38 @@
x ∈ {0}
y ∈ {0}
p ∈ {0}
-[eva] tests/value/pointer_comparison.c:8: Frama_C_show_each_1t: {{ &x + {4} }}
-[eva:alarm] tests/value/pointer_comparison.c:10: Warning:
+[eva] tests/value/pointer_comparison.c:13: Frama_C_show_each_1t: {{ &x + {4} }}
+[eva:alarm] tests/value/pointer_comparison.c:15: Warning:
pointer comparison.
assert \pointer_comparable((void *)tmp_0, (void *)(&y));
(tmp_0 from p++)
-[eva] tests/value/pointer_comparison.c:10: Frama_C_show_each_2: {{ &x + {8} }}
-[eva:alarm] tests/value/pointer_comparison.c:12: Warning:
+[eva] tests/value/pointer_comparison.c:15: Frama_C_show_each_2: {{ &x + {8} }}
+[eva:alarm] tests/value/pointer_comparison.c:17: Warning:
pointer comparison.
assert \pointer_comparable((void *)tmp_1, (void *)(&y));
(tmp_1 from p++)
-[eva] tests/value/pointer_comparison.c:12: Frama_C_show_each_3: {{ &x + {12} }}
-[eva:alarm] tests/value/pointer_comparison.c:14: Warning:
+[eva] tests/value/pointer_comparison.c:17: Frama_C_show_each_3: {{ &x + {12} }}
+[eva:alarm] tests/value/pointer_comparison.c:19: Warning:
pointer comparison.
assert \pointer_comparable((void *)tmp_2, (void *)(&y));
(tmp_2 from p++)
-[eva] tests/value/pointer_comparison.c:14: Frama_C_show_each_4: {{ &x + {16} }}
-[eva:alarm] tests/value/pointer_comparison.c:16: Warning:
+[eva] tests/value/pointer_comparison.c:19: Frama_C_show_each_4: {{ &x + {16} }}
+[eva:alarm] tests/value/pointer_comparison.c:21: Warning:
pointer downcast. assert (unsigned int)p ≤ 2147483647;
-[eva:alarm] tests/value/pointer_comparison.c:16: Warning:
+[eva:alarm] tests/value/pointer_comparison.c:21: Warning:
pointer downcast. assert (unsigned int)(&y) ≤ 2147483647;
-[eva] tests/value/pointer_comparison.c:16: Frama_C_show_each_5: {{ &x + {16} }}
-[eva] tests/value/pointer_comparison.c:17: Frama_C_show_each_5e: {{ &x + {16} }}
-[eva:alarm] tests/value/pointer_comparison.c:18: Warning:
+[eva] tests/value/pointer_comparison.c:21: Frama_C_show_each_5: {{ &x + {16} }}
+[eva] tests/value/pointer_comparison.c:22: Frama_C_show_each_5e: {{ &x + {16} }}
+[eva:alarm] tests/value/pointer_comparison.c:23: Warning:
pointer comparison.
assert \pointer_comparable((void *)tmp_3, (void *)(&y));
(tmp_3 from p++)
-[eva] tests/value/pointer_comparison.c:18: Frama_C_show_each_6: {{ &x + {20} }}
-[eva] tests/value/pointer_comparison.c:18:
+[eva] tests/value/pointer_comparison.c:23: Frama_C_show_each_6: {{ &x + {20} }}
+[eva] tests/value/pointer_comparison.c:23:
Frama_C_show_each_6: {{ &x + {20; 24} }}
-[eva] tests/value/pointer_comparison.c:18:
+[eva] tests/value/pointer_comparison.c:23:
Frama_C_show_each_6: {{ &x + {20; 24; 28} }}
-[eva] tests/value/pointer_comparison.c:18:
+[eva] tests/value/pointer_comparison.c:23:
Frama_C_show_each_6: {{ &x + [20..--],0%4 }}
[eva] Recording results for main
[eva] done for function main
@@ -133,28 +133,28 @@
--- Properties of Function 'main'
--------------------------------------------------------------------------------
-[ - ] Assertion 'Eva,ptr_comparison' (file tests/value/pointer_comparison.c, line 10)
+[ - ] Assertion 'Eva,ptr_comparison' (file tests/value/pointer_comparison.c, line 15)
assert
Eva: ptr_comparison:
\pointer_comparable((void *)tmp_0, (void *)(&y));
tried with Eva.
-[ - ] Assertion 'Eva,ptr_comparison' (file tests/value/pointer_comparison.c, line 12)
+[ - ] Assertion 'Eva,ptr_comparison' (file tests/value/pointer_comparison.c, line 17)
assert
Eva: ptr_comparison:
\pointer_comparable((void *)tmp_1, (void *)(&y));
tried with Eva.
-[ - ] Assertion 'Eva,ptr_comparison' (file tests/value/pointer_comparison.c, line 14)
+[ - ] Assertion 'Eva,ptr_comparison' (file tests/value/pointer_comparison.c, line 19)
assert
Eva: ptr_comparison:
\pointer_comparable((void *)tmp_2, (void *)(&y));
tried with Eva.
-[ - ] Assertion 'Eva,pointer_downcast' (file tests/value/pointer_comparison.c, line 16)
+[ - ] Assertion 'Eva,pointer_downcast' (file tests/value/pointer_comparison.c, line 21)
assert Eva: pointer_downcast: (unsigned int)p ≤ 2147483647;
tried with Eva.
-[ - ] Assertion 'Eva,pointer_downcast' (file tests/value/pointer_comparison.c, line 16)
+[ - ] Assertion 'Eva,pointer_downcast' (file tests/value/pointer_comparison.c, line 21)
assert Eva: pointer_downcast: (unsigned int)(&y) ≤ 2147483647;
tried with Eva.
-[ - ] Assertion 'Eva,ptr_comparison' (file tests/value/pointer_comparison.c, line 18)
+[ - ] Assertion 'Eva,ptr_comparison' (file tests/value/pointer_comparison.c, line 23)
assert
Eva: ptr_comparison:
\pointer_comparable((void *)tmp_3, (void *)(&y));
@@ -173,41 +173,41 @@
x ∈ {0}
y ∈ {0}
p ∈ {0}
-[eva] tests/value/pointer_comparison.c:8: Frama_C_show_each_1t: {{ &x + {4} }}
-[eva:alarm] tests/value/pointer_comparison.c:10: Warning:
+[eva] tests/value/pointer_comparison.c:13: Frama_C_show_each_1t: {{ &x + {4} }}
+[eva:alarm] tests/value/pointer_comparison.c:15: Warning:
pointer comparison.
assert \pointer_comparable((void *)tmp_0, (void *)(&y));
(tmp_0 from p++)
-[eva] tests/value/pointer_comparison.c:10: Frama_C_show_each_2: {{ &x + {8} }}
-[eva:alarm] tests/value/pointer_comparison.c:12: Warning:
+[eva] tests/value/pointer_comparison.c:15: Frama_C_show_each_2: {{ &x + {8} }}
+[eva:alarm] tests/value/pointer_comparison.c:17: Warning:
pointer comparison.
assert \pointer_comparable((void *)tmp_1, (void *)(&y));
(tmp_1 from p++)
-[eva] tests/value/pointer_comparison.c:12: Frama_C_show_each_3: {{ &x + {12} }}
-[eva:alarm] tests/value/pointer_comparison.c:14: Warning:
+[eva] tests/value/pointer_comparison.c:17: Frama_C_show_each_3: {{ &x + {12} }}
+[eva:alarm] tests/value/pointer_comparison.c:19: Warning:
pointer comparison.
assert \pointer_comparable((void *)tmp_2, (void *)(&y));
(tmp_2 from p++)
-[eva] tests/value/pointer_comparison.c:14: Frama_C_show_each_4: {{ &x + {16} }}
-[eva:alarm] tests/value/pointer_comparison.c:16: Warning:
+[eva] tests/value/pointer_comparison.c:19: Frama_C_show_each_4: {{ &x + {16} }}
+[eva:alarm] tests/value/pointer_comparison.c:21: Warning:
pointer downcast. assert (unsigned int)p ≤ 2147483647;
-[eva:alarm] tests/value/pointer_comparison.c:16: Warning:
+[eva:alarm] tests/value/pointer_comparison.c:21: Warning:
pointer downcast. assert (unsigned int)(&y) ≤ 2147483647;
-[eva:alarm] tests/value/pointer_comparison.c:16: Warning:
+[eva:alarm] tests/value/pointer_comparison.c:21: Warning:
pointer comparison.
assert \pointer_comparable((void *)((int)p), (void *)((int)(&y)));
-[eva] tests/value/pointer_comparison.c:16: Frama_C_show_each_5: {{ &x + {16} }}
-[eva] tests/value/pointer_comparison.c:17: Frama_C_show_each_5e: {{ &x + {16} }}
-[eva:alarm] tests/value/pointer_comparison.c:18: Warning:
+[eva] tests/value/pointer_comparison.c:21: Frama_C_show_each_5: {{ &x + {16} }}
+[eva] tests/value/pointer_comparison.c:22: Frama_C_show_each_5e: {{ &x + {16} }}
+[eva:alarm] tests/value/pointer_comparison.c:23: Warning:
pointer comparison.
assert \pointer_comparable((void *)tmp_3, (void *)(&y));
(tmp_3 from p++)
-[eva] tests/value/pointer_comparison.c:18: Frama_C_show_each_6: {{ &x + {20} }}
-[eva] tests/value/pointer_comparison.c:18:
+[eva] tests/value/pointer_comparison.c:23: Frama_C_show_each_6: {{ &x + {20} }}
+[eva] tests/value/pointer_comparison.c:23:
Frama_C_show_each_6: {{ &x + {20; 24} }}
-[eva] tests/value/pointer_comparison.c:18:
+[eva] tests/value/pointer_comparison.c:23:
Frama_C_show_each_6: {{ &x + {20; 24; 28} }}
-[eva] tests/value/pointer_comparison.c:18:
+[eva] tests/value/pointer_comparison.c:23:
Frama_C_show_each_6: {{ &x + [20..--],0%4 }}
[eva] Recording results for main
[eva] done for function main
@@ -232,33 +232,33 @@
--- Properties of Function 'main'
--------------------------------------------------------------------------------
-[ - ] Assertion 'Eva,ptr_comparison' (file tests/value/pointer_comparison.c, line 10)
+[ - ] Assertion 'Eva,ptr_comparison' (file tests/value/pointer_comparison.c, line 15)
assert
Eva: ptr_comparison:
\pointer_comparable((void *)tmp_0, (void *)(&y));
tried with Eva.
-[ - ] Assertion 'Eva,ptr_comparison' (file tests/value/pointer_comparison.c, line 12)
+[ - ] Assertion 'Eva,ptr_comparison' (file tests/value/pointer_comparison.c, line 17)
assert
Eva: ptr_comparison:
\pointer_comparable((void *)tmp_1, (void *)(&y));
tried with Eva.
-[ - ] Assertion 'Eva,ptr_comparison' (file tests/value/pointer_comparison.c, line 14)
+[ - ] Assertion 'Eva,ptr_comparison' (file tests/value/pointer_comparison.c, line 19)
assert
Eva: ptr_comparison:
\pointer_comparable((void *)tmp_2, (void *)(&y));
tried with Eva.
-[ - ] Assertion 'Eva,pointer_downcast' (file tests/value/pointer_comparison.c, line 16)
+[ - ] Assertion 'Eva,pointer_downcast' (file tests/value/pointer_comparison.c, line 21)
assert Eva: pointer_downcast: (unsigned int)p ≤ 2147483647;
tried with Eva.
-[ - ] Assertion 'Eva,pointer_downcast' (file tests/value/pointer_comparison.c, line 16)
+[ - ] Assertion 'Eva,pointer_downcast' (file tests/value/pointer_comparison.c, line 21)
assert Eva: pointer_downcast: (unsigned int)(&y) ≤ 2147483647;
tried with Eva.
-[ - ] Assertion 'Eva,ptr_comparison' (file tests/value/pointer_comparison.c, line 16)
+[ - ] Assertion 'Eva,ptr_comparison' (file tests/value/pointer_comparison.c, line 21)
assert
Eva: ptr_comparison:
\pointer_comparable((void *)((int)p), (void *)((int)(&y)));
tried with Eva.
-[ - ] Assertion 'Eva,ptr_comparison' (file tests/value/pointer_comparison.c, line 18)
+[ - ] Assertion 'Eva,ptr_comparison' (file tests/value/pointer_comparison.c, line 23)
assert
Eva: ptr_comparison:
\pointer_comparable((void *)tmp_3, (void *)(&y));
diff --git a/tests/value/oracle/pointer_comparison.1.res.oracle b/tests/value/oracle/pointer_comparison.1.res.oracle
index 0f48c4ee7e0a0f10c28b128a2b8f6ccc00f590cf..eea1599b423fb16430d10dc2727bea261a1b9ce1 100644
--- a/tests/value/oracle/pointer_comparison.1.res.oracle
+++ b/tests/value/oracle/pointer_comparison.1.res.oracle
@@ -6,52 +6,52 @@
x ∈ {0}
y ∈ {0}
p ∈ {0}
-[eva] tests/value/pointer_comparison.c:8: Frama_C_show_each_1t: {{ &x + {4} }}
-[eva:pointer-comparison] tests/value/pointer_comparison.c:10:
+[eva] tests/value/pointer_comparison.c:13: Frama_C_show_each_1t: {{ &x + {4} }}
+[eva:pointer-comparison] tests/value/pointer_comparison.c:15:
invalid pointer comparison: invalid pointer(s)
-[eva:pointer-comparison] tests/value/pointer_comparison.c:10:
+[eva:pointer-comparison] tests/value/pointer_comparison.c:15:
evaluating condition to {0; 1} instead of {0} because of UPCPA
-[eva] tests/value/pointer_comparison.c:10: Frama_C_show_each_2: {{ &x + {8} }}
-[eva:pointer-comparison] tests/value/pointer_comparison.c:10:
+[eva] tests/value/pointer_comparison.c:15: Frama_C_show_each_2: {{ &x + {8} }}
+[eva:pointer-comparison] tests/value/pointer_comparison.c:15:
evaluating condition to {0; 1} instead of {1} because of UPCPA
-[eva] tests/value/pointer_comparison.c:11: Frama_C_show_each_2e: {{ &x + {8} }}
-[eva:pointer-comparison] tests/value/pointer_comparison.c:12:
+[eva] tests/value/pointer_comparison.c:16: Frama_C_show_each_2e: {{ &x + {8} }}
+[eva:pointer-comparison] tests/value/pointer_comparison.c:17:
invalid pointer comparison: invalid pointer(s)
-[eva:pointer-comparison] tests/value/pointer_comparison.c:12:
+[eva:pointer-comparison] tests/value/pointer_comparison.c:17:
evaluating condition to {0; 1} instead of {0} because of UPCPA
-[eva] tests/value/pointer_comparison.c:12: Frama_C_show_each_3: {{ &x + {12} }}
-[eva:pointer-comparison] tests/value/pointer_comparison.c:12:
+[eva] tests/value/pointer_comparison.c:17: Frama_C_show_each_3: {{ &x + {12} }}
+[eva:pointer-comparison] tests/value/pointer_comparison.c:17:
evaluating condition to {0; 1} instead of {1} because of UPCPA
-[eva] tests/value/pointer_comparison.c:13: Frama_C_show_each_3e: {{ &x + {12} }}
-[eva:pointer-comparison] tests/value/pointer_comparison.c:14:
+[eva] tests/value/pointer_comparison.c:18: Frama_C_show_each_3e: {{ &x + {12} }}
+[eva:pointer-comparison] tests/value/pointer_comparison.c:19:
invalid pointer comparison: invalid pointer(s)
-[eva:pointer-comparison] tests/value/pointer_comparison.c:14:
+[eva:pointer-comparison] tests/value/pointer_comparison.c:19:
evaluating condition to {0; 1} instead of {0} because of UPCPA
-[eva] tests/value/pointer_comparison.c:14: Frama_C_show_each_4: {{ &x + {16} }}
-[eva:pointer-comparison] tests/value/pointer_comparison.c:14:
+[eva] tests/value/pointer_comparison.c:19: Frama_C_show_each_4: {{ &x + {16} }}
+[eva:pointer-comparison] tests/value/pointer_comparison.c:19:
evaluating condition to {0; 1} instead of {1} because of UPCPA
-[eva] tests/value/pointer_comparison.c:15: Frama_C_show_each_4e: {{ &x + {16} }}
-[eva:pointer-comparison] tests/value/pointer_comparison.c:16:
+[eva] tests/value/pointer_comparison.c:20: Frama_C_show_each_4e: {{ &x + {16} }}
+[eva:pointer-comparison] tests/value/pointer_comparison.c:21:
invalid pointer comparison: invalid pointer(s)
-[eva:alarm] tests/value/pointer_comparison.c:16: Warning:
+[eva:alarm] tests/value/pointer_comparison.c:21: Warning:
pointer downcast. assert (unsigned int)p ≤ 2147483647;
-[eva:alarm] tests/value/pointer_comparison.c:16: Warning:
+[eva:alarm] tests/value/pointer_comparison.c:21: Warning:
pointer downcast. assert (unsigned int)(&y) ≤ 2147483647;
-[eva] tests/value/pointer_comparison.c:16: Frama_C_show_each_5: {{ &x + {16} }}
-[eva] tests/value/pointer_comparison.c:17: Frama_C_show_each_5e: {{ &x + {16} }}
-[eva:pointer-comparison] tests/value/pointer_comparison.c:18:
+[eva] tests/value/pointer_comparison.c:21: Frama_C_show_each_5: {{ &x + {16} }}
+[eva] tests/value/pointer_comparison.c:22: Frama_C_show_each_5e: {{ &x + {16} }}
+[eva:pointer-comparison] tests/value/pointer_comparison.c:23:
invalid pointer comparison: invalid pointer(s)
-[eva:pointer-comparison] tests/value/pointer_comparison.c:18:
+[eva:pointer-comparison] tests/value/pointer_comparison.c:23:
evaluating condition to {0; 1} instead of {0} because of UPCPA
-[eva] tests/value/pointer_comparison.c:18: Frama_C_show_each_6: {{ &x + {20} }}
-[eva] tests/value/pointer_comparison.c:18: starting to merge loop iterations
-[eva] tests/value/pointer_comparison.c:18:
+[eva] tests/value/pointer_comparison.c:23: Frama_C_show_each_6: {{ &x + {20} }}
+[eva] tests/value/pointer_comparison.c:23: starting to merge loop iterations
+[eva] tests/value/pointer_comparison.c:23:
Frama_C_show_each_6: {{ &x + {20; 24} }}
-[eva] tests/value/pointer_comparison.c:18:
+[eva] tests/value/pointer_comparison.c:23:
Frama_C_show_each_6: {{ &x + {20; 24; 28} }}
-[eva] tests/value/pointer_comparison.c:18:
+[eva] tests/value/pointer_comparison.c:23:
Frama_C_show_each_6: {{ &x + [20..--],0%4 }}
-[eva:pointer-comparison] tests/value/pointer_comparison.c:18:
+[eva:pointer-comparison] tests/value/pointer_comparison.c:23:
evaluating condition to {0; 1} instead of {1} because of UPCPA
[eva] Recording results for main
[eva] done for function main
@@ -77,10 +77,10 @@
--- Properties of Function 'main'
--------------------------------------------------------------------------------
-[ - ] Assertion 'Eva,pointer_downcast' (file tests/value/pointer_comparison.c, line 16)
+[ - ] Assertion 'Eva,pointer_downcast' (file tests/value/pointer_comparison.c, line 21)
assert Eva: pointer_downcast: (unsigned int)p ≤ 2147483647;
tried with Eva.
-[ - ] Assertion 'Eva,pointer_downcast' (file tests/value/pointer_comparison.c, line 16)
+[ - ] Assertion 'Eva,pointer_downcast' (file tests/value/pointer_comparison.c, line 21)
assert Eva: pointer_downcast: (unsigned int)(&y) ≤ 2147483647;
tried with Eva.
@@ -97,41 +97,41 @@
x ∈ {0}
y ∈ {0}
p ∈ {0}
-[eva] tests/value/pointer_comparison.c:8: Frama_C_show_each_1t: {{ &x + {4} }}
-[eva:alarm] tests/value/pointer_comparison.c:10: Warning:
+[eva] tests/value/pointer_comparison.c:13: Frama_C_show_each_1t: {{ &x + {4} }}
+[eva:alarm] tests/value/pointer_comparison.c:15: Warning:
pointer comparison.
assert \pointer_comparable((void *)tmp_0, (void *)(&y));
(tmp_0 from p++)
-[eva] tests/value/pointer_comparison.c:10: Frama_C_show_each_2: {{ &x + {8} }}
-[eva] tests/value/pointer_comparison.c:11: Frama_C_show_each_2e: {{ &x + {8} }}
-[eva:alarm] tests/value/pointer_comparison.c:12: Warning:
+[eva] tests/value/pointer_comparison.c:15: Frama_C_show_each_2: {{ &x + {8} }}
+[eva] tests/value/pointer_comparison.c:16: Frama_C_show_each_2e: {{ &x + {8} }}
+[eva:alarm] tests/value/pointer_comparison.c:17: Warning:
pointer comparison.
assert \pointer_comparable((void *)tmp_1, (void *)(&y));
(tmp_1 from p++)
-[eva] tests/value/pointer_comparison.c:12: Frama_C_show_each_3: {{ &x + {12} }}
-[eva] tests/value/pointer_comparison.c:13: Frama_C_show_each_3e: {{ &x + {12} }}
-[eva:alarm] tests/value/pointer_comparison.c:14: Warning:
+[eva] tests/value/pointer_comparison.c:17: Frama_C_show_each_3: {{ &x + {12} }}
+[eva] tests/value/pointer_comparison.c:18: Frama_C_show_each_3e: {{ &x + {12} }}
+[eva:alarm] tests/value/pointer_comparison.c:19: Warning:
pointer comparison.
assert \pointer_comparable((void *)tmp_2, (void *)(&y));
(tmp_2 from p++)
-[eva] tests/value/pointer_comparison.c:14: Frama_C_show_each_4: {{ &x + {16} }}
-[eva] tests/value/pointer_comparison.c:15: Frama_C_show_each_4e: {{ &x + {16} }}
-[eva:alarm] tests/value/pointer_comparison.c:16: Warning:
+[eva] tests/value/pointer_comparison.c:19: Frama_C_show_each_4: {{ &x + {16} }}
+[eva] tests/value/pointer_comparison.c:20: Frama_C_show_each_4e: {{ &x + {16} }}
+[eva:alarm] tests/value/pointer_comparison.c:21: Warning:
pointer downcast. assert (unsigned int)p ≤ 2147483647;
-[eva:alarm] tests/value/pointer_comparison.c:16: Warning:
+[eva:alarm] tests/value/pointer_comparison.c:21: Warning:
pointer downcast. assert (unsigned int)(&y) ≤ 2147483647;
-[eva] tests/value/pointer_comparison.c:16: Frama_C_show_each_5: {{ &x + {16} }}
-[eva] tests/value/pointer_comparison.c:17: Frama_C_show_each_5e: {{ &x + {16} }}
-[eva:alarm] tests/value/pointer_comparison.c:18: Warning:
+[eva] tests/value/pointer_comparison.c:21: Frama_C_show_each_5: {{ &x + {16} }}
+[eva] tests/value/pointer_comparison.c:22: Frama_C_show_each_5e: {{ &x + {16} }}
+[eva:alarm] tests/value/pointer_comparison.c:23: Warning:
pointer comparison.
assert \pointer_comparable((void *)tmp_3, (void *)(&y));
(tmp_3 from p++)
-[eva] tests/value/pointer_comparison.c:18: Frama_C_show_each_6: {{ &x + {20} }}
-[eva] tests/value/pointer_comparison.c:18:
+[eva] tests/value/pointer_comparison.c:23: Frama_C_show_each_6: {{ &x + {20} }}
+[eva] tests/value/pointer_comparison.c:23:
Frama_C_show_each_6: {{ &x + {20; 24} }}
-[eva] tests/value/pointer_comparison.c:18:
+[eva] tests/value/pointer_comparison.c:23:
Frama_C_show_each_6: {{ &x + {20; 24; 28} }}
-[eva] tests/value/pointer_comparison.c:18:
+[eva] tests/value/pointer_comparison.c:23:
Frama_C_show_each_6: {{ &x + [20..--],0%4 }}
[eva] Recording results for main
[eva] done for function main
@@ -157,28 +157,28 @@
--- Properties of Function 'main'
--------------------------------------------------------------------------------
-[ - ] Assertion 'Eva,ptr_comparison' (file tests/value/pointer_comparison.c, line 10)
+[ - ] Assertion 'Eva,ptr_comparison' (file tests/value/pointer_comparison.c, line 15)
assert
Eva: ptr_comparison:
\pointer_comparable((void *)tmp_0, (void *)(&y));
tried with Eva.
-[ - ] Assertion 'Eva,ptr_comparison' (file tests/value/pointer_comparison.c, line 12)
+[ - ] Assertion 'Eva,ptr_comparison' (file tests/value/pointer_comparison.c, line 17)
assert
Eva: ptr_comparison:
\pointer_comparable((void *)tmp_1, (void *)(&y));
tried with Eva.
-[ - ] Assertion 'Eva,ptr_comparison' (file tests/value/pointer_comparison.c, line 14)
+[ - ] Assertion 'Eva,ptr_comparison' (file tests/value/pointer_comparison.c, line 19)
assert
Eva: ptr_comparison:
\pointer_comparable((void *)tmp_2, (void *)(&y));
tried with Eva.
-[ - ] Assertion 'Eva,pointer_downcast' (file tests/value/pointer_comparison.c, line 16)
+[ - ] Assertion 'Eva,pointer_downcast' (file tests/value/pointer_comparison.c, line 21)
assert Eva: pointer_downcast: (unsigned int)p ≤ 2147483647;
tried with Eva.
-[ - ] Assertion 'Eva,pointer_downcast' (file tests/value/pointer_comparison.c, line 16)
+[ - ] Assertion 'Eva,pointer_downcast' (file tests/value/pointer_comparison.c, line 21)
assert Eva: pointer_downcast: (unsigned int)(&y) ≤ 2147483647;
tried with Eva.
-[ - ] Assertion 'Eva,ptr_comparison' (file tests/value/pointer_comparison.c, line 18)
+[ - ] Assertion 'Eva,ptr_comparison' (file tests/value/pointer_comparison.c, line 23)
assert
Eva: ptr_comparison:
\pointer_comparable((void *)tmp_3, (void *)(&y));
@@ -197,44 +197,44 @@
x ∈ {0}
y ∈ {0}
p ∈ {0}
-[eva] tests/value/pointer_comparison.c:8: Frama_C_show_each_1t: {{ &x + {4} }}
-[eva:alarm] tests/value/pointer_comparison.c:10: Warning:
+[eva] tests/value/pointer_comparison.c:13: Frama_C_show_each_1t: {{ &x + {4} }}
+[eva:alarm] tests/value/pointer_comparison.c:15: Warning:
pointer comparison.
assert \pointer_comparable((void *)tmp_0, (void *)(&y));
(tmp_0 from p++)
-[eva] tests/value/pointer_comparison.c:10: Frama_C_show_each_2: {{ &x + {8} }}
-[eva] tests/value/pointer_comparison.c:11: Frama_C_show_each_2e: {{ &x + {8} }}
-[eva:alarm] tests/value/pointer_comparison.c:12: Warning:
+[eva] tests/value/pointer_comparison.c:15: Frama_C_show_each_2: {{ &x + {8} }}
+[eva] tests/value/pointer_comparison.c:16: Frama_C_show_each_2e: {{ &x + {8} }}
+[eva:alarm] tests/value/pointer_comparison.c:17: Warning:
pointer comparison.
assert \pointer_comparable((void *)tmp_1, (void *)(&y));
(tmp_1 from p++)
-[eva] tests/value/pointer_comparison.c:12: Frama_C_show_each_3: {{ &x + {12} }}
-[eva] tests/value/pointer_comparison.c:13: Frama_C_show_each_3e: {{ &x + {12} }}
-[eva:alarm] tests/value/pointer_comparison.c:14: Warning:
+[eva] tests/value/pointer_comparison.c:17: Frama_C_show_each_3: {{ &x + {12} }}
+[eva] tests/value/pointer_comparison.c:18: Frama_C_show_each_3e: {{ &x + {12} }}
+[eva:alarm] tests/value/pointer_comparison.c:19: Warning:
pointer comparison.
assert \pointer_comparable((void *)tmp_2, (void *)(&y));
(tmp_2 from p++)
-[eva] tests/value/pointer_comparison.c:14: Frama_C_show_each_4: {{ &x + {16} }}
-[eva] tests/value/pointer_comparison.c:15: Frama_C_show_each_4e: {{ &x + {16} }}
-[eva:alarm] tests/value/pointer_comparison.c:16: Warning:
+[eva] tests/value/pointer_comparison.c:19: Frama_C_show_each_4: {{ &x + {16} }}
+[eva] tests/value/pointer_comparison.c:20: Frama_C_show_each_4e: {{ &x + {16} }}
+[eva:alarm] tests/value/pointer_comparison.c:21: Warning:
pointer downcast. assert (unsigned int)p ≤ 2147483647;
-[eva:alarm] tests/value/pointer_comparison.c:16: Warning:
+[eva:alarm] tests/value/pointer_comparison.c:21: Warning:
pointer downcast. assert (unsigned int)(&y) ≤ 2147483647;
-[eva:alarm] tests/value/pointer_comparison.c:16: Warning:
+[eva:alarm] tests/value/pointer_comparison.c:21: Warning:
pointer comparison.
assert \pointer_comparable((void *)((int)p), (void *)((int)(&y)));
-[eva] tests/value/pointer_comparison.c:16: Frama_C_show_each_5: {{ &x + {16} }}
-[eva] tests/value/pointer_comparison.c:17: Frama_C_show_each_5e: {{ &x + {16} }}
-[eva:alarm] tests/value/pointer_comparison.c:18: Warning:
+[eva] tests/value/pointer_comparison.c:21: Frama_C_show_each_5: {{ &x + {16} }}
+[eva] tests/value/pointer_comparison.c:22: Frama_C_show_each_5e: {{ &x + {16} }}
+[eva:alarm] tests/value/pointer_comparison.c:23: Warning:
pointer comparison.
assert \pointer_comparable((void *)tmp_3, (void *)(&y));
(tmp_3 from p++)
-[eva] tests/value/pointer_comparison.c:18: Frama_C_show_each_6: {{ &x + {20} }}
-[eva] tests/value/pointer_comparison.c:18:
+[eva] tests/value/pointer_comparison.c:23: Frama_C_show_each_6: {{ &x + {20} }}
+[eva] tests/value/pointer_comparison.c:23:
Frama_C_show_each_6: {{ &x + {20; 24} }}
-[eva] tests/value/pointer_comparison.c:18:
+[eva] tests/value/pointer_comparison.c:23:
Frama_C_show_each_6: {{ &x + {20; 24; 28} }}
-[eva] tests/value/pointer_comparison.c:18:
+[eva] tests/value/pointer_comparison.c:23:
Frama_C_show_each_6: {{ &x + [20..--],0%4 }}
[eva] Recording results for main
[eva] done for function main
@@ -260,33 +260,33 @@
--- Properties of Function 'main'
--------------------------------------------------------------------------------
-[ - ] Assertion 'Eva,ptr_comparison' (file tests/value/pointer_comparison.c, line 10)
+[ - ] Assertion 'Eva,ptr_comparison' (file tests/value/pointer_comparison.c, line 15)
assert
Eva: ptr_comparison:
\pointer_comparable((void *)tmp_0, (void *)(&y));
tried with Eva.
-[ - ] Assertion 'Eva,ptr_comparison' (file tests/value/pointer_comparison.c, line 12)
+[ - ] Assertion 'Eva,ptr_comparison' (file tests/value/pointer_comparison.c, line 17)
assert
Eva: ptr_comparison:
\pointer_comparable((void *)tmp_1, (void *)(&y));
tried with Eva.
-[ - ] Assertion 'Eva,ptr_comparison' (file tests/value/pointer_comparison.c, line 14)
+[ - ] Assertion 'Eva,ptr_comparison' (file tests/value/pointer_comparison.c, line 19)
assert
Eva: ptr_comparison:
\pointer_comparable((void *)tmp_2, (void *)(&y));
tried with Eva.
-[ - ] Assertion 'Eva,pointer_downcast' (file tests/value/pointer_comparison.c, line 16)
+[ - ] Assertion 'Eva,pointer_downcast' (file tests/value/pointer_comparison.c, line 21)
assert Eva: pointer_downcast: (unsigned int)p ≤ 2147483647;
tried with Eva.
-[ - ] Assertion 'Eva,pointer_downcast' (file tests/value/pointer_comparison.c, line 16)
+[ - ] Assertion 'Eva,pointer_downcast' (file tests/value/pointer_comparison.c, line 21)
assert Eva: pointer_downcast: (unsigned int)(&y) ≤ 2147483647;
tried with Eva.
-[ - ] Assertion 'Eva,ptr_comparison' (file tests/value/pointer_comparison.c, line 16)
+[ - ] Assertion 'Eva,ptr_comparison' (file tests/value/pointer_comparison.c, line 21)
assert
Eva: ptr_comparison:
\pointer_comparable((void *)((int)p), (void *)((int)(&y)));
tried with Eva.
-[ - ] Assertion 'Eva,ptr_comparison' (file tests/value/pointer_comparison.c, line 18)
+[ - ] Assertion 'Eva,ptr_comparison' (file tests/value/pointer_comparison.c, line 23)
assert
Eva: ptr_comparison:
\pointer_comparable((void *)tmp_3, (void *)(&y));
diff --git a/tests/value/oracle/split_return.0.res.oracle b/tests/value/oracle/split_return.0.res.oracle
index 3c39daac7720985d50738ccf8f1157084f82ae0b..fb3bbb75a4b91c8b751a094ff5dd0ff772496b0a 100644
--- a/tests/value/oracle/split_return.0.res.oracle
+++ b/tests/value/oracle/split_return.0.res.oracle
@@ -19,109 +19,109 @@
v7 ∈ {0}
rand ∈ [--..--]
[eva] computing for function main1 <- main.
- Called from tests/value/split_return.i:207.
+ Called from tests/value/split_return.i:209.
[eva] computing for function init <- main1 <- main.
- Called from tests/value/split_return.i:20.
+ Called from tests/value/split_return.i:22.
[eva] using specification for function init
[eva] Done for function init
[eva] Recording results for main1
[eva] Done for function main1
[eva] computing for function main2 <- main.
- Called from tests/value/split_return.i:208.
+ Called from tests/value/split_return.i:210.
[eva] computing for function f2 <- main2 <- main.
- Called from tests/value/split_return.i:51.
+ Called from tests/value/split_return.i:53.
[eva] Recording results for f2
[eva] Done for function f2
-[eva] tests/value/split_return.i:52: Frama_C_show_each_f2: {0}, {0}
-[eva] tests/value/split_return.i:52: Frama_C_show_each_f2: {5; 7}, {5}
-[eva] tests/value/split_return.i:54: assertion got status valid.
-[eva] tests/value/split_return.i:56: Frama_C_show_each_f2_2: {5; 7}, {5}
-[eva] tests/value/split_return.i:57: assertion got status valid.
+[eva] tests/value/split_return.i:54: Frama_C_show_each_f2: {0}, {0}
+[eva] tests/value/split_return.i:54: Frama_C_show_each_f2: {5; 7}, {5}
+[eva] tests/value/split_return.i:56: assertion got status valid.
+[eva] tests/value/split_return.i:58: Frama_C_show_each_f2_2: {5; 7}, {5}
+[eva] tests/value/split_return.i:59: assertion got status valid.
[eva] Recording results for main2
[eva] Done for function main2
[eva] computing for function main3 <- main.
- Called from tests/value/split_return.i:209.
+ Called from tests/value/split_return.i:211.
[eva] computing for function f3 <- main3 <- main.
- Called from tests/value/split_return.i:76.
-[eva] tests/value/split_return.i:72: cannot properly split on \result == -2
+ Called from tests/value/split_return.i:78.
+[eva] tests/value/split_return.i:74: cannot properly split on \result == -2
[eva] Recording results for f3
[eva] Done for function f3
-[eva] tests/value/split_return.i:77: Frama_C_show_each_f3: {-2; 7}, {0; 5}
-[eva:alarm] tests/value/split_return.i:79: Warning:
- assertion got status unknown.
+[eva] tests/value/split_return.i:79: Frama_C_show_each_f3: {-2; 7}, {0; 5}
[eva:alarm] tests/value/split_return.i:81: Warning:
assertion got status unknown.
+[eva:alarm] tests/value/split_return.i:83: Warning:
+ assertion got status unknown.
[eva] Recording results for main3
[eva] Done for function main3
[eva] computing for function main4 <- main.
- Called from tests/value/split_return.i:210.
+ Called from tests/value/split_return.i:212.
[eva] computing for function f4 <- main4 <- main.
- Called from tests/value/split_return.i:97.
+ Called from tests/value/split_return.i:99.
[eva] Recording results for f4
[eva] Done for function f4
-[eva] tests/value/split_return.i:98: Frama_C_show_each_f4: {4; 7}, {0; 5}
-[eva:alarm] tests/value/split_return.i:100: Warning:
- assertion got status unknown.
+[eva] tests/value/split_return.i:100: Frama_C_show_each_f4: {4; 7}, {0; 5}
[eva:alarm] tests/value/split_return.i:102: Warning:
assertion got status unknown.
+[eva:alarm] tests/value/split_return.i:104: Warning:
+ assertion got status unknown.
[eva] Recording results for main4
[eva] Done for function main4
[eva] computing for function main5 <- main.
- Called from tests/value/split_return.i:211.
+ Called from tests/value/split_return.i:213.
[eva] computing for function f5 <- main5 <- main.
- Called from tests/value/split_return.i:120.
+ Called from tests/value/split_return.i:122.
[eva] Recording results for f5
[eva] Done for function f5
-[eva] tests/value/split_return.i:121: Frama_C_show_each_f5: {-2}, {0}
-[eva] tests/value/split_return.i:121: Frama_C_show_each_f5: {7}, {5}
-[eva] tests/value/split_return.i:123: assertion got status valid.
+[eva] tests/value/split_return.i:123: Frama_C_show_each_f5: {-2}, {0}
+[eva] tests/value/split_return.i:123: Frama_C_show_each_f5: {7}, {5}
[eva] tests/value/split_return.i:125: assertion got status valid.
+[eva] tests/value/split_return.i:127: assertion got status valid.
[eva] Recording results for main5
[eva] Done for function main5
[eva] computing for function main6 <- main.
- Called from tests/value/split_return.i:212.
+ Called from tests/value/split_return.i:214.
[eva] computing for function f6 <- main6 <- main.
- Called from tests/value/split_return.i:138.
-[eva:alarm] tests/value/split_return.i:133: Warning:
+ Called from tests/value/split_return.i:140.
+[eva:alarm] tests/value/split_return.i:135: Warning:
assertion got status unknown.
[eva] Recording results for f6
[eva] Done for function f6
[eva] Recording results for main6
[eva] Done for function main6
[eva] computing for function main7 <- main.
- Called from tests/value/split_return.i:213.
+ Called from tests/value/split_return.i:215.
[eva] computing for function f7 <- main7 <- main.
- Called from tests/value/split_return.i:151.
+ Called from tests/value/split_return.i:153.
[eva] Recording results for f7
[eva] Done for function f7
-[eva] tests/value/split_return.i:156:
+[eva] tests/value/split_return.i:158:
Frama_C_show_each_NULL: {{ NULL ; &v }}, {0; 1}
[eva] Recording results for main7
[eva] Done for function main7
[eva] computing for function main8 <- main.
- Called from tests/value/split_return.i:214.
+ Called from tests/value/split_return.i:216.
[eva] computing for function f8 <- main8 <- main.
- Called from tests/value/split_return.i:174.
+ Called from tests/value/split_return.i:176.
[eva] Recording results for f8
[eva] Done for function f8
-[eva] tests/value/split_return.i:175:
+[eva] tests/value/split_return.i:177:
Frama_C_show_each_then8: {-1; 4}, {{ NULL ; &x }}
[eva] Recording results for main8
[eva] Done for function main8
[eva] computing for function main9 <- main.
- Called from tests/value/split_return.i:215.
+ Called from tests/value/split_return.i:217.
[eva] computing for function uninit <- main9 <- main.
- Called from tests/value/split_return.i:202.
+ Called from tests/value/split_return.i:204.
[eva] Recording results for uninit
[eva] Done for function uninit
[eva] computing for function escaping <- main9 <- main.
- Called from tests/value/split_return.i:203.
-[eva:locals-escaping] tests/value/split_return.i:195: Warning:
+ Called from tests/value/split_return.i:205.
+[eva:locals-escaping] tests/value/split_return.i:197: Warning:
locals {x} escaping the scope of a block of escaping through p
[eva] Recording results for escaping
[eva] Done for function escaping
[eva] computing for function escaping <- main9 <- main.
- Called from tests/value/split_return.i:203.
+ Called from tests/value/split_return.i:205.
[eva] Recording results for escaping
[eva] Done for function escaping
[eva] Recording results for main9
@@ -363,13 +363,13 @@
--- Properties of Function 'init'
--------------------------------------------------------------------------------
-[ Extern ] Post-condition (file tests/value/split_return.i, line 15)
+[ Extern ] Post-condition (file tests/value/split_return.i, line 17)
Unverifiable but considered Valid.
-[ Extern ] Assigns (file tests/value/split_return.i, line 13)
+[ Extern ] Assigns (file tests/value/split_return.i, line 15)
Unverifiable but considered Valid.
-[ Extern ] Froms (file tests/value/split_return.i, line 13)
+[ Extern ] Froms (file tests/value/split_return.i, line 15)
Unverifiable but considered Valid.
-[ Extern ] Froms (file tests/value/split_return.i, line 14)
+[ Extern ] Froms (file tests/value/split_return.i, line 16)
Unverifiable but considered Valid.
[ Valid ] Default behavior
by Frama-C kernel.
@@ -378,54 +378,54 @@
--- Properties of Function 'main1'
--------------------------------------------------------------------------------
-[ Dead ] Assertion (file tests/value/split_return.i, line 30)
+[ Dead ] Assertion (file tests/value/split_return.i, line 32)
Locally valid, but unreachable.
By Eva because:
- - Unreachable program point (file tests/value/split_return.i, line 30)
-[Unreachable] Unreachable program point (file tests/value/split_return.i, line 30)
+ - Unreachable program point (file tests/value/split_return.i, line 32)
+[Unreachable] Unreachable program point (file tests/value/split_return.i, line 32)
by Eva.
--------------------------------------------------------------------------------
--- Properties of Function 'main2'
--------------------------------------------------------------------------------
-[ Valid ] Assertion (file tests/value/split_return.i, line 54)
+[ Valid ] Assertion (file tests/value/split_return.i, line 56)
by Eva.
-[ Valid ] Assertion (file tests/value/split_return.i, line 57)
+[ Valid ] Assertion (file tests/value/split_return.i, line 59)
by Eva.
--------------------------------------------------------------------------------
--- Properties of Function 'main3'
--------------------------------------------------------------------------------
-[ - ] Assertion (file tests/value/split_return.i, line 79)
- tried with Eva.
[ - ] Assertion (file tests/value/split_return.i, line 81)
tried with Eva.
+[ - ] Assertion (file tests/value/split_return.i, line 83)
+ tried with Eva.
--------------------------------------------------------------------------------
--- Properties of Function 'main4'
--------------------------------------------------------------------------------
-[ - ] Assertion (file tests/value/split_return.i, line 100)
- tried with Eva.
[ - ] Assertion (file tests/value/split_return.i, line 102)
tried with Eva.
+[ - ] Assertion (file tests/value/split_return.i, line 104)
+ tried with Eva.
--------------------------------------------------------------------------------
--- Properties of Function 'main5'
--------------------------------------------------------------------------------
-[ Valid ] Assertion (file tests/value/split_return.i, line 123)
- by Eva.
[ Valid ] Assertion (file tests/value/split_return.i, line 125)
by Eva.
+[ Valid ] Assertion (file tests/value/split_return.i, line 127)
+ by Eva.
--------------------------------------------------------------------------------
--- Properties of Function 'f6'
--------------------------------------------------------------------------------
-[ - ] Assertion (file tests/value/split_return.i, line 133)
+[ - ] Assertion (file tests/value/split_return.i, line 135)
tried with Eva.
--------------------------------------------------------------------------------
diff --git a/tests/value/oracle/split_return.1.res.oracle b/tests/value/oracle/split_return.1.res.oracle
index e161e8a21148dd6de625f47fd1cd8b0935903ee8..650987ca8d9790b7abac32b439ec5f5d470fd2e0 100644
--- a/tests/value/oracle/split_return.1.res.oracle
+++ b/tests/value/oracle/split_return.1.res.oracle
@@ -21,102 +21,102 @@
v7 ∈ {0}
rand ∈ [--..--]
[eva] computing for function main1 <- main.
- Called from tests/value/split_return.i:207.
+ Called from tests/value/split_return.i:209.
[eva] computing for function init <- main1 <- main.
- Called from tests/value/split_return.i:20.
+ Called from tests/value/split_return.i:22.
[eva] using specification for function init
[eva] Done for function init
[eva] Recording results for main1
[eva] Done for function main1
[eva] computing for function main2 <- main.
- Called from tests/value/split_return.i:208.
+ Called from tests/value/split_return.i:210.
[eva] computing for function f2 <- main2 <- main.
- Called from tests/value/split_return.i:51.
+ Called from tests/value/split_return.i:53.
[eva] Recording results for f2
[eva] Done for function f2
-[eva] tests/value/split_return.i:52: Frama_C_show_each_f2: {0}, {0}
-[eva] tests/value/split_return.i:52: Frama_C_show_each_f2: {5; 7}, {5}
-[eva] tests/value/split_return.i:54: assertion got status valid.
-[eva] tests/value/split_return.i:56: Frama_C_show_each_f2_2: {5; 7}, {5}
-[eva] tests/value/split_return.i:57: assertion got status valid.
+[eva] tests/value/split_return.i:54: Frama_C_show_each_f2: {0}, {0}
+[eva] tests/value/split_return.i:54: Frama_C_show_each_f2: {5; 7}, {5}
+[eva] tests/value/split_return.i:56: assertion got status valid.
+[eva] tests/value/split_return.i:58: Frama_C_show_each_f2_2: {5; 7}, {5}
+[eva] tests/value/split_return.i:59: assertion got status valid.
[eva] Recording results for main2
[eva] Done for function main2
[eva] computing for function main3 <- main.
- Called from tests/value/split_return.i:209.
+ Called from tests/value/split_return.i:211.
[eva] computing for function f3 <- main3 <- main.
- Called from tests/value/split_return.i:76.
+ Called from tests/value/split_return.i:78.
[eva] Recording results for f3
[eva] Done for function f3
-[eva] tests/value/split_return.i:77: Frama_C_show_each_f3: {-2}, {0}
-[eva] tests/value/split_return.i:77: Frama_C_show_each_f3: {7}, {5}
-[eva] tests/value/split_return.i:79: assertion got status valid.
+[eva] tests/value/split_return.i:79: Frama_C_show_each_f3: {-2}, {0}
+[eva] tests/value/split_return.i:79: Frama_C_show_each_f3: {7}, {5}
[eva] tests/value/split_return.i:81: assertion got status valid.
+[eva] tests/value/split_return.i:83: assertion got status valid.
[eva] Recording results for main3
[eva] Done for function main3
[eva] computing for function main4 <- main.
- Called from tests/value/split_return.i:210.
+ Called from tests/value/split_return.i:212.
[eva] computing for function f4 <- main4 <- main.
- Called from tests/value/split_return.i:97.
+ Called from tests/value/split_return.i:99.
[eva] Recording results for f4
[eva] Done for function f4
-[eva] tests/value/split_return.i:98: Frama_C_show_each_f4: {4}, {0}
-[eva] tests/value/split_return.i:98: Frama_C_show_each_f4: {7}, {5}
-[eva] tests/value/split_return.i:100: assertion got status valid.
+[eva] tests/value/split_return.i:100: Frama_C_show_each_f4: {4}, {0}
+[eva] tests/value/split_return.i:100: Frama_C_show_each_f4: {7}, {5}
[eva] tests/value/split_return.i:102: assertion got status valid.
+[eva] tests/value/split_return.i:104: assertion got status valid.
[eva] Recording results for main4
[eva] Done for function main4
[eva] computing for function main5 <- main.
- Called from tests/value/split_return.i:211.
+ Called from tests/value/split_return.i:213.
[eva] computing for function f5 <- main5 <- main.
- Called from tests/value/split_return.i:120.
+ Called from tests/value/split_return.i:122.
[eva] Recording results for f5
[eva] Done for function f5
-[eva] tests/value/split_return.i:121: Frama_C_show_each_f5: {-2}, {0}
-[eva] tests/value/split_return.i:121: Frama_C_show_each_f5: {7}, {5}
-[eva] tests/value/split_return.i:123: assertion got status valid.
+[eva] tests/value/split_return.i:123: Frama_C_show_each_f5: {-2}, {0}
+[eva] tests/value/split_return.i:123: Frama_C_show_each_f5: {7}, {5}
[eva] tests/value/split_return.i:125: assertion got status valid.
+[eva] tests/value/split_return.i:127: assertion got status valid.
[eva] Recording results for main5
[eva] Done for function main5
[eva] computing for function main6 <- main.
- Called from tests/value/split_return.i:212.
+ Called from tests/value/split_return.i:214.
[eva] computing for function f6 <- main6 <- main.
- Called from tests/value/split_return.i:138.
-[eva:alarm] tests/value/split_return.i:133: Warning:
+ Called from tests/value/split_return.i:140.
+[eva:alarm] tests/value/split_return.i:135: Warning:
assertion got status unknown.
-[eva] tests/value/split_return.i:134: cannot properly split on \result == 0
+[eva] tests/value/split_return.i:136: cannot properly split on \result == 0
[eva] Recording results for f6
[eva] Done for function f6
[eva] Recording results for main6
[eva] Done for function main6
[eva] computing for function main7 <- main.
- Called from tests/value/split_return.i:213.
+ Called from tests/value/split_return.i:215.
[eva] computing for function f7 <- main7 <- main.
- Called from tests/value/split_return.i:151.
+ Called from tests/value/split_return.i:153.
[eva] Recording results for f7
[eva] Done for function f7
-[eva] tests/value/split_return.i:156: Frama_C_show_each_NULL: {0}, {0}
-[eva] tests/value/split_return.i:156: Frama_C_show_each_NULL: {{ &v }}, {1}
+[eva] tests/value/split_return.i:158: Frama_C_show_each_NULL: {0}, {0}
+[eva] tests/value/split_return.i:158: Frama_C_show_each_NULL: {{ &v }}, {1}
[eva] Recording results for main7
[eva] Done for function main7
[eva] computing for function main8 <- main.
- Called from tests/value/split_return.i:214.
+ Called from tests/value/split_return.i:216.
[eva] computing for function f8 <- main8 <- main.
- Called from tests/value/split_return.i:174.
+ Called from tests/value/split_return.i:176.
[eva] Recording results for f8
[eva] Done for function f8
-[eva] tests/value/split_return.i:175: Frama_C_show_each_then8: {-1}, {0}
-[eva] tests/value/split_return.i:175: Frama_C_show_each_then8: {4}, {{ &x }}
+[eva] tests/value/split_return.i:177: Frama_C_show_each_then8: {-1}, {0}
+[eva] tests/value/split_return.i:177: Frama_C_show_each_then8: {4}, {{ &x }}
[eva] Recording results for main8
[eva] Done for function main8
[eva] computing for function main9 <- main.
- Called from tests/value/split_return.i:215.
+ Called from tests/value/split_return.i:217.
[eva] computing for function uninit <- main9 <- main.
- Called from tests/value/split_return.i:202.
+ Called from tests/value/split_return.i:204.
[eva] Recording results for uninit
[eva] Done for function uninit
[eva] computing for function escaping <- main9 <- main.
- Called from tests/value/split_return.i:203.
-[eva:locals-escaping] tests/value/split_return.i:195: Warning:
+ Called from tests/value/split_return.i:205.
+[eva:locals-escaping] tests/value/split_return.i:197: Warning:
locals {x} escaping the scope of a block of escaping through p
[eva] Recording results for escaping
[eva] Done for function escaping
@@ -359,13 +359,13 @@
--- Properties of Function 'init'
--------------------------------------------------------------------------------
-[ Extern ] Post-condition (file tests/value/split_return.i, line 15)
+[ Extern ] Post-condition (file tests/value/split_return.i, line 17)
Unverifiable but considered Valid.
-[ Extern ] Assigns (file tests/value/split_return.i, line 13)
+[ Extern ] Assigns (file tests/value/split_return.i, line 15)
Unverifiable but considered Valid.
-[ Extern ] Froms (file tests/value/split_return.i, line 13)
+[ Extern ] Froms (file tests/value/split_return.i, line 15)
Unverifiable but considered Valid.
-[ Extern ] Froms (file tests/value/split_return.i, line 14)
+[ Extern ] Froms (file tests/value/split_return.i, line 16)
Unverifiable but considered Valid.
[ Valid ] Default behavior
by Frama-C kernel.
@@ -374,54 +374,54 @@
--- Properties of Function 'main1'
--------------------------------------------------------------------------------
-[ Dead ] Assertion (file tests/value/split_return.i, line 30)
+[ Dead ] Assertion (file tests/value/split_return.i, line 32)
Locally valid, but unreachable.
By Eva because:
- - Unreachable program point (file tests/value/split_return.i, line 30)
-[Unreachable] Unreachable program point (file tests/value/split_return.i, line 30)
+ - Unreachable program point (file tests/value/split_return.i, line 32)
+[Unreachable] Unreachable program point (file tests/value/split_return.i, line 32)
by Eva.
--------------------------------------------------------------------------------
--- Properties of Function 'main2'
--------------------------------------------------------------------------------
-[ Valid ] Assertion (file tests/value/split_return.i, line 54)
+[ Valid ] Assertion (file tests/value/split_return.i, line 56)
by Eva.
-[ Valid ] Assertion (file tests/value/split_return.i, line 57)
+[ Valid ] Assertion (file tests/value/split_return.i, line 59)
by Eva.
--------------------------------------------------------------------------------
--- Properties of Function 'main3'
--------------------------------------------------------------------------------
-[ Valid ] Assertion (file tests/value/split_return.i, line 79)
- by Eva.
[ Valid ] Assertion (file tests/value/split_return.i, line 81)
by Eva.
+[ Valid ] Assertion (file tests/value/split_return.i, line 83)
+ by Eva.
--------------------------------------------------------------------------------
--- Properties of Function 'main4'
--------------------------------------------------------------------------------
-[ Valid ] Assertion (file tests/value/split_return.i, line 100)
- by Eva.
[ Valid ] Assertion (file tests/value/split_return.i, line 102)
by Eva.
+[ Valid ] Assertion (file tests/value/split_return.i, line 104)
+ by Eva.
--------------------------------------------------------------------------------
--- Properties of Function 'main5'
--------------------------------------------------------------------------------
-[ Valid ] Assertion (file tests/value/split_return.i, line 123)
- by Eva.
[ Valid ] Assertion (file tests/value/split_return.i, line 125)
by Eva.
+[ Valid ] Assertion (file tests/value/split_return.i, line 127)
+ by Eva.
--------------------------------------------------------------------------------
--- Properties of Function 'f6'
--------------------------------------------------------------------------------
-[ - ] Assertion (file tests/value/split_return.i, line 133)
+[ - ] Assertion (file tests/value/split_return.i, line 135)
tried with Eva.
--------------------------------------------------------------------------------
diff --git a/tests/value/oracle/split_return.3.res.oracle b/tests/value/oracle/split_return.3.res.oracle
index 0efcd2430ce9e8239d2ac44023a3a3c42f36a4b1..47b6e1be4a8e3289d2173b14a8477a64e24164ff 100644
--- a/tests/value/oracle/split_return.3.res.oracle
+++ b/tests/value/oracle/split_return.3.res.oracle
@@ -13,196 +13,196 @@
v7 ∈ {0}
rand ∈ [--..--]
[eva] computing for function main1 <- main.
- Called from tests/value/split_return.i:207.
+ Called from tests/value/split_return.i:209.
[eva] computing for function init <- main1 <- main.
- Called from tests/value/split_return.i:20.
+ Called from tests/value/split_return.i:22.
[eva] using specification for function init
[eva] Done for function init
[eva] Recording results for main1
[eva] Done for function main1
[eva] computing for function main2 <- main.
- Called from tests/value/split_return.i:208.
+ Called from tests/value/split_return.i:210.
[eva] computing for function f2 <- main2 <- main.
- Called from tests/value/split_return.i:51.
+ Called from tests/value/split_return.i:53.
[eva] Recording results for f2
[eva] Done for function f2
-[eva] tests/value/split_return.i:52: Frama_C_show_each_f2: {0}, {0}
-[eva] tests/value/split_return.i:52: Frama_C_show_each_f2: {5}, {5}
-[eva] tests/value/split_return.i:52: Frama_C_show_each_f2: {7}, {5}
-[eva] tests/value/split_return.i:54: assertion got status valid.
-[eva] tests/value/split_return.i:56: Frama_C_show_each_f2_2: {5}, {5}
-[eva] tests/value/split_return.i:56: Frama_C_show_each_f2_2: {7}, {5}
-[eva] tests/value/split_return.i:57: assertion got status valid.
+[eva] tests/value/split_return.i:54: Frama_C_show_each_f2: {0}, {0}
+[eva] tests/value/split_return.i:54: Frama_C_show_each_f2: {5}, {5}
+[eva] tests/value/split_return.i:54: Frama_C_show_each_f2: {7}, {5}
+[eva] tests/value/split_return.i:56: assertion got status valid.
+[eva] tests/value/split_return.i:58: Frama_C_show_each_f2_2: {5}, {5}
+[eva] tests/value/split_return.i:58: Frama_C_show_each_f2_2: {7}, {5}
+[eva] tests/value/split_return.i:59: assertion got status valid.
[eva] Recording results for main2
[eva] Done for function main2
[eva] computing for function main3 <- main.
- Called from tests/value/split_return.i:209.
+ Called from tests/value/split_return.i:211.
[eva] computing for function f3 <- main3 <- main.
- Called from tests/value/split_return.i:76.
+ Called from tests/value/split_return.i:78.
[eva] Recording results for f3
[eva] Done for function f3
-[eva] tests/value/split_return.i:77: Frama_C_show_each_f3: {7}, {5}
-[eva] tests/value/split_return.i:77: Frama_C_show_each_f3: {-2}, {0}
-[eva] tests/value/split_return.i:79: assertion got status valid.
+[eva] tests/value/split_return.i:79: Frama_C_show_each_f3: {7}, {5}
+[eva] tests/value/split_return.i:79: Frama_C_show_each_f3: {-2}, {0}
[eva] tests/value/split_return.i:81: assertion got status valid.
+[eva] tests/value/split_return.i:83: assertion got status valid.
[eva] Recording results for main3
[eva] Done for function main3
[eva] computing for function main3 <- main.
- Called from tests/value/split_return.i:209.
+ Called from tests/value/split_return.i:211.
[eva] computing for function f3 <- main3 <- main.
- Called from tests/value/split_return.i:76.
+ Called from tests/value/split_return.i:78.
[eva] Recording results for f3
[eva] Done for function f3
-[eva] tests/value/split_return.i:77: Frama_C_show_each_f3: {7}, {5}
-[eva] tests/value/split_return.i:77: Frama_C_show_each_f3: {-2}, {0}
+[eva] tests/value/split_return.i:79: Frama_C_show_each_f3: {7}, {5}
+[eva] tests/value/split_return.i:79: Frama_C_show_each_f3: {-2}, {0}
[eva] Recording results for main3
[eva] Done for function main3
[eva] computing for function main4 <- main.
- Called from tests/value/split_return.i:210.
+ Called from tests/value/split_return.i:212.
[eva] computing for function f4 <- main4 <- main.
- Called from tests/value/split_return.i:97.
+ Called from tests/value/split_return.i:99.
[eva] Recording results for f4
[eva] Done for function f4
-[eva] tests/value/split_return.i:98: Frama_C_show_each_f4: {4}, {0}
-[eva] tests/value/split_return.i:98: Frama_C_show_each_f4: {7}, {5}
-[eva] tests/value/split_return.i:100: assertion got status valid.
+[eva] tests/value/split_return.i:100: Frama_C_show_each_f4: {4}, {0}
+[eva] tests/value/split_return.i:100: Frama_C_show_each_f4: {7}, {5}
[eva] tests/value/split_return.i:102: assertion got status valid.
+[eva] tests/value/split_return.i:104: assertion got status valid.
[eva] Recording results for main4
[eva] Done for function main4
[eva] computing for function main4 <- main.
- Called from tests/value/split_return.i:210.
+ Called from tests/value/split_return.i:212.
[eva] computing for function f4 <- main4 <- main.
- Called from tests/value/split_return.i:97.
+ Called from tests/value/split_return.i:99.
[eva] Recording results for f4
[eva] Done for function f4
-[eva] tests/value/split_return.i:98: Frama_C_show_each_f4: {4}, {0}
-[eva] tests/value/split_return.i:98: Frama_C_show_each_f4: {7}, {5}
+[eva] tests/value/split_return.i:100: Frama_C_show_each_f4: {4}, {0}
+[eva] tests/value/split_return.i:100: Frama_C_show_each_f4: {7}, {5}
[eva] Recording results for main4
[eva] Done for function main4
[eva] computing for function main4 <- main.
- Called from tests/value/split_return.i:210.
+ Called from tests/value/split_return.i:212.
[eva] computing for function f4 <- main4 <- main.
- Called from tests/value/split_return.i:97.
+ Called from tests/value/split_return.i:99.
[eva] Recording results for f4
[eva] Done for function f4
-[eva] tests/value/split_return.i:98: Frama_C_show_each_f4: {4}, {0}
-[eva] tests/value/split_return.i:98: Frama_C_show_each_f4: {7}, {5}
+[eva] tests/value/split_return.i:100: Frama_C_show_each_f4: {4}, {0}
+[eva] tests/value/split_return.i:100: Frama_C_show_each_f4: {7}, {5}
[eva] Recording results for main4
[eva] Done for function main4
[eva] computing for function main4 <- main.
- Called from tests/value/split_return.i:210.
+ Called from tests/value/split_return.i:212.
[eva] computing for function f4 <- main4 <- main.
- Called from tests/value/split_return.i:97.
+ Called from tests/value/split_return.i:99.
[eva] Recording results for f4
[eva] Done for function f4
-[eva] tests/value/split_return.i:98: Frama_C_show_each_f4: {4}, {0}
-[eva] tests/value/split_return.i:98: Frama_C_show_each_f4: {7}, {5}
+[eva] tests/value/split_return.i:100: Frama_C_show_each_f4: {4}, {0}
+[eva] tests/value/split_return.i:100: Frama_C_show_each_f4: {7}, {5}
[eva] Recording results for main4
[eva] Done for function main4
[eva] computing for function main5 <- main.
- Called from tests/value/split_return.i:211.
+ Called from tests/value/split_return.i:213.
[eva] computing for function f5 <- main5 <- main.
- Called from tests/value/split_return.i:120.
+ Called from tests/value/split_return.i:122.
[eva] Recording results for f5
[eva] Done for function f5
-[eva] tests/value/split_return.i:121: Frama_C_show_each_f5: {7}, {5}
-[eva] tests/value/split_return.i:121: Frama_C_show_each_f5: {-2}, {0}
-[eva] tests/value/split_return.i:123: assertion got status valid.
+[eva] tests/value/split_return.i:123: Frama_C_show_each_f5: {7}, {5}
+[eva] tests/value/split_return.i:123: Frama_C_show_each_f5: {-2}, {0}
[eva] tests/value/split_return.i:125: assertion got status valid.
+[eva] tests/value/split_return.i:127: assertion got status valid.
[eva] Recording results for main5
[eva] Done for function main5
[eva] computing for function main6 <- main.
- Called from tests/value/split_return.i:212.
+ Called from tests/value/split_return.i:214.
[eva] computing for function f6 <- main6 <- main.
- Called from tests/value/split_return.i:138.
-[eva:alarm] tests/value/split_return.i:133: Warning:
+ Called from tests/value/split_return.i:140.
+[eva:alarm] tests/value/split_return.i:135: Warning:
assertion got status unknown.
[eva] Recording results for f6
[eva] Done for function f6
[eva] Recording results for main6
[eva] Done for function main6
[eva] computing for function main6 <- main.
- Called from tests/value/split_return.i:212.
+ Called from tests/value/split_return.i:214.
[eva] computing for function f6 <- main6 <- main.
- Called from tests/value/split_return.i:138.
+ Called from tests/value/split_return.i:140.
[eva] Recording results for f6
[eva] Done for function f6
[eva] Recording results for main6
[eva] Done for function main6
[eva] computing for function main7 <- main.
- Called from tests/value/split_return.i:213.
+ Called from tests/value/split_return.i:215.
[eva] computing for function f7 <- main7 <- main.
- Called from tests/value/split_return.i:151.
+ Called from tests/value/split_return.i:153.
[eva] Recording results for f7
[eva] Done for function f7
-[eva] tests/value/split_return.i:156: Frama_C_show_each_NULL: {0}, {0}
-[eva] tests/value/split_return.i:156: Frama_C_show_each_NULL: {{ &v }}, {1}
+[eva] tests/value/split_return.i:158: Frama_C_show_each_NULL: {0}, {0}
+[eva] tests/value/split_return.i:158: Frama_C_show_each_NULL: {{ &v }}, {1}
[eva] Recording results for main7
[eva] Done for function main7
[eva] computing for function main7 <- main.
- Called from tests/value/split_return.i:213.
+ Called from tests/value/split_return.i:215.
[eva] computing for function f7 <- main7 <- main.
- Called from tests/value/split_return.i:151.
+ Called from tests/value/split_return.i:153.
[eva] Recording results for f7
[eva] Done for function f7
-[eva] tests/value/split_return.i:156: Frama_C_show_each_NULL: {0}, {0}
-[eva] tests/value/split_return.i:156: Frama_C_show_each_NULL: {{ &v }}, {1}
+[eva] tests/value/split_return.i:158: Frama_C_show_each_NULL: {0}, {0}
+[eva] tests/value/split_return.i:158: Frama_C_show_each_NULL: {{ &v }}, {1}
[eva] Recording results for main7
[eva] Done for function main7
[eva] computing for function main8 <- main.
- Called from tests/value/split_return.i:214.
+ Called from tests/value/split_return.i:216.
[eva] computing for function f8 <- main8 <- main.
- Called from tests/value/split_return.i:174.
+ Called from tests/value/split_return.i:176.
[eva] Recording results for f8
[eva] Done for function f8
-[eva] tests/value/split_return.i:175: Frama_C_show_each_then8: {4}, {{ &x }}
-[eva] tests/value/split_return.i:175: Frama_C_show_each_then8: {-1}, {0}
+[eva] tests/value/split_return.i:177: Frama_C_show_each_then8: {4}, {{ &x }}
+[eva] tests/value/split_return.i:177: Frama_C_show_each_then8: {-1}, {0}
[eva] Recording results for main8
[eva] Done for function main8
[eva] computing for function main8 <- main.
- Called from tests/value/split_return.i:214.
+ Called from tests/value/split_return.i:216.
[eva] computing for function f8 <- main8 <- main.
- Called from tests/value/split_return.i:174.
+ Called from tests/value/split_return.i:176.
[eva] Recording results for f8
[eva] Done for function f8
-[eva] tests/value/split_return.i:175: Frama_C_show_each_then8: {4}, {{ &x }}
-[eva] tests/value/split_return.i:175: Frama_C_show_each_then8: {-1}, {0}
+[eva] tests/value/split_return.i:177: Frama_C_show_each_then8: {4}, {{ &x }}
+[eva] tests/value/split_return.i:177: Frama_C_show_each_then8: {-1}, {0}
[eva] Recording results for main8
[eva] Done for function main8
[eva] computing for function main8 <- main.
- Called from tests/value/split_return.i:214.
+ Called from tests/value/split_return.i:216.
[eva] computing for function f8 <- main8 <- main.
- Called from tests/value/split_return.i:174.
+ Called from tests/value/split_return.i:176.
[eva] Recording results for f8
[eva] Done for function f8
-[eva] tests/value/split_return.i:175: Frama_C_show_each_then8: {4}, {{ &x }}
-[eva] tests/value/split_return.i:175: Frama_C_show_each_then8: {-1}, {0}
+[eva] tests/value/split_return.i:177: Frama_C_show_each_then8: {4}, {{ &x }}
+[eva] tests/value/split_return.i:177: Frama_C_show_each_then8: {-1}, {0}
[eva] Recording results for main8
[eva] Done for function main8
[eva] computing for function main8 <- main.
- Called from tests/value/split_return.i:214.
+ Called from tests/value/split_return.i:216.
[eva] computing for function f8 <- main8 <- main.
- Called from tests/value/split_return.i:174.
+ Called from tests/value/split_return.i:176.
[eva] Recording results for f8
[eva] Done for function f8
-[eva] tests/value/split_return.i:175: Frama_C_show_each_then8: {4}, {{ &x }}
-[eva] tests/value/split_return.i:175: Frama_C_show_each_then8: {-1}, {0}
+[eva] tests/value/split_return.i:177: Frama_C_show_each_then8: {4}, {{ &x }}
+[eva] tests/value/split_return.i:177: Frama_C_show_each_then8: {-1}, {0}
[eva] Recording results for main8
[eva] Done for function main8
[eva] computing for function main9 <- main.
- Called from tests/value/split_return.i:215.
+ Called from tests/value/split_return.i:217.
[eva] computing for function uninit <- main9 <- main.
- Called from tests/value/split_return.i:202.
+ Called from tests/value/split_return.i:204.
[eva] Recording results for uninit
[eva] Done for function uninit
[eva] computing for function escaping <- main9 <- main.
- Called from tests/value/split_return.i:203.
-[eva:locals-escaping] tests/value/split_return.i:195: Warning:
+ Called from tests/value/split_return.i:205.
+[eva:locals-escaping] tests/value/split_return.i:197: Warning:
locals {x} escaping the scope of a block of escaping through p
[eva] Recording results for escaping
[eva] Done for function escaping
[eva] computing for function escaping <- main9 <- main.
- Called from tests/value/split_return.i:203.
+ Called from tests/value/split_return.i:205.
[eva] Recording results for escaping
[eva] Done for function escaping
[eva] Recording results for main9
diff --git a/tests/value/oracle/split_return.4.res.oracle b/tests/value/oracle/split_return.4.res.oracle
index 9751f1d714782c4f4f5c41324c7050e3690dd387..0951639034e140b1835d8a952ddc442c4622ef40 100644
--- a/tests/value/oracle/split_return.4.res.oracle
+++ b/tests/value/oracle/split_return.4.res.oracle
@@ -16,196 +16,196 @@
v7 ∈ {0}
rand ∈ [--..--]
[eva] computing for function main1 <- main.
- Called from tests/value/split_return.i:207.
+ Called from tests/value/split_return.i:209.
[eva] computing for function init <- main1 <- main.
- Called from tests/value/split_return.i:20.
+ Called from tests/value/split_return.i:22.
[eva] using specification for function init
[eva] Done for function init
[eva] Recording results for main1
[eva] Done for function main1
[eva] computing for function main2 <- main.
- Called from tests/value/split_return.i:208.
+ Called from tests/value/split_return.i:210.
[eva] computing for function f2 <- main2 <- main.
- Called from tests/value/split_return.i:51.
+ Called from tests/value/split_return.i:53.
[eva] Recording results for f2
[eva] Done for function f2
-[eva] tests/value/split_return.i:52: Frama_C_show_each_f2: {0}, {0}
-[eva] tests/value/split_return.i:52: Frama_C_show_each_f2: {5}, {5}
-[eva] tests/value/split_return.i:52: Frama_C_show_each_f2: {7}, {5}
-[eva] tests/value/split_return.i:54: assertion got status valid.
-[eva] tests/value/split_return.i:56: Frama_C_show_each_f2_2: {5}, {5}
-[eva] tests/value/split_return.i:56: Frama_C_show_each_f2_2: {7}, {5}
-[eva] tests/value/split_return.i:57: assertion got status valid.
+[eva] tests/value/split_return.i:54: Frama_C_show_each_f2: {0}, {0}
+[eva] tests/value/split_return.i:54: Frama_C_show_each_f2: {5}, {5}
+[eva] tests/value/split_return.i:54: Frama_C_show_each_f2: {7}, {5}
+[eva] tests/value/split_return.i:56: assertion got status valid.
+[eva] tests/value/split_return.i:58: Frama_C_show_each_f2_2: {5}, {5}
+[eva] tests/value/split_return.i:58: Frama_C_show_each_f2_2: {7}, {5}
+[eva] tests/value/split_return.i:59: assertion got status valid.
[eva] Recording results for main2
[eva] Done for function main2
[eva] computing for function main3 <- main.
- Called from tests/value/split_return.i:209.
+ Called from tests/value/split_return.i:211.
[eva] computing for function f3 <- main3 <- main.
- Called from tests/value/split_return.i:76.
+ Called from tests/value/split_return.i:78.
[eva] Recording results for f3
[eva] Done for function f3
-[eva] tests/value/split_return.i:77: Frama_C_show_each_f3: {7}, {5}
-[eva] tests/value/split_return.i:77: Frama_C_show_each_f3: {-2}, {0}
-[eva] tests/value/split_return.i:79: assertion got status valid.
+[eva] tests/value/split_return.i:79: Frama_C_show_each_f3: {7}, {5}
+[eva] tests/value/split_return.i:79: Frama_C_show_each_f3: {-2}, {0}
[eva] tests/value/split_return.i:81: assertion got status valid.
+[eva] tests/value/split_return.i:83: assertion got status valid.
[eva] Recording results for main3
[eva] Done for function main3
[eva] computing for function main3 <- main.
- Called from tests/value/split_return.i:209.
+ Called from tests/value/split_return.i:211.
[eva] computing for function f3 <- main3 <- main.
- Called from tests/value/split_return.i:76.
+ Called from tests/value/split_return.i:78.
[eva] Recording results for f3
[eva] Done for function f3
-[eva] tests/value/split_return.i:77: Frama_C_show_each_f3: {7}, {5}
-[eva] tests/value/split_return.i:77: Frama_C_show_each_f3: {-2}, {0}
+[eva] tests/value/split_return.i:79: Frama_C_show_each_f3: {7}, {5}
+[eva] tests/value/split_return.i:79: Frama_C_show_each_f3: {-2}, {0}
[eva] Recording results for main3
[eva] Done for function main3
[eva] computing for function main4 <- main.
- Called from tests/value/split_return.i:210.
+ Called from tests/value/split_return.i:212.
[eva] computing for function f4 <- main4 <- main.
- Called from tests/value/split_return.i:97.
+ Called from tests/value/split_return.i:99.
[eva] Recording results for f4
[eva] Done for function f4
-[eva] tests/value/split_return.i:98: Frama_C_show_each_f4: {4}, {0}
-[eva] tests/value/split_return.i:98: Frama_C_show_each_f4: {7}, {5}
-[eva] tests/value/split_return.i:100: assertion got status valid.
+[eva] tests/value/split_return.i:100: Frama_C_show_each_f4: {4}, {0}
+[eva] tests/value/split_return.i:100: Frama_C_show_each_f4: {7}, {5}
[eva] tests/value/split_return.i:102: assertion got status valid.
+[eva] tests/value/split_return.i:104: assertion got status valid.
[eva] Recording results for main4
[eva] Done for function main4
[eva] computing for function main4 <- main.
- Called from tests/value/split_return.i:210.
+ Called from tests/value/split_return.i:212.
[eva] computing for function f4 <- main4 <- main.
- Called from tests/value/split_return.i:97.
+ Called from tests/value/split_return.i:99.
[eva] Recording results for f4
[eva] Done for function f4
-[eva] tests/value/split_return.i:98: Frama_C_show_each_f4: {4}, {0}
-[eva] tests/value/split_return.i:98: Frama_C_show_each_f4: {7}, {5}
+[eva] tests/value/split_return.i:100: Frama_C_show_each_f4: {4}, {0}
+[eva] tests/value/split_return.i:100: Frama_C_show_each_f4: {7}, {5}
[eva] Recording results for main4
[eva] Done for function main4
[eva] computing for function main4 <- main.
- Called from tests/value/split_return.i:210.
+ Called from tests/value/split_return.i:212.
[eva] computing for function f4 <- main4 <- main.
- Called from tests/value/split_return.i:97.
+ Called from tests/value/split_return.i:99.
[eva] Recording results for f4
[eva] Done for function f4
-[eva] tests/value/split_return.i:98: Frama_C_show_each_f4: {4}, {0}
-[eva] tests/value/split_return.i:98: Frama_C_show_each_f4: {7}, {5}
+[eva] tests/value/split_return.i:100: Frama_C_show_each_f4: {4}, {0}
+[eva] tests/value/split_return.i:100: Frama_C_show_each_f4: {7}, {5}
[eva] Recording results for main4
[eva] Done for function main4
[eva] computing for function main4 <- main.
- Called from tests/value/split_return.i:210.
+ Called from tests/value/split_return.i:212.
[eva] computing for function f4 <- main4 <- main.
- Called from tests/value/split_return.i:97.
+ Called from tests/value/split_return.i:99.
[eva] Recording results for f4
[eva] Done for function f4
-[eva] tests/value/split_return.i:98: Frama_C_show_each_f4: {4}, {0}
-[eva] tests/value/split_return.i:98: Frama_C_show_each_f4: {7}, {5}
+[eva] tests/value/split_return.i:100: Frama_C_show_each_f4: {4}, {0}
+[eva] tests/value/split_return.i:100: Frama_C_show_each_f4: {7}, {5}
[eva] Recording results for main4
[eva] Done for function main4
[eva] computing for function main5 <- main.
- Called from tests/value/split_return.i:211.
+ Called from tests/value/split_return.i:213.
[eva] computing for function f5 <- main5 <- main.
- Called from tests/value/split_return.i:120.
+ Called from tests/value/split_return.i:122.
[eva] Recording results for f5
[eva] Done for function f5
-[eva] tests/value/split_return.i:121: Frama_C_show_each_f5: {7}, {5}
-[eva] tests/value/split_return.i:121: Frama_C_show_each_f5: {-2}, {0}
-[eva] tests/value/split_return.i:123: assertion got status valid.
+[eva] tests/value/split_return.i:123: Frama_C_show_each_f5: {7}, {5}
+[eva] tests/value/split_return.i:123: Frama_C_show_each_f5: {-2}, {0}
[eva] tests/value/split_return.i:125: assertion got status valid.
+[eva] tests/value/split_return.i:127: assertion got status valid.
[eva] Recording results for main5
[eva] Done for function main5
[eva] computing for function main6 <- main.
- Called from tests/value/split_return.i:212.
+ Called from tests/value/split_return.i:214.
[eva] computing for function f6 <- main6 <- main.
- Called from tests/value/split_return.i:138.
-[eva:alarm] tests/value/split_return.i:133: Warning:
+ Called from tests/value/split_return.i:140.
+[eva:alarm] tests/value/split_return.i:135: Warning:
assertion got status unknown.
[eva] Recording results for f6
[eva] Done for function f6
[eva] Recording results for main6
[eva] Done for function main6
[eva] computing for function main6 <- main.
- Called from tests/value/split_return.i:212.
+ Called from tests/value/split_return.i:214.
[eva] computing for function f6 <- main6 <- main.
- Called from tests/value/split_return.i:138.
+ Called from tests/value/split_return.i:140.
[eva] Recording results for f6
[eva] Done for function f6
[eva] Recording results for main6
[eva] Done for function main6
[eva] computing for function main7 <- main.
- Called from tests/value/split_return.i:213.
+ Called from tests/value/split_return.i:215.
[eva] computing for function f7 <- main7 <- main.
- Called from tests/value/split_return.i:151.
+ Called from tests/value/split_return.i:153.
[eva] Recording results for f7
[eva] Done for function f7
-[eva] tests/value/split_return.i:156: Frama_C_show_each_NULL: {0}, {0}
-[eva] tests/value/split_return.i:156: Frama_C_show_each_NULL: {{ &v }}, {1}
+[eva] tests/value/split_return.i:158: Frama_C_show_each_NULL: {0}, {0}
+[eva] tests/value/split_return.i:158: Frama_C_show_each_NULL: {{ &v }}, {1}
[eva] Recording results for main7
[eva] Done for function main7
[eva] computing for function main7 <- main.
- Called from tests/value/split_return.i:213.
+ Called from tests/value/split_return.i:215.
[eva] computing for function f7 <- main7 <- main.
- Called from tests/value/split_return.i:151.
+ Called from tests/value/split_return.i:153.
[eva] Recording results for f7
[eva] Done for function f7
-[eva] tests/value/split_return.i:156: Frama_C_show_each_NULL: {0}, {0}
-[eva] tests/value/split_return.i:156: Frama_C_show_each_NULL: {{ &v }}, {1}
+[eva] tests/value/split_return.i:158: Frama_C_show_each_NULL: {0}, {0}
+[eva] tests/value/split_return.i:158: Frama_C_show_each_NULL: {{ &v }}, {1}
[eva] Recording results for main7
[eva] Done for function main7
[eva] computing for function main8 <- main.
- Called from tests/value/split_return.i:214.
+ Called from tests/value/split_return.i:216.
[eva] computing for function f8 <- main8 <- main.
- Called from tests/value/split_return.i:174.
+ Called from tests/value/split_return.i:176.
[eva] Recording results for f8
[eva] Done for function f8
-[eva] tests/value/split_return.i:175: Frama_C_show_each_then8: {4}, {{ &x }}
-[eva] tests/value/split_return.i:175: Frama_C_show_each_then8: {-1}, {0}
+[eva] tests/value/split_return.i:177: Frama_C_show_each_then8: {4}, {{ &x }}
+[eva] tests/value/split_return.i:177: Frama_C_show_each_then8: {-1}, {0}
[eva] Recording results for main8
[eva] Done for function main8
[eva] computing for function main8 <- main.
- Called from tests/value/split_return.i:214.
+ Called from tests/value/split_return.i:216.
[eva] computing for function f8 <- main8 <- main.
- Called from tests/value/split_return.i:174.
+ Called from tests/value/split_return.i:176.
[eva] Recording results for f8
[eva] Done for function f8
-[eva] tests/value/split_return.i:175: Frama_C_show_each_then8: {4}, {{ &x }}
-[eva] tests/value/split_return.i:175: Frama_C_show_each_then8: {-1}, {0}
+[eva] tests/value/split_return.i:177: Frama_C_show_each_then8: {4}, {{ &x }}
+[eva] tests/value/split_return.i:177: Frama_C_show_each_then8: {-1}, {0}
[eva] Recording results for main8
[eva] Done for function main8
[eva] computing for function main8 <- main.
- Called from tests/value/split_return.i:214.
+ Called from tests/value/split_return.i:216.
[eva] computing for function f8 <- main8 <- main.
- Called from tests/value/split_return.i:174.
+ Called from tests/value/split_return.i:176.
[eva] Recording results for f8
[eva] Done for function f8
-[eva] tests/value/split_return.i:175: Frama_C_show_each_then8: {4}, {{ &x }}
-[eva] tests/value/split_return.i:175: Frama_C_show_each_then8: {-1}, {0}
+[eva] tests/value/split_return.i:177: Frama_C_show_each_then8: {4}, {{ &x }}
+[eva] tests/value/split_return.i:177: Frama_C_show_each_then8: {-1}, {0}
[eva] Recording results for main8
[eva] Done for function main8
[eva] computing for function main8 <- main.
- Called from tests/value/split_return.i:214.
+ Called from tests/value/split_return.i:216.
[eva] computing for function f8 <- main8 <- main.
- Called from tests/value/split_return.i:174.
+ Called from tests/value/split_return.i:176.
[eva] Recording results for f8
[eva] Done for function f8
-[eva] tests/value/split_return.i:175: Frama_C_show_each_then8: {4}, {{ &x }}
-[eva] tests/value/split_return.i:175: Frama_C_show_each_then8: {-1}, {0}
+[eva] tests/value/split_return.i:177: Frama_C_show_each_then8: {4}, {{ &x }}
+[eva] tests/value/split_return.i:177: Frama_C_show_each_then8: {-1}, {0}
[eva] Recording results for main8
[eva] Done for function main8
[eva] computing for function main9 <- main.
- Called from tests/value/split_return.i:215.
+ Called from tests/value/split_return.i:217.
[eva] computing for function uninit <- main9 <- main.
- Called from tests/value/split_return.i:202.
+ Called from tests/value/split_return.i:204.
[eva] Recording results for uninit
[eva] Done for function uninit
[eva] computing for function escaping <- main9 <- main.
- Called from tests/value/split_return.i:203.
-[eva:locals-escaping] tests/value/split_return.i:195: Warning:
+ Called from tests/value/split_return.i:205.
+[eva:locals-escaping] tests/value/split_return.i:197: Warning:
locals {x} escaping the scope of a block of escaping through p
[eva] Recording results for escaping
[eva] Done for function escaping
[eva] computing for function escaping <- main9 <- main.
- Called from tests/value/split_return.i:203.
+ Called from tests/value/split_return.i:205.
[eva] Recording results for escaping
[eva] Done for function escaping
[eva] Recording results for main9
@@ -460,181 +460,181 @@
v7 ∈ {0}
rand ∈ [--..--]
[eva] computing for function main1 <- main.
- Called from tests/value/split_return.i:207.
+ Called from tests/value/split_return.i:209.
[eva] computing for function init <- main1 <- main.
- Called from tests/value/split_return.i:20.
+ Called from tests/value/split_return.i:22.
[eva] Done for function init
[eva] Recording results for main1
[eva] Done for function main1
[eva] computing for function main2 <- main.
- Called from tests/value/split_return.i:208.
+ Called from tests/value/split_return.i:210.
[eva] computing for function f2 <- main2 <- main.
- Called from tests/value/split_return.i:51.
+ Called from tests/value/split_return.i:53.
[eva] Recording results for f2
[eva] Done for function f2
-[eva] tests/value/split_return.i:52: Frama_C_show_each_f2: {0}, {0}
-[eva] tests/value/split_return.i:52: Frama_C_show_each_f2: {5; 7}, {5}
-[eva] tests/value/split_return.i:56: Frama_C_show_each_f2_2: {5; 7}, {5}
+[eva] tests/value/split_return.i:54: Frama_C_show_each_f2: {0}, {0}
+[eva] tests/value/split_return.i:54: Frama_C_show_each_f2: {5; 7}, {5}
+[eva] tests/value/split_return.i:58: Frama_C_show_each_f2_2: {5; 7}, {5}
[eva] Recording results for main2
[eva] Done for function main2
[eva] computing for function main3 <- main.
- Called from tests/value/split_return.i:209.
+ Called from tests/value/split_return.i:211.
[eva] computing for function f3 <- main3 <- main.
- Called from tests/value/split_return.i:76.
+ Called from tests/value/split_return.i:78.
[eva] Recording results for f3
[eva] Done for function f3
-[eva] tests/value/split_return.i:77: Frama_C_show_each_f3: {7}, {5}
-[eva] tests/value/split_return.i:77: Frama_C_show_each_f3: {-2}, {0}
+[eva] tests/value/split_return.i:79: Frama_C_show_each_f3: {7}, {5}
+[eva] tests/value/split_return.i:79: Frama_C_show_each_f3: {-2}, {0}
[eva] Recording results for main3
[eva] Done for function main3
[eva] computing for function main3 <- main.
- Called from tests/value/split_return.i:209.
+ Called from tests/value/split_return.i:211.
[eva] computing for function f3 <- main3 <- main.
- Called from tests/value/split_return.i:76.
+ Called from tests/value/split_return.i:78.
[eva] Recording results for f3
[eva] Done for function f3
-[eva] tests/value/split_return.i:77: Frama_C_show_each_f3: {7}, {5}
-[eva] tests/value/split_return.i:77: Frama_C_show_each_f3: {-2}, {0}
+[eva] tests/value/split_return.i:79: Frama_C_show_each_f3: {7}, {5}
+[eva] tests/value/split_return.i:79: Frama_C_show_each_f3: {-2}, {0}
[eva] Recording results for main3
[eva] Done for function main3
[eva] computing for function main4 <- main.
- Called from tests/value/split_return.i:210.
+ Called from tests/value/split_return.i:212.
[eva] computing for function f4 <- main4 <- main.
- Called from tests/value/split_return.i:97.
+ Called from tests/value/split_return.i:99.
[eva] Recording results for f4
[eva] Done for function f4
-[eva] tests/value/split_return.i:98: Frama_C_show_each_f4: {4}, {0}
-[eva] tests/value/split_return.i:98: Frama_C_show_each_f4: {7}, {5}
+[eva] tests/value/split_return.i:100: Frama_C_show_each_f4: {4}, {0}
+[eva] tests/value/split_return.i:100: Frama_C_show_each_f4: {7}, {5}
[eva] Recording results for main4
[eva] Done for function main4
[eva] computing for function main4 <- main.
- Called from tests/value/split_return.i:210.
+ Called from tests/value/split_return.i:212.
[eva] computing for function f4 <- main4 <- main.
- Called from tests/value/split_return.i:97.
+ Called from tests/value/split_return.i:99.
[eva] Recording results for f4
[eva] Done for function f4
-[eva] tests/value/split_return.i:98: Frama_C_show_each_f4: {4}, {0}
-[eva] tests/value/split_return.i:98: Frama_C_show_each_f4: {7}, {5}
+[eva] tests/value/split_return.i:100: Frama_C_show_each_f4: {4}, {0}
+[eva] tests/value/split_return.i:100: Frama_C_show_each_f4: {7}, {5}
[eva] Recording results for main4
[eva] Done for function main4
[eva] computing for function main4 <- main.
- Called from tests/value/split_return.i:210.
+ Called from tests/value/split_return.i:212.
[eva] computing for function f4 <- main4 <- main.
- Called from tests/value/split_return.i:97.
+ Called from tests/value/split_return.i:99.
[eva] Recording results for f4
[eva] Done for function f4
-[eva] tests/value/split_return.i:98: Frama_C_show_each_f4: {4}, {0}
-[eva] tests/value/split_return.i:98: Frama_C_show_each_f4: {7}, {5}
+[eva] tests/value/split_return.i:100: Frama_C_show_each_f4: {4}, {0}
+[eva] tests/value/split_return.i:100: Frama_C_show_each_f4: {7}, {5}
[eva] Recording results for main4
[eva] Done for function main4
[eva] computing for function main4 <- main.
- Called from tests/value/split_return.i:210.
+ Called from tests/value/split_return.i:212.
[eva] computing for function f4 <- main4 <- main.
- Called from tests/value/split_return.i:97.
+ Called from tests/value/split_return.i:99.
[eva] Recording results for f4
[eva] Done for function f4
-[eva] tests/value/split_return.i:98: Frama_C_show_each_f4: {4}, {0}
-[eva] tests/value/split_return.i:98: Frama_C_show_each_f4: {7}, {5}
+[eva] tests/value/split_return.i:100: Frama_C_show_each_f4: {4}, {0}
+[eva] tests/value/split_return.i:100: Frama_C_show_each_f4: {7}, {5}
[eva] Recording results for main4
[eva] Done for function main4
[eva] computing for function main5 <- main.
- Called from tests/value/split_return.i:211.
+ Called from tests/value/split_return.i:213.
[eva] computing for function f5 <- main5 <- main.
- Called from tests/value/split_return.i:120.
+ Called from tests/value/split_return.i:122.
[eva] Recording results for f5
[eva] Done for function f5
-[eva] tests/value/split_return.i:121: Frama_C_show_each_f5: {7}, {5}
-[eva] tests/value/split_return.i:121: Frama_C_show_each_f5: {-2}, {0}
+[eva] tests/value/split_return.i:123: Frama_C_show_each_f5: {7}, {5}
+[eva] tests/value/split_return.i:123: Frama_C_show_each_f5: {-2}, {0}
[eva] Recording results for main5
[eva] Done for function main5
[eva] computing for function main6 <- main.
- Called from tests/value/split_return.i:212.
+ Called from tests/value/split_return.i:214.
[eva] computing for function f6 <- main6 <- main.
- Called from tests/value/split_return.i:138.
+ Called from tests/value/split_return.i:140.
[eva] Recording results for f6
[eva] Done for function f6
[eva] Recording results for main6
[eva] Done for function main6
[eva] computing for function main6 <- main.
- Called from tests/value/split_return.i:212.
+ Called from tests/value/split_return.i:214.
[eva] computing for function f6 <- main6 <- main.
- Called from tests/value/split_return.i:138.
+ Called from tests/value/split_return.i:140.
[eva] Recording results for f6
[eva] Done for function f6
[eva] Recording results for main6
[eva] Done for function main6
[eva] computing for function main7 <- main.
- Called from tests/value/split_return.i:213.
+ Called from tests/value/split_return.i:215.
[eva] computing for function f7 <- main7 <- main.
- Called from tests/value/split_return.i:151.
+ Called from tests/value/split_return.i:153.
[eva] Recording results for f7
[eva] Done for function f7
-[eva] tests/value/split_return.i:156: Frama_C_show_each_NULL: {0}, {0}
-[eva] tests/value/split_return.i:156: Frama_C_show_each_NULL: {{ &v }}, {1}
+[eva] tests/value/split_return.i:158: Frama_C_show_each_NULL: {0}, {0}
+[eva] tests/value/split_return.i:158: Frama_C_show_each_NULL: {{ &v }}, {1}
[eva] Recording results for main7
[eva] Done for function main7
[eva] computing for function main7 <- main.
- Called from tests/value/split_return.i:213.
+ Called from tests/value/split_return.i:215.
[eva] computing for function f7 <- main7 <- main.
- Called from tests/value/split_return.i:151.
+ Called from tests/value/split_return.i:153.
[eva] Recording results for f7
[eva] Done for function f7
-[eva] tests/value/split_return.i:156: Frama_C_show_each_NULL: {0}, {0}
-[eva] tests/value/split_return.i:156: Frama_C_show_each_NULL: {{ &v }}, {1}
+[eva] tests/value/split_return.i:158: Frama_C_show_each_NULL: {0}, {0}
+[eva] tests/value/split_return.i:158: Frama_C_show_each_NULL: {{ &v }}, {1}
[eva] Recording results for main7
[eva] Done for function main7
[eva] computing for function main8 <- main.
- Called from tests/value/split_return.i:214.
+ Called from tests/value/split_return.i:216.
[eva] computing for function f8 <- main8 <- main.
- Called from tests/value/split_return.i:174.
+ Called from tests/value/split_return.i:176.
[eva] Recording results for f8
[eva] Done for function f8
-[eva] tests/value/split_return.i:175: Frama_C_show_each_then8: {4}, {{ &x }}
-[eva] tests/value/split_return.i:175: Frama_C_show_each_then8: {-1}, {0}
+[eva] tests/value/split_return.i:177: Frama_C_show_each_then8: {4}, {{ &x }}
+[eva] tests/value/split_return.i:177: Frama_C_show_each_then8: {-1}, {0}
[eva] Recording results for main8
[eva] Done for function main8
[eva] computing for function main8 <- main.
- Called from tests/value/split_return.i:214.
+ Called from tests/value/split_return.i:216.
[eva] computing for function f8 <- main8 <- main.
- Called from tests/value/split_return.i:174.
+ Called from tests/value/split_return.i:176.
[eva] Recording results for f8
[eva] Done for function f8
-[eva] tests/value/split_return.i:175: Frama_C_show_each_then8: {4}, {{ &x }}
-[eva] tests/value/split_return.i:175: Frama_C_show_each_then8: {-1}, {0}
+[eva] tests/value/split_return.i:177: Frama_C_show_each_then8: {4}, {{ &x }}
+[eva] tests/value/split_return.i:177: Frama_C_show_each_then8: {-1}, {0}
[eva] Recording results for main8
[eva] Done for function main8
[eva] computing for function main8 <- main.
- Called from tests/value/split_return.i:214.
+ Called from tests/value/split_return.i:216.
[eva] computing for function f8 <- main8 <- main.
- Called from tests/value/split_return.i:174.
+ Called from tests/value/split_return.i:176.
[eva] Recording results for f8
[eva] Done for function f8
-[eva] tests/value/split_return.i:175: Frama_C_show_each_then8: {4}, {{ &x }}
-[eva] tests/value/split_return.i:175: Frama_C_show_each_then8: {-1}, {0}
+[eva] tests/value/split_return.i:177: Frama_C_show_each_then8: {4}, {{ &x }}
+[eva] tests/value/split_return.i:177: Frama_C_show_each_then8: {-1}, {0}
[eva] Recording results for main8
[eva] Done for function main8
[eva] computing for function main8 <- main.
- Called from tests/value/split_return.i:214.
+ Called from tests/value/split_return.i:216.
[eva] computing for function f8 <- main8 <- main.
- Called from tests/value/split_return.i:174.
+ Called from tests/value/split_return.i:176.
[eva] Recording results for f8
[eva] Done for function f8
-[eva] tests/value/split_return.i:175: Frama_C_show_each_then8: {4}, {{ &x }}
-[eva] tests/value/split_return.i:175: Frama_C_show_each_then8: {-1}, {0}
+[eva] tests/value/split_return.i:177: Frama_C_show_each_then8: {4}, {{ &x }}
+[eva] tests/value/split_return.i:177: Frama_C_show_each_then8: {-1}, {0}
[eva] Recording results for main8
[eva] Done for function main8
[eva] computing for function main9 <- main.
- Called from tests/value/split_return.i:215.
+ Called from tests/value/split_return.i:217.
[eva] computing for function uninit <- main9 <- main.
- Called from tests/value/split_return.i:202.
+ Called from tests/value/split_return.i:204.
[eva] Recording results for uninit
[eva] Done for function uninit
[eva] computing for function escaping <- main9 <- main.
- Called from tests/value/split_return.i:203.
+ Called from tests/value/split_return.i:205.
[eva] Recording results for escaping
[eva] Done for function escaping
[eva] computing for function escaping <- main9 <- main.
- Called from tests/value/split_return.i:203.
+ Called from tests/value/split_return.i:205.
[eva] Recording results for escaping
[eva] Done for function escaping
[eva] Recording results for main9
diff --git a/tests/value/oracle/use_spec.0.res.oracle b/tests/value/oracle/use_spec.0.res.oracle
index 473f5c28774e85d3c07a0650f0853708a8c07b47..f919f266c6c3385772cec013449032dd0d85669e 100644
--- a/tests/value/oracle/use_spec.0.res.oracle
+++ b/tests/value/oracle/use_spec.0.res.oracle
@@ -2,7 +2,7 @@
[eva] User Error: no assigns specified for function 'f', for which a builtin
or the specification will be used. Potential unsoundness.
[eva] Warning: Generating potentially incorrect assigns for function 'f' for which option -eva-use-spec is set
-[kernel:annot:missing-spec] tests/value/use_spec.i:7: Warning:
+[kernel:annot:missing-spec] tests/value/use_spec.i:10: Warning:
Neither code nor specification for function f, generating default assigns from the prototype
[eva] Analyzing a complete application starting at main
[eva] Computing initial state
@@ -13,21 +13,21 @@
y ∈ {0}
z ∈ {0}
[eva] computing for function f <- main.
- Called from tests/value/use_spec.i:22.
+ Called from tests/value/use_spec.i:25.
[eva] using specification for function f
[eva] Done for function f
[eva] computing for function g <- main.
- Called from tests/value/use_spec.i:23.
-[kernel:annot:missing-spec] tests/value/use_spec.i:23: Warning:
+ Called from tests/value/use_spec.i:26.
+[kernel:annot:missing-spec] tests/value/use_spec.i:26: Warning:
Neither code nor specification for function g, generating default assigns from the prototype
[eva] using specification for function g
[eva] Done for function g
[eva] computing for function h <- main.
- Called from tests/value/use_spec.i:24.
+ Called from tests/value/use_spec.i:27.
[eva] using specification for function h
[eva] Done for function h
[eva] computing for function i <- main.
- Called from tests/value/use_spec.i:25.
+ Called from tests/value/use_spec.i:28.
[eva] using specification for function i
[eva] Done for function i
[eva] Recording results for main
@@ -41,13 +41,13 @@
y ∈ [--..--]
z ∈ [--..--]
[from] ====== DISPLAYING CALLWISE DEPENDENCIES ======
-[from] call to f at tests/value/use_spec.i:22 (by main):
+[from] call to f at tests/value/use_spec.i:25 (by main):
x FROM x (and SELF)
-[from] call to g at tests/value/use_spec.i:23 (by main):
+[from] call to g at tests/value/use_spec.i:26 (by main):
y FROM y (and SELF)
-[from] call to h at tests/value/use_spec.i:24 (by main):
+[from] call to h at tests/value/use_spec.i:27 (by main):
z FROM \nothing
-[from] call to i at tests/value/use_spec.i:25 (by main):
+[from] call to i at tests/value/use_spec.i:28 (by main):
w FROM \nothing
[from] entry point:
w FROM \nothing
diff --git a/tests/value/oracle/use_spec.1.res.oracle b/tests/value/oracle/use_spec.1.res.oracle
index caebc27ff6d6acaf84a35f7c375e41bdb1adc841..0aa0d76d877484b6fcf0c9b12e851abb6c91a284 100644
--- a/tests/value/oracle/use_spec.1.res.oracle
+++ b/tests/value/oracle/use_spec.1.res.oracle
@@ -2,7 +2,7 @@
[eva] User Error: no assigns specified for function 'f', for which a builtin
or the specification will be used. Potential unsoundness.
[eva] Warning: Generating potentially incorrect assigns for function 'f' for which option -eva-use-spec is set
-[kernel:annot:missing-spec] tests/value/use_spec.i:7: Warning:
+[kernel:annot:missing-spec] tests/value/use_spec.i:10: Warning:
Neither code nor specification for function f, generating default assigns from the prototype
[eva] Analyzing a complete application starting at main
[eva] Computing initial state
@@ -13,21 +13,21 @@
y ∈ {0}
z ∈ {0}
[eva] computing for function f <- main.
- Called from tests/value/use_spec.i:22.
+ Called from tests/value/use_spec.i:25.
[eva] using specification for function f
[eva] Done for function f
[eva] computing for function g <- main.
- Called from tests/value/use_spec.i:23.
-[kernel:annot:missing-spec] tests/value/use_spec.i:23: Warning:
+ Called from tests/value/use_spec.i:26.
+[kernel:annot:missing-spec] tests/value/use_spec.i:26: Warning:
Neither code nor specification for function g, generating default assigns from the prototype
[eva] using specification for function g
[eva] Done for function g
[eva] computing for function h <- main.
- Called from tests/value/use_spec.i:24.
+ Called from tests/value/use_spec.i:27.
[eva] using specification for function h
[eva] Done for function h
[eva] computing for function i <- main.
- Called from tests/value/use_spec.i:25.
+ Called from tests/value/use_spec.i:28.
[eva] using specification for function i
[eva] Done for function i
[eva] Recording results for main
@@ -41,13 +41,13 @@
y ∈ [--..--]
z ∈ [--..--]
[from] ====== DISPLAYING CALLWISE DEPENDENCIES ======
-[from] call to f at tests/value/use_spec.i:22 (by main):
+[from] call to f at tests/value/use_spec.i:25 (by main):
x FROM direct: x (and SELF)
-[from] call to g at tests/value/use_spec.i:23 (by main):
+[from] call to g at tests/value/use_spec.i:26 (by main):
y FROM direct: y (and SELF)
-[from] call to h at tests/value/use_spec.i:24 (by main):
+[from] call to h at tests/value/use_spec.i:27 (by main):
z FROM \nothing
-[from] call to i at tests/value/use_spec.i:25 (by main):
+[from] call to i at tests/value/use_spec.i:28 (by main):
w FROM \nothing
[from] entry point:
w FROM \nothing
diff --git a/tests/value/origin.i b/tests/value/origin.i
index 3146eb3f46ab38c22461e2880e799bb66af52b67..cd5d3c1c4c28178e57acdedd89077dfff0b0d9c3 100644
--- a/tests/value/origin.i
+++ b/tests/value/origin.i
@@ -1,7 +1,7 @@
/* run.config*
-
- OPT: -no-autoload-plugins -load-module from,inout,eva @EVA_CONFIG@ -eva -eva-warn-copy-indeterminate=-origin_misalign_2,-main -main main -journal-disable -then -out -deps
- OPT: -no-autoload-plugins -load-module from,inout,eva @EVA_CONFIG@ -eva -eva-warn-copy-indeterminate=-origin_misalign_2,-origin -main origin -journal-disable -then -out -deps
+ PLUGIN: @EVA_MAIN_PLUGINS@ inout,from
+ OPT: @EVA_CONFIG@ -eva -eva-warn-copy-indeterminate=-origin_misalign_2,-main -main main -then -out -deps
+ OPT: @EVA_CONFIG@ -eva -eva-warn-copy-indeterminate=-origin_misalign_2,-origin -main origin -then -out -deps
*/
char f(void);
diff --git a/tests/value/pointer_comparison.c b/tests/value/pointer_comparison.c
index 40717af44c5547544a81941d440e3e5673642187..5b5d341d0c4075647c4c3ce52f73a1c978a53616 100644
--- a/tests/value/pointer_comparison.c
+++ b/tests/value/pointer_comparison.c
@@ -1,8 +1,13 @@
/* run.config*
- STDOPT: +" -load-module report -report-print-properties -eva-warn-undefined-pointer-comparison none -eva-msg-key pointer-comparison -then -report -then -eva-warn-undefined-pointer-comparison pointer -then -report -then -eva-warn-undefined-pointer-comparison all -then -report"
- STDOPT: +" -load-module report -report-print-properties -eva-undefined-pointer-comparison-propagate-all -eva-warn-undefined-pointer-comparison none -eva-msg-key pointer-comparison -then -report -then -eva-warn-undefined-pointer-comparison pointer -then -report -then -eva-warn-undefined-pointer-comparison all -then -report"
+ PLUGIN: @PTEST_PLUGIN@ report
+ STDOPT: +" -report-print-properties -eva-warn-undefined-pointer-comparison none -eva-msg-key pointer-comparison -then -report -then -eva-warn-undefined-pointer-comparison pointer -then -report -then -eva-warn-undefined-pointer-comparison all -then -report"
+ STDOPT: +" -report-print-properties -eva-undefined-pointer-comparison-propagate-all -eva-warn-undefined-pointer-comparison none -eva-msg-key pointer-comparison -then -report -then -eva-warn-undefined-pointer-comparison pointer -then -report -then -eva-warn-undefined-pointer-comparison all -then -report"
+
*/
+
+
int x,y,*p;
+
int main(){
p = &x;
if (p++ != &y) Frama_C_show_each_1t(p);
diff --git a/tests/value/postcond_leaf.c b/tests/value/postcond_leaf.c
index 37b99f53706ca6690608d4df5d780720fb0afa04..5716b272b950ae7e0f926e8da33215d9f4b50028 100644
--- a/tests/value/postcond_leaf.c
+++ b/tests/value/postcond_leaf.c
@@ -1,5 +1,6 @@
/* run.config*
-OPT: -no-autoload-plugins @EVA_CONFIG@ -load-module eva,inout,report -eva-no-show-progress -eva -eva-use-spec g1,g2,g3 -then -report
+ PLUGIN: @EVA_MAIN_PLUGINS@ report
+ OPT: @EVA_CONFIG@ -eva-no-show-progress -eva -eva-use-spec g1,g2,g3 -then -report
*/
/* Test what is printed when Value evaluates a post-condition:
@@ -15,7 +16,6 @@ OPT: -no-autoload-plugins @EVA_CONFIG@ -load-module eva,inout,report -eva-no-sho
warning is too distracting otherwise)
*/
-
extern int i;
//@ ensures 0 == 1;
diff --git a/tests/value/precise_locations.i b/tests/value/precise_locations.i
index 942739895819533255887b5f61ec8f7e124fd806..4c66a8257edcbc1d18e9f84c2b4dc711deef5254 100644
--- a/tests/value/precise_locations.i
+++ b/tests/value/precise_locations.i
@@ -1,7 +1,7 @@
/* run.config*
- STDOPT: +"-eva-widening-period 3 -then -inout -load-module report -report -then -eva-plevel 250"
+ PLUGIN: @PTEST_PLUGIN@ report
+ STDOPT: +"-eva-widening-period 3 -then -inout -report -then -eva-plevel 250"
*/
-
struct s {
int f1[5];
int f_inter[5];
diff --git a/tests/value/precond.c b/tests/value/precond.c
index a8c73729935defb33716cd1688cef3fb929786fa..adf9cc9c33b40e95b8503dd0c13e128285e9a800 100644
--- a/tests/value/precond.c
+++ b/tests/value/precond.c
@@ -1,8 +1,8 @@
/* run.config*
- OPT: -no-autoload-plugins -load-module from,inout,eva,report -lib-entry -eva @EVA_CONFIG@ -then -report -report-print-properties -then -report-no-specialized
+ PLUGIN: @EVA_MAIN_PLUGINS@ report
+ OPT: -lib-entry -eva @EVA_CONFIG@ -then -report -report-print-properties -then -report-no-specialized
*/
-
int x;
/*@ requires i_plus_one: i+1 >= 0;
diff --git a/tests/value/precond2.c b/tests/value/precond2.c
index 20b7ad01306ebe270fdfe52d1426116f9958c8a8..a9b51cc52f71e9f157a5f51d1ff1f67c04af1fab 100644
--- a/tests/value/precond2.c
+++ b/tests/value/precond2.c
@@ -1,8 +1,8 @@
/* run.config*
- OPT: -machdep x86_32 -no-autoload-plugins -load-module from,inout,eva,report,rtegen -rte -then -eva @EVA_CONFIG@ -then -report -report-print-properties
- OPT: -machdep x86_32 -no-autoload-plugins -load-module from,inout,eva,report,rtegen -eva @EVA_CONFIG@ -then -rte -then -report -report-print-properties
+PLUGIN: @EVA_MAIN_PLUGINS@ report rtegen
+ OPT: -machdep x86_32 @RTE_TEST@ -then -eva @EVA_CONFIG@ -then -report -report-print-properties
+ OPT: -machdep x86_32 -eva @EVA_CONFIG@ -then @RTE_TEST@ -then -report -report-print-properties
*/
-
// Fuse with precond.c when bts #1208 is solved
int x;
diff --git a/tests/value/protomain.i b/tests/value/protomain.i
index ff7e47cb0b4932e85d8ffb3a341b0e4f19e3c604..b9018d4e5dac5e76924982102895c81f572eb4d9 100644
--- a/tests/value/protomain.i
+++ b/tests/value/protomain.i
@@ -1,4 +1,5 @@
/* run.config*
- OPT: -no-autoload-plugins -load-module inout,eva -eva @EVA_CONFIG@
+ PLUGIN: @EVA_MAIN_PLUGINS@
+ OPT: -eva @EVA_CONFIG@
*/
int main(int c, char **);
diff --git a/tests/value/recol.c b/tests/value/recol.c
index 46f6de92f5ab375b405205aee08f18c3c344ddcf..afddafdc2a795bb6d13a37f4cd5c31a460d59e93 100644
--- a/tests/value/recol.c
+++ b/tests/value/recol.c
@@ -1,8 +1,8 @@
/* run.config*
- OPT: -no-autoload-plugins -load-module eva,inout -eva @EVA_CONFIG@ -eva-slevel 100 -cpp-extra-args="-DPTEST " -journal-disable -no-warn-signed-overflow
- OPT: -no-autoload-plugins -load-module eva,inout -eva @EVA_CONFIG@ -eva-slevel 100 -cpp-extra-args="-DPTEST " -journal-disable -machdep ppc_32 -no-warn-signed-overflow
+PLUGIN: @EVA_MAIN_PLUGINS@
+ OPT: -eva @EVA_CONFIG@ -eva-slevel 100 -cpp-extra-args="-DPTEST " -no-warn-signed-overflow
+ OPT: -eva @EVA_CONFIG@ -eva-slevel 100 -cpp-extra-args="-DPTEST " -machdep ppc_32 -no-warn-signed-overflow
*/
-
#ifndef PTEST
#include <stdio.h>
#endif
diff --git a/tests/value/redundant_alarms.c b/tests/value/redundant_alarms.c
index a6b1785cd3d19a218c1a13b55ca62b8bda5344d0..1009eafff78a6b6e4c778ce62ce41d192e621084 100644
--- a/tests/value/redundant_alarms.c
+++ b/tests/value/redundant_alarms.c
@@ -1,7 +1,7 @@
/* run.config*
- OPT: -no-autoload-plugins -load-module inout,scope,slicing,sparecode @EVA_CONFIG@ -eva-warn-copy-indeterminate=-@all,main3 -scope-msg-key rm_asserts -scope-verbose 2 -eva-remove-redundant-alarms -print -slice-threat main1 -then-on 'Slicing export' -print
+ PLUGIN: inout,scope,slicing,sparecode
+ OPT: @EVA_CONFIG@ -eva-warn-copy-indeterminate=-@all,main3 -scope-msg-key rm_asserts -scope-verbose 2 -eva-remove-redundant-alarms -print -slice-threat main1 -then-on 'Slicing export' -print
**/
-
volatile int v;
void main1(int c) {
diff --git a/tests/value/reevaluate_alarms.i b/tests/value/reevaluate_alarms.i
index 9085a0a7185533f1b36bbf543d4b94b45f86db36..649ac3850284a94a358a0e59d74118f116802d6a 100644
--- a/tests/value/reevaluate_alarms.i
+++ b/tests/value/reevaluate_alarms.i
@@ -1,8 +1,8 @@
/* run.config*
- STDOPT: +"-load-module report -report -then -eva-slevel 10"
+ PLUGIN: @PTEST_PLUGIN@ report
+ STDOPT: +"-report -then -eva-slevel 10"
*/
-
int S=0;
int T[5];
int n = 1;
diff --git a/tests/value/replace_by_show_each.c b/tests/value/replace_by_show_each.c
index 51592b67f44fd1c183ee2478a67dc16468c4ed9f..832a73028a0081dc7c2719cb7ce9d6e9925872b0 100644
--- a/tests/value/replace_by_show_each.c
+++ b/tests/value/replace_by_show_each.c
@@ -1,7 +1,7 @@
/* run.config*
- OPT: -no-autoload-plugins -load-module from,inout,eva -eva @EVA_CONFIG@ -inout -calldeps
+ PLUGIN: @EVA_MAIN_PLUGINS@ from,inout
+ OPT: -eva @EVA_CONFIG@ -inout -calldeps
*/
-
#define show_each_1 Frama_C_show_each_1
#define show_each_2 Frama_C_show_each_2
diff --git a/tests/value/sign_of_bitfiled_int.c b/tests/value/sign_of_bitfiled_int.c
index b69aa28c06baafceb1534387dc5b661cbbb20ab1..f26d8b248cd884cb6fd20182c89adbb4eed4f2f2 100644
--- a/tests/value/sign_of_bitfiled_int.c
+++ b/tests/value/sign_of_bitfiled_int.c
@@ -1,9 +1,9 @@
/* run.config*
- OPT: -no-autoload-plugins -load-module eva,inout -eva @EVA_CONFIG@ -cpp-extra-args="-DPTEST" -journal-disable
- OPT: -no-autoload-plugins -load-module eva,inout -machdep ppc_32 -eva @EVA_CONFIG@ -cpp-extra-args="-DPTEST" -journal-disable
+ PLUGIN: @EVA_MAIN_PLUGINS@
+ OPT: -eva @EVA_CONFIG@ -cpp-extra-args="-DPTEST"
+ OPT: -machdep ppc_32 -eva @EVA_CONFIG@ -cpp-extra-args="-DPTEST"
*/
-
#ifndef PTEST
#include <stdio.h>
#endif
diff --git a/tests/value/simplify_cfg.i b/tests/value/simplify_cfg.i
index 5c1b0f1d7193e23bfa1bcbc04740b3aacbd5b681..f10fb7cbcd5f6f32751990df583c0ba302825b69 100644
--- a/tests/value/simplify_cfg.i
+++ b/tests/value/simplify_cfg.i
@@ -1,8 +1,8 @@
/* run.config*
- OPT: -no-autoload-plugins -load-module eva,inout -simplify-cfg -keep-switch -eva @EVA_CONFIG@ -journal-disable
- OPT: -no-autoload-plugins -load-module eva,inout -simplify-cfg -eva @EVA_CONFIG@ -journal-disable
+ PLUGIN: @EVA_MAIN_PLUGINS@
+ OPT: -simplify-cfg -keep-switch -eva @EVA_CONFIG@
+ OPT: -simplify-cfg -eva @EVA_CONFIG@
*/
-
int main(int x, int y) {
int z = 0;
char c = 'c';
diff --git a/tests/value/split_return.i b/tests/value/split_return.i
index df9fbcbdada17c3366d1da87a6b948f454b8129e..08b7e3e2ea7e4d22cfa1b736084949d33a47ce4e 100644
--- a/tests/value/split_return.i
+++ b/tests/value/split_return.i
@@ -1,12 +1,14 @@
/* run.config*
- STDOPT: +"-deterministic -eva-no-memexec -eva-slevel-function init:3,main1:3,f2:4,main2:4,f4:3,main5:3,uninit:2,main9:2 -eva-split-return-function f2:0,f3:-2:-4,f4:4,f5:-2,NON_EXISTING:4,uninit:0,escaping:0 -eva-warn-copy-indeterminate=-uninit,-escaping,-main9 -permissive -then -load-module report -report"
- STDOPT: +"-deterministic -eva-no-memexec -eva -journal-disable -out -input -deps -eva-slevel 6 -eva-split-return auto -eva-split-return-function f7:0:3 -eva-warn-copy-indeterminate=-uninit,-escaping,-main9 -then -load-module report -report"
+ PLUGIN: @PTEST_PLUGIN@ report
+ STDOPT: +"-deterministic -eva-no-memexec -eva-slevel-function init:3,main1:3,f2:4,main2:4,f4:3,main5:3,uninit:2,main9:2 -eva-split-return-function f2:0,f3:-2:-4,f4:4,f5:-2,NON_EXISTING:4,uninit:0,escaping:0 -eva-warn-copy-indeterminate=-uninit,-escaping,-main9 -permissive -then -report"
+ STDOPT: +"-deterministic -eva-no-memexec -eva-slevel 6 -eva-split-return auto -eva-split-return-function f7:0:3 -eva-warn-copy-indeterminate=-uninit,-escaping,-main9 -then -report"
+ PLUGIN: @EVA_PLUGINS@
EXIT:1
COMMENT: below command must fail, as -permissive is not set
- STDOPT: +"-deterministic -eva-no-memexec -eva -eva-slevel-function NON_EXISTING:4 -eva-warn-copy-indeterminate=-uninit,-escaping,-main9"
+ STDOPT: +"-deterministic -eva-no-memexec -eva-slevel-function NON_EXISTING:4 -eva-warn-copy-indeterminate=-uninit,-escaping,-main9"
EXIT:0
- STDOPT: +"-deterministic -eva-no-memexec -eva -journal-disable -out -input -deps -eva-slevel 6 -eva-split-return full -eva-warn-copy-indeterminate=-uninit,-escaping,-main9"
- STDOPT: +"-deterministic -eva-no-memexec -eva -journal-disable -out -input -deps -eva-slevel 6 -eva-split-return full -eva-split-return-function f7:0:3 -eva-split-return-function f2:full -eva-warn-copy-indeterminate=-uninit,-escaping,-main9 -then -eva-split-return-function f2:auto"
+ STDOPT: +"-deterministic -eva-no-memexec -eva-slevel 6 -eva-split-return full -eva-warn-copy-indeterminate=-uninit,-escaping,-main9"
+ STDOPT: +"-deterministic -eva-no-memexec -eva-slevel 6 -eva-split-return full -eva-split-return-function f7:0:3 -eva-split-return-function f2:full -eva-warn-copy-indeterminate=-uninit,-escaping,-main9 -then -eva-split-return-function f2:auto"
*/
diff --git a/tests/value/summary.i b/tests/value/summary.i
index 8d5d6efd3f583a37f9ef638481739269650a8d07..718f105808a8e7a74784f387e3945490e35f5f0b 100644
--- a/tests/value/summary.i
+++ b/tests/value/summary.i
@@ -3,9 +3,9 @@
STDOPT: +"-eva-msg-key=summary -main minimal"
STDOPT: +"-eva-msg-key=summary -main bottom"
STDOPT: +"-eva-msg-key=summary -main main"
- STDOPT: +"-rte -eva-msg-key=summary -main main -slevel 0"
+PLUGIN: @PTEST_PLUGIN@ rtegen
+ STDOPT: +"@RTE_TEST@ -eva-msg-key=summary -main main -slevel 0"
*/
-
/* Tests the summary on the smallest possible program. */
void minimalist ();
void minimal () {}
diff --git a/tests/value/ulongvslonglong.i b/tests/value/ulongvslonglong.i
index c945f20f8813505c233ddf76b4df42533726d3bc..6de591f1cbcfa4fad682d832e564e234621c009b 100644
--- a/tests/value/ulongvslonglong.i
+++ b/tests/value/ulongvslonglong.i
@@ -1,8 +1,8 @@
/* run.config*
- OPT: -no-autoload-plugins -load-module eva,inout -eva @EVA_CONFIG@ -journal-disable -machdep x86_64
- OPT: -no-autoload-plugins -load-module eva,inout -eva @EVA_CONFIG@ -journal-disable
+ PLUGIN: @EVA_MAIN_PLUGINS@
+ OPT: -eva @EVA_CONFIG@ -machdep x86_64
+ OPT: -eva @EVA_CONFIG@
*/
-
int x;
long x2;
unsigned long x9[6][2];
diff --git a/tests/value/uninit_callstack.i b/tests/value/uninit_callstack.i
index 6adb7e5120047524db8d21d776a7d7f5d76c9abc..8ee2bed040ae9d010226ded9ee9ddf6883fe8985 100644
--- a/tests/value/uninit_callstack.i
+++ b/tests/value/uninit_callstack.i
@@ -1,8 +1,8 @@
/* run.config*
- OPT: -no-autoload-plugins -load-module eva -eva @EVA_CONFIG@ -eva-no-show-progress -eva-print-callstacks -journal-disable -eva-no-results
+ PLUGIN: @EVA_MAIN_PLUGINS@
+ OPT: -eva @EVA_CONFIG@ -eva-no-show-progress -eva-print-callstacks -eva-no-results
*/
int *p, x;
-
void f(void)
{
if (*p) x = 1;
diff --git a/tests/value/unknown_sizeof.i b/tests/value/unknown_sizeof.i
index 94e88f03ca2aaa60f0b99312ef0a1c2dbc9868b0..40b7487daa78839926f4004ada6b81924d513109 100644
--- a/tests/value/unknown_sizeof.i
+++ b/tests/value/unknown_sizeof.i
@@ -1,10 +1,10 @@
/* run.config*
EXIT: 1
- OPT: -no-autoload-plugins -load-module eva -eva @EVA_CONFIG@ -main main1
- OPT: -no-autoload-plugins -load-module eva -eva @EVA_CONFIG@ -main main2
+ PLUGIN: eva
+ OPT: -eva @EVA_CONFIG@ -main main1
+ OPT: -eva @EVA_CONFIG@ -main main2
*/
struct s;
-
struct s s;
void f(struct s) { // Argument has unknown size
diff --git a/tests/value/use_spec.i b/tests/value/use_spec.i
index 3097dcc25cb54367cd22fe2bc77aa23d5cfea43c..ebbe2977bbf3c0194c0255b63c553e79321976de 100644
--- a/tests/value/use_spec.i
+++ b/tests/value/use_spec.i
@@ -1,9 +1,12 @@
/* run.config*
+ PLUGIN: @EVA_MAIN_PLUGINS@ from,inout
EXIT: 1
- OPT: -no-autoload-plugins -load-module from,inout,eva -eva-use-spec f,h -eva @EVA_CONFIG@ -inout -calldeps
- OPT: -no-autoload-plugins -load-module from,inout,eva -eva-use-spec f,h -eva @EVA_CONFIG@ -inout -calldeps -show-indirect-deps
+ OPT: -eva-use-spec f,h -eva @EVA_CONFIG@ -inout -calldeps
+ OPT: -eva-use-spec f,h -eva @EVA_CONFIG@ -inout -calldeps -show-indirect-deps
*/
+
+
void f(int *x) {
}
diff --git a/tests/value/volatile2.i b/tests/value/volatile2.i
index f1088a88553a2248945e46d4bbb132348729c74f..0a4a86e76ec0dd4f4f2cf93b6965cbd22f806c0a 100644
--- a/tests/value/volatile2.i
+++ b/tests/value/volatile2.i
@@ -1,8 +1,8 @@
/* run.config*
- OPT: -no-autoload-plugins -load-module from,inout,eva -print -eva @EVA_CONFIG@ -machdep x86_16
+ PLUGIN: @EVA_MAIN_PLUGINS@
+ OPT: -print -eva @EVA_CONFIG@ -machdep x86_16
*/
-
volatile unsigned char t[10];
struct u { unsigned char f1; unsigned char f2;};
volatile struct u u;
diff --git a/tests/value/widen_overflow.i b/tests/value/widen_overflow.i
index 9bf6480e8085454da2b1e8bacec7f77ba184285a..97168423354269637c70f4b978402c47ed3f4ec8 100644
--- a/tests/value/widen_overflow.i
+++ b/tests/value/widen_overflow.i
@@ -1,7 +1,7 @@
/* run.config*
- OPT: -no-autoload-plugins -load-module eva,inout -eva @EVA_CONFIG@
+ PLUGIN: @EVA_MAIN_PLUGINS@
+ OPT: -eva @EVA_CONFIG@
*/
-
int main() {
Frama_C_show_each(sizeof(unsigned int));