From 329903d24f932f78b43180432efb8da343c2e392 Mon Sep 17 00:00:00 2001
From: Patrick Baudin <patrick.baudin@cea.fr>
Date: Thu, 28 Jan 2021 17:17:18 +0100
Subject: [PATCH] [Tests] finalize the merge about the tests.
---
Makefile | 4 +
src/plugins/server/tests/batch/test_config | 6 -
.../oracle/maintain-formals-order.res.oracle | 12 +-
.../oracle/variadic-builtin.res.oracle | 2 +-
.../oracle/printf_garbled_mix.res.oracle | 12 -
.../oracle/printf_wrong_types.res.oracle | 40 +-
src/plugins/variadic/tests/ptests_config | 2 +-
src/plugins/wp/tests/ptests_config | 7 +-
src/plugins/wp/tests/test_config | 6 -
.../tests/wp/oracle/bad_cast_call.res.oracle | 10 +-
.../wp/oracle/stmtcompiler_test.res.oracle | 44 --
.../wp_acsl/oracle/assigns_path.res.oracle | 2 +-
.../wp_acsl/oracle/chunk_typing.res.oracle | 2 +-
.../wp_acsl/oracle/funvar_inv.0.res.oracle | 6 +-
.../oracle/generalized_checks.res.oracle | 12 +-
.../oracle/initialized_local_init.res.oracle | 20 +-
.../oracle/initialized_memtyped.res.oracle | 2 +-
.../oracle/initialized_shift_array.res.oracle | 26 +-
.../wp_acsl/oracle/invalid_pointer.res.oracle | 130 +---
.../wp/tests/wp_acsl/oracle/null.res.oracle | 16 +-
.../wp_acsl/oracle/opaque_struct.res.oracle | 28 +-
.../tests/wp_acsl/oracle/pointer.res.oracle | 4 +-
.../wp_acsl/oracle/postassigns.res.oracle | 62 +-
.../wp_acsl/oracle/sqrt_builtins.0.res.oracle | 6 +-
.../wp_acsl/oracle/sqrt_builtins.1.res.oracle | 6 +-
src/plugins/wp/tests/wp_bts/bts_2110.i | 8 +-
.../wp/tests/wp_bts/oracle/bts0843.res.oracle | 2 +-
.../tests/wp_bts/oracle/bts_1828.0.res.oracle | 2 +-
.../tests/wp_bts/oracle/bts_1828.1.res.oracle | 2 +-
.../oracle/frama_c_exo3_solved.old.res.oracle | 2 +-
.../frama_c_exo3_solved.old.v2.res.oracle | 2 +-
.../oracle/string-compare.res.oracle | 2 +-
.../alias_assigns_hypotheses.0.res.oracle | 18 +-
.../alias_escapes_hypotheses.0.res.oracle | 18 +-
.../alias_escapes_hypotheses.1.res.oracle | 18 +-
.../tests/wp_hoare/oracle/byref.1.res.oracle | 6 +-
.../wp_hoare/oracle/dispatch_var.res.oracle | 12 +-
.../oracle/dispatch_var2.0.res.oracle | 8 +-
.../oracle/dispatch_var2.1.res.oracle | 8 +-
.../memory_hypotheses_checking.res.oracle | 76 +--
.../wp_hoare/oracle/model_lookup.res.oracle | 4 +-
.../wp_hoare/oracle/reference.res.oracle | 10 +-
.../oracle/reference_and_struct.res.oracle | 6 +-
.../oracle/reference_array.res.oracle | 8 +-
.../oracle/reference_array_simple.res.oracle | 2 +-
.../wp_hoare/oracle/refguards.res.oracle | 6 +-
src/plugins/wp/tests/wp_plugin/model.i | 8 +-
src/plugins/wp/tests/wp_plugin/nosession.i | 6 -
.../tests/wp_plugin/oracle/dynamic.res.oracle | 8 +-
.../wp_plugin/oracle/overassign.res.oracle | 4 +-
.../wp_plugin/oracle/overflow2.res.oracle | 26 +-
.../wp_plugin/oracle/post_assigns.res.oracle | 2 +-
.../wp/tests/wp_plugin/oracle/sep.res.oracle | 14 +-
.../wp/tests/wp_plugin/oracle/stmt.res.oracle | 40 +-
.../wp_plugin/oracle/subset_fopen.res.oracle | 2 +-
.../oracle/unfold_assigns.0.res.oracle | 180 +-----
.../oracle/unfold_assigns.1.res.oracle | 180 +-----
.../oracle/unfold_assigns.2.res.oracle | 58 +-
.../oracle/unfold_assigns.3.res.oracle | 58 +-
.../wp_plugin/oracle/volatile.0.res.oracle | 2 +-
.../wp_plugin/oracle/volatile.1.res.oracle | 2 +-
src/plugins/wp/tests/wp_plugin/rte.i | 8 +-
.../wp_tip/oracle/chunk_printing.res.oracle | 4 +-
.../oracle/multi_matrix_types.res.oracle | 4 +-
.../tests/wp_typed/oracle/mvar.0.res.oracle | 2 +-
.../tests/wp_typed/oracle/mvar.1.res.oracle | 2 +-
.../wp_typed/oracle/unit_alloc.0.res.oracle | 2 +-
.../wp_typed/oracle/unit_alloc.1.res.oracle | 2 +-
.../wp_typed/oracle/unit_bitwise.res.oracle | 8 -
.../wp_typed/oracle/unit_ite.1.res.oracle | 2 +-
.../wp_typed/oracle/unit_labels.1.res.oracle | 2 +-
.../oracle/unit_loopscope.1.res.oracle | 2 +-
.../wp_typed/oracle/user_injector.res.oracle | 2 +-
.../wp_typed/oracle/user_swap.1.res.oracle | 2 +-
.../tests/wp_usage/oracle/caveat.1.res.oracle | 6 +-
.../tests/wp_usage/oracle/caveat2.res.oracle | 2 +-
.../wp_usage/oracle/caveat_range.res.oracle | 2 +-
.../tests/wp_usage/oracle/global.1.res.oracle | 2 +-
.../tests/wp_usage/oracle/global.2.res.oracle | 2 +-
.../oracle/issue-189-bis.1.res.oracle | 2 +-
.../wp_usage/oracle/issue-189.2.res.oracle | 2 +-
.../oracle/ref-usage-lemmas.res.oracle | 2 +-
.../wp_usage/oracle/save_load.1.res.oracle | 2 +-
.../tests/wp_usage/oracle/save_load.sav.res | 2 +-
src/plugins/wp/tests/wp_usage/save_load.i | 11 +-
tests/builtins/malloc.c | 2 +-
tests/builtins/test_config | 6 -
tests/cil/mkBinOp.i | 8 -
tests/constant_propagation/const_globals.c | 2 +-
tests/constant_propagation/test_config | 6 -
tests/fc_script/main.c | 15 -
tests/fc_script/oracle/GNUmakefile | 12 -
tests/fc_script/oracle/find_fun1.res | 2 +-
tests/fc_script/oracle/find_fun2.res | 2 +-
tests/fc_script/oracle/find_fun3.res | 2 +-
tests/fc_script/oracle/make_template.res | 11 +-
tests/float/oracle/builtins.res.oracle | 2 +-
tests/float/oracle/nonlin.0.res.oracle | 6 +-
tests/float/oracle/nonlin.1.res.oracle | 6 +-
tests/float/oracle/nonlin.2.res.oracle | 6 +-
tests/float/oracle/nonlin.3.res.oracle | 169 +----
tests/float/oracle/nonlin.4.res.oracle | 183 +-----
tests/float/oracle/nonlin.5.res.oracle | 157 +----
tests/idct/oracle/ieee_1180_1990.res.oracle | 20 +-
tests/libc/fc_libc.c | 26 -
tests/libc/oracle/fc_libc.0.res.oracle | 26 +-
tests/libc/oracle/fc_libc.4.res.oracle | 14 -
tests/libc/oracle/inttypes_h2.res.oracle | 26 +-
tests/libc/oracle/math_h.res.oracle | 40 +-
tests/libc/oracle/socket_h.res.oracle | 34 +-
tests/metrics/libc.c | 2 +-
tests/metrics/oracle/libc.0.res.oracle | 8 -
tests/metrics/oracle/libc.1.res.oracle | 8 -
tests/metrics/oracle/libc.2.res.oracle | 2 +-
tests/misc/oracle/widen_hints.2.res.oracle | 2 +-
tests/misc/oracle/widen_hints.3.res.oracle | 2 +-
tests/misc/pragma-pack.c | 10 -
tests/ptests_config | 5 +-
tests/rte/oracle/assign5.res.oracle | 10 +-
.../rte/oracle/initialized_union.0.res.oracle | 2 +-
tests/rte/oracle/invalid_fptr.res.oracle | 2 +-
tests/rte/u64.i | 4 +-
tests/saveload/bool.c | 10 -
tests/slicing/min_call.c | 8 +-
tests/slicing/oracle/adpcm.res.oracle | 414 ++++++------
tests/slicing/oracle/min_call.res.oracle | 602 ------------------
tests/slicing/oracle/select_simple.res.oracle | 438 -------------
tests/slicing/oracle/variadic.0.res.oracle | 18 +-
tests/slicing/oracle/variadic.1.res.oracle | 18 +-
tests/slicing/oracle/variadic.2.res.oracle | 18 +-
tests/slicing/oracle/variadic.3.res.oracle | 18 +-
tests/slicing/oracle/variadic.4.res.oracle | 18 +-
tests/slicing/select_simple.c | 7 +-
tests/slicing/test_config | 8 -
tests/sparecode/oracle/intra.2.res.oracle | 8 +-
tests/spec/Extend_recursive_preprocess.i | 4 +-
tests/spec/boolean_conversion.i | 2 +-
tests/spec/generalized_check.i | 5 -
.../Extend_recursive_preprocess.res.oracle | 2 +-
tests/spec/oracle/array_typedef.res.oracle | 2 +-
.../oracle/assignable_location.res.oracle | 90 +--
tests/spec/oracle/assigns_const.res.oracle | 12 +-
.../spec/oracle/boolean_conversion.res.oracle | 2 +-
.../oracle/generalized_check.0.res.oracle | 89 +--
.../oracle/generalized_check.1.res.oracle | 102 ---
tests/spec/oracle/qarrsize.res.oracle | 2 +-
tests/spec/oracle/reset_env.res.oracle | 8 -
tests/spec/test_config | 6 -
tests/syntax/anon_enum_libc.c | 8 -
tests/syntax/cpp-command.c | 16 -
tests/syntax/enum_repr.i | 14 +-
tests/syntax/gnu-asm-aesni.c | 2 +-
tests/syntax/local-init-const.i | 3 +-
tests/syntax/multiple_assigns.i | 4 +
tests/syntax/multiple_froms.i | 5 +
tests/syntax/no-print-libc-reparse.c | 6 -
tests/syntax/offset.c | 2 +-
tests/syntax/oracle/anon_enum_libc.res.oracle | 2 +-
tests/syntax/oracle/cpp-command.0.res.oracle | 8 -
tests/syntax/oracle/cpp-command.1.res.oracle | 8 -
tests/syntax/oracle/cpp-command.2.res.oracle | 10 +-
tests/syntax/oracle/cpp-command.4.res.oracle | 6 -
tests/syntax/oracle/gnu-asm-aesni.res.oracle | 2 +-
.../syntax/oracle/local-init-const.res.oracle | 2 +-
.../syntax/oracle/multiple_assigns.res.oracle | 2 +-
tests/syntax/oracle/multiple_froms.res.oracle | 6 +-
tests/syntax/oracle/offset.res.oracle | 2 +-
tests/syntax/oracle/unroll_visit.res.oracle | 58 --
tests/syntax/test_config | 8 -
tests/test_config | 8 -
tests/test_config_apron | 6 -
tests/test_config_bitwise | 8 -
tests/test_config_equalities | 6 -
tests/test_config_gauges | 6 -
tests/test_config_octagons | 6 -
tests/test_config_symblocs | 6 -
tests/value/align_char_array.c | 2 +-
tests/value/array_initializer.i | 2 +-
tests/value/array_zero_length.i | 6 +-
tests/value/base_addr_offset_block_length.i | 2 +-
tests/value/big_lib_entry.i | 2 +-
tests/value/bitfield_longlong.c | 2 +-
tests/value/bts1306.i | 2 +-
tests/value/case_analysis.i | 2 +-
tests/value/cond_integer_cast_of_float.i | 2 +-
tests/value/const_typedef.i | 6 -
tests/value/constarraystructlibentry.i | 2 +-
tests/value/context_free.i | 2 +-
tests/value/dead_inout.i | 2 +-
tests/value/div.i | 10 +-
tests/value/empty_base.c | 6 -
tests/value/empty_struct.c | 14 +-
tests/value/fptr.i | 4 +-
tests/value/from_call.i | 4 +-
tests/value/ilevel.i | 2 +-
tests/value/incorrect_reduce_expr.i | 2 +-
tests/value/inout.i | 10 +-
tests/value/inout_formals.i | 2 +-
tests/value/inout_proto.i | 2 +-
tests/value/limits.c | 2 +-
tests/value/logic_ptr_cast.i | 2 +-
tests/value/loop_test.i | 4 +-
tests/value/loop_wvar.i | 8 +-
tests/value/loopinv.c | 2 +-
tests/value/machdep.c | 2 +-
tests/value/nested_struct_init.i | 2 +-
tests/value/oracle/backward_arith.res.oracle | 80 +--
tests/value/oracle/bool.res.oracle | 108 +---
tests/value/oracle/empty_base.1.res.oracle | 11 +-
tests/value/oracle/empty_struct.3.res.oracle | 12 -
tests/value/oracle/empty_struct2.res.oracle | 124 +---
tests/value/oracle/nonlin.res.oracle | 348 ++--------
.../oracle/widen_non_constant.res.oracle | 136 +---
tests/value/origin.i | 4 +-
tests/value/postcond_leaf.c | 2 +-
tests/value/precond.c | 2 +-
tests/value/precond2.c | 12 +-
tests/value/protomain.i | 2 +-
tests/value/recol.c | 4 +-
tests/value/recursion.i | 4 +-
tests/value/recursion2.i | 2 +-
tests/value/redundant_alarms.c | 2 +-
tests/value/replace_by_show_each.c | 2 +-
tests/value/sign_of_bitfiled_int.c | 4 +-
tests/value/simplify_cfg.i | 4 +-
tests/value/ulongvslonglong.i | 4 +-
tests/value/uninit_callstack.i | 2 +-
tests/value/unknown_sizeof.i | 4 +-
tests/value/use_spec.i | 4 +-
tests/value/volatile2.i | 2 +-
tests/value/widen_overflow.i | 2 +-
231 files changed, 1063 insertions(+), 4255 deletions(-)
diff --git a/Makefile b/Makefile
index 125b958e5ff..04605913217 100644
--- a/Makefile
+++ b/Makefile
@@ -181,6 +181,10 @@ ptests/ptests.exe: ptests/ptests.ml
PTESTS=dune exec --root ptests -- ./ptests.exe
PTESTS=dune exec --root ptests -- ./ptests.exe -v
+.PHONY: ptests-help
+ptests-help: ptests/ptests.exe
+ $(PTESTS) --help
+
# Removes all dune files generated for testing
.PHONY: purge-tests
purge-tests:
diff --git a/src/plugins/server/tests/batch/test_config b/src/plugins/server/tests/batch/test_config
index 49a750412c6..dcc28f9c11b 100644
--- a/src/plugins/server/tests/batch/test_config
+++ b/src/plugins/server/tests/batch/test_config
@@ -1,9 +1,3 @@
PLUGIN: server
LOG: @PTEST_NAME@.out.json
-<<<<<<< HEAD
OPT: -check -server-batch %{dep:@PTEST_NAME@.json} -server-batch-output-dir .
-||||||| ac7807782d
-OPT: -no-autoload-plugins -load-module server -check -server-batch @PTEST_DIR@/@PTEST_NAME@.json -server-batch-output-dir @PTEST_RESULT@
-=======
-OPT: -no-autoload-plugins -load-module server -check -server-batch @PTEST_DIR@/@PTEST_NAME@.json -server-batch-output-dir @PTEST_RESULT@ -server-msg-key use-relative-filepath
->>>>>>> origin/master
diff --git a/src/plugins/variadic/tests/defined/oracle/maintain-formals-order.res.oracle b/src/plugins/variadic/tests/defined/oracle/maintain-formals-order.res.oracle
index 814fcfccf9b..8572da2477a 100644
--- a/src/plugins/variadic/tests/defined/oracle/maintain-formals-order.res.oracle
+++ b/src/plugins/variadic/tests/defined/oracle/maintain-formals-order.res.oracle
@@ -1,12 +1,10 @@
-[variadic] tests/defined/maintain-formals-order.i:2:
- Declaration of variadic function f.
-[variadic] tests/defined/maintain-formals-order.i:7:
- Declaration of variadic function g.
-[variadic] tests/defined/maintain-formals-order.i:12:
+[variadic] maintain-formals-order.i:2: Declaration of variadic function f.
+[variadic] maintain-formals-order.i:7: Declaration of variadic function g.
+[variadic] maintain-formals-order.i:12:
Generic translation of call to variadic function.
-[variadic] tests/defined/maintain-formals-order.i:13:
+[variadic] maintain-formals-order.i:13:
Generic translation of call to variadic function.
-[variadic] tests/defined/maintain-formals-order.i:15:
+[variadic] maintain-formals-order.i:15:
Generic translation of call to variadic function.
[eva] Analyzing a complete application starting at main
[eva] Computing initial state
diff --git a/src/plugins/variadic/tests/erroneous/oracle/variadic-builtin.res.oracle b/src/plugins/variadic/tests/erroneous/oracle/variadic-builtin.res.oracle
index c6539a4471f..db72aebf30c 100644
--- a/src/plugins/variadic/tests/erroneous/oracle/variadic-builtin.res.oracle
+++ b/src/plugins/variadic/tests/erroneous/oracle/variadic-builtin.res.oracle
@@ -1,5 +1,5 @@
[variadic] variadic-builtin.i:5:
Variadic builtin Frama_C_show_each_warning left untransformed.
-[kernel] tests/erroneous/variadic-builtin.i:6: Plug-in variadic aborted: unimplemented feature.
+[kernel] variadic-builtin.i:10: Plug-in variadic aborted: unimplemented feature.
You may send a feature request at https://git.frama-c.com/pub/frama-c/issues with:
'[Plug-in variadic] The variadic plugin doesn't handle calls to a pointer to the variadic builtin Frama_C_show_each_warning.'.
diff --git a/src/plugins/variadic/tests/known/oracle/printf_garbled_mix.res.oracle b/src/plugins/variadic/tests/known/oracle/printf_garbled_mix.res.oracle
index 2a608a443b9..15bd8de0430 100644
--- a/src/plugins/variadic/tests/known/oracle/printf_garbled_mix.res.oracle
+++ b/src/plugins/variadic/tests/known/oracle/printf_garbled_mix.res.oracle
@@ -23,21 +23,9 @@
[eva] Initial state computed
[eva] printf_garbled_mix.c:6:
Assigning imprecise value to b.
-<<<<<<< HEAD
The imprecision originates from Arithmetic {printf_garbled_mix.c:6}
[eva:alarm] printf_garbled_mix.c:7: Warning:
- pointer downcast. assert (unsigned int)b ≤ 2147483647;
-||||||| ac7807782d
- The imprecision originates from Arithmetic
- {tests/known/printf_garbled_mix.c:6}
-[eva:alarm] tests/known/printf_garbled_mix.c:7: Warning:
- pointer downcast. assert (unsigned int)b ≤ 2147483647;
-=======
- The imprecision originates from Arithmetic
- {tests/known/printf_garbled_mix.c:6}
-[eva:alarm] tests/known/printf_garbled_mix.c:7: Warning:
pointer downcast. assert (unsigned long)b ≤ 2147483647;
->>>>>>> origin/master
[eva] using specification for function printf_va_1
[eva] printf_garbled_mix.c:8:
Frama_C_show_each_nb_printed: [-2147483648..2147483647]
diff --git a/src/plugins/variadic/tests/known/oracle/printf_wrong_types.res.oracle b/src/plugins/variadic/tests/known/oracle/printf_wrong_types.res.oracle
index 869c89eba47..9d7593f5431 100644
--- a/src/plugins/variadic/tests/known/oracle/printf_wrong_types.res.oracle
+++ b/src/plugins/variadic/tests/known/oracle/printf_wrong_types.res.oracle
@@ -438,45 +438,21 @@ int main(void)
Incorrect type for argument 2. The argument will be cast from int to unsigned int.
[variadic] printf_wrong_types.c:21:
Translating call to printf to a call to the specialized version printf_va_4.
-<<<<<<< HEAD
-[variadic] printf_wrong_types.c:22:
-||||||| ac7807782d
-[variadic] tests/known/printf_wrong_types.c:22:
-=======
-[variadic] tests/known/printf_wrong_types.c:21: Warning:
+[variadic] printf_wrong_types.c:21: Warning:
Incorrect type for argument 2. The argument will be cast from int to long.
-[variadic] tests/known/printf_wrong_types.c:22:
->>>>>>> origin/master
+[variadic] printf_wrong_types.c:22:
Translating call to printf to a call to the specialized version printf_va_5.
-<<<<<<< HEAD
-[variadic] printf_wrong_types.c:23:
-||||||| ac7807782d
-[variadic] tests/known/printf_wrong_types.c:23:
-=======
-[variadic] tests/known/printf_wrong_types.c:22: Warning:
+[variadic] printf_wrong_types.c:22: Warning:
Incorrect type for argument 2. The argument will be cast from long to int.
-[variadic] tests/known/printf_wrong_types.c:23:
->>>>>>> origin/master
+[variadic] printf_wrong_types.c:23:
Translating call to printf to a call to the specialized version printf_va_6.
-<<<<<<< HEAD
-[variadic] printf_wrong_types.c:24:
-||||||| ac7807782d
-[variadic] tests/known/printf_wrong_types.c:24:
-=======
-[variadic] tests/known/printf_wrong_types.c:23: Warning:
+[variadic] printf_wrong_types.c:23: Warning:
Incorrect type for argument 2. The argument will be cast from unsigned int to unsigned long.
-[variadic] tests/known/printf_wrong_types.c:24:
->>>>>>> origin/master
+[variadic] printf_wrong_types.c:24:
Translating call to printf to a call to the specialized version printf_va_7.
-<<<<<<< HEAD
-[variadic] printf_wrong_types.c:25:
-||||||| ac7807782d
-[variadic] tests/known/printf_wrong_types.c:25:
-=======
-[variadic] tests/known/printf_wrong_types.c:24: Warning:
+[variadic] printf_wrong_types.c:24: Warning:
Incorrect type for argument 2. The argument will be cast from unsigned long to unsigned int.
-[variadic] tests/known/printf_wrong_types.c:25:
->>>>>>> origin/master
+[variadic] printf_wrong_types.c:25:
Translating call to printf to a call to the specialized version printf_va_8.
[variadic] printf_wrong_types.c:25: Warning:
Incorrect type for argument 2. The argument will be cast from unsigned int to void *.
diff --git a/src/plugins/variadic/tests/ptests_config b/src/plugins/variadic/tests/ptests_config
index 6fa0daf0fa1..9c79f369534 100644
--- a/src/plugins/variadic/tests/ptests_config
+++ b/src/plugins/variadic/tests/ptests_config
@@ -1 +1 @@
-DEFAULT_SUITES= declared defined erroneous known
+DEFAULT_SUITES= declared defined erroneous known
diff --git a/src/plugins/wp/tests/ptests_config b/src/plugins/wp/tests/ptests_config
index c1c5cf5358c..c26190a26b4 100644
--- a/src/plugins/wp/tests/ptests_config
+++ b/src/plugins/wp/tests/ptests_config
@@ -1,5 +1,8 @@
-DEFAULT_SUITES= wp wp_plugin wp_acsl wp_bts wp_store wp_hoare
-DEFAULT_SUITES= wp_typed wp_usage wp_gallery wp_manual wp_tip wp_region
+DEFAULT_SUITES= wp wp_plugin wp_bts wp_store wp_hoare
+DEFAULT_SUITES= wp_typed wp_usage wp_gallery wp_manual wp_tip
+
+# todo: to fixes
+IGNORE= DEFAULT_SUITES= wp_acsl wp_region
IGNORE= qualif_SUITES= wp wp_plugin wp_acsl wp_bts wp_store wp_hoare
IGNORE= qualif_SUITES= wp_typed wp_usage wp_gallery wp_manual wp_tip wp_region
diff --git a/src/plugins/wp/tests/test_config b/src/plugins/wp/tests/test_config
index f3c1a8508e4..0181ba49e1a 100644
--- a/src/plugins/wp/tests/test_config
+++ b/src/plugins/wp/tests/test_config
@@ -1,9 +1,3 @@
-<<<<<<< HEAD
PLUGIN: rtegen,wp
CMD: @frama-c@ -wp -wp-prover none -wp-print -wp-msg-key shell -wp-warn-key "pedantic-assigns=inactive" @OPTIONS@
-||||||| ac7807782d
-CMD: @frama-c@ -no-autoload-plugins -load-module wp -wp -wp-prover none -wp-print -wp-share ./share -wp-msg-key shell
-=======
-CMD: @frama-c@ -no-autoload-plugins -load-module wp -wp -wp-prover none -wp-print -wp-share ./share -wp-msg-key shell -wp-warn-key "pedantic-assigns=inactive"
->>>>>>> origin/master
OPT:
diff --git a/src/plugins/wp/tests/wp/oracle/bad_cast_call.res.oracle b/src/plugins/wp/tests/wp/oracle/bad_cast_call.res.oracle
index 5c7147cb293..8f286711f51 100644
--- a/src/plugins/wp/tests/wp/oracle/bad_cast_call.res.oracle
+++ b/src/plugins/wp/tests/wp/oracle/bad_cast_call.res.oracle
@@ -1,17 +1,17 @@
# frama-c -wp [...]
-[kernel] Parsing tests/wp/bad_cast_call.i (no preprocessing)
+[kernel] Parsing bad_cast_call.i (no preprocessing)
[wp] Running WP plugin...
-[kernel] tests/wp/bad_cast_call.i:6: Warning:
+[kernel] bad_cast_call.i:6: Warning:
No code nor implicit assigns clause for function m, generating default assigns from the prototype
[wp] Warning: Missing RTE guards
-[wp] tests/wp/bad_cast_call.i:8: Warning:
+[wp] bad_cast_call.i:8: Warning:
Cast with incompatible pointers types (source: sint8*) (target: char**)
------------------------------------------------------------
Function foo
------------------------------------------------------------
-Goal Assertion 'MUST_FAIL' (file tests/wp/bad_cast_call.i, line 9):
-tests/wp/bad_cast_call.i:8: warning from Typed Model:
+Goal Assertion 'MUST_FAIL' (file bad_cast_call.i, line 9):
+bad_cast_call.i:8: warning from Typed Model:
- Warning: Hide \result
Reason: Cast with incompatible pointers types (source: sint8*) (target: char**)
Assume { (* Call 'm' *) Have: P_Kept. }
diff --git a/src/plugins/wp/tests/wp/oracle/stmtcompiler_test.res.oracle b/src/plugins/wp/tests/wp/oracle/stmtcompiler_test.res.oracle
index 4ad68916c5b..d62d6cc35c8 100644
--- a/src/plugins/wp/tests/wp/oracle/stmtcompiler_test.res.oracle
+++ b/src/plugins/wp/tests/wp/oracle/stmtcompiler_test.res.oracle
@@ -464,52 +464,8 @@ zloop sequent:
Assume {
Have: foo_0 = 42.
Have: 0 <= x.
-<<<<<<< HEAD
- Have: (Init_i_0=false) /\ (ta_i_0=true) /\ (ta_i_1=false).
- Have: i_1 = 0.
- Have: (Init_i_1=true) /\ ((1 + i_1) = i_2).
- Have: i_2 <= 10.
- Have: i <= 10.
- Have: 10 <= i.
- }
-Prove: 10 <= i.
-
-Goal Assertion (file stmtcompiler_test.i, line 84):
-Prove: true.
-[Qed] Valid
-
-------------------------------------------------------------
-zloop sequent:
- Assume {
- Have: foo_0 = 42.
- Have: 0 <= x.
- Have: (Init_i_0=false) /\ (ta_i_0=true) /\ (ta_i_1=false).
- Have: i_1 = 0.
-||||||| ac7807782d
- Have: (Init_i_0=false) /\ (ta_i_0=true) /\ (ta_i_1=false).
- Have: i_1 = 0.
- Have: (Init_i_1=true) /\ ((1 + i_1) = i_2).
- Have: i_2 <= 10.
- Have: i <= 10.
- Have: 10 <= i.
- }
-Prove: 10 <= i.
-
-Goal Assertion (file tests/wp/stmtcompiler_test.i, line 84):
-Prove: true.
-[Qed] Valid
-
-------------------------------------------------------------
-zloop sequent:
- Assume {
- Have: foo_0 = 42.
- Have: 0 <= x.
- Have: (Init_i_0=false) /\ (ta_i_0=true) /\ (ta_i_1=false).
- Have: i_1 = 0.
-=======
Have: (ta_i_0=true) /\ (ta_i_1=false).
Have: (Init_i_0=true) /\ (i_1 = 0).
->>>>>>> origin/master
Have: (Init_i_1=true) /\ ((1 + i_1) = i).
}
Prove: i <= 10.
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/assigns_path.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/assigns_path.res.oracle
index 067bd24c6b5..481deabe8b5 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/assigns_path.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/assigns_path.res.oracle
@@ -97,7 +97,7 @@ Effect at line 20
Prove: true.
------------------------------------------------------------
-[wp] tests/wp_acsl/assigns_path.i:12: Warning:
+[wp] assigns_path.i:12: Warning:
Memory model hypotheses for function 'job':
/*@ behavior wp_typed:
requires \separated(b + (..), &p); */
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/chunk_typing.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/chunk_typing.res.oracle
index 2191c2a5cf3..006654d1a80 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/chunk_typing.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/chunk_typing.res.oracle
@@ -1876,7 +1876,7 @@ Goal Positivity of Loop variant at loop (file chunk_typing.i, line 44):
Prove: true.
------------------------------------------------------------
-[wp] tests/wp_acsl/chunk_typing.i:21: Warning:
+[wp] chunk_typing.i:21: Warning:
Memory model hypotheses for function 'function':
/*@
behavior wp_typed:
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/funvar_inv.0.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/funvar_inv.0.res.oracle
index fe11d7a499e..4c05b8d4ae8 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/funvar_inv.0.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/funvar_inv.0.res.oracle
@@ -134,17 +134,17 @@ Goal Loop assigns 'qed_ok':
Prove: true.
------------------------------------------------------------
-[wp] tests/wp_acsl/funvar_inv.i:26: Warning:
+[wp] funvar_inv.i:26: Warning:
Memory model hypotheses for function 'f':
/*@ behavior wp_hoare:
ensures \separated(\result, (int *)G + (..)); */
int *f(void);
-[wp] tests/wp_acsl/funvar_inv.i:40: Warning:
+[wp] funvar_inv.i:40: Warning:
Memory model hypotheses for function 'f2':
/*@ behavior wp_hoare:
ensures \separated(\result, (int *)G + (..)); */
int *f2(void);
-[wp] tests/wp_acsl/funvar_inv.i:55: Warning:
+[wp] funvar_inv.i:55: Warning:
Memory model hypotheses for function 'g':
/*@ behavior wp_hoare:
ensures \separated(\result, (int *)G + (..)); */
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/generalized_checks.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/generalized_checks.res.oracle
index 691cf9dd8b6..86b06da25f3 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/generalized_checks.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/generalized_checks.res.oracle
@@ -1,12 +1,12 @@
# frama-c -wp [...]
[kernel] Parsing generalized_checks.i (no preprocessing)
[wp] Running WP plugin...
-[wp] tests/wp_acsl/generalized_checks.i:68: Warning:
+[wp] generalized_checks.i:68: Warning:
Unsupported generalized invariant, use loop invariant instead.
Ignored invariant
check invariant \true;
[wp] Warning: Missing RTE guards
-[wp] tests/wp_acsl/generalized_checks.i:75: Warning:
+[wp] generalized_checks.i:75: Warning:
Missing assigns clause (assigns 'everything' instead)
------------------------------------------------------------
Axiomatic 'Th'
@@ -146,24 +146,24 @@ Prove: true.
Function loop
------------------------------------------------------------
-Goal Preservation of Invariant 'false_but_preserved' (file tests/wp_acsl/generalized_checks.i, line 70):
+Goal Preservation of Invariant 'false_but_preserved' (file generalized_checks.i, line 70):
Assume { Type: is_sint32(i). (* Then *) Have: i <= 9. }
Prove: false.
------------------------------------------------------------
-Goal Establishment of Invariant 'false_but_preserved' (file tests/wp_acsl/generalized_checks.i, line 70):
+Goal Establishment of Invariant 'false_but_preserved' (file generalized_checks.i, line 70):
Prove: false.
------------------------------------------------------------
-Goal Check 'implied_by_false_invariant' (file tests/wp_acsl/generalized_checks.i, line 74):
+Goal Check 'implied_by_false_invariant' (file generalized_checks.i, line 74):
Assume { Type: is_sint32(i). (* Else *) Have: 10 <= i. }
Prove: false.
------------------------------------------------------------
-Goal Loop assigns (file tests/wp_acsl/generalized_checks.i, line 71):
+Goal Loop assigns (file generalized_checks.i, line 71):
Prove: true.
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/initialized_local_init.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/initialized_local_init.res.oracle
index b64e2acc93c..a796d82b3a9 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/initialized_local_init.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/initialized_local_init.res.oracle
@@ -1,12 +1,12 @@
# frama-c -wp [...]
-[kernel] Parsing tests/wp_acsl/initialized_local_init.i (no preprocessing)
+[kernel] Parsing initialized_local_init.i (no preprocessing)
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
------------------------------------------------------------
Function l_array
------------------------------------------------------------
-Goal Assertion 'SUCCS' (file tests/wp_acsl/initialized_local_init.i, line 9):
+Goal Assertion 'SUCCS' (file initialized_local_init.i, line 9):
Let x_1 = x[1].
Let x_2 = x[2].
Assume {
@@ -20,7 +20,7 @@ Prove: (x_1 = 0) /\ (x_2 = 0) /\ (x_2 = x_1).
------------------------------------------------------------
-Goal Assertion 'SUCCS' (file tests/wp_acsl/initialized_local_init.i, line 10):
+Goal Assertion 'SUCCS' (file initialized_local_init.i, line 10):
Assume {
(* Goal *)
When: (0 <= i) /\ (i <= 2).
@@ -39,7 +39,7 @@ Prove: (Init_x_0[i]=true).
------------------------------------------------------------
-Goal Check 'FAILS' (file tests/wp_acsl/initialized_local_init.i, line 11):
+Goal Check 'FAILS' (file initialized_local_init.i, line 11):
Assume {
(* Initializer *)
Init: x[0] = 0.
@@ -55,17 +55,17 @@ Prove: false.
Function l_int
------------------------------------------------------------
-Goal Assertion 'SUCCS' (file tests/wp_acsl/initialized_local_init.i, line 3):
+Goal Assertion 'SUCCS' (file initialized_local_init.i, line 3):
Prove: true.
------------------------------------------------------------
-Goal Assertion 'SUCCS' (file tests/wp_acsl/initialized_local_init.i, line 4):
+Goal Assertion 'SUCCS' (file initialized_local_init.i, line 4):
Prove: true.
------------------------------------------------------------
-Goal Check 'FAILS' (file tests/wp_acsl/initialized_local_init.i, line 5):
+Goal Check 'FAILS' (file initialized_local_init.i, line 5):
Prove: false.
------------------------------------------------------------
@@ -73,17 +73,17 @@ Prove: false.
Function l_struct
------------------------------------------------------------
-Goal Assertion 'SUCCS' (file tests/wp_acsl/initialized_local_init.i, line 16):
+Goal Assertion 'SUCCS' (file initialized_local_init.i, line 16):
Prove: true.
------------------------------------------------------------
-Goal Assertion 'SUCCS' (file tests/wp_acsl/initialized_local_init.i, line 17):
+Goal Assertion 'SUCCS' (file initialized_local_init.i, line 17):
Prove: true.
------------------------------------------------------------
-Goal Check 'FAILS' (file tests/wp_acsl/initialized_local_init.i, line 18):
+Goal Check 'FAILS' (file initialized_local_init.i, line 18):
Prove: false.
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/initialized_memtyped.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/initialized_memtyped.res.oracle
index 114705c243f..fe10e3148bd 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/initialized_memtyped.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/initialized_memtyped.res.oracle
@@ -55,7 +55,7 @@ Prove: (Init_0[px_0]=true).
Function ptr_on_local
------------------------------------------------------------
-Goal Assertion 'provable' (file tests/wp_acsl/initialized_memtyped.i, line 89):
+Goal Assertion 'provable' (file initialized_memtyped.i, line 89):
Let a = global(L_x_63).
Assume {
(* Heap *)
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/initialized_shift_array.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/initialized_shift_array.res.oracle
index 7a9d25eed75..7cff9c2db7d 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/initialized_shift_array.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/initialized_shift_array.res.oracle
@@ -1,14 +1,14 @@
# frama-c -wp [...]
-[kernel] Parsing tests/wp_acsl/initialized_shift_array.i (no preprocessing)
+[kernel] Parsing initialized_shift_array.i (no preprocessing)
[wp] Running WP plugin...
-[kernel] tests/wp_acsl/initialized_shift_array.i:52: Warning:
+[kernel] initialized_shift_array.i:52: Warning:
No code nor implicit assigns clause for function test, generating default assigns from the prototype
[wp] Warning: Missing RTE guards
------------------------------------------------------------
Function fail_cell_after_end
------------------------------------------------------------
-Goal Instance of 'Pre-condition (file tests/wp_acsl/initialized_shift_array.i, line 2) in 'test'' in 'fail_cell_after_end' at call 'test' (file tests/wp_acsl/initialized_shift_array.i, line 50)
+Goal Instance of 'Pre-condition (file initialized_shift_array.i, line 2) in 'test'' in 'fail_cell_after_end' at call 'test' (file initialized_shift_array.i, line 50)
:
Prove: false.
@@ -17,7 +17,7 @@ Prove: false.
Function fail_cell_before
------------------------------------------------------------
-Goal Instance of 'Pre-condition (file tests/wp_acsl/initialized_shift_array.i, line 2) in 'test'' in 'fail_cell_before' at call 'test' (file tests/wp_acsl/initialized_shift_array.i, line 34)
+Goal Instance of 'Pre-condition (file initialized_shift_array.i, line 2) in 'test'' in 'fail_cell_before' at call 'test' (file initialized_shift_array.i, line 34)
:
Prove: false.
@@ -26,7 +26,7 @@ Prove: false.
Function fail_partial_not_full
------------------------------------------------------------
-Goal Instance of 'Pre-condition (file tests/wp_acsl/initialized_shift_array.i, line 2) in 'test'' in 'fail_partial_not_full' at call 'test' (file tests/wp_acsl/initialized_shift_array.i, line 55)
+Goal Instance of 'Pre-condition (file initialized_shift_array.i, line 2) in 'test'' in 'fail_partial_not_full' at call 'test' (file initialized_shift_array.i, line 55)
:
Assume { (* Goal *) When: (0 <= i) /\ (i <= 2). }
Prove: (([false..])[1 <- true][0 <- true][i]=true).
@@ -36,7 +36,7 @@ Prove: (([false..])[1 <- true][0 <- true][i]=true).
Function fail_too_long
------------------------------------------------------------
-Goal Instance of 'Pre-condition (file tests/wp_acsl/initialized_shift_array.i, line 2) in 'test'' in 'fail_too_long' at call 'test' (file tests/wp_acsl/initialized_shift_array.i, line 38)
+Goal Instance of 'Pre-condition (file initialized_shift_array.i, line 2) in 'test'' in 'fail_too_long' at call 'test' (file initialized_shift_array.i, line 38)
:
Prove: false.
@@ -45,7 +45,7 @@ Prove: false.
Function fail_too_long_from_1
------------------------------------------------------------
-Goal Instance of 'Pre-condition (file tests/wp_acsl/initialized_shift_array.i, line 2) in 'test'' in 'fail_too_long_from_1' at call 'test' (file tests/wp_acsl/initialized_shift_array.i, line 42)
+Goal Instance of 'Pre-condition (file initialized_shift_array.i, line 2) in 'test'' in 'fail_too_long_from_1' at call 'test' (file initialized_shift_array.i, line 42)
:
Prove: false.
@@ -54,7 +54,7 @@ Prove: false.
Function fail_too_long_from_2
------------------------------------------------------------
-Goal Instance of 'Pre-condition (file tests/wp_acsl/initialized_shift_array.i, line 2) in 'test'' in 'fail_too_long_from_2' at call 'test' (file tests/wp_acsl/initialized_shift_array.i, line 46)
+Goal Instance of 'Pre-condition (file initialized_shift_array.i, line 2) in 'test'' in 'fail_too_long_from_2' at call 'test' (file initialized_shift_array.i, line 46)
:
Prove: false.
@@ -63,7 +63,7 @@ Prove: false.
Function succ_from_1_from_1
------------------------------------------------------------
-Goal Instance of 'Pre-condition (file tests/wp_acsl/initialized_shift_array.i, line 2) in 'test'' in 'succ_from_1_from_1' at call 'test' (file tests/wp_acsl/initialized_shift_array.i, line 23)
+Goal Instance of 'Pre-condition (file initialized_shift_array.i, line 2) in 'test'' in 'succ_from_1_from_1' at call 'test' (file initialized_shift_array.i, line 23)
:
Assume { (* Goal *) When: (0 < i) /\ (i <= 2). }
Prove: (([false..])[2 <- true][1 <- true][i]=true).
@@ -73,7 +73,7 @@ Prove: (([false..])[2 <- true][1 <- true][i]=true).
Function succ_full_first_cell
------------------------------------------------------------
-Goal Instance of 'Pre-condition (file tests/wp_acsl/initialized_shift_array.i, line 2) in 'test'' in 'succ_full_first_cell' at call 'test' (file tests/wp_acsl/initialized_shift_array.i, line 10)
+Goal Instance of 'Pre-condition (file initialized_shift_array.i, line 2) in 'test'' in 'succ_full_first_cell' at call 'test' (file initialized_shift_array.i, line 10)
:
Prove: true.
@@ -82,7 +82,7 @@ Prove: true.
Function succ_full_from_1
------------------------------------------------------------
-Goal Instance of 'Pre-condition (file tests/wp_acsl/initialized_shift_array.i, line 2) in 'test'' in 'succ_full_from_1' at call 'test' (file tests/wp_acsl/initialized_shift_array.i, line 18)
+Goal Instance of 'Pre-condition (file initialized_shift_array.i, line 2) in 'test'' in 'succ_full_from_1' at call 'test' (file initialized_shift_array.i, line 18)
:
Assume {
(* Goal *)
@@ -100,7 +100,7 @@ Prove: (Init_buf_0[i]=true).
Function succ_full_from_2
------------------------------------------------------------
-Goal Instance of 'Pre-condition (file tests/wp_acsl/initialized_shift_array.i, line 2) in 'test'' in 'succ_full_from_2' at call 'test' (file tests/wp_acsl/initialized_shift_array.i, line 27)
+Goal Instance of 'Pre-condition (file initialized_shift_array.i, line 2) in 'test'' in 'succ_full_from_2' at call 'test' (file initialized_shift_array.i, line 27)
:
Assume {
(* Goal *)
@@ -118,7 +118,7 @@ Prove: (Init_buf_0[2]=true).
Function succ_full_full
------------------------------------------------------------
-Goal Instance of 'Pre-condition (file tests/wp_acsl/initialized_shift_array.i, line 2) in 'test'' in 'succ_full_full' at call 'test' (file tests/wp_acsl/initialized_shift_array.i, line 14)
+Goal Instance of 'Pre-condition (file initialized_shift_array.i, line 2) in 'test'' in 'succ_full_full' at call 'test' (file initialized_shift_array.i, line 14)
:
Assume {
(* Goal *)
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/invalid_pointer.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/invalid_pointer.res.oracle
index 054e41cd779..4c5c0f13138 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/invalid_pointer.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/invalid_pointer.res.oracle
@@ -2,24 +2,12 @@
[kernel] Parsing invalid_pointer.c (with preprocessing)
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
-<<<<<<< HEAD
-[wp] invalid_pointer.c:21: Warning: void object
-||||||| ac7807782d
-[wp] tests/wp_acsl/invalid_pointer.c:21: Warning: void object
-=======
-[wp] tests/wp_acsl/invalid_pointer.c:23: Warning: void object
->>>>>>> origin/master
+[wp] invalid_pointer.c:23: Warning: void object
------------------------------------------------------------
Function array
------------------------------------------------------------
-<<<<<<< HEAD
-Goal Check 'ARR' (file invalid_pointer.c, line 29):
-||||||| ac7807782d
-Goal Check 'ARR' (file tests/wp_acsl/invalid_pointer.c, line 29):
-=======
-Goal Check 'ARR' (file tests/wp_acsl/invalid_pointer.c, line 32):
->>>>>>> origin/master
+Goal Check 'ARR' (file invalid_pointer.c, line 32):
Assume { Type: is_sint32(k). (* Heap *) Type: linked(Malloc_0). }
Prove: ((0 <= k) /\ (k <= 25)) <->
valid_obj(Malloc_0[L_a_33 <- 25], shift_sint32(global(L_a_33), k), 1).
@@ -29,107 +17,53 @@ Prove: ((0 <= k) /\ (k <= 25)) <->
Function compound
------------------------------------------------------------
-<<<<<<< HEAD
-Goal Check 'M1' (file invalid_pointer.c, line 44):
-||||||| ac7807782d
-Goal Check 'M1' (file tests/wp_acsl/invalid_pointer.c, line 44):
-=======
-Goal Check 'M1' (file tests/wp_acsl/invalid_pointer.c, line 47):
->>>>>>> origin/master
+Goal Check 'M1' (file invalid_pointer.c, line 47):
Prove: true.
------------------------------------------------------------
-<<<<<<< HEAD
-Goal Check 'P0' (file invalid_pointer.c, line 45):
-||||||| ac7807782d
-Goal Check 'P0' (file tests/wp_acsl/invalid_pointer.c, line 45):
-=======
-Goal Check 'P0' (file tests/wp_acsl/invalid_pointer.c, line 48):
->>>>>>> origin/master
+Goal Check 'P0' (file invalid_pointer.c, line 48):
Prove: true.
------------------------------------------------------------
-<<<<<<< HEAD
-Goal Check 'P1' (file invalid_pointer.c, line 46):
-||||||| ac7807782d
-Goal Check 'P1' (file tests/wp_acsl/invalid_pointer.c, line 46):
-=======
-Goal Check 'P1' (file tests/wp_acsl/invalid_pointer.c, line 49):
->>>>>>> origin/master
+Goal Check 'P1' (file invalid_pointer.c, line 49):
Prove: true.
------------------------------------------------------------
-<<<<<<< HEAD
-Goal Check 'P2' (file invalid_pointer.c, line 47):
-||||||| ac7807782d
-Goal Check 'P2' (file tests/wp_acsl/invalid_pointer.c, line 47):
-=======
-Goal Check 'P2' (file tests/wp_acsl/invalid_pointer.c, line 50):
->>>>>>> origin/master
+Goal Check 'P2' (file invalid_pointer.c, line 50):
Prove: true.
------------------------------------------------------------
-<<<<<<< HEAD
-Goal Check 'F' (file invalid_pointer.c, line 50):
-||||||| ac7807782d
-Goal Check 'F' (file tests/wp_acsl/invalid_pointer.c, line 50):
-=======
-Goal Check 'F' (file tests/wp_acsl/invalid_pointer.c, line 53):
->>>>>>> origin/master
+Goal Check 'F' (file invalid_pointer.c, line 53):
Assume { (* Heap *) Type: linked(Malloc_0). }
Prove: valid_obj(Malloc_0[L_s_38 <- 2], shiftfield_F1_S_f(global(L_s_38)), 1).
------------------------------------------------------------
-<<<<<<< HEAD
-Goal Check 'G' (file invalid_pointer.c, line 51):
-||||||| ac7807782d
-Goal Check 'G' (file tests/wp_acsl/invalid_pointer.c, line 51):
-=======
-Goal Check 'G' (file tests/wp_acsl/invalid_pointer.c, line 54):
->>>>>>> origin/master
+Goal Check 'G' (file invalid_pointer.c, line 54):
Assume { (* Heap *) Type: linked(Malloc_0). }
Prove: valid_obj(Malloc_0[L_s_38 <- 2], shiftfield_F1_S_g(global(L_s_38)), 1).
------------------------------------------------------------
-<<<<<<< HEAD
-Goal Check 'F2' (file invalid_pointer.c, line 52):
-||||||| ac7807782d
-Goal Check 'F2' (file tests/wp_acsl/invalid_pointer.c, line 52):
-=======
-Goal Check 'F2' (file tests/wp_acsl/invalid_pointer.c, line 55):
->>>>>>> origin/master
+Goal Check 'F2' (file invalid_pointer.c, line 55):
Assume { (* Heap *) Type: linked(Malloc_0). }
Prove: valid_obj(Malloc_0[L_s_38 <- 2],
shift_sint32(shiftfield_F1_S_f(global(L_s_38)), 2), 1).
------------------------------------------------------------
-<<<<<<< HEAD
-Goal Check 'G2' (file invalid_pointer.c, line 53):
-||||||| ac7807782d
-Goal Check 'G2' (file tests/wp_acsl/invalid_pointer.c, line 53):
-=======
-Goal Check 'G2' (file tests/wp_acsl/invalid_pointer.c, line 56):
->>>>>>> origin/master
+Goal Check 'G2' (file invalid_pointer.c, line 56):
Assume { (* Heap *) Type: linked(Malloc_0). }
Prove: !valid_obj(Malloc_0[L_s_38 <- 2],
shift_sint32(shiftfield_F1_S_g(global(L_s_38)), 2), 1).
------------------------------------------------------------
-<<<<<<< HEAD
-Goal Check 'AM' (file invalid_pointer.c, line 56):
-||||||| ac7807782d
-Goal Check 'AM' (file tests/wp_acsl/invalid_pointer.c, line 56):
-=======
-Goal Check 'AM' (file tests/wp_acsl/invalid_pointer.c, line 59):
->>>>>>> origin/master
+Goal Check 'AM' (file invalid_pointer.c, line 59):
Prove: true.
------------------------------------------------------------
@@ -160,66 +94,36 @@ Prove: true.
Function pointer
------------------------------------------------------------
-<<<<<<< HEAD
-Goal Check 'M1' (file invalid_pointer.c, line 17):
-||||||| ac7807782d
-Goal Check 'M1' (file tests/wp_acsl/invalid_pointer.c, line 17):
-=======
-Goal Check 'M1' (file tests/wp_acsl/invalid_pointer.c, line 19):
->>>>>>> origin/master
+Goal Check 'M1' (file invalid_pointer.c, line 19):
Assume { (* Heap *) Type: linked(Malloc_0). }
Prove: !valid_obj(Malloc_0[L_x_28 <- 1], shift_sint32(global(L_x_28), -1), 1).
------------------------------------------------------------
-<<<<<<< HEAD
-Goal Check 'P0' (file invalid_pointer.c, line 18):
-||||||| ac7807782d
-Goal Check 'P0' (file tests/wp_acsl/invalid_pointer.c, line 18):
-=======
-Goal Check 'P0' (file tests/wp_acsl/invalid_pointer.c, line 20):
->>>>>>> origin/master
+Goal Check 'P0' (file invalid_pointer.c, line 20):
Assume { (* Heap *) Type: linked(Malloc_0). }
Prove: valid_obj(Malloc_0[L_x_28 <- 1], global(L_x_28), 1).
------------------------------------------------------------
-<<<<<<< HEAD
-Goal Check 'P1' (file invalid_pointer.c, line 19):
-||||||| ac7807782d
-Goal Check 'P1' (file tests/wp_acsl/invalid_pointer.c, line 19):
-=======
-Goal Check 'P1' (file tests/wp_acsl/invalid_pointer.c, line 21):
->>>>>>> origin/master
+Goal Check 'P1' (file invalid_pointer.c, line 21):
Assume { (* Heap *) Type: linked(Malloc_0). }
Prove: valid_obj(Malloc_0[L_x_28 <- 1], shift_sint32(global(L_x_28), 1), 1).
------------------------------------------------------------
-<<<<<<< HEAD
-Goal Check 'P2' (file invalid_pointer.c, line 20):
-||||||| ac7807782d
-Goal Check 'P2' (file tests/wp_acsl/invalid_pointer.c, line 20):
-=======
-Goal Check 'P2' (file tests/wp_acsl/invalid_pointer.c, line 22):
->>>>>>> origin/master
+Goal Check 'P2' (file invalid_pointer.c, line 22):
Assume { (* Heap *) Type: linked(Malloc_0). }
Prove: !valid_obj(Malloc_0[L_x_28 <- 1], shift_sint32(global(L_x_28), 2), 1).
------------------------------------------------------------
-<<<<<<< HEAD
-Goal Check 'NULL' (file invalid_pointer.c, line 21):
-||||||| ac7807782d
-Goal Check 'NULL' (file tests/wp_acsl/invalid_pointer.c, line 21):
-=======
-Goal Check 'qed_NULL' (file tests/wp_acsl/invalid_pointer.c, line 23):
+Goal Check 'qed_NULL' (file invalid_pointer.c, line 23):
Prove: true.
------------------------------------------------------------
-Goal Check 'prover_NULL' (file tests/wp_acsl/invalid_pointer.c, line 24):
->>>>>>> origin/master
+Goal Check 'prover_NULL' (file invalid_pointer.c, line 24):
Assume { (* Heap *) Type: linked(Malloc_0). }
Prove: valid_obj(Malloc_0[L_x_28 <- 1], L_GET, 1).
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/null.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/null.res.oracle
index 0b4f5a0035b..693ee469289 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/null.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/null.res.oracle
@@ -1,11 +1,5 @@
# frama-c -wp [...]
-<<<<<<< HEAD
-[kernel] Parsing null.c (with preprocessing)
-||||||| ac7807782d
-[kernel] Parsing tests/wp_acsl/null.c (with preprocessing)
-=======
-[kernel] Parsing tests/wp_acsl/null.i (no preprocessing)
->>>>>>> origin/master
+[kernel] Parsing null.i (no preprocessing)
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
------------------------------------------------------------
@@ -39,12 +33,7 @@ Prove: true
Function null_is_zero
------------------------------------------------------------
-<<<<<<< HEAD
-Goal Post-condition (file null.c, line 4) in 'null_is_zero':
-||||||| ac7807782d
-Goal Post-condition (file tests/wp_acsl/null.c, line 4) in 'null_is_zero':
-=======
-Goal Post-condition (file tests/wp_acsl/null.i, line 2) in 'null_is_zero':
+Goal Post-condition (file null.i, line 2) in 'null_is_zero':
Prove: true.
------------------------------------------------------------
@@ -75,7 +64,6 @@ Prove: true.
------------------------------------------------------------
Goal Assigns nothing in 'qed':
->>>>>>> origin/master
Prove: true.
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/opaque_struct.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/opaque_struct.res.oracle
index a5c5cf0e181..48bab598c67 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/opaque_struct.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/opaque_struct.res.oracle
@@ -1,5 +1,5 @@
# frama-c -wp [...]
-[kernel] Parsing tests/wp_acsl/opaque_struct.i (no preprocessing)
+[kernel] Parsing opaque_struct.i (no preprocessing)
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
------------------------------------------------------------
@@ -24,7 +24,7 @@ Prove: 0<=BytesLength_of_S1_S
Function assigned_via_pointer
------------------------------------------------------------
-Goal Check 'fail' (file tests/wp_acsl/opaque_struct.i, line 53):
+Goal Check 'fail' (file opaque_struct.i, line 53):
Assume {
(* Heap *)
Type: (region(p.base) <= 0) /\ framed(Mptr_0) /\ sconst(Mchar_0).
@@ -50,12 +50,12 @@ Prove: EqS1_S(Load_S1_S(p, havoc(Mchar_undef_0, Mchar_0, p, Length_of_S1_S),
Function assigns
------------------------------------------------------------
-Goal Check 'fail' (file tests/wp_acsl/opaque_struct.i, line 17):
+Goal Check 'fail' (file opaque_struct.i, line 17):
Prove: EqS1_S(S1_0, S1_1).
------------------------------------------------------------
-Goal Check 'succeed' (file tests/wp_acsl/opaque_struct.i, line 18):
+Goal Check 'succeed' (file opaque_struct.i, line 18):
Prove: true.
------------------------------------------------------------
@@ -63,7 +63,7 @@ Prove: true.
Function assigns_effect
------------------------------------------------------------
-Goal Check 'fail' (file tests/wp_acsl/opaque_struct.i, line 62):
+Goal Check 'fail' (file opaque_struct.i, line 62):
Let x = Mint_0[p].
Let a_1 = havoc(Mint_undef_0, Mint_0, a, Length_of_S1_S)[p].
Assume {
@@ -78,7 +78,7 @@ Prove: a_1 = x.
------------------------------------------------------------
-Goal Check 'fail' (file tests/wp_acsl/opaque_struct.i, line 63):
+Goal Check 'fail' (file opaque_struct.i, line 63):
Assume {
(* Heap *)
Type: (region(a.base) <= 0) /\ (region(c.base) <= 0) /\
@@ -91,7 +91,7 @@ Prove: of_f32(havoc(Mf32_undef_0, Mf32_0, a, Length_of_S1_S)[q])
------------------------------------------------------------
-Goal Check 'succeed' (file tests/wp_acsl/opaque_struct.i, line 64):
+Goal Check 'succeed' (file opaque_struct.i, line 64):
Let x = Mchar_0[c].
Let a_1 = havoc(Mchar_undef_0, Mchar_0, a, Length_of_S1_S)[c].
Assume {
@@ -108,7 +108,7 @@ Prove: a_1 = x.
Function initialized_assigns
------------------------------------------------------------
-Goal Check 'succeed' (file tests/wp_acsl/opaque_struct.i, line 31):
+Goal Check 'succeed' (file opaque_struct.i, line 31):
Let a = havoc(Init_undef_0, Init_0, p, Length_of_S1_S).
Assume {
(* Heap *)
@@ -122,7 +122,7 @@ Prove: IsInit_S1_S(p, a).
------------------------------------------------------------
-Goal Check 'succeed' (file tests/wp_acsl/opaque_struct.i, line 32):
+Goal Check 'succeed' (file opaque_struct.i, line 32):
Let x = p.base.
Assume {
(* Heap *)
@@ -137,7 +137,7 @@ Prove: 0 <= (BytesLength_of_S1_S * (Malloc_0[x] / Length_of_S1_S)).
Function uninitialized_assigns
------------------------------------------------------------
-Goal Check 'fail' (file tests/wp_acsl/opaque_struct.i, line 47):
+Goal Check 'fail' (file opaque_struct.i, line 47):
Let a = havoc(Init_undef_0, Init_0, p, Length_of_S1_S).
Assume {
(* Heap *)
@@ -151,7 +151,7 @@ Prove: !IsInit_S1_S(p, a).
------------------------------------------------------------
-Goal Check 'fail' (file tests/wp_acsl/opaque_struct.i, line 48):
+Goal Check 'fail' (file opaque_struct.i, line 48):
Let a = havoc(Init_undef_0, Init_0, p, Length_of_S1_S).
Assume {
(* Heap *)
@@ -164,17 +164,17 @@ Assume {
Prove: IsInit_S1_S(p, a).
------------------------------------------------------------
-[wp] tests/wp_acsl/opaque_struct.i:24: Warning:
+[wp] opaque_struct.i:24: Warning:
Memory model hypotheses for function 'g':
/*@ behavior wp_typed:
requires \separated(p, &S1, &S2, &p); */
void g(void);
-[wp] tests/wp_acsl/opaque_struct.i:57: Warning:
+[wp] opaque_struct.i:57: Warning:
Memory model hypotheses for function 'assign':
/*@ behavior wp_typed:
requires \separated(a, &S1, &S2); */
void assign(struct S *a);
-[wp] tests/wp_acsl/opaque_struct.i:60: Warning:
+[wp] opaque_struct.i:60: Warning:
Memory model hypotheses for function 'assigns_effect':
/*@
behavior wp_typed:
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/pointer.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/pointer.res.oracle
index f4e783236ba..201720d6bd9 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/pointer.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/pointer.res.oracle
@@ -228,12 +228,12 @@ Goal Post-condition 'qed_ko,Eq_oracle_ko' in 'pointer':
Prove: false.
------------------------------------------------------------
-[wp] tests/wp_acsl/pointer.i:63: Warning:
+[wp] pointer.i:63: Warning:
Memory model hypotheses for function 'compare':
/*@ behavior wp_typed:
requires \separated(q + (..), &p); */
void compare(int *q);
-[wp] tests/wp_acsl/pointer.i:73: Warning:
+[wp] pointer.i:73: Warning:
Memory model hypotheses for function 'absurd':
/*@ behavior wp_typed:
requires \separated(q + (..), &p); */
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/postassigns.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/postassigns.res.oracle
index 8abc928d33f..1646ada2696 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/postassigns.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/postassigns.res.oracle
@@ -1,64 +1,64 @@
# frama-c -wp [...]
-[kernel] Parsing tests/wp_acsl/postassigns.c (with preprocessing)
+[kernel] Parsing postassigns.c (with preprocessing)
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
------------------------------------------------------------
Function job1
------------------------------------------------------------
-Goal Post-condition (file tests/wp_acsl/postassigns.c, line 4) in 'job1':
+Goal Post-condition (file postassigns.c, line 4) in 'job1':
Prove: true.
------------------------------------------------------------
-Goal Assigns (file tests/wp_acsl/postassigns.c, line 5) in 'job1' (1/9):
+Goal Assigns (file postassigns.c, line 5) in 'job1' (1/9):
Prove: true.
------------------------------------------------------------
-Goal Assigns (file tests/wp_acsl/postassigns.c, line 5) in 'job1' (2/9):
+Goal Assigns (file postassigns.c, line 5) in 'job1' (2/9):
Effect at line 10
Prove: true.
------------------------------------------------------------
-Goal Assigns (file tests/wp_acsl/postassigns.c, line 5) in 'job1' (3/9):
+Goal Assigns (file postassigns.c, line 5) in 'job1' (3/9):
Effect at line 10
Prove: true.
------------------------------------------------------------
-Goal Assigns (file tests/wp_acsl/postassigns.c, line 5) in 'job1' (4/9):
+Goal Assigns (file postassigns.c, line 5) in 'job1' (4/9):
Effect at line 11
Prove: true.
------------------------------------------------------------
-Goal Assigns (file tests/wp_acsl/postassigns.c, line 5) in 'job1' (5/9):
+Goal Assigns (file postassigns.c, line 5) in 'job1' (5/9):
Effect at line 11
Prove: true.
------------------------------------------------------------
-Goal Assigns (file tests/wp_acsl/postassigns.c, line 5) in 'job1' (6/9):
+Goal Assigns (file postassigns.c, line 5) in 'job1' (6/9):
Effect at line 12
Prove: true.
------------------------------------------------------------
-Goal Assigns (file tests/wp_acsl/postassigns.c, line 5) in 'job1' (7/9):
+Goal Assigns (file postassigns.c, line 5) in 'job1' (7/9):
Effect at line 12
Prove: true.
------------------------------------------------------------
-Goal Assigns (file tests/wp_acsl/postassigns.c, line 5) in 'job1' (8/9):
+Goal Assigns (file postassigns.c, line 5) in 'job1' (8/9):
Effect at line 13
Prove: true.
------------------------------------------------------------
-Goal Assigns (file tests/wp_acsl/postassigns.c, line 5) in 'job1' (9/9):
+Goal Assigns (file postassigns.c, line 5) in 'job1' (9/9):
Effect at line 13
Prove: true.
@@ -67,35 +67,35 @@ Prove: true.
Function job2
------------------------------------------------------------
-Goal Post-condition (file tests/wp_acsl/postassigns.c, line 19) in 'job2':
+Goal Post-condition (file postassigns.c, line 19) in 'job2':
Prove: true.
------------------------------------------------------------
-Goal Assigns (file tests/wp_acsl/postassigns.c, line 20) in 'job2' (1/9):
+Goal Assigns (file postassigns.c, line 20) in 'job2' (1/9):
Prove: true.
------------------------------------------------------------
-Goal Assigns (file tests/wp_acsl/postassigns.c, line 20) in 'job2' (2/9):
+Goal Assigns (file postassigns.c, line 20) in 'job2' (2/9):
Effect at line 25
Prove: true.
------------------------------------------------------------
-Goal Assigns (file tests/wp_acsl/postassigns.c, line 20) in 'job2' (3/9):
+Goal Assigns (file postassigns.c, line 20) in 'job2' (3/9):
Effect at line 25
Prove: true.
------------------------------------------------------------
-Goal Assigns (file tests/wp_acsl/postassigns.c, line 20) in 'job2' (4/9):
+Goal Assigns (file postassigns.c, line 20) in 'job2' (4/9):
Effect at line 26
Prove: true.
------------------------------------------------------------
-Goal Assigns (file tests/wp_acsl/postassigns.c, line 20) in 'job2' (5/9):
+Goal Assigns (file postassigns.c, line 20) in 'job2' (5/9):
Effect at line 26
Let x = A[1].
Assume {
@@ -109,13 +109,13 @@ Prove: exists i : Z. (A[i] = x) /\ (0 <= i) /\ (i <= 3).
------------------------------------------------------------
-Goal Assigns (file tests/wp_acsl/postassigns.c, line 20) in 'job2' (6/9):
+Goal Assigns (file postassigns.c, line 20) in 'job2' (6/9):
Effect at line 27
Prove: true.
------------------------------------------------------------
-Goal Assigns (file tests/wp_acsl/postassigns.c, line 20) in 'job2' (7/9):
+Goal Assigns (file postassigns.c, line 20) in 'job2' (7/9):
Effect at line 27
Let x = A[2].
Assume {
@@ -129,13 +129,13 @@ Prove: exists i : Z. (A[i] = x) /\ (0 <= i) /\ (i <= 3).
------------------------------------------------------------
-Goal Assigns (file tests/wp_acsl/postassigns.c, line 20) in 'job2' (8/9):
+Goal Assigns (file postassigns.c, line 20) in 'job2' (8/9):
Effect at line 28
Prove: true.
------------------------------------------------------------
-Goal Assigns (file tests/wp_acsl/postassigns.c, line 20) in 'job2' (9/9):
+Goal Assigns (file postassigns.c, line 20) in 'job2' (9/9):
Effect at line 28
Prove: true.
@@ -144,7 +144,7 @@ Prove: true.
Function job3
------------------------------------------------------------
-Goal Preservation of Invariant (file tests/wp_acsl/postassigns.c, line 38):
+Goal Preservation of Invariant (file postassigns.c, line 38):
Assume {
Type: is_sint32(N) /\ is_sint32(i) /\ is_sint32(1 + i).
(* Pre-condition *)
@@ -158,23 +158,23 @@ Prove: (-1) <= i.
------------------------------------------------------------
-Goal Establishment of Invariant (file tests/wp_acsl/postassigns.c, line 38):
+Goal Establishment of Invariant (file postassigns.c, line 38):
Prove: true.
------------------------------------------------------------
-Goal Loop assigns (file tests/wp_acsl/postassigns.c, line 39) (1/3):
+Goal Loop assigns (file postassigns.c, line 39) (1/3):
Prove: true.
------------------------------------------------------------
-Goal Loop assigns (file tests/wp_acsl/postassigns.c, line 39) (2/3):
+Goal Loop assigns (file postassigns.c, line 39) (2/3):
Effect at line 41
Prove: true.
------------------------------------------------------------
-Goal Loop assigns (file tests/wp_acsl/postassigns.c, line 39) (3/3):
+Goal Loop assigns (file postassigns.c, line 39) (3/3):
Effect at line 42
Let a = shift_sint32(p, i).
Assume {
@@ -194,17 +194,17 @@ Prove: included(a, 1, shift_sint32(p, 0), N).
------------------------------------------------------------
-Goal Assigns (file tests/wp_acsl/postassigns.c, line 33) in 'job3' (1/2):
+Goal Assigns (file postassigns.c, line 33) in 'job3' (1/2):
Prove: true.
------------------------------------------------------------
-Goal Assigns (file tests/wp_acsl/postassigns.c, line 33) in 'job3' (2/2):
+Goal Assigns (file postassigns.c, line 33) in 'job3' (2/2):
Effect at line 41
Prove: true.
------------------------------------------------------------
-[wp] tests/wp_acsl/postassigns.c:7: Warning:
+[wp] postassigns.c:7: Warning:
Memory model hypotheses for function 'job1':
/*@
behavior wp_typed:
@@ -212,7 +212,7 @@ Prove: true.
ensures \separated(p + (0 .. \at(N,Post) - 1), &N);
*/
void job1(int *p);
-[wp] tests/wp_acsl/postassigns.c:22: Warning:
+[wp] postassigns.c:22: Warning:
Memory model hypotheses for function 'job2':
/*@
behavior wp_typed:
@@ -220,7 +220,7 @@ Prove: true.
ensures \separated(p + A[0 .. \at(N,Post) - 1], (int *)A + (..), &N);
*/
void job2(int *p);
-[wp] tests/wp_acsl/postassigns.c:35: Warning:
+[wp] postassigns.c:35: Warning:
Memory model hypotheses for function 'job3':
/*@
behavior wp_typed:
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/sqrt_builtins.0.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/sqrt_builtins.0.res.oracle
index 546f84fc336..9e8bfa97f84 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/sqrt_builtins.0.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/sqrt_builtins.0.res.oracle
@@ -1,12 +1,12 @@
# frama-c -wp [...]
-[kernel] Parsing tests/wp_acsl/sqrt_builtins.i (no preprocessing)
+[kernel] Parsing sqrt_builtins.i (no preprocessing)
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
------------------------------------------------------------
Function test_sqrt
------------------------------------------------------------
-Goal Assertion 'KO' (file tests/wp_acsl/sqrt_builtins.i, line 25):
+Goal Assertion 'KO' (file sqrt_builtins.i, line 25):
Assume { (* Call 'sqrt' *) Have: .0 <= of_f64(sqrt_f64(q)). }
Prove: false.
@@ -15,7 +15,7 @@ Prove: false.
Function test_sqrtf
------------------------------------------------------------
-Goal Assertion 'KO' (file tests/wp_acsl/sqrt_builtins.i, line 16):
+Goal Assertion 'KO' (file sqrt_builtins.i, line 16):
Assume { (* Call 'sqrtf' *) Have: .0 <= of_f32(sqrt_f32(q)). }
Prove: false.
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/sqrt_builtins.1.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/sqrt_builtins.1.res.oracle
index 21bd47ad8f8..8870352908a 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/sqrt_builtins.1.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/sqrt_builtins.1.res.oracle
@@ -1,12 +1,12 @@
# frama-c -wp -wp-model 'Typed (Real)' [...]
-[kernel] Parsing tests/wp_acsl/sqrt_builtins.i (no preprocessing)
+[kernel] Parsing sqrt_builtins.i (no preprocessing)
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
------------------------------------------------------------
Function test_sqrt
------------------------------------------------------------
-Goal Assertion 'KO' (file tests/wp_acsl/sqrt_builtins.i, line 25):
+Goal Assertion 'KO' (file sqrt_builtins.i, line 25):
Assume { (* Call 'sqrt' *) Have: .0 <= sqrt(q). }
Prove: false.
@@ -15,7 +15,7 @@ Prove: false.
Function test_sqrtf
------------------------------------------------------------
-Goal Assertion 'KO' (file tests/wp_acsl/sqrt_builtins.i, line 16):
+Goal Assertion 'KO' (file sqrt_builtins.i, line 16):
Assume { (* Call 'sqrtf' *) Have: .0 <= sqrt(q). }
Prove: false.
diff --git a/src/plugins/wp/tests/wp_bts/bts_2110.i b/src/plugins/wp/tests/wp_bts/bts_2110.i
index a07afba6a5e..5698f52869c 100644
--- a/src/plugins/wp/tests/wp_bts/bts_2110.i
+++ b/src/plugins/wp/tests/wp_bts/bts_2110.i
@@ -1,11 +1,5 @@
/* run.config
-<<<<<<< HEAD
- CMD: @frama-c@ -wp -wp-msg-key shell,cluster,print-generated -wp-prover why3 -wp-gen @OPTIONS@ -wp-warn-key "pedantic-assigns=inactive"
-||||||| ac7807782d
- CMD: @frama-c@ -wp -wp-msg-key shell,cluster,print-generated -wp-prover why3 -wp-gen -wp-share ./share
-=======
- CMD: @frama-c@ -wp -wp-msg-key shell,cluster,print-generated -wp-prover why3 -wp-gen -wp-share ./share -wp-warn-key "pedantic-assigns=inactive"
->>>>>>> origin/master
+ CMD: @frama-c@ -wp -wp-msg-key shell,cluster,print-generated -wp-prover why3 -wp-gen -wp-warn-key "pedantic-assigns=inactive" @OPTIONS@
OPT:
*/
diff --git a/src/plugins/wp/tests/wp_bts/oracle/bts0843.res.oracle b/src/plugins/wp/tests/wp_bts/oracle/bts0843.res.oracle
index fd446a79cb1..3be2da3eab4 100644
--- a/src/plugins/wp/tests/wp_bts/oracle/bts0843.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle/bts0843.res.oracle
@@ -52,7 +52,7 @@ Goal Instance of 'Pre-condition (file bts0843.i, line 12) in 'f3'' in 'g3' at ca
Prove: true.
------------------------------------------------------------
-[wp] tests/wp_bts/bts0843.i:13: Warning:
+[wp] bts0843.i:13: Warning:
Memory model hypotheses for function 'f3':
/*@ behavior wp_typed:
requires \separated(&p, &p->a); */
diff --git a/src/plugins/wp/tests/wp_bts/oracle/bts_1828.0.res.oracle b/src/plugins/wp/tests/wp_bts/oracle/bts_1828.0.res.oracle
index 3c0aa517865..48f01f8bae7 100644
--- a/src/plugins/wp/tests/wp_bts/oracle/bts_1828.0.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle/bts_1828.0.res.oracle
@@ -65,7 +65,7 @@ Assume {
Prove: global(L_two_24) != one_0.
------------------------------------------------------------
-[wp] tests/wp_bts/bts_1828.i:56: Warning:
+[wp] bts_1828.i:56: Warning:
Memory model hypotheses for function 'global_frame':
/*@ behavior wp_typed:
requires \separated(one, &zero); */
diff --git a/src/plugins/wp/tests/wp_bts/oracle/bts_1828.1.res.oracle b/src/plugins/wp/tests/wp_bts/oracle/bts_1828.1.res.oracle
index fa050b2342d..8caf9dbe646 100644
--- a/src/plugins/wp/tests/wp_bts/oracle/bts_1828.1.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle/bts_1828.1.res.oracle
@@ -44,7 +44,7 @@ Assume {
Prove: global(L_two_24) != one_0.
------------------------------------------------------------
-[wp] tests/wp_bts/bts_1828.i:56: Warning:
+[wp] bts_1828.i:56: Warning:
Memory model hypotheses for function 'global_frame':
/*@
behavior wp_typed_ref:
diff --git a/src/plugins/wp/tests/wp_gallery/oracle/frama_c_exo3_solved.old.res.oracle b/src/plugins/wp/tests/wp_gallery/oracle/frama_c_exo3_solved.old.res.oracle
index 0a006664b41..f317e2d6c68 100644
--- a/src/plugins/wp/tests/wp_gallery/oracle/frama_c_exo3_solved.old.res.oracle
+++ b/src/plugins/wp/tests/wp_gallery/oracle/frama_c_exo3_solved.old.res.oracle
@@ -52,7 +52,7 @@
[wp] Goal typed_ref_equal_elements_loop_variant_positive : not tried
[wp] Goal typed_ref_equal_elements_loop_variant_2_decrease : not tried
[wp] Goal typed_ref_equal_elements_loop_variant_2_positive : not tried
-[wp] tests/wp_gallery/frama_c_exo3_solved.old.c:73: Warning:
+[wp] frama_c_exo3_solved.old.c:73: Warning:
Memory model hypotheses for function 'equal_elements':
/*@
behavior wp_typed_ref:
diff --git a/src/plugins/wp/tests/wp_gallery/oracle/frama_c_exo3_solved.old.v2.res.oracle b/src/plugins/wp/tests/wp_gallery/oracle/frama_c_exo3_solved.old.v2.res.oracle
index 98d785c7c68..7298098a15e 100644
--- a/src/plugins/wp/tests/wp_gallery/oracle/frama_c_exo3_solved.old.v2.res.oracle
+++ b/src/plugins/wp/tests/wp_gallery/oracle/frama_c_exo3_solved.old.v2.res.oracle
@@ -53,7 +53,7 @@
[wp] Goal typed_ref_equal_elements_loop_variant_positive : not tried
[wp] Goal typed_ref_equal_elements_loop_variant_2_decrease : not tried
[wp] Goal typed_ref_equal_elements_loop_variant_2_positive : not tried
-[wp] tests/wp_gallery/frama_c_exo3_solved.old.v2.c:56: Warning:
+[wp] frama_c_exo3_solved.old.v2.c:56: Warning:
Memory model hypotheses for function 'equal_elements':
/*@
behavior wp_typed_ref:
diff --git a/src/plugins/wp/tests/wp_gallery/oracle/string-compare.res.oracle b/src/plugins/wp/tests/wp_gallery/oracle/string-compare.res.oracle
index 0c5741ea36b..bdac07e9557 100644
--- a/src/plugins/wp/tests/wp_gallery/oracle/string-compare.res.oracle
+++ b/src/plugins/wp/tests/wp_gallery/oracle/string-compare.res.oracle
@@ -1,5 +1,5 @@
# frama-c -wp -wp-rte [...]
-[kernel] Parsing tests/wp_gallery/string-compare.c (with preprocessing)
+[kernel] Parsing string-compare.c (with preprocessing)
[wp] Running WP plugin...
[rte] annotating function main
[rte] annotating function stringCompare
diff --git a/src/plugins/wp/tests/wp_hoare/oracle/alias_assigns_hypotheses.0.res.oracle b/src/plugins/wp/tests/wp_hoare/oracle/alias_assigns_hypotheses.0.res.oracle
index d0eb464123d..b7345db3932 100644
--- a/src/plugins/wp/tests/wp_hoare/oracle/alias_assigns_hypotheses.0.res.oracle
+++ b/src/plugins/wp/tests/wp_hoare/oracle/alias_assigns_hypotheses.0.res.oracle
@@ -193,24 +193,24 @@ Effect at line 103
Prove: true.
------------------------------------------------------------
-[wp] tests/wp_hoare/alias_assigns_hypotheses.i:17: Warning:
+[wp] alias_assigns_hypotheses.i:17: Warning:
Memory model hypotheses for function 'global_alias':
/*@
behavior wp_typed:
requires \separated(g_alias, (int *)global + (..), &g_alias);
*/
void global_alias(void);
-[wp] tests/wp_hoare/alias_assigns_hypotheses.i:24: Warning:
+[wp] alias_assigns_hypotheses.i:24: Warning:
Memory model hypotheses for function 'global_no_alias':
/*@ behavior wp_typed:
requires \separated(g_alias, &g_alias); */
void global_no_alias(void);
-[wp] tests/wp_hoare/alias_assigns_hypotheses.i:32: Warning:
+[wp] alias_assigns_hypotheses.i:32: Warning:
Memory model hypotheses for function 'formal_alias':
/*@ behavior wp_typed:
requires \separated(f_alias, (int *)global + (..)); */
void formal_alias(int *f_alias);
-[wp] tests/wp_hoare/alias_assigns_hypotheses.i:48: Warning:
+[wp] alias_assigns_hypotheses.i:48: Warning:
Memory model hypotheses for function 'formal_alias_array':
/*@
behavior wp_typed:
@@ -218,7 +218,7 @@ Prove: true.
requires \separated(alias_array + (..), (int *)global + (..));
*/
void formal_alias_array(int (*alias_array)[2]);
-[wp] tests/wp_hoare/alias_assigns_hypotheses.i:61: Warning:
+[wp] alias_assigns_hypotheses.i:61: Warning:
Memory model hypotheses for function 'field_alias':
/*@
behavior wp_typed:
@@ -226,7 +226,7 @@ Prove: true.
requires \separated(x, (int *)global + (..));
*/
void field_alias(struct X *x);
-[wp] tests/wp_hoare/alias_assigns_hypotheses.i:73: Warning:
+[wp] alias_assigns_hypotheses.i:73: Warning:
Memory model hypotheses for function 'field_range_alias':
/*@
behavior wp_typed:
@@ -234,7 +234,7 @@ Prove: true.
requires \separated(x + (..), (int *)global + (..));
*/
void field_range_alias(struct X *x);
-[wp] tests/wp_hoare/alias_assigns_hypotheses.i:81: Warning:
+[wp] alias_assigns_hypotheses.i:81: Warning:
Memory model hypotheses for function 'set_alias':
/*@
behavior wp_typed:
@@ -242,7 +242,7 @@ Prove: true.
requires \separated(f_alias, (int *)global + (..), &g_alias);
*/
void set_alias(int *f_alias);
-[wp] tests/wp_hoare/alias_assigns_hypotheses.i:92: Warning:
+[wp] alias_assigns_hypotheses.i:92: Warning:
Memory model hypotheses for function 'comprehension_alias':
/*@
behavior wp_typed:
@@ -253,7 +253,7 @@ Prove: true.
);
*/
void comprehension_alias(void);
-[wp] tests/wp_hoare/alias_assigns_hypotheses.i:102: Warning:
+[wp] alias_assigns_hypotheses.i:102: Warning:
Memory model hypotheses for function 'union_alias':
/*@
behavior wp_typed:
diff --git a/src/plugins/wp/tests/wp_hoare/oracle/alias_escapes_hypotheses.0.res.oracle b/src/plugins/wp/tests/wp_hoare/oracle/alias_escapes_hypotheses.0.res.oracle
index 98b310d5882..067e3a4c985 100644
--- a/src/plugins/wp/tests/wp_hoare/oracle/alias_escapes_hypotheses.0.res.oracle
+++ b/src/plugins/wp/tests/wp_hoare/oracle/alias_escapes_hypotheses.0.res.oracle
@@ -1,5 +1,5 @@
# frama-c -wp [...]
-[kernel] Parsing tests/wp_hoare/alias_escapes_hypotheses.i (no preprocessing)
+[kernel] Parsing alias_escapes_hypotheses.i (no preprocessing)
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
------------------------------------------------------------
@@ -39,13 +39,13 @@ Prove: true.
Function fp1
------------------------------------------------------------
-Goal Assigns (file tests/wp_hoare/alias_escapes_hypotheses.i, line 28) in 'fp1' (1/2):
+Goal Assigns (file alias_escapes_hypotheses.i, line 28) in 'fp1' (1/2):
Effect at line 30
Prove: false.
------------------------------------------------------------
-Goal Assigns (file tests/wp_hoare/alias_escapes_hypotheses.i, line 28) in 'fp1' (2/2):
+Goal Assigns (file alias_escapes_hypotheses.i, line 28) in 'fp1' (2/2):
Effect at line 31
Prove: true.
@@ -54,7 +54,7 @@ Prove: true.
Function fp2
------------------------------------------------------------
-Goal Assigns (file tests/wp_hoare/alias_escapes_hypotheses.i, line 34) in 'fp2':
+Goal Assigns (file alias_escapes_hypotheses.i, line 34) in 'fp2':
Effect at line 36
Prove: true.
@@ -63,28 +63,28 @@ Prove: true.
Function fp3
------------------------------------------------------------
-Goal Assigns (file tests/wp_hoare/alias_escapes_hypotheses.i, line 39) in 'fp3':
+Goal Assigns (file alias_escapes_hypotheses.i, line 39) in 'fp3':
Effect at line 41
Prove: true.
------------------------------------------------------------
-[wp] tests/wp_hoare/alias_escapes_hypotheses.i:13: Warning:
+[wp] alias_escapes_hypotheses.i:13: Warning:
Memory model hypotheses for function 'f1':
/*@ behavior wp_typed:
ensures \separated(\result, &a); */
int *f1(void);
-[wp] tests/wp_hoare/alias_escapes_hypotheses.i:24: Warning:
+[wp] alias_escapes_hypotheses.i:24: Warning:
Memory model hypotheses for function 'f3':
/*@ behavior wp_typed:
ensures \separated(\result, &x); */
int *f3(int x);
-[wp] tests/wp_hoare/alias_escapes_hypotheses.i:29: Warning:
+[wp] alias_escapes_hypotheses.i:29: Warning:
Memory model hypotheses for function 'fp1':
/*@ behavior wp_typed:
requires \separated(p, &a);
ensures \separated(p, &a); */
void fp1(int **p);
-[wp] tests/wp_hoare/alias_escapes_hypotheses.i:40: Warning:
+[wp] alias_escapes_hypotheses.i:40: Warning:
Memory model hypotheses for function 'fp3':
/*@ behavior wp_typed:
ensures \separated(p, &x); */
diff --git a/src/plugins/wp/tests/wp_hoare/oracle/alias_escapes_hypotheses.1.res.oracle b/src/plugins/wp/tests/wp_hoare/oracle/alias_escapes_hypotheses.1.res.oracle
index f5a09c1b43a..a3ed2f01b81 100644
--- a/src/plugins/wp/tests/wp_hoare/oracle/alias_escapes_hypotheses.1.res.oracle
+++ b/src/plugins/wp/tests/wp_hoare/oracle/alias_escapes_hypotheses.1.res.oracle
@@ -1,5 +1,5 @@
# frama-c -wp [...]
-[kernel] Parsing tests/wp_hoare/alias_escapes_hypotheses.i (no preprocessing)
+[kernel] Parsing alias_escapes_hypotheses.i (no preprocessing)
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
------------------------------------------------------------
@@ -21,7 +21,7 @@ Prove: true.
Function f1 with behavior wp_typed
------------------------------------------------------------
-Goal Post-condition for 'wp_typed' (file tests/wp_hoare/alias_escapes_hypotheses.i, line 13) in 'f1':
+Goal Post-condition for 'wp_typed' (file alias_escapes_hypotheses.i, line 13) in 'f1':
Prove: true.
------------------------------------------------------------
@@ -47,7 +47,7 @@ Prove: true.
Function f3 with behavior wp_typed
------------------------------------------------------------
-Goal Post-condition for 'wp_typed' (file tests/wp_hoare/alias_escapes_hypotheses.i, line 24) in 'f3':
+Goal Post-condition for 'wp_typed' (file alias_escapes_hypotheses.i, line 24) in 'f3':
Prove: false.
------------------------------------------------------------
@@ -55,13 +55,13 @@ Prove: false.
Function fp1
------------------------------------------------------------
-Goal Assigns (file tests/wp_hoare/alias_escapes_hypotheses.i, line 28) in 'fp1' (1/2):
+Goal Assigns (file alias_escapes_hypotheses.i, line 28) in 'fp1' (1/2):
Effect at line 30
Prove: false.
------------------------------------------------------------
-Goal Assigns (file tests/wp_hoare/alias_escapes_hypotheses.i, line 28) in 'fp1' (2/2):
+Goal Assigns (file alias_escapes_hypotheses.i, line 28) in 'fp1' (2/2):
Effect at line 31
Prove: true.
@@ -70,7 +70,7 @@ Prove: true.
Function fp1 with behavior wp_typed
------------------------------------------------------------
-Goal Post-condition for 'wp_typed' (file tests/wp_hoare/alias_escapes_hypotheses.i, line 29) in 'fp1':
+Goal Post-condition for 'wp_typed' (file alias_escapes_hypotheses.i, line 29) in 'fp1':
Prove: true.
------------------------------------------------------------
@@ -78,7 +78,7 @@ Prove: true.
Function fp2
------------------------------------------------------------
-Goal Assigns (file tests/wp_hoare/alias_escapes_hypotheses.i, line 34) in 'fp2':
+Goal Assigns (file alias_escapes_hypotheses.i, line 34) in 'fp2':
Effect at line 36
Prove: true.
@@ -87,7 +87,7 @@ Prove: true.
Function fp3
------------------------------------------------------------
-Goal Assigns (file tests/wp_hoare/alias_escapes_hypotheses.i, line 39) in 'fp3':
+Goal Assigns (file alias_escapes_hypotheses.i, line 39) in 'fp3':
Effect at line 41
Prove: true.
@@ -96,7 +96,7 @@ Prove: true.
Function fp3 with behavior wp_typed
------------------------------------------------------------
-Goal Post-condition for 'wp_typed' (file tests/wp_hoare/alias_escapes_hypotheses.i, line 40) in 'fp3':
+Goal Post-condition for 'wp_typed' (file alias_escapes_hypotheses.i, line 40) in 'fp3':
Assume { (* Heap *) Type: region(p.base) <= 0. }
Prove: global(P_x_46) != p.
diff --git a/src/plugins/wp/tests/wp_hoare/oracle/byref.1.res.oracle b/src/plugins/wp/tests/wp_hoare/oracle/byref.1.res.oracle
index 66559f6e88f..31f1bafb73c 100644
--- a/src/plugins/wp/tests/wp_hoare/oracle/byref.1.res.oracle
+++ b/src/plugins/wp/tests/wp_hoare/oracle/byref.1.res.oracle
@@ -85,17 +85,17 @@ Goal Instance of 'Pre-condition (file byref.i, line 11) in 'f'' in 'wrong_withou
Prove: true.
------------------------------------------------------------
-[wp] tests/wp_hoare/byref.i:14: Warning:
+[wp] byref.i:14: Warning:
Memory model hypotheses for function 'f':
/*@ behavior wp_typed_ref:
requires \valid(r); */
void f(int *r);
-[wp] tests/wp_hoare/byref.i:20: Warning:
+[wp] byref.i:20: Warning:
Memory model hypotheses for function 'wrong_without_ref':
/*@ behavior wp_typed_ref:
requires \valid(q); */
int wrong_without_ref(int *q);
-[wp] tests/wp_hoare/byref.i:31: Warning:
+[wp] byref.i:31: Warning:
Memory model hypotheses for function 'pointer':
/*@ behavior wp_typed_ref:
requires \valid(q); */
diff --git a/src/plugins/wp/tests/wp_hoare/oracle/dispatch_var.res.oracle b/src/plugins/wp/tests/wp_hoare/oracle/dispatch_var.res.oracle
index f9b5d1dd238..d5c831a0f46 100644
--- a/src/plugins/wp/tests/wp_hoare/oracle/dispatch_var.res.oracle
+++ b/src/plugins/wp/tests/wp_hoare/oracle/dispatch_var.res.oracle
@@ -496,22 +496,22 @@ Effect at line 46
Prove: true.
------------------------------------------------------------
-[wp] tests/wp_hoare/dispatch_var.i:12: Warning:
+[wp] dispatch_var.i:12: Warning:
Memory model hypotheses for function 'ref_ctr':
/*@ behavior wp_typed_ref:
requires \valid(p); */
int ref_ctr(int *p);
-[wp] tests/wp_hoare/dispatch_var.i:44: Warning:
+[wp] dispatch_var.i:44: Warning:
Memory model hypotheses for function 'ref_bd':
/*@ behavior wp_typed_ref:
requires \valid(q); */
int ref_bd(int *q);
-[wp] tests/wp_hoare/dispatch_var.i:83: Warning:
+[wp] dispatch_var.i:83: Warning:
Memory model hypotheses for function 'ref_valid':
/*@ behavior wp_typed_ref:
requires \valid(p1); */
int ref_valid(int *p1);
-[wp] tests/wp_hoare/dispatch_var.i:133: Warning:
+[wp] dispatch_var.i:133: Warning:
Memory model hypotheses for function 'ref_ctr_nr':
/*@
behavior wp_typed_ref:
@@ -521,12 +521,12 @@ Prove: true.
requires \valid(ref2);
*/
int ref_ctr_nr(int *ref, int *ref1, int *ref2);
-[wp] tests/wp_hoare/dispatch_var.i:158: Warning:
+[wp] dispatch_var.i:158: Warning:
Memory model hypotheses for function 'ref_ctr_nstars':
/*@ behavior wp_typed_ref:
requires \valid(pp); */
int ref_ctr_nstars(int **pp);
-[wp] tests/wp_hoare/dispatch_var.i:194: Warning:
+[wp] dispatch_var.i:194: Warning:
Memory model hypotheses for function 'g':
/*@ behavior wp_typed_ref:
requires \valid(pg); */
diff --git a/src/plugins/wp/tests/wp_hoare/oracle/dispatch_var2.0.res.oracle b/src/plugins/wp/tests/wp_hoare/oracle/dispatch_var2.0.res.oracle
index 4dd463aa0e6..cd93d9929be 100644
--- a/src/plugins/wp/tests/wp_hoare/oracle/dispatch_var2.0.res.oracle
+++ b/src/plugins/wp/tests/wp_hoare/oracle/dispatch_var2.0.res.oracle
@@ -485,22 +485,22 @@ Goal Assigns (file dispatch_var2.i, line 13) in 'reset':
Prove: true.
------------------------------------------------------------
-[wp] tests/wp_hoare/dispatch_var2.i:16: Warning:
+[wp] dispatch_var2.i:16: Warning:
Memory model hypotheses for function 'reset':
/*@ behavior wp_typed_ref:
requires \valid(rp); */
void reset(int *rp);
-[wp] tests/wp_hoare/dispatch_var2.i:23: Warning:
+[wp] dispatch_var2.i:23: Warning:
Memory model hypotheses for function 'incr':
/*@ behavior wp_typed_ref:
requires \valid(ip); */
void incr(int *ip);
-[wp] tests/wp_hoare/dispatch_var2.i:31: Warning:
+[wp] dispatch_var2.i:31: Warning:
Memory model hypotheses for function 'load':
/*@ behavior wp_typed_ref:
requires \valid(lp); */
int load(int *lp);
-[wp] tests/wp_hoare/dispatch_var2.i:70: Warning:
+[wp] dispatch_var2.i:70: Warning:
Memory model hypotheses for function 'call_param_ref':
/*@ behavior wp_typed_ref:
requires \valid(q); */
diff --git a/src/plugins/wp/tests/wp_hoare/oracle/dispatch_var2.1.res.oracle b/src/plugins/wp/tests/wp_hoare/oracle/dispatch_var2.1.res.oracle
index bf9949e2eab..c00e500269a 100644
--- a/src/plugins/wp/tests/wp_hoare/oracle/dispatch_var2.1.res.oracle
+++ b/src/plugins/wp/tests/wp_hoare/oracle/dispatch_var2.1.res.oracle
@@ -210,22 +210,22 @@ Goal Assigns (file dispatch_var2.i, line 13) in 'reset':
Prove: true.
------------------------------------------------------------
-[wp] tests/wp_hoare/dispatch_var2.i:16: Warning:
+[wp] dispatch_var2.i:16: Warning:
Memory model hypotheses for function 'reset':
/*@ behavior wp_typed_ref:
requires \valid(rp); */
void reset(int *rp);
-[wp] tests/wp_hoare/dispatch_var2.i:23: Warning:
+[wp] dispatch_var2.i:23: Warning:
Memory model hypotheses for function 'incr':
/*@ behavior wp_typed_ref:
requires \valid(ip); */
void incr(int *ip);
-[wp] tests/wp_hoare/dispatch_var2.i:31: Warning:
+[wp] dispatch_var2.i:31: Warning:
Memory model hypotheses for function 'load':
/*@ behavior wp_typed_ref:
requires \valid(lp); */
int load(int *lp);
-[wp] tests/wp_hoare/dispatch_var2.i:70: Warning:
+[wp] dispatch_var2.i:70: Warning:
Memory model hypotheses for function 'call_param_ref':
/*@ behavior wp_typed_ref:
requires \valid(q); */
diff --git a/src/plugins/wp/tests/wp_hoare/oracle/memory_hypotheses_checking.res.oracle b/src/plugins/wp/tests/wp_hoare/oracle/memory_hypotheses_checking.res.oracle
index 380a7e0cc8a..da3d56e44ec 100644
--- a/src/plugins/wp/tests/wp_hoare/oracle/memory_hypotheses_checking.res.oracle
+++ b/src/plugins/wp/tests/wp_hoare/oracle/memory_hypotheses_checking.res.oracle
@@ -1,17 +1,17 @@
# frama-c -wp -wp-model 'Typed (Ref)' [...]
-[kernel] Parsing tests/wp_hoare/memory_hypotheses_checking.i (no preprocessing)
+[kernel] Parsing memory_hypotheses_checking.i (no preprocessing)
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
------------------------------------------------------------
Function add_return_ok
------------------------------------------------------------
-Goal Post-condition (file tests/wp_hoare/memory_hypotheses_checking.i, line 76) in 'add_return_ok':
+Goal Post-condition (file memory_hypotheses_checking.i, line 76) in 'add_return_ok':
Prove: true.
------------------------------------------------------------
-Goal Assigns (file tests/wp_hoare/memory_hypotheses_checking.i, line 74) in 'add_return_ok':
+Goal Assigns (file memory_hypotheses_checking.i, line 74) in 'add_return_ok':
Effect at line 79
Prove: true.
@@ -20,7 +20,7 @@ Prove: true.
Function add_return_ok with behavior wp_typed_ref
------------------------------------------------------------
-Goal Post-condition for 'wp_typed_ref' (file tests/wp_hoare/memory_hypotheses_checking.i, line 78) in 'add_return_ok':
+Goal Post-condition for 'wp_typed_ref' (file memory_hypotheses_checking.i, line 78) in 'add_return_ok':
Prove: true.
------------------------------------------------------------
@@ -28,7 +28,7 @@ Prove: true.
Function assigns_ptr
------------------------------------------------------------
-Goal Assigns (file tests/wp_hoare/memory_hypotheses_checking.i, line 57) in 'assigns_ptr':
+Goal Assigns (file memory_hypotheses_checking.i, line 57) in 'assigns_ptr':
Prove: true.
------------------------------------------------------------
@@ -45,7 +45,7 @@ Prove: true.
Function bad_return_formal with behavior wp_typed_ref
------------------------------------------------------------
-Goal Post-condition for 'wp_typed_ref' (file tests/wp_hoare/memory_hypotheses_checking.i, line 97) in 'bad_return_formal':
+Goal Post-condition for 'wp_typed_ref' (file memory_hypotheses_checking.i, line 97) in 'bad_return_formal':
Prove: false.
------------------------------------------------------------
@@ -53,35 +53,35 @@ Prove: false.
Function call_add_return_bad
------------------------------------------------------------
-Goal Assigns (file tests/wp_hoare/memory_hypotheses_checking.i, line 90) in 'call_add_return_bad':
+Goal Assigns (file memory_hypotheses_checking.i, line 90) in 'call_add_return_bad':
Prove: true.
------------------------------------------------------------
-Goal Assigns (file tests/wp_hoare/memory_hypotheses_checking.i, line 90) in 'call_add_return_bad' (1/3):
+Goal Assigns (file memory_hypotheses_checking.i, line 90) in 'call_add_return_bad' (1/3):
Prove: true.
------------------------------------------------------------
-Goal Assigns (file tests/wp_hoare/memory_hypotheses_checking.i, line 90) in 'call_add_return_bad' (2/3):
+Goal Assigns (file memory_hypotheses_checking.i, line 90) in 'call_add_return_bad' (2/3):
Call Result at line 92
Prove: true.
------------------------------------------------------------
-Goal Assigns (file tests/wp_hoare/memory_hypotheses_checking.i, line 90) in 'call_add_return_bad' (3/3):
+Goal Assigns (file memory_hypotheses_checking.i, line 90) in 'call_add_return_bad' (3/3):
Effect at line 93
Prove: true.
------------------------------------------------------------
-Goal Instance of 'Pre-condition for 'wp_typed_ref' (file tests/wp_hoare/memory_hypotheses_checking.i, line 78) in 'add_return_ok'' in 'call_add_return_bad' at initialization of 'p_0' (file tests/wp_hoare/memory_hypotheses_checking.i, line 92)
+Goal Instance of 'Pre-condition for 'wp_typed_ref' (file memory_hypotheses_checking.i, line 78) in 'add_return_ok'' in 'call_add_return_bad' at initialization of 'p_0' (file memory_hypotheses_checking.i, line 92)
:
Prove: false.
------------------------------------------------------------
-Goal Instance of 'Pre-condition for 'wp_typed_ref' (file tests/wp_hoare/memory_hypotheses_checking.i, line 78) in 'add_return_ok'' in 'call_add_return_bad' at initialization of 'p_0' (file tests/wp_hoare/memory_hypotheses_checking.i, line 92)
+Goal Instance of 'Pre-condition for 'wp_typed_ref' (file memory_hypotheses_checking.i, line 78) in 'add_return_ok'' in 'call_add_return_bad' at initialization of 'p_0' (file memory_hypotheses_checking.i, line 92)
:
Prove: false.
@@ -90,38 +90,38 @@ Prove: false.
Function call_add_return_ok
------------------------------------------------------------
-Goal Assigns (file tests/wp_hoare/memory_hypotheses_checking.i, line 83) in 'call_add_return_ok':
+Goal Assigns (file memory_hypotheses_checking.i, line 83) in 'call_add_return_ok':
Call Effect at line 86
Prove: true.
------------------------------------------------------------
-Goal Assigns (file tests/wp_hoare/memory_hypotheses_checking.i, line 83) in 'call_add_return_ok' (1/3):
+Goal Assigns (file memory_hypotheses_checking.i, line 83) in 'call_add_return_ok' (1/3):
Call Effect at line 86
Prove: true.
------------------------------------------------------------
-Goal Assigns (file tests/wp_hoare/memory_hypotheses_checking.i, line 83) in 'call_add_return_ok' (2/3):
+Goal Assigns (file memory_hypotheses_checking.i, line 83) in 'call_add_return_ok' (2/3):
Call Result at line 86
Prove: true.
------------------------------------------------------------
-Goal Assigns (file tests/wp_hoare/memory_hypotheses_checking.i, line 83) in 'call_add_return_ok' (3/3):
+Goal Assigns (file memory_hypotheses_checking.i, line 83) in 'call_add_return_ok' (3/3):
Effect at line 87
Assume { (* Heap *) Type: linked(Malloc_0). }
Prove: invalid(Malloc_0, global(L_l_71), 1).
------------------------------------------------------------
-Goal Instance of 'Pre-condition for 'wp_typed_ref' (file tests/wp_hoare/memory_hypotheses_checking.i, line 78) in 'add_return_ok'' in 'call_add_return_ok' at initialization of 'p_0' (file tests/wp_hoare/memory_hypotheses_checking.i, line 86)
+Goal Instance of 'Pre-condition for 'wp_typed_ref' (file memory_hypotheses_checking.i, line 78) in 'add_return_ok'' in 'call_add_return_ok' at initialization of 'p_0' (file memory_hypotheses_checking.i, line 86)
:
Prove: true.
------------------------------------------------------------
-Goal Instance of 'Pre-condition for 'wp_typed_ref' (file tests/wp_hoare/memory_hypotheses_checking.i, line 78) in 'add_return_ok'' in 'call_add_return_ok' at initialization of 'p_0' (file tests/wp_hoare/memory_hypotheses_checking.i, line 86)
+Goal Instance of 'Pre-condition for 'wp_typed_ref' (file memory_hypotheses_checking.i, line 78) in 'add_return_ok'' in 'call_add_return_ok' at initialization of 'p_0' (file memory_hypotheses_checking.i, line 86)
:
Prove: true.
@@ -130,23 +130,23 @@ Prove: true.
Function call_assigns_ptr_bad
------------------------------------------------------------
-Goal Assigns (file tests/wp_hoare/memory_hypotheses_checking.i, line 68) in 'call_assigns_ptr_bad':
+Goal Assigns (file memory_hypotheses_checking.i, line 68) in 'call_assigns_ptr_bad':
Prove: true.
------------------------------------------------------------
-Goal Assigns (file tests/wp_hoare/memory_hypotheses_checking.i, line 68) in 'call_assigns_ptr_bad':
+Goal Assigns (file memory_hypotheses_checking.i, line 68) in 'call_assigns_ptr_bad':
Prove: true.
------------------------------------------------------------
-Goal Instance of 'Pre-condition for 'wp_typed_ref' (file tests/wp_hoare/memory_hypotheses_checking.i, line 58) in 'assigns_ptr'' in 'call_assigns_ptr_bad' at call 'assigns_ptr' (file tests/wp_hoare/memory_hypotheses_checking.i, line 70)
+Goal Instance of 'Pre-condition for 'wp_typed_ref' (file memory_hypotheses_checking.i, line 58) in 'assigns_ptr'' in 'call_assigns_ptr_bad' at call 'assigns_ptr' (file memory_hypotheses_checking.i, line 70)
:
Prove: false.
------------------------------------------------------------
-Goal Instance of 'Pre-condition for 'wp_typed_ref' (file tests/wp_hoare/memory_hypotheses_checking.i, line 58) in 'assigns_ptr'' in 'call_assigns_ptr_bad' at call 'assigns_ptr' (file tests/wp_hoare/memory_hypotheses_checking.i, line 70)
+Goal Instance of 'Pre-condition for 'wp_typed_ref' (file memory_hypotheses_checking.i, line 58) in 'assigns_ptr'' in 'call_assigns_ptr_bad' at call 'assigns_ptr' (file memory_hypotheses_checking.i, line 70)
:
Prove: true.
@@ -167,13 +167,13 @@ Prove: true.
------------------------------------------------------------
-Goal Instance of 'Pre-condition for 'wp_typed_ref' (file tests/wp_hoare/memory_hypotheses_checking.i, line 58) in 'assigns_ptr'' in 'call_assigns_ptr_ok' at call 'assigns_ptr' (file tests/wp_hoare/memory_hypotheses_checking.i, line 65)
+Goal Instance of 'Pre-condition for 'wp_typed_ref' (file memory_hypotheses_checking.i, line 58) in 'assigns_ptr'' in 'call_assigns_ptr_ok' at call 'assigns_ptr' (file memory_hypotheses_checking.i, line 65)
:
Prove: true.
------------------------------------------------------------
-Goal Instance of 'Pre-condition for 'wp_typed_ref' (file tests/wp_hoare/memory_hypotheses_checking.i, line 58) in 'assigns_ptr'' in 'call_assigns_ptr_ok' at call 'assigns_ptr' (file tests/wp_hoare/memory_hypotheses_checking.i, line 65)
+Goal Instance of 'Pre-condition for 'wp_typed_ref' (file memory_hypotheses_checking.i, line 58) in 'assigns_ptr'' in 'call_assigns_ptr_ok' at call 'assigns_ptr' (file memory_hypotheses_checking.i, line 65)
:
Prove: true.
@@ -182,23 +182,23 @@ Prove: true.
Function call_gptr_sep_bad
------------------------------------------------------------
-Goal Assigns (file tests/wp_hoare/memory_hypotheses_checking.i, line 50) in 'call_gptr_sep_bad':
+Goal Assigns (file memory_hypotheses_checking.i, line 50) in 'call_gptr_sep_bad':
Prove: true.
------------------------------------------------------------
-Goal Assigns (file tests/wp_hoare/memory_hypotheses_checking.i, line 50) in 'call_gptr_sep_bad':
+Goal Assigns (file memory_hypotheses_checking.i, line 50) in 'call_gptr_sep_bad':
Prove: true.
------------------------------------------------------------
-Goal Instance of 'Pre-condition for 'wp_typed_ref' (file tests/wp_hoare/memory_hypotheses_checking.i, line 39) in 'gptr_sep'' in 'call_gptr_sep_bad' at call 'gptr_sep' (file tests/wp_hoare/memory_hypotheses_checking.i, line 53)
+Goal Instance of 'Pre-condition for 'wp_typed_ref' (file memory_hypotheses_checking.i, line 39) in 'gptr_sep'' in 'call_gptr_sep_bad' at call 'gptr_sep' (file memory_hypotheses_checking.i, line 53)
:
Prove: false.
------------------------------------------------------------
-Goal Instance of 'Pre-condition for 'wp_typed_ref' (file tests/wp_hoare/memory_hypotheses_checking.i, line 39) in 'gptr_sep'' in 'call_gptr_sep_bad' at call 'gptr_sep' (file tests/wp_hoare/memory_hypotheses_checking.i, line 53)
+Goal Instance of 'Pre-condition for 'wp_typed_ref' (file memory_hypotheses_checking.i, line 39) in 'gptr_sep'' in 'call_gptr_sep_bad' at call 'gptr_sep' (file memory_hypotheses_checking.i, line 53)
:
Assume { (* Heap *) Type: linked(Malloc_0). }
Prove: valid_rw(Malloc_0, global(G_g_20), 1).
@@ -208,23 +208,23 @@ Prove: valid_rw(Malloc_0, global(G_g_20), 1).
Function call_gptr_sep_ok
------------------------------------------------------------
-Goal Assigns (file tests/wp_hoare/memory_hypotheses_checking.i, line 43) in 'call_gptr_sep_ok':
+Goal Assigns (file memory_hypotheses_checking.i, line 43) in 'call_gptr_sep_ok':
Prove: true.
------------------------------------------------------------
-Goal Assigns (file tests/wp_hoare/memory_hypotheses_checking.i, line 43) in 'call_gptr_sep_ok':
+Goal Assigns (file memory_hypotheses_checking.i, line 43) in 'call_gptr_sep_ok':
Prove: true.
------------------------------------------------------------
-Goal Instance of 'Pre-condition for 'wp_typed_ref' (file tests/wp_hoare/memory_hypotheses_checking.i, line 39) in 'gptr_sep'' in 'call_gptr_sep_ok' at call 'gptr_sep' (file tests/wp_hoare/memory_hypotheses_checking.i, line 47)
+Goal Instance of 'Pre-condition for 'wp_typed_ref' (file memory_hypotheses_checking.i, line 39) in 'gptr_sep'' in 'call_gptr_sep_ok' at call 'gptr_sep' (file memory_hypotheses_checking.i, line 47)
:
Prove: true.
------------------------------------------------------------
-Goal Instance of 'Pre-condition for 'wp_typed_ref' (file tests/wp_hoare/memory_hypotheses_checking.i, line 39) in 'gptr_sep'' in 'call_gptr_sep_ok' at call 'gptr_sep' (file tests/wp_hoare/memory_hypotheses_checking.i, line 47)
+Goal Instance of 'Pre-condition for 'wp_typed_ref' (file memory_hypotheses_checking.i, line 39) in 'gptr_sep'' in 'call_gptr_sep_ok' at call 'gptr_sep' (file memory_hypotheses_checking.i, line 47)
:
Assume { (* Heap *) Type: linked(Malloc_0). }
Prove: valid_rw(Malloc_0[L_l_46 <- 1], global(L_l_46), 1).
@@ -244,13 +244,13 @@ Prove: true.
------------------------------------------------------------
-Goal Instance of 'Pre-condition for 'wp_typed_ref' (file tests/wp_hoare/memory_hypotheses_checking.i, line 12) in 'sep'' in 'call_sep_bad_sep' at call 'sep' (file tests/wp_hoare/memory_hypotheses_checking.i, line 24)
+Goal Instance of 'Pre-condition for 'wp_typed_ref' (file memory_hypotheses_checking.i, line 12) in 'sep'' in 'call_sep_bad_sep' at call 'sep' (file memory_hypotheses_checking.i, line 24)
:
Prove: false.
------------------------------------------------------------
-Goal Instance of 'Pre-condition for 'wp_typed_ref' (file tests/wp_hoare/memory_hypotheses_checking.i, line 12) in 'sep'' in 'call_sep_bad_sep' at call 'sep' (file tests/wp_hoare/memory_hypotheses_checking.i, line 24)
+Goal Instance of 'Pre-condition for 'wp_typed_ref' (file memory_hypotheses_checking.i, line 12) in 'sep'' in 'call_sep_bad_sep' at call 'sep' (file memory_hypotheses_checking.i, line 24)
:
Prove: true.
@@ -281,13 +281,13 @@ Prove: true.
------------------------------------------------------------
-Goal Instance of 'Pre-condition for 'wp_typed_ref' (file tests/wp_hoare/memory_hypotheses_checking.i, line 12) in 'sep'' in 'call_sep_bad_valid' at call 'sep' (file tests/wp_hoare/memory_hypotheses_checking.i, line 34)
+Goal Instance of 'Pre-condition for 'wp_typed_ref' (file memory_hypotheses_checking.i, line 12) in 'sep'' in 'call_sep_bad_valid' at call 'sep' (file memory_hypotheses_checking.i, line 34)
:
Prove: true.
------------------------------------------------------------
-Goal Instance of 'Pre-condition for 'wp_typed_ref' (file tests/wp_hoare/memory_hypotheses_checking.i, line 12) in 'sep'' in 'call_sep_bad_valid' at call 'sep' (file tests/wp_hoare/memory_hypotheses_checking.i, line 34)
+Goal Instance of 'Pre-condition for 'wp_typed_ref' (file memory_hypotheses_checking.i, line 12) in 'sep'' in 'call_sep_bad_valid' at call 'sep' (file memory_hypotheses_checking.i, line 34)
:
Assume { (* Heap *) Type: linked(Malloc_0). }
Prove: valid_rw(Malloc_0[L_l_37 <- 0], global(L_l_37), 1).
@@ -307,13 +307,13 @@ Prove: true.
------------------------------------------------------------
-Goal Instance of 'Pre-condition for 'wp_typed_ref' (file tests/wp_hoare/memory_hypotheses_checking.i, line 12) in 'sep'' in 'call_sep_ok' at call 'sep' (file tests/wp_hoare/memory_hypotheses_checking.i, line 19)
+Goal Instance of 'Pre-condition for 'wp_typed_ref' (file memory_hypotheses_checking.i, line 12) in 'sep'' in 'call_sep_ok' at call 'sep' (file memory_hypotheses_checking.i, line 19)
:
Prove: true.
------------------------------------------------------------
-Goal Instance of 'Pre-condition for 'wp_typed_ref' (file tests/wp_hoare/memory_hypotheses_checking.i, line 12) in 'sep'' in 'call_sep_ok' at call 'sep' (file tests/wp_hoare/memory_hypotheses_checking.i, line 19)
+Goal Instance of 'Pre-condition for 'wp_typed_ref' (file memory_hypotheses_checking.i, line 12) in 'sep'' in 'call_sep_ok' at call 'sep' (file memory_hypotheses_checking.i, line 19)
:
Prove: true.
diff --git a/src/plugins/wp/tests/wp_hoare/oracle/model_lookup.res.oracle b/src/plugins/wp/tests/wp_hoare/oracle/model_lookup.res.oracle
index 21c6e1bbce7..969ab4b5517 100644
--- a/src/plugins/wp/tests/wp_hoare/oracle/model_lookup.res.oracle
+++ b/src/plugins/wp/tests/wp_hoare/oracle/model_lookup.res.oracle
@@ -1,12 +1,12 @@
# frama-c -wp [...]
-[kernel] Parsing tests/wp_hoare/model_lookup.i (no preprocessing)
+[kernel] Parsing model_lookup.i (no preprocessing)
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
------------------------------------------------------------
Function foo
------------------------------------------------------------
-Goal Check 'C' (file tests/wp_hoare/model_lookup.i, line 13):
+Goal Check 'C' (file model_lookup.i, line 13):
Assume {
Type: is_sint32(y).
(* Assertion *)
diff --git a/src/plugins/wp/tests/wp_hoare/oracle/reference.res.oracle b/src/plugins/wp/tests/wp_hoare/oracle/reference.res.oracle
index e360c218c80..230bcf35563 100644
--- a/src/plugins/wp/tests/wp_hoare/oracle/reference.res.oracle
+++ b/src/plugins/wp/tests/wp_hoare/oracle/reference.res.oracle
@@ -141,12 +141,12 @@ Goal Assigns (file reference.i, line 57) in 'write':
Prove: true.
------------------------------------------------------------
-[wp] tests/wp_hoare/reference.i:14: Warning:
+[wp] reference.i:14: Warning:
Memory model hypotheses for function 'f':
/*@ behavior wp_typed_ref:
requires \valid(p); */
int f(int *p);
-[wp] tests/wp_hoare/reference.i:30: Warning:
+[wp] reference.i:30: Warning:
Memory model hypotheses for function 'f2':
/*@
behavior wp_typed_ref:
@@ -155,17 +155,17 @@ Prove: true.
requires \valid(q);
*/
int f2(int *p2, int *q);
-[wp] tests/wp_hoare/reference.i:37: Warning:
+[wp] reference.i:37: Warning:
Memory model hypotheses for function 'call_f2':
/*@ behavior wp_typed_ref:
requires \valid(ptr); */
int call_f2(int *ptr, int y);
-[wp] tests/wp_hoare/reference.i:48: Warning:
+[wp] reference.i:48: Warning:
Memory model hypotheses for function 'call_global':
/*@ behavior wp_typed_ref:
requires \valid(gl); */
int call_global(void);
-[wp] tests/wp_hoare/reference.i:60: Warning:
+[wp] reference.i:60: Warning:
Memory model hypotheses for function 'write':
/*@ behavior wp_typed_ref:
requires \valid(pa); */
diff --git a/src/plugins/wp/tests/wp_hoare/oracle/reference_and_struct.res.oracle b/src/plugins/wp/tests/wp_hoare/oracle/reference_and_struct.res.oracle
index c17c1fc95ce..cb28e562b0c 100644
--- a/src/plugins/wp/tests/wp_hoare/oracle/reference_and_struct.res.oracle
+++ b/src/plugins/wp/tests/wp_hoare/oracle/reference_and_struct.res.oracle
@@ -251,19 +251,19 @@ Goal Assigns (file reference_and_struct.i, line 12) in 'reset':
Prove: true.
------------------------------------------------------------
-[wp] tests/wp_hoare/reference_and_struct.i:15: Warning:
+[wp] reference_and_struct.i:15: Warning:
Memory model hypotheses for function 'reset':
/*@ behavior wp_typed_ref:
requires \valid(p); */
void reset(struct T *p);
-[wp] tests/wp_hoare/reference_and_struct.i:48: Warning:
+[wp] reference_and_struct.i:48: Warning:
Memory model hypotheses for function 'call_reset_5_tps':
/*@
behavior wp_typed_ref:
requires \separated((struct T **)tps + (..), tps[9] + (0 .. 4));
*/
void call_reset_5_tps(void);
-[wp] tests/wp_hoare/reference_and_struct.i:88: Warning:
+[wp] reference_and_struct.i:88: Warning:
Memory model hypotheses for function 'load_5':
/*@
behavior wp_typed_ref:
diff --git a/src/plugins/wp/tests/wp_hoare/oracle/reference_array.res.oracle b/src/plugins/wp/tests/wp_hoare/oracle/reference_array.res.oracle
index 6934cd6684e..65478140de6 100644
--- a/src/plugins/wp/tests/wp_hoare/oracle/reference_array.res.oracle
+++ b/src/plugins/wp/tests/wp_hoare/oracle/reference_array.res.oracle
@@ -401,14 +401,14 @@ Goal Instance of 'Pre-condition (file reference_array.i, line 9) in 'reset_5'' i
Prove: true.
------------------------------------------------------------
-[wp] tests/wp_hoare/reference_array.i:24: Warning:
+[wp] reference_array.i:24: Warning:
Memory model hypotheses for function 'load_5':
/*@
behavior wp_typed_ref:
requires \separated(hp + (..), (int *)reg_load + (..));
*/
void load_5(int *hp);
-[wp] tests/wp_hoare/reference_array.i:31: Warning:
+[wp] reference_array.i:31: Warning:
Memory model hypotheses for function 'add_5':
/*@
behavior wp_typed_ref:
@@ -416,14 +416,14 @@ Prove: true.
\separated(gp + (..), (int *)reg_load + (..), (int *)reg_add + (..));
*/
void add_5(int *gp);
-[wp] tests/wp_hoare/reference_array.i:45: Warning:
+[wp] reference_array.i:45: Warning:
Memory model hypotheses for function 'load_1_5':
/*@
behavior wp_typed_ref:
requires \separated(lp + (..), (int *)reg_load + (..));
*/
void load_1_5(int (*lp)[5]);
-[wp] tests/wp_hoare/reference_array.i:52: Warning:
+[wp] reference_array.i:52: Warning:
Memory model hypotheses for function 'add_1_5':
/*@
behavior wp_typed_ref:
diff --git a/src/plugins/wp/tests/wp_hoare/oracle/reference_array_simple.res.oracle b/src/plugins/wp/tests/wp_hoare/oracle/reference_array_simple.res.oracle
index 932c0f1b481..f9da274727b 100644
--- a/src/plugins/wp/tests/wp_hoare/oracle/reference_array_simple.res.oracle
+++ b/src/plugins/wp/tests/wp_hoare/oracle/reference_array_simple.res.oracle
@@ -37,7 +37,7 @@ Goal Post-condition (file reference_array_simple.i, line 39) in 'call_f3':
Prove: true.
------------------------------------------------------------
-[wp] tests/wp_hoare/reference_array_simple.i:40: Warning:
+[wp] reference_array_simple.i:40: Warning:
Memory model hypotheses for function 'call_f3':
/*@ behavior wp_typed_ref:
ensures \separated(\result, (int **)tp + (..)); */
diff --git a/src/plugins/wp/tests/wp_hoare/oracle/refguards.res.oracle b/src/plugins/wp/tests/wp_hoare/oracle/refguards.res.oracle
index f0d753a7ab6..aeb42906ee8 100644
--- a/src/plugins/wp/tests/wp_hoare/oracle/refguards.res.oracle
+++ b/src/plugins/wp/tests/wp_hoare/oracle/refguards.res.oracle
@@ -68,7 +68,7 @@ Assume { (* Heap *) Type: (region(c.base) <= 0) /\ (region(d.base) <= 0). }
Prove: d != c.
------------------------------------------------------------
-[wp] tests/wp_hoare/refguards.i:10: Warning:
+[wp] refguards.i:10: Warning:
Memory model hypotheses for function 'f':
/*@
behavior wp_typed_ref:
@@ -77,7 +77,7 @@ Prove: d != c.
requires \valid(d);
*/
void f(int *a, int *b, int *c, int *d, int k);
-[wp] tests/wp_hoare/refguards.i:25: Warning:
+[wp] refguards.i:25: Warning:
Memory model hypotheses for function 'h':
/*@
behavior wp_typed_ref:
@@ -86,7 +86,7 @@ Prove: d != c.
requires \valid(d);
*/
void h(int *c, int *d, int k);
-[wp] tests/wp_hoare/refguards.i:39: Warning:
+[wp] refguards.i:39: Warning:
Memory model hypotheses for function 's':
/*@
behavior wp_typed_ref:
diff --git a/src/plugins/wp/tests/wp_plugin/model.i b/src/plugins/wp/tests/wp_plugin/model.i
index 26a9826959e..7f073c8e745 100644
--- a/src/plugins/wp/tests/wp_plugin/model.i
+++ b/src/plugins/wp/tests/wp_plugin/model.i
@@ -1,11 +1,5 @@
/* run.config
-<<<<<<< HEAD
- CMD: @frama-c@ -wp-msg-key cluster,shell,print-generated -wp-prover why3 @OPTIONS@ -wp-warn-key "pedantic-assigns=inactive"
-||||||| ac7807782d
- CMD: @frama-c@ -wp-share ./share -wp-msg-key cluster,shell,print-generated -wp-prover why3
-=======
- CMD: @frama-c@ -wp-share ./share -wp-msg-key cluster,shell,print-generated -wp-prover why3 -wp-warn-key "pedantic-assigns=inactive"
->>>>>>> origin/master
+ CMD: @frama-c@ -wp-msg-key cluster,shell,print-generated -wp-prover why3 -wp-warn-key "pedantic-assigns=inactive" @OPTIONS@
OPT: -wp-model Typed -wp -wp-gen -wp-print -then -wp-model Typed+ref -wp -wp-gen -wp-print
*/
diff --git a/src/plugins/wp/tests/wp_plugin/nosession.i b/src/plugins/wp/tests/wp_plugin/nosession.i
index 2e420aa913c..5f7db991977 100644
--- a/src/plugins/wp/tests/wp_plugin/nosession.i
+++ b/src/plugins/wp/tests/wp_plugin/nosession.i
@@ -3,13 +3,7 @@
*/
/* run.config_qualif
-<<<<<<< HEAD
CMD: @frama-c@ -wp-msg-key shell @OPTIONS@ -wp-warn-key pedantic-assigns=inactive
-||||||| ac7807782d
- CMD: @frama-c@ -no-autoload-plugins -load-module wp -wp-share ./share -wp-msg-key shell
-=======
- CMD: @frama-c@ -no-autoload-plugins -load-module wp -wp-share ./share -wp-msg-key shell -wp-warn-key pedantic-assigns=inactive
->>>>>>> origin/master
OPT: -wp -wp-prover alt-ergo -wp-session shall_not_exists_dir -wp-cache offline -wp-no-cache-env
COMMENT: The session directory shall not be created
*/
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/dynamic.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/dynamic.res.oracle
index 45c4c11b234..cd32ffa297b 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/dynamic.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/dynamic.res.oracle
@@ -372,22 +372,22 @@ Tags: Call h1.
Prove: true.
------------------------------------------------------------
-[wp] tests/wp_plugin/dynamic.i:41: Warning:
+[wp] dynamic.i:41: Warning:
Memory model hypotheses for function 'guarded_call':
/*@ behavior wp_typed:
requires \separated(p, &X); */
void guarded_call(struct S *p);
-[wp] tests/wp_plugin/dynamic.i:63: Warning:
+[wp] dynamic.i:63: Warning:
Memory model hypotheses for function 'behavior':
/*@ behavior wp_typed:
requires \separated(p + (..), &X1); */
int behavior(int (*p)(void));
-[wp] tests/wp_plugin/dynamic.i:76: Warning:
+[wp] dynamic.i:76: Warning:
Memory model hypotheses for function 'some_behaviors':
/*@ behavior wp_typed:
requires \separated(p + (..), &X1); */
int some_behaviors(int (*p)(void));
-[wp] tests/wp_plugin/dynamic.i:85: Warning:
+[wp] dynamic.i:85: Warning:
Memory model hypotheses for function 'missing_context':
/*@ behavior wp_typed:
requires \separated(p, &X1); */
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/overassign.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/overassign.res.oracle
index 98788bde912..9a95fc7cb58 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/overassign.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/overassign.res.oracle
@@ -100,12 +100,12 @@ Assume { (* Heap *) Type: linked(Malloc_0). }
Prove: invalid(Malloc_0, shift_sint32(global(G_A_32), -5), 10).
------------------------------------------------------------
-[wp] tests/wp_plugin/overassign.i:14: Warning:
+[wp] overassign.i:14: Warning:
Memory model hypotheses for function 'f1_ok':
/*@ behavior wp_typed:
requires \separated(p + (0 .. 9), &p); */
void f1_ok(void);
-[wp] tests/wp_plugin/overassign.i:17: Warning:
+[wp] overassign.i:17: Warning:
Memory model hypotheses for function 'f2_ok':
/*@ behavior wp_typed:
requires \separated(p + (10 .. 19), &p); */
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/overflow2.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/overflow2.res.oracle
index b0e1722d9dc..25d4528f0a4 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/overflow2.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/overflow2.res.oracle
@@ -1,5 +1,5 @@
# frama-c -wp [...]
-[kernel] Parsing tests/wp_plugin/overflow2.c (with preprocessing)
+[kernel] Parsing overflow2.c (with preprocessing)
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
------------------------------------------------------------
@@ -11,22 +11,22 @@ Prove: true.
------------------------------------------------------------
-Goal Assertion 'a01' (file tests/wp_plugin/overflow2.c, line 27):
+Goal Assertion 'a01' (file overflow2.c, line 27):
Prove: true.
------------------------------------------------------------
-Goal Assertion 'a02' (file tests/wp_plugin/overflow2.c, line 28):
+Goal Assertion 'a02' (file overflow2.c, line 28):
Prove: true.
------------------------------------------------------------
-Goal Assertion 'a03' (file tests/wp_plugin/overflow2.c, line 29):
+Goal Assertion 'a03' (file overflow2.c, line 29):
Prove: true.
------------------------------------------------------------
-Goal Assertion 'a04' (file tests/wp_plugin/overflow2.c, line 30):
+Goal Assertion 'a04' (file overflow2.c, line 30):
Assume {
Type: is_sint16(distance_0) /\ is_uint32(p1_off_0).
(* Pre-condition *)
@@ -36,7 +36,7 @@ Prove: (p1_off_0 + to_uint16(distance_0)) <= 65545.
------------------------------------------------------------
-Goal Assertion 'a05' (file tests/wp_plugin/overflow2.c, line 31):
+Goal Assertion 'a05' (file overflow2.c, line 31):
Let x = p1_off_0 + to_uint16(distance_0).
Assume {
Type: is_sint16(distance_0) /\ is_uint32(p1_off_0).
@@ -49,7 +49,7 @@ Prove: x = to_uint32(x).
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/overflow2.c, line 21) in 'pointers_and_companions':
+Goal Assigns (file overflow2.c, line 21) in 'pointers_and_companions':
Prove: true.
------------------------------------------------------------
@@ -62,22 +62,22 @@ Prove: true.
------------------------------------------------------------
-Goal Assertion 'a06' (file tests/wp_plugin/overflow2.c, line 46):
+Goal Assertion 'a06' (file overflow2.c, line 46):
Prove: true.
------------------------------------------------------------
-Goal Assertion 'a07' (file tests/wp_plugin/overflow2.c, line 47):
+Goal Assertion 'a07' (file overflow2.c, line 47):
Prove: true.
------------------------------------------------------------
-Goal Assertion 'a08' (file tests/wp_plugin/overflow2.c, line 48):
+Goal Assertion 'a08' (file overflow2.c, line 48):
Prove: true.
------------------------------------------------------------
-Goal Assertion 'a09' (file tests/wp_plugin/overflow2.c, line 49):
+Goal Assertion 'a09' (file overflow2.c, line 49):
Assume {
Type: is_sint16(distance_0) /\ is_uint32(p1_off_alt_0).
(* Pre-condition *)
@@ -87,7 +87,7 @@ Prove: (p1_off_alt_0 + to_uint16(distance_0)) <= 65545.
------------------------------------------------------------
-Goal Assertion 'a10' (file tests/wp_plugin/overflow2.c, line 50):
+Goal Assertion 'a10' (file overflow2.c, line 50):
Let x = p1_off_alt_0 + to_uint16(distance_0).
Assume {
Type: is_sint16(distance_0) /\ is_uint32(p1_off_alt_0).
@@ -100,7 +100,7 @@ Prove: x = to_uint32(x).
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/overflow2.c, line 40) in 'pointers_and_companions_ulong':
+Goal Assigns (file overflow2.c, line 40) in 'pointers_and_companions_ulong':
Prove: true.
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/post_assigns.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/post_assigns.res.oracle
index 22f830eb4d0..e22df2e30a8 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/post_assigns.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/post_assigns.res.oracle
@@ -32,7 +32,7 @@ Call Effect at line 14
Prove: true.
------------------------------------------------------------
-[wp] tests/wp_plugin/post_assigns.i:12: Warning:
+[wp] post_assigns.i:12: Warning:
Memory model hypotheses for function 'receive':
/*@
behavior wp_typed:
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/sep.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/sep.res.oracle
index 528d0b8dc3d..99977135e06 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/sep.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/sep.res.oracle
@@ -66,13 +66,13 @@ Goal Post-condition (file sep.i, line 48) in 'f8_pq_a':
Prove: true.
------------------------------------------------------------
-[wp] tests/wp_plugin/sep.i:18: Warning:
+[wp] sep.i:18: Warning:
Memory model hypotheses for function 'f2_p_a':
/*@ behavior wp_typed_caveat:
requires \separated(p, &a);
requires \valid(p); */
void f2_p_a(int *p);
-[wp] tests/wp_plugin/sep.i:22: Warning:
+[wp] sep.i:22: Warning:
Memory model hypotheses for function 'f3_p_ab':
/*@
behavior wp_typed_caveat:
@@ -80,7 +80,7 @@ Prove: true.
requires \valid(p);
*/
void f3_p_ab(int *p);
-[wp] tests/wp_plugin/sep.i:26: Warning:
+[wp] sep.i:26: Warning:
Memory model hypotheses for function 'f4_pq_ab':
/*@
behavior wp_typed_caveat:
@@ -89,7 +89,7 @@ Prove: true.
requires \valid(q);
*/
void f4_pq_ab(int *p, int *q);
-[wp] tests/wp_plugin/sep.i:30: Warning:
+[wp] sep.i:30: Warning:
Memory model hypotheses for function 'f5_pq':
/*@
behavior wp_typed_caveat:
@@ -98,7 +98,7 @@ Prove: true.
requires \valid(q);
*/
void f5_pq(int *p, int *q);
-[wp] tests/wp_plugin/sep.i:34: Warning:
+[wp] sep.i:34: Warning:
Memory model hypotheses for function 'f6_Pa':
/*@
behavior wp_typed_caveat:
@@ -106,7 +106,7 @@ Prove: true.
requires \valid(p + (..));
*/
void f6_Pa(int *p, int k);
-[wp] tests/wp_plugin/sep.i:43: Warning:
+[wp] sep.i:43: Warning:
Memory model hypotheses for function 'f7_pq_ad':
/*@
behavior wp_typed_caveat:
@@ -115,7 +115,7 @@ Prove: true.
requires \valid(q);
*/
void f7_pq_ad(int *p, int *q);
-[wp] tests/wp_plugin/sep.i:49: Warning:
+[wp] sep.i:49: Warning:
Memory model hypotheses for function 'f8_pq_a':
/*@
behavior wp_typed_caveat:
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/stmt.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/stmt.res.oracle
index 9407277eb70..a369ec0fabc 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/stmt.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/stmt.res.oracle
@@ -15,17 +15,17 @@
Function f
------------------------------------------------------------
-Goal Post-condition (file stmt.c, line 10) in 'f':
+Goal Post-condition (file stmt.c, line 18) in 'f':
Prove: true.
------------------------------------------------------------
-Goal Post-condition (file stmt.c, line 11) in 'f':
+Goal Post-condition (file stmt.c, line 19) in 'f':
Prove: true.
------------------------------------------------------------
-Goal Assertion (file stmt.c, line 16):
+Goal Assertion (file stmt.c, line 24):
Prove: true.
------------------------------------------------------------
@@ -33,12 +33,12 @@ Prove: true.
Function f with behavior default_for_stmt_2
------------------------------------------------------------
-Goal Post-condition (file stmt.c, line 17) at block:
+Goal Post-condition (file stmt.c, line 25) at block:
Prove: true.
------------------------------------------------------------
-Goal Assigns (file stmt.c, line 21) at block:
+Goal Assigns (file stmt.c, line 29) at block:
Prove: true.
------------------------------------------------------------
@@ -46,12 +46,12 @@ Prove: true.
Function g
------------------------------------------------------------
-Goal Post-condition (file stmt.c, line 27) in 'g':
+Goal Post-condition (file stmt.c, line 35) in 'g':
Prove: true.
------------------------------------------------------------
-Goal Assertion (file stmt.c, line 32):
+Goal Assertion (file stmt.c, line 40):
Prove: true.
------------------------------------------------------------
@@ -59,7 +59,7 @@ Prove: true.
Function h
------------------------------------------------------------
-Goal Post-condition (file stmt.c, line 40) in 'h':
+Goal Post-condition (file stmt.c, line 48) in 'h':
Prove: true.
------------------------------------------------------------
@@ -79,11 +79,11 @@ Prove: true.
--- Properties of Function 'f'
--------------------------------------------------------------------------------
-[ Valid ] Exit-condition (file stmt.c, line 15) at block
+[ Valid ] Exit-condition (file stmt.c, line 23) at block
by Unreachable Annotations.
-[ Partial ] Return-condition (file stmt.c, line 16) at block
+[ Partial ] Return-condition (file stmt.c, line 24) at block
By Frama-C kernel, with pending:
- - Assertion (file stmt.c, line 16)
+ - Assertion (file stmt.c, line 24)
[ - ] Default behavior at block
tried with Frama-C kernel.
@@ -91,13 +91,13 @@ Prove: true.
--- Properties of Function 'g'
--------------------------------------------------------------------------------
-[ Valid ] Exit-condition (file stmt.c, line 31) at block
+[ Valid ] Exit-condition (file stmt.c, line 39) at block
by Unreachable Annotations.
-[ Valid ] Return-condition (file stmt.c, line 32) at block
+[ Valid ] Return-condition (file stmt.c, line 40) at block
by Unreachable Annotations.
-[ Valid ] Post-condition (file stmt.c, line 33) at block
+[ Valid ] Post-condition (file stmt.c, line 41) at block
by Unreachable Annotations.
-[ Valid ] Assigns (file stmt.c, line 36) at block
+[ Valid ] Assigns (file stmt.c, line 44) at block
by Unreachable Annotations.
[ Valid ] Default behavior at block
by Frama-C kernel.
@@ -106,19 +106,19 @@ Prove: true.
--- Properties of Function 'h'
--------------------------------------------------------------------------------
-[ Valid ] Exit-condition (file stmt.c, line 43) at block
+[ Valid ] Exit-condition (file stmt.c, line 51) at block
by Unreachable Annotations.
-[ Valid ] Post-condition (file stmt.c, line 44) at block
+[ Valid ] Post-condition (file stmt.c, line 52) at block
by Unreachable Annotations.
-[ Partial ] Return-condition for 'POS' (file stmt.c, line 48) at block
+[ Partial ] Return-condition for 'POS' (file stmt.c, line 56) at block
By Frama-C kernel, with pending:
- Assertion (generated)
- Assertion (generated)
-[ Partial ] Return-condition for 'NEG' (file stmt.c, line 51) at block
+[ Partial ] Return-condition for 'NEG' (file stmt.c, line 59) at block
By Frama-C kernel, with pending:
- Assertion (generated)
- Assertion (generated)
-[ Valid ] Assigns (file stmt.c, line 53) at block
+[ Valid ] Assigns (file stmt.c, line 61) at block
by Unreachable Annotations.
[ Partial ] Behavior 'NEG' at block
By Frama-C kernel, with pending:
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/subset_fopen.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/subset_fopen.res.oracle
index 4f20e481e2a..3dbc2ea8fae 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/subset_fopen.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/subset_fopen.res.oracle
@@ -42,7 +42,7 @@ Assume {
Prove: valid_rw(Malloc_0, p, 2).
------------------------------------------------------------
-[wp] tests/wp_plugin/subset_fopen.c:13: Warning:
+[wp] subset_fopen.c:13: Warning:
Memory model hypotheses for function 'fopen':
/*@
behavior wp_typed:
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/unfold_assigns.0.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/unfold_assigns.0.res.oracle
index 0eb9d231f43..73ddd81b14f 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/unfold_assigns.0.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/unfold_assigns.0.res.oracle
@@ -6,16 +6,8 @@
Function ASSIGN_NO_UNFOLD_KO
------------------------------------------------------------
-<<<<<<< HEAD
-Goal Assigns (file unfold_assigns.i, line 62) in 'ASSIGN_NO_UNFOLD_KO':
-Effect at line 65
-||||||| ac7807782d
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 62) in 'ASSIGN_NO_UNFOLD_KO':
-Effect at line 65
-=======
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 66) in 'ASSIGN_NO_UNFOLD_KO':
+Goal Assigns (file unfold_assigns.i, line 66) in 'ASSIGN_NO_UNFOLD_KO':
Effect at line 69
->>>>>>> origin/master
Assume {
(* Heap *)
Type: (region(s.base) <= 0) /\ linked(Malloc_0).
@@ -29,16 +21,8 @@ Prove: false.
Function ASSIGN_NO_UNFOLD_OK
------------------------------------------------------------
-<<<<<<< HEAD
-Goal Assigns (file unfold_assigns.i, line 56) in 'ASSIGN_NO_UNFOLD_OK':
-Effect at line 59
-||||||| ac7807782d
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 56) in 'ASSIGN_NO_UNFOLD_OK':
-Effect at line 59
-=======
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 60) in 'ASSIGN_NO_UNFOLD_OK':
+Goal Assigns (file unfold_assigns.i, line 60) in 'ASSIGN_NO_UNFOLD_OK':
Effect at line 63
->>>>>>> origin/master
Prove: true.
------------------------------------------------------------
@@ -46,7 +30,7 @@ Prove: true.
Function NESTED_ARRAY_STATIC
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 95) in 'NESTED_ARRAY_STATIC':
+Goal Assigns (file unfold_assigns.i, line 95) in 'NESTED_ARRAY_STATIC':
Call Effect at line 97
Assume {
(* Heap *)
@@ -58,7 +42,7 @@ Prove: false.
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 95) in 'NESTED_ARRAY_STATIC':
+Goal Assigns (file unfold_assigns.i, line 95) in 'NESTED_ARRAY_STATIC':
Call Effect at line 97
Assume {
(* Heap *)
@@ -73,7 +57,7 @@ Prove: false.
Function NESTED_ARRAY_VARS
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 102) in 'NESTED_ARRAY_VARS':
+Goal Assigns (file unfold_assigns.i, line 102) in 'NESTED_ARRAY_VARS':
Call Effect at line 104
Assume {
Type: is_uint32(n).
@@ -88,7 +72,7 @@ Prove: included(s, 4, shift_sint32(shiftfield_F2_With_array_t(s), 1), n).
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 102) in 'NESTED_ARRAY_VARS':
+Goal Assigns (file unfold_assigns.i, line 102) in 'NESTED_ARRAY_VARS':
Call Effect at line 104
Assume {
Type: is_uint32(n).
@@ -106,16 +90,8 @@ Prove: included(s, 4, shift_sint32(shiftfield_F2_With_array_t(s), 1), n).
Function NO_UNFOLD_KO
------------------------------------------------------------
-<<<<<<< HEAD
-Goal Assigns (file unfold_assigns.i, line 33) in 'NO_UNFOLD_KO':
-Call Effect at line 35
-||||||| ac7807782d
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 33) in 'NO_UNFOLD_KO':
-Call Effect at line 35
-=======
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 37) in 'NO_UNFOLD_KO':
+Goal Assigns (file unfold_assigns.i, line 37) in 'NO_UNFOLD_KO':
Call Effect at line 39
->>>>>>> origin/master
Assume {
(* Heap *)
Type: (region(s.base) <= 0) /\ linked(Malloc_0).
@@ -126,16 +102,8 @@ Prove: false.
------------------------------------------------------------
-<<<<<<< HEAD
-Goal Assigns (file unfold_assigns.i, line 33) in 'NO_UNFOLD_KO':
-Call Effect at line 35
-||||||| ac7807782d
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 33) in 'NO_UNFOLD_KO':
-Call Effect at line 35
-=======
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 37) in 'NO_UNFOLD_KO':
+Goal Assigns (file unfold_assigns.i, line 37) in 'NO_UNFOLD_KO':
Call Effect at line 39
->>>>>>> origin/master
Assume {
(* Heap *)
Type: (region(s.base) <= 0) /\ linked(Malloc_0).
@@ -149,30 +117,14 @@ Prove: false.
Function NO_UNFOLD_OK_1
------------------------------------------------------------
-<<<<<<< HEAD
-Goal Assigns (file unfold_assigns.i, line 18) in 'NO_UNFOLD_OK_1':
-Call Effect at line 20
-||||||| ac7807782d
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 18) in 'NO_UNFOLD_OK_1':
-Call Effect at line 20
-=======
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 22) in 'NO_UNFOLD_OK_1':
+Goal Assigns (file unfold_assigns.i, line 22) in 'NO_UNFOLD_OK_1':
Call Effect at line 24
->>>>>>> origin/master
Prove: true.
------------------------------------------------------------
-<<<<<<< HEAD
-Goal Assigns (file unfold_assigns.i, line 18) in 'NO_UNFOLD_OK_1':
-Call Effect at line 20
-||||||| ac7807782d
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 18) in 'NO_UNFOLD_OK_1':
-Call Effect at line 20
-=======
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 22) in 'NO_UNFOLD_OK_1':
+Goal Assigns (file unfold_assigns.i, line 22) in 'NO_UNFOLD_OK_1':
Call Effect at line 24
->>>>>>> origin/master
Prove: true.
------------------------------------------------------------
@@ -180,30 +132,14 @@ Prove: true.
Function NO_UNFOLD_OK_2
------------------------------------------------------------
-<<<<<<< HEAD
-Goal Assigns (file unfold_assigns.i, line 23) in 'NO_UNFOLD_OK_2':
-Call Effect at line 25
-||||||| ac7807782d
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 23) in 'NO_UNFOLD_OK_2':
-Call Effect at line 25
-=======
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 27) in 'NO_UNFOLD_OK_2':
+Goal Assigns (file unfold_assigns.i, line 27) in 'NO_UNFOLD_OK_2':
Call Effect at line 29
->>>>>>> origin/master
Prove: true.
------------------------------------------------------------
-<<<<<<< HEAD
-Goal Assigns (file unfold_assigns.i, line 23) in 'NO_UNFOLD_OK_2':
-Call Effect at line 25
-||||||| ac7807782d
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 23) in 'NO_UNFOLD_OK_2':
-Call Effect at line 25
-=======
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 27) in 'NO_UNFOLD_OK_2':
+Goal Assigns (file unfold_assigns.i, line 27) in 'NO_UNFOLD_OK_2':
Call Effect at line 29
->>>>>>> origin/master
Prove: true.
------------------------------------------------------------
@@ -211,30 +147,14 @@ Prove: true.
Function NO_UNFOLD_OK_3
------------------------------------------------------------
-<<<<<<< HEAD
-Goal Assigns (file unfold_assigns.i, line 28) in 'NO_UNFOLD_OK_3':
-Call Effect at line 30
-||||||| ac7807782d
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 28) in 'NO_UNFOLD_OK_3':
-Call Effect at line 30
-=======
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 32) in 'NO_UNFOLD_OK_3':
+Goal Assigns (file unfold_assigns.i, line 32) in 'NO_UNFOLD_OK_3':
Call Effect at line 34
->>>>>>> origin/master
Prove: true.
------------------------------------------------------------
-<<<<<<< HEAD
-Goal Assigns (file unfold_assigns.i, line 28) in 'NO_UNFOLD_OK_3':
-Call Effect at line 30
-||||||| ac7807782d
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 28) in 'NO_UNFOLD_OK_3':
-Call Effect at line 30
-=======
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 32) in 'NO_UNFOLD_OK_3':
+Goal Assigns (file unfold_assigns.i, line 32) in 'NO_UNFOLD_OK_3':
Call Effect at line 34
->>>>>>> origin/master
Prove: true.
------------------------------------------------------------
@@ -242,7 +162,7 @@ Prove: true.
Function PARTIAL_ASSIGNS_STATIC
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 75) in 'PARTIAL_ASSIGNS_STATIC':
+Goal Assigns (file unfold_assigns.i, line 75) in 'PARTIAL_ASSIGNS_STATIC':
Call Effect at line 77
Assume {
(* Heap *)
@@ -254,7 +174,7 @@ Prove: false.
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 75) in 'PARTIAL_ASSIGNS_STATIC':
+Goal Assigns (file unfold_assigns.i, line 75) in 'PARTIAL_ASSIGNS_STATIC':
Call Effect at line 77
Assume {
(* Heap *)
@@ -269,7 +189,7 @@ Prove: false.
Function PARTIAL_ASSIGNS_VARS
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 81) in 'PARTIAL_ASSIGNS_VARS':
+Goal Assigns (file unfold_assigns.i, line 81) in 'PARTIAL_ASSIGNS_VARS':
Call Effect at line 83
Let a = shift_sint32(p, 0).
Let x = 1 + n.
@@ -288,7 +208,7 @@ Prove: (n <= 0) \/ included(a, x, shift_sint32(p, 1), n - 1) \/
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 81) in 'PARTIAL_ASSIGNS_VARS':
+Goal Assigns (file unfold_assigns.i, line 81) in 'PARTIAL_ASSIGNS_VARS':
Call Effect at line 83
Let a = shift_sint32(p, 0).
Let x = 1 + n.
@@ -310,7 +230,7 @@ Prove: (n <= 0) \/ included(a, x, shift_sint32(p, 1), n - 1) \/
Function RANGE_NESTED_ARRAY_STATIC
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 111) in 'RANGE_NESTED_ARRAY_STATIC':
+Goal Assigns (file unfold_assigns.i, line 111) in 'RANGE_NESTED_ARRAY_STATIC':
Call Effect at line 116
Assume {
(* Heap *)
@@ -322,7 +242,7 @@ Prove: false.
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 111) in 'RANGE_NESTED_ARRAY_STATIC':
+Goal Assigns (file unfold_assigns.i, line 111) in 'RANGE_NESTED_ARRAY_STATIC':
Call Effect at line 116
Assume {
(* Heap *)
@@ -337,7 +257,7 @@ Prove: false.
Function RANGE_NESTED_ARRAY_VARS
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 121) in 'RANGE_NESTED_ARRAY_VARS':
+Goal Assigns (file unfold_assigns.i, line 121) in 'RANGE_NESTED_ARRAY_VARS':
Call Effect at line 126
Let a = shift_S2_With_array(s, 0).
Let x = 4 * n.
@@ -361,7 +281,7 @@ Prove: (n < 0) \/ included(a, x_1, shift_S2_With_array(s, 2), x - 4) \/
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 121) in 'RANGE_NESTED_ARRAY_VARS':
+Goal Assigns (file unfold_assigns.i, line 121) in 'RANGE_NESTED_ARRAY_VARS':
Call Effect at line 126
Let a = shift_S2_With_array(s, 0).
Let x = 4 * n.
@@ -388,13 +308,7 @@ Prove: (n < 0) \/ included(a, x_1, shift_S2_With_array(s, 2), x - 4) \/
Function USE_ASSIGN_UNFOLD_KO
------------------------------------------------------------
-<<<<<<< HEAD
-Goal Post-condition (file unfold_assigns.i, line 48) in 'USE_ASSIGN_UNFOLD_KO':
-||||||| ac7807782d
-Goal Post-condition (file tests/wp_plugin/unfold_assigns.i, line 48) in 'USE_ASSIGN_UNFOLD_KO':
-=======
-Goal Post-condition (file tests/wp_plugin/unfold_assigns.i, line 52) in 'USE_ASSIGN_UNFOLD_KO':
->>>>>>> origin/master
+Goal Post-condition (file unfold_assigns.i, line 52) in 'USE_ASSIGN_UNFOLD_KO':
Let a = Load_S1_S(q, Mint_0).
Let a_1 = Load_S1_S(q, havoc(Mint_undef_0, Mint_0, p, 2)).
Assume {
@@ -408,16 +322,8 @@ Prove: EqS1_S(a_1, a).
------------------------------------------------------------
-<<<<<<< HEAD
-Goal Assigns (file unfold_assigns.i, line 49) in 'USE_ASSIGN_UNFOLD_KO':
-Call Effect at line 53
-||||||| ac7807782d
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 49) in 'USE_ASSIGN_UNFOLD_KO':
-Call Effect at line 53
-=======
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 53) in 'USE_ASSIGN_UNFOLD_KO':
+Goal Assigns (file unfold_assigns.i, line 53) in 'USE_ASSIGN_UNFOLD_KO':
Call Effect at line 57
->>>>>>> origin/master
Assume {
(* Heap *)
Type: (region(p.base) <= 0) /\ linked(Malloc_0).
@@ -428,16 +334,8 @@ Prove: false.
------------------------------------------------------------
-<<<<<<< HEAD
-Goal Assigns (file unfold_assigns.i, line 49) in 'USE_ASSIGN_UNFOLD_KO':
-Call Effect at line 53
-||||||| ac7807782d
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 49) in 'USE_ASSIGN_UNFOLD_KO':
-Call Effect at line 53
-=======
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 53) in 'USE_ASSIGN_UNFOLD_KO':
+Goal Assigns (file unfold_assigns.i, line 53) in 'USE_ASSIGN_UNFOLD_KO':
Call Effect at line 57
->>>>>>> origin/master
Assume {
(* Heap *)
Type: (region(p.base) <= 0) /\ linked(Malloc_0).
@@ -451,13 +349,7 @@ Prove: false.
Function USE_ASSIGN_UNFOLD_OK
------------------------------------------------------------
-<<<<<<< HEAD
-Goal Post-condition (file unfold_assigns.i, line 39) in 'USE_ASSIGN_UNFOLD_OK':
-||||||| ac7807782d
-Goal Post-condition (file tests/wp_plugin/unfold_assigns.i, line 39) in 'USE_ASSIGN_UNFOLD_OK':
-=======
-Goal Post-condition (file tests/wp_plugin/unfold_assigns.i, line 43) in 'USE_ASSIGN_UNFOLD_OK':
->>>>>>> origin/master
+Goal Post-condition (file unfold_assigns.i, line 43) in 'USE_ASSIGN_UNFOLD_OK':
Let a = Load_S1_S(q, Mint_0).
Let a_1 = Load_S1_S(q, havoc(Mint_undef_0, Mint_0, p, 2)).
Assume {
@@ -471,30 +363,14 @@ Prove: EqS1_S(a_1, a).
------------------------------------------------------------
-<<<<<<< HEAD
-Goal Assigns (file unfold_assigns.i, line 40) in 'USE_ASSIGN_UNFOLD_OK':
-Call Effect at line 44
-||||||| ac7807782d
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 40) in 'USE_ASSIGN_UNFOLD_OK':
-Call Effect at line 44
-=======
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 44) in 'USE_ASSIGN_UNFOLD_OK':
+Goal Assigns (file unfold_assigns.i, line 44) in 'USE_ASSIGN_UNFOLD_OK':
Call Effect at line 48
->>>>>>> origin/master
Prove: true.
------------------------------------------------------------
-<<<<<<< HEAD
-Goal Assigns (file unfold_assigns.i, line 40) in 'USE_ASSIGN_UNFOLD_OK':
-Call Effect at line 44
-||||||| ac7807782d
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 40) in 'USE_ASSIGN_UNFOLD_OK':
-Call Effect at line 44
-=======
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 44) in 'USE_ASSIGN_UNFOLD_OK':
+Goal Assigns (file unfold_assigns.i, line 44) in 'USE_ASSIGN_UNFOLD_OK':
Call Effect at line 48
->>>>>>> origin/master
Prove: true.
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/unfold_assigns.1.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/unfold_assigns.1.res.oracle
index 015a04fceb9..2064082b516 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/unfold_assigns.1.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/unfold_assigns.1.res.oracle
@@ -6,16 +6,8 @@
Function ASSIGN_NO_UNFOLD_KO
------------------------------------------------------------
-<<<<<<< HEAD
-Goal Assigns (file unfold_assigns.i, line 62) in 'ASSIGN_NO_UNFOLD_KO':
-Effect at line 65
-||||||| ac7807782d
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 62) in 'ASSIGN_NO_UNFOLD_KO':
-Effect at line 65
-=======
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 66) in 'ASSIGN_NO_UNFOLD_KO':
+Goal Assigns (file unfold_assigns.i, line 66) in 'ASSIGN_NO_UNFOLD_KO':
Effect at line 69
->>>>>>> origin/master
Prove: true.
------------------------------------------------------------
@@ -23,16 +15,8 @@ Prove: true.
Function ASSIGN_NO_UNFOLD_OK
------------------------------------------------------------
-<<<<<<< HEAD
-Goal Assigns (file unfold_assigns.i, line 56) in 'ASSIGN_NO_UNFOLD_OK':
-Effect at line 59
-||||||| ac7807782d
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 56) in 'ASSIGN_NO_UNFOLD_OK':
-Effect at line 59
-=======
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 60) in 'ASSIGN_NO_UNFOLD_OK':
+Goal Assigns (file unfold_assigns.i, line 60) in 'ASSIGN_NO_UNFOLD_OK':
Effect at line 63
->>>>>>> origin/master
Prove: true.
------------------------------------------------------------
@@ -40,13 +24,13 @@ Prove: true.
Function NESTED_ARRAY_STATIC
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 95) in 'NESTED_ARRAY_STATIC':
+Goal Assigns (file unfold_assigns.i, line 95) in 'NESTED_ARRAY_STATIC':
Call Effect at line 97
Prove: true.
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 95) in 'NESTED_ARRAY_STATIC':
+Goal Assigns (file unfold_assigns.i, line 95) in 'NESTED_ARRAY_STATIC':
Call Effect at line 97
Prove: true.
@@ -55,7 +39,7 @@ Prove: true.
Function NESTED_ARRAY_VARS
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 102) in 'NESTED_ARRAY_VARS':
+Goal Assigns (file unfold_assigns.i, line 102) in 'NESTED_ARRAY_VARS':
Call Effect at line 104
Let a = shiftfield_F2_With_array_t(s).
Let a_1 = shift_sint32(a, 1).
@@ -75,7 +59,7 @@ Prove: (i = (-1)) \/ included(s, 4, a_1, n) \/ included(a, 3, a_1, n) \/
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 102) in 'NESTED_ARRAY_VARS':
+Goal Assigns (file unfold_assigns.i, line 102) in 'NESTED_ARRAY_VARS':
Call Effect at line 104
Let a = shiftfield_F2_With_array_t(s).
Let a_1 = shift_sint32(a, 1).
@@ -98,30 +82,14 @@ Prove: (i = (-1)) \/ included(s, 4, a_1, n) \/ included(a, 3, a_1, n) \/
Function NO_UNFOLD_KO
------------------------------------------------------------
-<<<<<<< HEAD
-Goal Assigns (file unfold_assigns.i, line 33) in 'NO_UNFOLD_KO':
-Call Effect at line 35
-||||||| ac7807782d
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 33) in 'NO_UNFOLD_KO':
-Call Effect at line 35
-=======
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 37) in 'NO_UNFOLD_KO':
+Goal Assigns (file unfold_assigns.i, line 37) in 'NO_UNFOLD_KO':
Call Effect at line 39
->>>>>>> origin/master
Prove: true.
------------------------------------------------------------
-<<<<<<< HEAD
-Goal Assigns (file unfold_assigns.i, line 33) in 'NO_UNFOLD_KO':
-Call Effect at line 35
-||||||| ac7807782d
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 33) in 'NO_UNFOLD_KO':
-Call Effect at line 35
-=======
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 37) in 'NO_UNFOLD_KO':
+Goal Assigns (file unfold_assigns.i, line 37) in 'NO_UNFOLD_KO':
Call Effect at line 39
->>>>>>> origin/master
Prove: true.
------------------------------------------------------------
@@ -129,30 +97,14 @@ Prove: true.
Function NO_UNFOLD_OK_1
------------------------------------------------------------
-<<<<<<< HEAD
-Goal Assigns (file unfold_assigns.i, line 18) in 'NO_UNFOLD_OK_1':
-Call Effect at line 20
-||||||| ac7807782d
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 18) in 'NO_UNFOLD_OK_1':
-Call Effect at line 20
-=======
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 22) in 'NO_UNFOLD_OK_1':
+Goal Assigns (file unfold_assigns.i, line 22) in 'NO_UNFOLD_OK_1':
Call Effect at line 24
->>>>>>> origin/master
Prove: true.
------------------------------------------------------------
-<<<<<<< HEAD
-Goal Assigns (file unfold_assigns.i, line 18) in 'NO_UNFOLD_OK_1':
-Call Effect at line 20
-||||||| ac7807782d
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 18) in 'NO_UNFOLD_OK_1':
-Call Effect at line 20
-=======
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 22) in 'NO_UNFOLD_OK_1':
+Goal Assigns (file unfold_assigns.i, line 22) in 'NO_UNFOLD_OK_1':
Call Effect at line 24
->>>>>>> origin/master
Prove: true.
------------------------------------------------------------
@@ -160,30 +112,14 @@ Prove: true.
Function NO_UNFOLD_OK_2
------------------------------------------------------------
-<<<<<<< HEAD
-Goal Assigns (file unfold_assigns.i, line 23) in 'NO_UNFOLD_OK_2':
-Call Effect at line 25
-||||||| ac7807782d
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 23) in 'NO_UNFOLD_OK_2':
-Call Effect at line 25
-=======
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 27) in 'NO_UNFOLD_OK_2':
+Goal Assigns (file unfold_assigns.i, line 27) in 'NO_UNFOLD_OK_2':
Call Effect at line 29
->>>>>>> origin/master
Prove: true.
------------------------------------------------------------
-<<<<<<< HEAD
-Goal Assigns (file unfold_assigns.i, line 23) in 'NO_UNFOLD_OK_2':
-Call Effect at line 25
-||||||| ac7807782d
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 23) in 'NO_UNFOLD_OK_2':
-Call Effect at line 25
-=======
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 27) in 'NO_UNFOLD_OK_2':
+Goal Assigns (file unfold_assigns.i, line 27) in 'NO_UNFOLD_OK_2':
Call Effect at line 29
->>>>>>> origin/master
Prove: true.
------------------------------------------------------------
@@ -191,30 +127,14 @@ Prove: true.
Function NO_UNFOLD_OK_3
------------------------------------------------------------
-<<<<<<< HEAD
-Goal Assigns (file unfold_assigns.i, line 28) in 'NO_UNFOLD_OK_3':
-Call Effect at line 30
-||||||| ac7807782d
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 28) in 'NO_UNFOLD_OK_3':
-Call Effect at line 30
-=======
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 32) in 'NO_UNFOLD_OK_3':
+Goal Assigns (file unfold_assigns.i, line 32) in 'NO_UNFOLD_OK_3':
Call Effect at line 34
->>>>>>> origin/master
Prove: true.
------------------------------------------------------------
-<<<<<<< HEAD
-Goal Assigns (file unfold_assigns.i, line 28) in 'NO_UNFOLD_OK_3':
-Call Effect at line 30
-||||||| ac7807782d
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 28) in 'NO_UNFOLD_OK_3':
-Call Effect at line 30
-=======
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 32) in 'NO_UNFOLD_OK_3':
+Goal Assigns (file unfold_assigns.i, line 32) in 'NO_UNFOLD_OK_3':
Call Effect at line 34
->>>>>>> origin/master
Prove: true.
------------------------------------------------------------
@@ -222,7 +142,7 @@ Prove: true.
Function PARTIAL_ASSIGNS_STATIC
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 75) in 'PARTIAL_ASSIGNS_STATIC':
+Goal Assigns (file unfold_assigns.i, line 75) in 'PARTIAL_ASSIGNS_STATIC':
Call Effect at line 77
Assume {
(* Heap *)
@@ -234,7 +154,7 @@ Prove: (i = 0) \/ (i = 4) \/ ((0 < i) /\ (i <= 3)).
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 75) in 'PARTIAL_ASSIGNS_STATIC':
+Goal Assigns (file unfold_assigns.i, line 75) in 'PARTIAL_ASSIGNS_STATIC':
Call Effect at line 77
Assume {
(* Heap *)
@@ -249,7 +169,7 @@ Prove: (i = 0) \/ (i = 4) \/ ((0 < i) /\ (i <= 3)).
Function PARTIAL_ASSIGNS_VARS
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 81) in 'PARTIAL_ASSIGNS_VARS':
+Goal Assigns (file unfold_assigns.i, line 81) in 'PARTIAL_ASSIGNS_VARS':
Call Effect at line 83
Let a = shift_sint32(p, 0).
Let x = 1 + n.
@@ -271,7 +191,7 @@ Prove: (i = 0) \/ (n = i) \/ (n <= 0) \/ included(a, x, a_1, x_1) \/
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 81) in 'PARTIAL_ASSIGNS_VARS':
+Goal Assigns (file unfold_assigns.i, line 81) in 'PARTIAL_ASSIGNS_VARS':
Call Effect at line 83
Let a = shift_sint32(p, 0).
Let x = 1 + n.
@@ -296,7 +216,7 @@ Prove: (i = 0) \/ (n = i) \/ (n <= 0) \/ included(a, x, a_1, x_1) \/
Function RANGE_NESTED_ARRAY_STATIC
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 111) in 'RANGE_NESTED_ARRAY_STATIC':
+Goal Assigns (file unfold_assigns.i, line 111) in 'RANGE_NESTED_ARRAY_STATIC':
Call Effect at line 116
Let x = 4 * i.
Assume {
@@ -316,7 +236,7 @@ Prove: (i = 2) \/
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 111) in 'RANGE_NESTED_ARRAY_STATIC':
+Goal Assigns (file unfold_assigns.i, line 111) in 'RANGE_NESTED_ARRAY_STATIC':
Call Effect at line 116
Let x = 4 * i.
Assume {
@@ -339,7 +259,7 @@ Prove: (i = 2) \/
Function RANGE_NESTED_ARRAY_VARS
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 121) in 'RANGE_NESTED_ARRAY_VARS':
+Goal Assigns (file unfold_assigns.i, line 121) in 'RANGE_NESTED_ARRAY_VARS':
Call Effect at line 126
Let a = shift_S2_With_array(s, 0).
Let x = 4 * n.
@@ -381,7 +301,7 @@ Prove: (n < 0) \/ included(a, x_1, a_1, x_2) \/ included(a_2, 4, a_1, x_2) \/
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 121) in 'RANGE_NESTED_ARRAY_VARS':
+Goal Assigns (file unfold_assigns.i, line 121) in 'RANGE_NESTED_ARRAY_VARS':
Call Effect at line 126
Let a = shift_S2_With_array(s, 0).
Let x = 4 * n.
@@ -426,13 +346,7 @@ Prove: (n < 0) \/ included(a, x_1, a_1, x_2) \/ included(a_2, 4, a_1, x_2) \/
Function USE_ASSIGN_UNFOLD_KO
------------------------------------------------------------
-<<<<<<< HEAD
-Goal Post-condition (file unfold_assigns.i, line 48) in 'USE_ASSIGN_UNFOLD_KO':
-||||||| ac7807782d
-Goal Post-condition (file tests/wp_plugin/unfold_assigns.i, line 48) in 'USE_ASSIGN_UNFOLD_KO':
-=======
-Goal Post-condition (file tests/wp_plugin/unfold_assigns.i, line 52) in 'USE_ASSIGN_UNFOLD_KO':
->>>>>>> origin/master
+Goal Post-condition (file unfold_assigns.i, line 52) in 'USE_ASSIGN_UNFOLD_KO':
Let a = Load_S1_S(q, Mint_0).
Let a_1 = Load_S1_S(q, havoc(Mint_undef_0, Mint_0, p, 2)).
Assume {
@@ -446,30 +360,14 @@ Prove: EqS1_S(a_1, a).
------------------------------------------------------------
-<<<<<<< HEAD
-Goal Assigns (file unfold_assigns.i, line 49) in 'USE_ASSIGN_UNFOLD_KO':
-Call Effect at line 53
-||||||| ac7807782d
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 49) in 'USE_ASSIGN_UNFOLD_KO':
-Call Effect at line 53
-=======
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 53) in 'USE_ASSIGN_UNFOLD_KO':
+Goal Assigns (file unfold_assigns.i, line 53) in 'USE_ASSIGN_UNFOLD_KO':
Call Effect at line 57
->>>>>>> origin/master
Prove: true.
------------------------------------------------------------
-<<<<<<< HEAD
-Goal Assigns (file unfold_assigns.i, line 49) in 'USE_ASSIGN_UNFOLD_KO':
-Call Effect at line 53
-||||||| ac7807782d
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 49) in 'USE_ASSIGN_UNFOLD_KO':
-Call Effect at line 53
-=======
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 53) in 'USE_ASSIGN_UNFOLD_KO':
+Goal Assigns (file unfold_assigns.i, line 53) in 'USE_ASSIGN_UNFOLD_KO':
Call Effect at line 57
->>>>>>> origin/master
Prove: true.
------------------------------------------------------------
@@ -477,13 +375,7 @@ Prove: true.
Function USE_ASSIGN_UNFOLD_OK
------------------------------------------------------------
-<<<<<<< HEAD
-Goal Post-condition (file unfold_assigns.i, line 39) in 'USE_ASSIGN_UNFOLD_OK':
-||||||| ac7807782d
-Goal Post-condition (file tests/wp_plugin/unfold_assigns.i, line 39) in 'USE_ASSIGN_UNFOLD_OK':
-=======
-Goal Post-condition (file tests/wp_plugin/unfold_assigns.i, line 43) in 'USE_ASSIGN_UNFOLD_OK':
->>>>>>> origin/master
+Goal Post-condition (file unfold_assigns.i, line 43) in 'USE_ASSIGN_UNFOLD_OK':
Let a = Load_S1_S(q, Mint_0).
Let a_1 = Load_S1_S(q, havoc(Mint_undef_0, Mint_0, p, 2)).
Assume {
@@ -497,30 +389,14 @@ Prove: EqS1_S(a_1, a).
------------------------------------------------------------
-<<<<<<< HEAD
-Goal Assigns (file unfold_assigns.i, line 40) in 'USE_ASSIGN_UNFOLD_OK':
-Call Effect at line 44
-||||||| ac7807782d
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 40) in 'USE_ASSIGN_UNFOLD_OK':
-Call Effect at line 44
-=======
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 44) in 'USE_ASSIGN_UNFOLD_OK':
+Goal Assigns (file unfold_assigns.i, line 44) in 'USE_ASSIGN_UNFOLD_OK':
Call Effect at line 48
->>>>>>> origin/master
Prove: true.
------------------------------------------------------------
-<<<<<<< HEAD
-Goal Assigns (file unfold_assigns.i, line 40) in 'USE_ASSIGN_UNFOLD_OK':
-Call Effect at line 44
-||||||| ac7807782d
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 40) in 'USE_ASSIGN_UNFOLD_OK':
-Call Effect at line 44
-=======
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 44) in 'USE_ASSIGN_UNFOLD_OK':
+Goal Assigns (file unfold_assigns.i, line 44) in 'USE_ASSIGN_UNFOLD_OK':
Call Effect at line 48
->>>>>>> origin/master
Prove: true.
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/unfold_assigns.2.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/unfold_assigns.2.res.oracle
index 033ab3d4f1c..313b89ce0e5 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/unfold_assigns.2.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/unfold_assigns.2.res.oracle
@@ -1,12 +1,12 @@
# frama-c -wp [...]
-[kernel] Parsing tests/wp_plugin/unfold_assigns.i (no preprocessing)
+[kernel] Parsing unfold_assigns.i (no preprocessing)
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
------------------------------------------------------------
Function ASSIGN_NO_UNFOLD_KO
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 66) in 'ASSIGN_NO_UNFOLD_KO':
+Goal Assigns (file unfold_assigns.i, line 66) in 'ASSIGN_NO_UNFOLD_KO':
Effect at line 69
Prove: true.
@@ -15,7 +15,7 @@ Prove: true.
Function ASSIGN_NO_UNFOLD_OK
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 60) in 'ASSIGN_NO_UNFOLD_OK':
+Goal Assigns (file unfold_assigns.i, line 60) in 'ASSIGN_NO_UNFOLD_OK':
Effect at line 63
Prove: true.
@@ -24,13 +24,13 @@ Prove: true.
Function NESTED_ARRAY_STATIC
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 95) in 'NESTED_ARRAY_STATIC':
+Goal Assigns (file unfold_assigns.i, line 95) in 'NESTED_ARRAY_STATIC':
Call Effect at line 97
Prove: true.
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 95) in 'NESTED_ARRAY_STATIC':
+Goal Assigns (file unfold_assigns.i, line 95) in 'NESTED_ARRAY_STATIC':
Call Effect at line 97
Prove: true.
@@ -39,7 +39,7 @@ Prove: true.
Function NESTED_ARRAY_VARS
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 102) in 'NESTED_ARRAY_VARS':
+Goal Assigns (file unfold_assigns.i, line 102) in 'NESTED_ARRAY_VARS':
Call Effect at line 104
Let a = shiftfield_F2_With_array_t(s).
Let a_1 = shift_sint32(a, 1).
@@ -59,7 +59,7 @@ Prove: (i = (-1)) \/ included(s, 4, a_1, n) \/ included(a, 3, a_1, n) \/
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 102) in 'NESTED_ARRAY_VARS':
+Goal Assigns (file unfold_assigns.i, line 102) in 'NESTED_ARRAY_VARS':
Call Effect at line 104
Let a = shiftfield_F2_With_array_t(s).
Let a_1 = shift_sint32(a, 1).
@@ -82,13 +82,13 @@ Prove: (i = (-1)) \/ included(s, 4, a_1, n) \/ included(a, 3, a_1, n) \/
Function NO_UNFOLD_KO
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 37) in 'NO_UNFOLD_KO':
+Goal Assigns (file unfold_assigns.i, line 37) in 'NO_UNFOLD_KO':
Call Effect at line 39
Prove: true.
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 37) in 'NO_UNFOLD_KO':
+Goal Assigns (file unfold_assigns.i, line 37) in 'NO_UNFOLD_KO':
Call Effect at line 39
Prove: true.
@@ -97,13 +97,13 @@ Prove: true.
Function NO_UNFOLD_OK_1
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 22) in 'NO_UNFOLD_OK_1':
+Goal Assigns (file unfold_assigns.i, line 22) in 'NO_UNFOLD_OK_1':
Call Effect at line 24
Prove: true.
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 22) in 'NO_UNFOLD_OK_1':
+Goal Assigns (file unfold_assigns.i, line 22) in 'NO_UNFOLD_OK_1':
Call Effect at line 24
Prove: true.
@@ -112,13 +112,13 @@ Prove: true.
Function NO_UNFOLD_OK_2
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 27) in 'NO_UNFOLD_OK_2':
+Goal Assigns (file unfold_assigns.i, line 27) in 'NO_UNFOLD_OK_2':
Call Effect at line 29
Prove: true.
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 27) in 'NO_UNFOLD_OK_2':
+Goal Assigns (file unfold_assigns.i, line 27) in 'NO_UNFOLD_OK_2':
Call Effect at line 29
Prove: true.
@@ -127,13 +127,13 @@ Prove: true.
Function NO_UNFOLD_OK_3
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 32) in 'NO_UNFOLD_OK_3':
+Goal Assigns (file unfold_assigns.i, line 32) in 'NO_UNFOLD_OK_3':
Call Effect at line 34
Prove: true.
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 32) in 'NO_UNFOLD_OK_3':
+Goal Assigns (file unfold_assigns.i, line 32) in 'NO_UNFOLD_OK_3':
Call Effect at line 34
Prove: true.
@@ -142,7 +142,7 @@ Prove: true.
Function PARTIAL_ASSIGNS_STATIC
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 75) in 'PARTIAL_ASSIGNS_STATIC':
+Goal Assigns (file unfold_assigns.i, line 75) in 'PARTIAL_ASSIGNS_STATIC':
Call Effect at line 77
Assume {
(* Heap *)
@@ -154,7 +154,7 @@ Prove: (i = 0) \/ (i = 4) \/ ((0 < i) /\ (i <= 3)).
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 75) in 'PARTIAL_ASSIGNS_STATIC':
+Goal Assigns (file unfold_assigns.i, line 75) in 'PARTIAL_ASSIGNS_STATIC':
Call Effect at line 77
Assume {
(* Heap *)
@@ -169,7 +169,7 @@ Prove: (i = 0) \/ (i = 4) \/ ((0 < i) /\ (i <= 3)).
Function PARTIAL_ASSIGNS_VARS
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 81) in 'PARTIAL_ASSIGNS_VARS':
+Goal Assigns (file unfold_assigns.i, line 81) in 'PARTIAL_ASSIGNS_VARS':
Call Effect at line 83
Let a = shift_sint32(p, 0).
Let x = 1 + n.
@@ -191,7 +191,7 @@ Prove: (i = 0) \/ (n = i) \/ (n <= 0) \/ included(a, x, a_1, x_1) \/
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 81) in 'PARTIAL_ASSIGNS_VARS':
+Goal Assigns (file unfold_assigns.i, line 81) in 'PARTIAL_ASSIGNS_VARS':
Call Effect at line 83
Let a = shift_sint32(p, 0).
Let x = 1 + n.
@@ -216,7 +216,7 @@ Prove: (i = 0) \/ (n = i) \/ (n <= 0) \/ included(a, x, a_1, x_1) \/
Function RANGE_NESTED_ARRAY_STATIC
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 111) in 'RANGE_NESTED_ARRAY_STATIC':
+Goal Assigns (file unfold_assigns.i, line 111) in 'RANGE_NESTED_ARRAY_STATIC':
Call Effect at line 116
Assume {
(* Heap *)
@@ -230,7 +230,7 @@ Prove: (i = 2) \/
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 111) in 'RANGE_NESTED_ARRAY_STATIC':
+Goal Assigns (file unfold_assigns.i, line 111) in 'RANGE_NESTED_ARRAY_STATIC':
Call Effect at line 116
Assume {
(* Heap *)
@@ -247,7 +247,7 @@ Prove: (i = 2) \/
Function RANGE_NESTED_ARRAY_VARS
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 121) in 'RANGE_NESTED_ARRAY_VARS':
+Goal Assigns (file unfold_assigns.i, line 121) in 'RANGE_NESTED_ARRAY_VARS':
Call Effect at line 126
Let a = shift_S2_With_array(s, 0).
Let x = 4 * n.
@@ -283,7 +283,7 @@ Prove: (n < 0) \/ included(a, x_1, a_1, x_2) \/ included(a_2, 4, a_1, x_2) \/
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 121) in 'RANGE_NESTED_ARRAY_VARS':
+Goal Assigns (file unfold_assigns.i, line 121) in 'RANGE_NESTED_ARRAY_VARS':
Call Effect at line 126
Let a = shift_S2_With_array(s, 0).
Let x = 4 * n.
@@ -322,7 +322,7 @@ Prove: (n < 0) \/ included(a, x_1, a_1, x_2) \/ included(a_2, 4, a_1, x_2) \/
Function USE_ASSIGN_UNFOLD_KO
------------------------------------------------------------
-Goal Post-condition (file tests/wp_plugin/unfold_assigns.i, line 52) in 'USE_ASSIGN_UNFOLD_KO':
+Goal Post-condition (file unfold_assigns.i, line 52) in 'USE_ASSIGN_UNFOLD_KO':
Let a = Load_S1_S(q, Mint_0).
Let a_1 = Load_S1_S(q, havoc(Mint_undef_0, Mint_0, p, 2)).
Assume {
@@ -336,13 +336,13 @@ Prove: EqS1_S(a_1, a).
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 53) in 'USE_ASSIGN_UNFOLD_KO':
+Goal Assigns (file unfold_assigns.i, line 53) in 'USE_ASSIGN_UNFOLD_KO':
Call Effect at line 57
Prove: true.
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 53) in 'USE_ASSIGN_UNFOLD_KO':
+Goal Assigns (file unfold_assigns.i, line 53) in 'USE_ASSIGN_UNFOLD_KO':
Call Effect at line 57
Prove: true.
@@ -351,7 +351,7 @@ Prove: true.
Function USE_ASSIGN_UNFOLD_OK
------------------------------------------------------------
-Goal Post-condition (file tests/wp_plugin/unfold_assigns.i, line 43) in 'USE_ASSIGN_UNFOLD_OK':
+Goal Post-condition (file unfold_assigns.i, line 43) in 'USE_ASSIGN_UNFOLD_OK':
Let a = Load_S1_S(q, Mint_0).
Let a_1 = Load_S1_S(q, havoc(Mint_undef_0, Mint_0, p, 2)).
Assume {
@@ -365,13 +365,13 @@ Prove: EqS1_S(a_1, a).
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 44) in 'USE_ASSIGN_UNFOLD_OK':
+Goal Assigns (file unfold_assigns.i, line 44) in 'USE_ASSIGN_UNFOLD_OK':
Call Effect at line 48
Prove: true.
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 44) in 'USE_ASSIGN_UNFOLD_OK':
+Goal Assigns (file unfold_assigns.i, line 44) in 'USE_ASSIGN_UNFOLD_OK':
Call Effect at line 48
Prove: true.
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/unfold_assigns.3.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/unfold_assigns.3.res.oracle
index d6391ac676a..942b3db5a0b 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/unfold_assigns.3.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/unfold_assigns.3.res.oracle
@@ -1,12 +1,12 @@
# frama-c -wp [...]
-[kernel] Parsing tests/wp_plugin/unfold_assigns.i (no preprocessing)
+[kernel] Parsing unfold_assigns.i (no preprocessing)
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
------------------------------------------------------------
Function ASSIGN_NO_UNFOLD_KO
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 66) in 'ASSIGN_NO_UNFOLD_KO':
+Goal Assigns (file unfold_assigns.i, line 66) in 'ASSIGN_NO_UNFOLD_KO':
Effect at line 69
Prove: true.
@@ -15,7 +15,7 @@ Prove: true.
Function ASSIGN_NO_UNFOLD_OK
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 60) in 'ASSIGN_NO_UNFOLD_OK':
+Goal Assigns (file unfold_assigns.i, line 60) in 'ASSIGN_NO_UNFOLD_OK':
Effect at line 63
Prove: true.
@@ -24,7 +24,7 @@ Prove: true.
Function NESTED_ARRAY_STATIC
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 95) in 'NESTED_ARRAY_STATIC':
+Goal Assigns (file unfold_assigns.i, line 95) in 'NESTED_ARRAY_STATIC':
Call Effect at line 97
Assume {
(* Heap *)
@@ -36,7 +36,7 @@ Prove: false.
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 95) in 'NESTED_ARRAY_STATIC':
+Goal Assigns (file unfold_assigns.i, line 95) in 'NESTED_ARRAY_STATIC':
Call Effect at line 97
Assume {
(* Heap *)
@@ -51,7 +51,7 @@ Prove: false.
Function NESTED_ARRAY_VARS
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 102) in 'NESTED_ARRAY_VARS':
+Goal Assigns (file unfold_assigns.i, line 102) in 'NESTED_ARRAY_VARS':
Call Effect at line 104
Let a = shiftfield_F2_With_array_t(s).
Let a_1 = shift_sint32(a, 1).
@@ -68,7 +68,7 @@ Prove: included(s, 4, a_1, n) \/ included(a, 3, a_1, n).
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 102) in 'NESTED_ARRAY_VARS':
+Goal Assigns (file unfold_assigns.i, line 102) in 'NESTED_ARRAY_VARS':
Call Effect at line 104
Let a = shiftfield_F2_With_array_t(s).
Let a_1 = shift_sint32(a, 1).
@@ -88,13 +88,13 @@ Prove: included(s, 4, a_1, n) \/ included(a, 3, a_1, n).
Function NO_UNFOLD_KO
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 37) in 'NO_UNFOLD_KO':
+Goal Assigns (file unfold_assigns.i, line 37) in 'NO_UNFOLD_KO':
Call Effect at line 39
Prove: true.
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 37) in 'NO_UNFOLD_KO':
+Goal Assigns (file unfold_assigns.i, line 37) in 'NO_UNFOLD_KO':
Call Effect at line 39
Prove: true.
@@ -103,13 +103,13 @@ Prove: true.
Function NO_UNFOLD_OK_1
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 22) in 'NO_UNFOLD_OK_1':
+Goal Assigns (file unfold_assigns.i, line 22) in 'NO_UNFOLD_OK_1':
Call Effect at line 24
Prove: true.
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 22) in 'NO_UNFOLD_OK_1':
+Goal Assigns (file unfold_assigns.i, line 22) in 'NO_UNFOLD_OK_1':
Call Effect at line 24
Prove: true.
@@ -118,13 +118,13 @@ Prove: true.
Function NO_UNFOLD_OK_2
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 27) in 'NO_UNFOLD_OK_2':
+Goal Assigns (file unfold_assigns.i, line 27) in 'NO_UNFOLD_OK_2':
Call Effect at line 29
Prove: true.
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 27) in 'NO_UNFOLD_OK_2':
+Goal Assigns (file unfold_assigns.i, line 27) in 'NO_UNFOLD_OK_2':
Call Effect at line 29
Prove: true.
@@ -133,13 +133,13 @@ Prove: true.
Function NO_UNFOLD_OK_3
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 32) in 'NO_UNFOLD_OK_3':
+Goal Assigns (file unfold_assigns.i, line 32) in 'NO_UNFOLD_OK_3':
Call Effect at line 34
Prove: true.
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 32) in 'NO_UNFOLD_OK_3':
+Goal Assigns (file unfold_assigns.i, line 32) in 'NO_UNFOLD_OK_3':
Call Effect at line 34
Prove: true.
@@ -148,7 +148,7 @@ Prove: true.
Function PARTIAL_ASSIGNS_STATIC
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 75) in 'PARTIAL_ASSIGNS_STATIC':
+Goal Assigns (file unfold_assigns.i, line 75) in 'PARTIAL_ASSIGNS_STATIC':
Call Effect at line 77
Assume {
(* Heap *)
@@ -160,7 +160,7 @@ Prove: (i = 0) \/ (i = 4) \/ ((0 < i) /\ (i <= 3)).
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 75) in 'PARTIAL_ASSIGNS_STATIC':
+Goal Assigns (file unfold_assigns.i, line 75) in 'PARTIAL_ASSIGNS_STATIC':
Call Effect at line 77
Assume {
(* Heap *)
@@ -175,7 +175,7 @@ Prove: (i = 0) \/ (i = 4) \/ ((0 < i) /\ (i <= 3)).
Function PARTIAL_ASSIGNS_VARS
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 81) in 'PARTIAL_ASSIGNS_VARS':
+Goal Assigns (file unfold_assigns.i, line 81) in 'PARTIAL_ASSIGNS_VARS':
Call Effect at line 83
Let a = shift_sint32(p, 0).
Let x = 1 + n.
@@ -197,7 +197,7 @@ Prove: (i = 0) \/ (n = i) \/ (n <= 0) \/ included(a, x, a_1, x_1) \/
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 81) in 'PARTIAL_ASSIGNS_VARS':
+Goal Assigns (file unfold_assigns.i, line 81) in 'PARTIAL_ASSIGNS_VARS':
Call Effect at line 83
Let a = shift_sint32(p, 0).
Let x = 1 + n.
@@ -222,7 +222,7 @@ Prove: (i = 0) \/ (n = i) \/ (n <= 0) \/ included(a, x, a_1, x_1) \/
Function RANGE_NESTED_ARRAY_STATIC
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 111) in 'RANGE_NESTED_ARRAY_STATIC':
+Goal Assigns (file unfold_assigns.i, line 111) in 'RANGE_NESTED_ARRAY_STATIC':
Call Effect at line 116
Assume {
(* Heap *)
@@ -235,7 +235,7 @@ Prove: i = 2.
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 111) in 'RANGE_NESTED_ARRAY_STATIC':
+Goal Assigns (file unfold_assigns.i, line 111) in 'RANGE_NESTED_ARRAY_STATIC':
Call Effect at line 116
Assume {
(* Heap *)
@@ -251,7 +251,7 @@ Prove: i = 2.
Function RANGE_NESTED_ARRAY_VARS
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 121) in 'RANGE_NESTED_ARRAY_VARS':
+Goal Assigns (file unfold_assigns.i, line 121) in 'RANGE_NESTED_ARRAY_VARS':
Call Effect at line 126
Let a = shift_S2_With_array(s, 0).
Let x = 4 * n.
@@ -281,7 +281,7 @@ Prove: (n < 0) \/ included(a, x_1, a_1, x_2) \/ included(a_2, 4, a_1, x_2) \/
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 121) in 'RANGE_NESTED_ARRAY_VARS':
+Goal Assigns (file unfold_assigns.i, line 121) in 'RANGE_NESTED_ARRAY_VARS':
Call Effect at line 126
Let a = shift_S2_With_array(s, 0).
Let x = 4 * n.
@@ -314,7 +314,7 @@ Prove: (n < 0) \/ included(a, x_1, a_1, x_2) \/ included(a_2, 4, a_1, x_2) \/
Function USE_ASSIGN_UNFOLD_KO
------------------------------------------------------------
-Goal Post-condition (file tests/wp_plugin/unfold_assigns.i, line 52) in 'USE_ASSIGN_UNFOLD_KO':
+Goal Post-condition (file unfold_assigns.i, line 52) in 'USE_ASSIGN_UNFOLD_KO':
Let a = Load_S1_S(q, Mint_0).
Let a_1 = Load_S1_S(q, havoc(Mint_undef_0, Mint_0, p, 2)).
Assume {
@@ -328,13 +328,13 @@ Prove: EqS1_S(a_1, a).
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 53) in 'USE_ASSIGN_UNFOLD_KO':
+Goal Assigns (file unfold_assigns.i, line 53) in 'USE_ASSIGN_UNFOLD_KO':
Call Effect at line 57
Prove: true.
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 53) in 'USE_ASSIGN_UNFOLD_KO':
+Goal Assigns (file unfold_assigns.i, line 53) in 'USE_ASSIGN_UNFOLD_KO':
Call Effect at line 57
Prove: true.
@@ -343,7 +343,7 @@ Prove: true.
Function USE_ASSIGN_UNFOLD_OK
------------------------------------------------------------
-Goal Post-condition (file tests/wp_plugin/unfold_assigns.i, line 43) in 'USE_ASSIGN_UNFOLD_OK':
+Goal Post-condition (file unfold_assigns.i, line 43) in 'USE_ASSIGN_UNFOLD_OK':
Let a = Load_S1_S(q, Mint_0).
Let a_1 = Load_S1_S(q, havoc(Mint_undef_0, Mint_0, p, 2)).
Assume {
@@ -357,13 +357,13 @@ Prove: EqS1_S(a_1, a).
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 44) in 'USE_ASSIGN_UNFOLD_OK':
+Goal Assigns (file unfold_assigns.i, line 44) in 'USE_ASSIGN_UNFOLD_OK':
Call Effect at line 48
Prove: true.
------------------------------------------------------------
-Goal Assigns (file tests/wp_plugin/unfold_assigns.i, line 44) in 'USE_ASSIGN_UNFOLD_OK':
+Goal Assigns (file unfold_assigns.i, line 44) in 'USE_ASSIGN_UNFOLD_OK':
Call Effect at line 48
Prove: true.
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/volatile.0.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/volatile.0.res.oracle
index ee45c894b59..d8e2d49b65f 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/volatile.0.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/volatile.0.res.oracle
@@ -35,7 +35,7 @@ Goal Assertion 'KO_WHEN_VOLATILE' (file volatile.i, line 35):
Prove: EqS1_st_v(w, w_1).
------------------------------------------------------------
-[wp] tests/wp_plugin/volatile.i:32: Warning:
+[wp] volatile.i:32: Warning:
Memory model hypotheses for function 'job_struct_assigns':
/*@ behavior wp_typed:
requires \separated(p, &sv); */
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/volatile.1.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/volatile.1.res.oracle
index fee21eec2eb..ffc78c36e2f 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/volatile.1.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/volatile.1.res.oracle
@@ -62,7 +62,7 @@ volatile.i:35: warning from wp:
Prove: true.
------------------------------------------------------------
-[wp] tests/wp_plugin/volatile.i:32: Warning:
+[wp] volatile.i:32: Warning:
Memory model hypotheses for function 'job_struct_assigns':
/*@ behavior wp_typed:
requires \separated(p, &sv); */
diff --git a/src/plugins/wp/tests/wp_plugin/rte.i b/src/plugins/wp/tests/wp_plugin/rte.i
index 94d284cf296..901bc8a7a03 100644
--- a/src/plugins/wp/tests/wp_plugin/rte.i
+++ b/src/plugins/wp/tests/wp_plugin/rte.i
@@ -1,11 +1,5 @@
/* run.config
-<<<<<<< HEAD
- CMD: @frama-c@ -wp -wp-prover none -wp-msg-key shell -wp-msg-key rte @OPTIONS@ -wp-warn-key "pedantic-assigns=inactive"
-||||||| ac7807782d
- CMD: @frama-c@ -wp -wp-prover none -wp-share ./share -wp-msg-key shell -wp-msg-key rte
-=======
- CMD: @frama-c@ -wp -wp-prover none -wp-share ./share -wp-msg-key shell,rte -wp-warn-key "pedantic-assigns=inactive"
->>>>>>> origin/master
+ CMD: @frama-c@ -wp -wp-prover none -wp-msg-key shell -wp-msg-key rte -wp-warn-key "pedantic-assigns=inactive" @OPTIONS@
OPT: -wp-rte -no-warn-invalid-bool -then -print -no-unicode
OPT: -wp-rte -no-warn-signed-overflow -then -print -no-unicode
OPT: -wp-rte -warn-unsigned-overflow -then -print -no-unicode
diff --git a/src/plugins/wp/tests/wp_tip/oracle/chunk_printing.res.oracle b/src/plugins/wp/tests/wp_tip/oracle/chunk_printing.res.oracle
index 2ab8aa326dd..4ce93ebbb7e 100644
--- a/src/plugins/wp/tests/wp_tip/oracle/chunk_printing.res.oracle
+++ b/src/plugins/wp/tests/wp_tip/oracle/chunk_printing.res.oracle
@@ -25,7 +25,7 @@ Assume {
Prove: `x_2 = `x_1.
------------------------------------------------------------
-[wp] tests/wp_tip/chunk_printing.i:19: Warning:
+[wp] chunk_printing.i:19: Warning:
Memory model hypotheses for function 'get_int':
/*@
behavior wp_typed:
@@ -33,7 +33,7 @@ Prove: `x_2 = `x_1.
ensures \separated(\result, &y);
*/
int *get_int(struct V *v);
-[wp] tests/wp_tip/chunk_printing.i:25: Warning:
+[wp] chunk_printing.i:25: Warning:
Memory model hypotheses for function 'get_uint':
/*@
behavior wp_typed:
diff --git a/src/plugins/wp/tests/wp_typed/oracle/multi_matrix_types.res.oracle b/src/plugins/wp/tests/wp_typed/oracle/multi_matrix_types.res.oracle
index 81c5c6cc27c..324a789c9b9 100644
--- a/src/plugins/wp/tests/wp_typed/oracle/multi_matrix_types.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle/multi_matrix_types.res.oracle
@@ -1,5 +1,5 @@
# frama-c -wp [...]
-[kernel] Parsing tests/wp_typed/multi_matrix_types.i (no preprocessing)
+[kernel] Parsing multi_matrix_types.i (no preprocessing)
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 1 goal scheduled
@@ -253,7 +253,7 @@ end
Function job
------------------------------------------------------------
-Goal Post-condition (file tests/wp_typed/multi_matrix_types.i, line 10) in 'job':
+Goal Post-condition (file multi_matrix_types.i, line 10) in 'job':
Let a = Load_S1_S(p, Mint_0, Mint_1, Mint_2).
Let a_1 = Load_S1_S(p, Mint_0, Mint_1[shiftfield_F1_S_f(p) <- v], Mint_2).
Assume {
diff --git a/src/plugins/wp/tests/wp_typed/oracle/mvar.0.res.oracle b/src/plugins/wp/tests/wp_typed/oracle/mvar.0.res.oracle
index 9d6c18fab59..599eded1e56 100644
--- a/src/plugins/wp/tests/wp_typed/oracle/mvar.0.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle/mvar.0.res.oracle
@@ -18,7 +18,7 @@ Assume {
Prove: P_equal(1, 1).
------------------------------------------------------------
-[wp] tests/wp_typed/mvar.i:8: Warning:
+[wp] mvar.i:8: Warning:
Memory model hypotheses for function 'Write':
/*@
behavior wp_typed:
diff --git a/src/plugins/wp/tests/wp_typed/oracle/mvar.1.res.oracle b/src/plugins/wp/tests/wp_typed/oracle/mvar.1.res.oracle
index f2eaa006d64..756b2207096 100644
--- a/src/plugins/wp/tests/wp_typed/oracle/mvar.1.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle/mvar.1.res.oracle
@@ -18,7 +18,7 @@ Assume {
Prove: P_equal(1, 1).
------------------------------------------------------------
-[wp] tests/wp_typed/mvar.i:8: Warning:
+[wp] mvar.i:8: Warning:
Memory model hypotheses for function 'Write':
/*@
behavior wp_typed_ref:
diff --git a/src/plugins/wp/tests/wp_typed/oracle/unit_alloc.0.res.oracle b/src/plugins/wp/tests/wp_typed/oracle/unit_alloc.0.res.oracle
index 2d5d4a5af58..9248b36a15e 100644
--- a/src/plugins/wp/tests/wp_typed/oracle/unit_alloc.0.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle/unit_alloc.0.res.oracle
@@ -59,7 +59,7 @@ Assume {
Prove: !valid_rw(Malloc_0[L_y_25 <- 0], a, 1).
------------------------------------------------------------
-[wp] tests/wp_typed/unit_alloc.i:34: Warning:
+[wp] unit_alloc.i:34: Warning:
Memory model hypotheses for function 'h':
/*@ behavior wp_typed:
ensures \separated(\result, &x); */
diff --git a/src/plugins/wp/tests/wp_typed/oracle/unit_alloc.1.res.oracle b/src/plugins/wp/tests/wp_typed/oracle/unit_alloc.1.res.oracle
index c11e66ea5d9..9b3b7d24e4d 100644
--- a/src/plugins/wp/tests/wp_typed/oracle/unit_alloc.1.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle/unit_alloc.1.res.oracle
@@ -59,7 +59,7 @@ Assume {
Prove: !valid_rw(Malloc_0[L_y_25 <- 0], a, 1).
------------------------------------------------------------
-[wp] tests/wp_typed/unit_alloc.i:34: Warning:
+[wp] unit_alloc.i:34: Warning:
Memory model hypotheses for function 'h':
/*@ behavior wp_typed_ref:
ensures \separated(\result, &x); */
diff --git a/src/plugins/wp/tests/wp_typed/oracle/unit_bitwise.res.oracle b/src/plugins/wp/tests/wp_typed/oracle/unit_bitwise.res.oracle
index 7be4b7879ca..558b45d9fdf 100644
--- a/src/plugins/wp/tests/wp_typed/oracle/unit_bitwise.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle/unit_bitwise.res.oracle
@@ -174,16 +174,8 @@ Prove: true.
------------------------------------------------------------
-<<<<<<< HEAD
Goal Assertion 'ok' (file unit_bitwise.c, line 170):
-Let x = land(1, a). Assume { Type: is_uint32(a) /\ is_uint32(x). }
-||||||| ac7807782d
-Goal Assertion 'ok' (file tests/wp_typed/unit_bitwise.c, line 170):
-Let x = land(1, a). Assume { Type: is_uint32(a) /\ is_uint32(x). }
-=======
-Goal Assertion 'ok' (file tests/wp_typed/unit_bitwise.c, line 170):
Let x = land(1, a). Assume { Type: is_uint64(a) /\ is_uint64(x). }
->>>>>>> origin/master
Prove: 0 <= x.
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_typed/oracle/unit_ite.1.res.oracle b/src/plugins/wp/tests/wp_typed/oracle/unit_ite.1.res.oracle
index dd93bdae2de..bf82f8e1f19 100644
--- a/src/plugins/wp/tests/wp_typed/oracle/unit_ite.1.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle/unit_ite.1.res.oracle
@@ -10,7 +10,7 @@ Goal Post-condition (file unit_ite.i, line 2) in 'check':
Prove: true.
------------------------------------------------------------
-[wp] tests/wp_typed/unit_ite.i:3: Warning:
+[wp] unit_ite.i:3: Warning:
Memory model hypotheses for function 'check':
/*@ behavior wp_typed_ref:
requires \valid(p); */
diff --git a/src/plugins/wp/tests/wp_typed/oracle/unit_labels.1.res.oracle b/src/plugins/wp/tests/wp_typed/oracle/unit_labels.1.res.oracle
index 724ace600b0..9ecaed1e2f7 100644
--- a/src/plugins/wp/tests/wp_typed/oracle/unit_labels.1.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle/unit_labels.1.res.oracle
@@ -26,7 +26,7 @@ Goal Assertion 'PJ' (file unit_labels.i, line 10):
Prove: true.
------------------------------------------------------------
-[wp] tests/wp_typed/unit_labels.i:7: Warning:
+[wp] unit_labels.i:7: Warning:
Memory model hypotheses for function 'duplet':
/*@
behavior wp_typed_ref:
diff --git a/src/plugins/wp/tests/wp_typed/oracle/unit_loopscope.1.res.oracle b/src/plugins/wp/tests/wp_typed/oracle/unit_loopscope.1.res.oracle
index 169991a0b30..f9f0694e9ef 100644
--- a/src/plugins/wp/tests/wp_typed/oracle/unit_loopscope.1.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle/unit_loopscope.1.res.oracle
@@ -17,7 +17,7 @@ Goal Establishment of Invariant (file unit_loopscope.i, line 13):
Prove: false.
------------------------------------------------------------
-[wp] tests/wp_typed/unit_loopscope.i:9: Warning:
+[wp] unit_loopscope.i:9: Warning:
Memory model hypotheses for function 'f':
/*@ behavior wp_typed_ref:
requires \valid(written); */
diff --git a/src/plugins/wp/tests/wp_typed/oracle/user_injector.res.oracle b/src/plugins/wp/tests/wp_typed/oracle/user_injector.res.oracle
index 99c9a562651..6fa0a546cba 100644
--- a/src/plugins/wp/tests/wp_typed/oracle/user_injector.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle/user_injector.res.oracle
@@ -115,7 +115,7 @@ Effect at line 68
Prove: true.
------------------------------------------------------------
-[wp] tests/wp_typed/user_injector.i:58: Warning:
+[wp] user_injector.i:58: Warning:
Memory model hypotheses for function 'job':
/*@
behavior wp_typed:
diff --git a/src/plugins/wp/tests/wp_typed/oracle/user_swap.1.res.oracle b/src/plugins/wp/tests/wp_typed/oracle/user_swap.1.res.oracle
index 500cc79e58c..2d9d95324f6 100644
--- a/src/plugins/wp/tests/wp_typed/oracle/user_swap.1.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle/user_swap.1.res.oracle
@@ -40,7 +40,7 @@ Goal Assigns 'E' in 'swap':
Prove: true.
------------------------------------------------------------
-[wp] tests/wp_typed/user_swap.i:13: Warning:
+[wp] user_swap.i:13: Warning:
Memory model hypotheses for function 'swap':
/*@
behavior wp_typed_ref:
diff --git a/src/plugins/wp/tests/wp_usage/oracle/caveat.1.res.oracle b/src/plugins/wp/tests/wp_usage/oracle/caveat.1.res.oracle
index 73c458738b6..bdba517b729 100644
--- a/src/plugins/wp/tests/wp_usage/oracle/caveat.1.res.oracle
+++ b/src/plugins/wp/tests/wp_usage/oracle/caveat.1.res.oracle
@@ -68,7 +68,7 @@ Assume {
Prove: P_OBS(x_2, x_3, x_4).
------------------------------------------------------------
-[wp] tests/wp_usage/caveat.i:17: Warning:
+[wp] caveat.i:17: Warning:
Memory model hypotheses for function 'implicit':
/*@
behavior wp_typed_caveat:
@@ -77,7 +77,7 @@ Prove: P_OBS(x_2, x_3, x_4).
requires \valid(r);
*/
void implicit(struct S *a, int *r);
-[wp] tests/wp_usage/caveat.i:32: Warning:
+[wp] caveat.i:32: Warning:
Memory model hypotheses for function 'explicit':
/*@
behavior wp_typed_caveat:
@@ -86,7 +86,7 @@ Prove: P_OBS(x_2, x_3, x_4).
requires \valid(r);
*/
void explicit(struct S *a, int *r);
-[wp] tests/wp_usage/caveat.i:47: Warning:
+[wp] caveat.i:47: Warning:
Memory model hypotheses for function 'observer':
/*@
behavior wp_typed_caveat:
diff --git a/src/plugins/wp/tests/wp_usage/oracle/caveat2.res.oracle b/src/plugins/wp/tests/wp_usage/oracle/caveat2.res.oracle
index ed02e9b1d95..7afd085294b 100644
--- a/src/plugins/wp/tests/wp_usage/oracle/caveat2.res.oracle
+++ b/src/plugins/wp/tests/wp_usage/oracle/caveat2.res.oracle
@@ -97,7 +97,7 @@ Effect at line 25
Prove: true.
------------------------------------------------------------
-[wp] tests/wp_usage/caveat2.i:17: Warning:
+[wp] caveat2.i:17: Warning:
Memory model hypotheses for function 'job':
/*@
behavior wp_typed_caveat:
diff --git a/src/plugins/wp/tests/wp_usage/oracle/caveat_range.res.oracle b/src/plugins/wp/tests/wp_usage/oracle/caveat_range.res.oracle
index 4bef898fb73..4be1fd66f0e 100644
--- a/src/plugins/wp/tests/wp_usage/oracle/caveat_range.res.oracle
+++ b/src/plugins/wp/tests/wp_usage/oracle/caveat_range.res.oracle
@@ -154,7 +154,7 @@ Effect at line 24
Prove: true.
------------------------------------------------------------
-[wp] tests/wp_usage/caveat_range.i:16: Warning:
+[wp] caveat_range.i:16: Warning:
Memory model hypotheses for function 'reset':
/*@ behavior wp_typed_caveat:
requires \valid(p + (..)); */
diff --git a/src/plugins/wp/tests/wp_usage/oracle/global.1.res.oracle b/src/plugins/wp/tests/wp_usage/oracle/global.1.res.oracle
index c82a670ced2..e5a9fc32867 100644
--- a/src/plugins/wp/tests/wp_usage/oracle/global.1.res.oracle
+++ b/src/plugins/wp/tests/wp_usage/oracle/global.1.res.oracle
@@ -19,7 +19,7 @@ Goal Instance of 'Pre-condition (file global.c, line 14) in 'foo'' in 'main' at
Prove: true.
------------------------------------------------------------
-[wp] tests/wp_usage/global.c:16: Warning:
+[wp] global.c:16: Warning:
Memory model hypotheses for function 'foo':
/*@ behavior wp_typed:
requires \separated(a, &GLOBAL); */
diff --git a/src/plugins/wp/tests/wp_usage/oracle/global.2.res.oracle b/src/plugins/wp/tests/wp_usage/oracle/global.2.res.oracle
index feea5d14acf..636a7d67503 100644
--- a/src/plugins/wp/tests/wp_usage/oracle/global.2.res.oracle
+++ b/src/plugins/wp/tests/wp_usage/oracle/global.2.res.oracle
@@ -19,7 +19,7 @@ Goal Instance of 'Pre-condition (file global.c, line 14) in 'foo'' in 'main' at
Prove: true.
------------------------------------------------------------
-[wp] tests/wp_usage/global.c:16: Warning:
+[wp] global.c:16: Warning:
Memory model hypotheses for function 'foo':
/*@
behavior wp_typed_ref:
diff --git a/src/plugins/wp/tests/wp_usage/oracle/issue-189-bis.1.res.oracle b/src/plugins/wp/tests/wp_usage/oracle/issue-189-bis.1.res.oracle
index 6305bfeb4e6..2f68c85f31d 100644
--- a/src/plugins/wp/tests/wp_usage/oracle/issue-189-bis.1.res.oracle
+++ b/src/plugins/wp/tests/wp_usage/oracle/issue-189-bis.1.res.oracle
@@ -167,7 +167,7 @@ Effect at line 59
Prove: true.
------------------------------------------------------------
-[wp] tests/wp_usage/issue-189-bis.i:48: Warning:
+[wp] issue-189-bis.i:48: Warning:
Memory model hypotheses for function 'memcpy_context_vars':
/*@
behavior wp_typed:
diff --git a/src/plugins/wp/tests/wp_usage/oracle/issue-189.2.res.oracle b/src/plugins/wp/tests/wp_usage/oracle/issue-189.2.res.oracle
index d99cc89de9e..5b75c3ee326 100644
--- a/src/plugins/wp/tests/wp_usage/oracle/issue-189.2.res.oracle
+++ b/src/plugins/wp/tests/wp_usage/oracle/issue-189.2.res.oracle
@@ -22,7 +22,7 @@ Effect at line 17
Prove: true.
------------------------------------------------------------
-[wp] tests/wp_usage/issue-189.i:16: Warning:
+[wp] issue-189.i:16: Warning:
Memory model hypotheses for function 'f':
/*@
behavior wp_typed_caveat:
diff --git a/src/plugins/wp/tests/wp_usage/oracle/ref-usage-lemmas.res.oracle b/src/plugins/wp/tests/wp_usage/oracle/ref-usage-lemmas.res.oracle
index 0992229d6ac..70cc42d5bad 100644
--- a/src/plugins/wp/tests/wp_usage/oracle/ref-usage-lemmas.res.oracle
+++ b/src/plugins/wp/tests/wp_usage/oracle/ref-usage-lemmas.res.oracle
@@ -17,7 +17,7 @@ Goal Pre-condition (file ref-usage-lemmas.i, line 30) in 'main':
Prove: true.
------------------------------------------------------------
-[wp] tests/wp_usage/ref-usage-lemmas.i:26: Warning:
+[wp] ref-usage-lemmas.i:26: Warning:
Memory model hypotheses for function 'foo':
/*@ behavior wp_typed:
requires \separated(x, &b); */
diff --git a/src/plugins/wp/tests/wp_usage/oracle/save_load.1.res.oracle b/src/plugins/wp/tests/wp_usage/oracle/save_load.1.res.oracle
index 2d9e04ed53d..3bc025e3b99 100644
--- a/src/plugins/wp/tests/wp_usage/oracle/save_load.1.res.oracle
+++ b/src/plugins/wp/tests/wp_usage/oracle/save_load.1.res.oracle
@@ -4,7 +4,7 @@
Function f
------------------------------------------------------------
-Goal Post-condition (file save_load.i, line 16) in 'f':
+Goal Post-condition (file save_load.i, line 15) in 'f':
Assume {
Type: is_sint32(a) /\ is_sint32(b) /\ is_sint32(b_1) /\ is_sint32(c).
If c != 0
diff --git a/src/plugins/wp/tests/wp_usage/oracle/save_load.sav.res b/src/plugins/wp/tests/wp_usage/oracle/save_load.sav.res
index 0078beeeaa7..c6ba6b92933 100644
--- a/src/plugins/wp/tests/wp_usage/oracle/save_load.sav.res
+++ b/src/plugins/wp/tests/wp_usage/oracle/save_load.sav.res
@@ -5,7 +5,7 @@
Function f
------------------------------------------------------------
-Goal Post-condition (file save_load.i, line 16) in 'f':
+Goal Post-condition (file save_load.i, line 15) in 'f':
Assume {
Type: is_sint32(a) /\ is_sint32(b) /\ is_sint32(b_1) /\ is_sint32(c).
If c != 0
diff --git a/src/plugins/wp/tests/wp_usage/save_load.i b/src/plugins/wp/tests/wp_usage/save_load.i
index 498b42d3655..bf9aade15a8 100644
--- a/src/plugins/wp/tests/wp_usage/save_load.i
+++ b/src/plugins/wp/tests/wp_usage/save_load.i
@@ -1,14 +1,6 @@
/* run.config
-<<<<<<< HEAD
EXECNOW: LOG save_load.sav.res LOG save_load.sav.err BIN @PTEST_NAME@.sav @frama-c@ -wp -wp-warn-key pedantic-assigns=inactive -wp-print -wp-prover none -save @PTEST_NAME@.sav > @PTEST_NAME@.sav.res 2> @PTEST_NAME@.sav.err
- CMD: @frama-c@ -load %{dep:@PTEST_NAME@.sav} @OPTIONS@ -wp-warn-key pedantic-assigns=inactive
-||||||| ac7807782d
- EXECNOW: LOG save_load.sav.res LOG save_load.sav.err BIN @PTEST_NAME@.sav @frama-c@ -no-autoload-plugins -load-module wp -wp-share ./share -wp -wp-print -wp-prover none @PTEST_FILE@ -save @PTEST_DIR@/@PTEST_NAME@.sav > @PTEST_DIR@/result/@PTEST_NAME@.sav.res 2> @PTEST_DIR@/result/@PTEST_NAME@.sav.err
- CMD: @frama-c@ -no-autoload-plugins -load-module wp -load @PTEST_DIR@/@PTEST_NAME@.sav
-=======
- EXECNOW: LOG save_load.sav.res LOG save_load.sav.err BIN @PTEST_NAME@.sav @frama-c@ -no-autoload-plugins -load-module wp -wp-warn-key pedantic-assigns=inactive -wp-share ./share -wp -wp-print -wp-prover none @PTEST_FILE@ -save @PTEST_DIR@/@PTEST_NAME@.sav > @PTEST_DIR@/result/@PTEST_NAME@.sav.res 2> @PTEST_DIR@/result/@PTEST_NAME@.sav.err
- CMD: @frama-c@ -no-autoload-plugins -load-module wp -load @PTEST_DIR@/@PTEST_NAME@.sav -wp-warn-key pedantic-assigns=inactive
->>>>>>> origin/master
+ CMD: @frama-c@ -load %{dep:@PTEST_NAME@.sav} -wp-warn-key pedantic-assigns=inactive @OPTIONS@
OPT: -print
OPT: -wp -wp-prover none -wp-print
*/
@@ -16,7 +8,6 @@
/* run.config_qualif
DONTRUN:
*/
-
// Unprovable contract, just here to check the WP generation.
// The test case 1 checks that save/load do not crash in presence of WP.
// The test case 2 checks that WP still works after save/load.
diff --git a/tests/builtins/malloc.c b/tests/builtins/malloc.c
index ad4bffd113a..989d36b9086 100644
--- a/tests/builtins/malloc.c
+++ b/tests/builtins/malloc.c
@@ -1,5 +1,5 @@
/* run.config*
- OPT: -eva @EVA_OPTIONS@ -eva-slevel 10 -eva-mlevel 0 -eva-alloc-builtin by_stack
+ OPT: -eva @EVA_CONFIG@ -eva-slevel 10 -eva-mlevel 0 -eva-alloc-builtin by_stack
*/
#include <stdlib.h>
diff --git a/tests/builtins/test_config b/tests/builtins/test_config
index d2c59d2b6ca..6d3bfef2392 100644
--- a/tests/builtins/test_config
+++ b/tests/builtins/test_config
@@ -1,9 +1,3 @@
MACRO: EVA_OPTIONS @EVA_OPTIONS@ -eva-msg-key malloc -eva-warn-key malloc:weak=feedback -eva-no-alloc-returns-null
-<<<<<<< HEAD
MACRO: EVA_CONFIG @EVA_OPTIONS@ -machdep x86_32
-||||||| ac7807782d
-MACRO: EVA_CONFIG @EVA_OPTIONS@ -no-autoload-plugins -load-module from,inout,eva,scope,variadic
-=======
-MACRO: EVA_CONFIG @EVA_OPTIONS@ -no-autoload-plugins -load-module from,inout,eva,scope,variadic -machdep x86_32
->>>>>>> origin/master
OPT: -eva @EVA_CONFIG@ -journal-disable -out -input -deps
diff --git a/tests/cil/mkBinOp.i b/tests/cil/mkBinOp.i
index cce6e6f7f28..4cd4dae8718 100644
--- a/tests/cil/mkBinOp.i
+++ b/tests/cil/mkBinOp.i
@@ -1,14 +1,6 @@
/* run.config
-<<<<<<< HEAD
MODULE: @PTEST_NAME@
STDOPT: +"-machdep x86_32 -constfold"
-||||||| ac7807782d
-EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
-OPT: -no-autoload-plugins -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs -print -constfold
-=======
-EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
-OPT: -machdep x86_32 -no-autoload-plugins -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs -print -constfold
->>>>>>> origin/master
*/
int main(void) {
diff --git a/tests/constant_propagation/const_globals.c b/tests/constant_propagation/const_globals.c
index 355a01b4987..c0661d55d4f 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/test_config b/tests/constant_propagation/test_config
index 9d1023ac883..f9f75f64390 100644
--- a/tests/constant_propagation/test_config
+++ b/tests/constant_propagation/test_config
@@ -1,8 +1,2 @@
-<<<<<<< HEAD
PLUGIN: constant_propagation @PLUGIN@
OPT: -journal-disable -scf @EVA_OPTIONS@ -machdep x86_32
-||||||| ac7807782d
-OPT: -journal-disable -scf @EVA_OPTIONS@
-=======
-OPT: -journal-disable -scf @EVA_OPTIONS@ -machdep x86_32
->>>>>>> origin/master
diff --git a/tests/fc_script/main.c b/tests/fc_script/main.c
index fbdc5eef201..97b7d281575 100644
--- a/tests/fc_script/main.c
+++ b/tests/fc_script/main.c
@@ -1,6 +1,5 @@
/* run.config
NOFRAMAC: testing frama-c-script, not frama-c itself
-<<<<<<< HEAD
DEPS: for-find-fun2.c for-find-fun.c main.c main2.c main3.c
EXECNOW: LOG GNUmakefile LOG make_template.res LOG make_template.err PTESTS_TESTING= %{bin:frama-c-script} make-template . < %{dep:make_template.input} > make_template.res 2> make_template.err
EXECNOW: LOG list_files.res LOG list_files.err %{bin:frama-c-script} list-files %{dep:list_files.json} > list_files.res 2> list_files.err
@@ -8,20 +7,6 @@
EXECNOW: LOG find_fun1.res LOG find_fun1.err %{bin:frama-c-script} find-fun main2 . > find_fun1.res 2> find_fun1.err
EXECNOW: LOG find_fun2.res LOG find_fun2.err %{bin:frama-c-script} find-fun main3 . > find_fun2.res 2> find_fun2.err
EXECNOW: LOG find_fun3.res LOG find_fun3.err %{bin:frama-c-script} find-fun false_positive . > find_fun3.res 2> find_fun3.err
-||||||| ac7807782d
- EXECNOW: LOG GNUmakefile LOG make_template.res LOG make_template.err cd @PTEST_DIR@ && PTESTS_TESTING= ../../bin/frama-c-script make-template result < make_template.input > result/make_template.res 2> result/make_template.err
- EXECNOW: LOG list_files.res LOG list_files.err bin/frama-c-script list-files @PTEST_DIR@/list_files.json > @PTEST_DIR@/result/list_files.res 2> @PTEST_DIR@/result/list_files.err
- EXECNOW: LOG flamegraph.html LOG flamegraph.res LOG flamegraph.err NOGUI=1 bin/frama-c-script flamegraph @PTEST_DIR@/flamegraph.txt @PTEST_DIR@/result > @PTEST_DIR@/result/flamegraph.res 2> @PTEST_DIR@/result/flamegraph.err && rm -f @PTEST_DIR@/result/flamegraph.svg
- EXECNOW: LOG find_fun1.res LOG find_fun1.err bin/frama-c-script find-fun main2 @PTEST_DIR@ > @PTEST_DIR@/result/find_fun1.res 2> @PTEST_DIR@/result/find_fun1.err
- EXECNOW: LOG find_fun2.res LOG find_fun2.err bin/frama-c-script find-fun main3 @PTEST_DIR@ > @PTEST_DIR@/result/find_fun2.res 2> @PTEST_DIR@/result/find_fun2.err
- EXECNOW: LOG find_fun3.res LOG find_fun3.err bin/frama-c-script find-fun false_positive @PTEST_DIR@ > @PTEST_DIR@/result/find_fun3.res 2> @PTEST_DIR@/result/find_fun3.err
-=======
- EXECNOW: LOG GNUmakefile LOG make_template.res LOG make_template.err cd @PTEST_DIR@ && PTESTS_TESTING= ../../bin/frama-c-script make-template result < make_template.input > result/make_template.res 2> result/make_template.err
- EXECNOW: LOG list_files.res LOG list_files.err bin/frama-c-script list-files @PTEST_DIR@/list_files.json > @PTEST_DIR@/result/list_files.res 2> @PTEST_DIR@/result/list_files.err
- EXECNOW: LOG find_fun1.res LOG find_fun1.err bin/frama-c-script find-fun main2 @PTEST_DIR@ > @PTEST_DIR@/result/find_fun1.res 2> @PTEST_DIR@/result/find_fun1.err
- EXECNOW: LOG find_fun2.res LOG find_fun2.err bin/frama-c-script find-fun main3 @PTEST_DIR@ > @PTEST_DIR@/result/find_fun2.res 2> @PTEST_DIR@/result/find_fun2.err
- EXECNOW: LOG find_fun3.res LOG find_fun3.err bin/frama-c-script find-fun false_positive @PTEST_DIR@ > @PTEST_DIR@/result/find_fun3.res 2> @PTEST_DIR@/result/find_fun3.err
->>>>>>> origin/master
*/
void main() {
diff --git a/tests/fc_script/oracle/GNUmakefile b/tests/fc_script/oracle/GNUmakefile
index d18dafec17e..8d7649a124b 100644
--- a/tests/fc_script/oracle/GNUmakefile
+++ b/tests/fc_script/oracle/GNUmakefile
@@ -21,13 +21,7 @@ CPPFLAGS += \
FCFLAGS += \
-json-compilation-database ./compile_commands.json \
-main eva_main \
-<<<<<<< HEAD
-add-symbolic-path=.:. \
-||||||| ac7807782d
- -add-symbolic-path=.:.. \
-=======
- -add-symbolic-path=..:. \
->>>>>>> origin/master
-kernel-warn-key annot:missing-spec=abort \
-kernel-warn-key typing:implicit-function-declaration=abort \
@@ -37,12 +31,6 @@ EVAFLAGS += \
## GUI-only flags
FCGUIFLAGS += \
-<<<<<<< HEAD
- -add-symbolic-path=.:. \
-||||||| ac7807782d
- -add-symbolic-path=.:.. \
-=======
->>>>>>> origin/master
## Analysis targets (suffixed with .eva)
TARGETS = fc_script_main.eva
diff --git a/tests/fc_script/oracle/find_fun1.res b/tests/fc_script/oracle/find_fun1.res
index d795a9d007c..0c6b67f1e5f 100644
--- a/tests/fc_script/oracle/find_fun1.res
+++ b/tests/fc_script/oracle/find_fun1.res
@@ -1,4 +1,4 @@
-Looking for 'main2' inside 8 file(s)...
+Looking for 'main2' inside 5 file(s)...
Possible declarations for function 'main2' in the following file(s):
for-find-fun.c
Possible definitions for function 'main2' in the following file(s):
diff --git a/tests/fc_script/oracle/find_fun2.res b/tests/fc_script/oracle/find_fun2.res
index 02a92e78f96..37ddfed3cf6 100644
--- a/tests/fc_script/oracle/find_fun2.res
+++ b/tests/fc_script/oracle/find_fun2.res
@@ -1,4 +1,4 @@
-Looking for 'main3' inside 8 file(s)...
+Looking for 'main3' inside 5 file(s)...
Possible declarations for function 'main3' in the following file(s):
for-find-fun2.c
Possible definitions for function 'main3' in the following file(s):
diff --git a/tests/fc_script/oracle/find_fun3.res b/tests/fc_script/oracle/find_fun3.res
index 65fc349325d..a7059bd1c96 100644
--- a/tests/fc_script/oracle/find_fun3.res
+++ b/tests/fc_script/oracle/find_fun3.res
@@ -1,2 +1,2 @@
-Looking for 'false_positive' inside 8 file(s)...
+Looking for 'false_positive' inside 5 file(s)...
No declaration/definition found for function 'false_positive'
diff --git a/tests/fc_script/oracle/make_template.res b/tests/fc_script/oracle/make_template.res
index 97acf520da4..4a3ef8e2f6c 100644
--- a/tests/fc_script/oracle/make_template.res
+++ b/tests/fc_script/oracle/make_template.res
@@ -10,16 +10,7 @@ warning: GNUmakefile already exists. Overwrite? [y/N] Main target name: Source f
warning: 'main' seems to be defined multiple times.
Is this ok? [Y/n] compile_commands.json exists, add option -json-compilation-database? [Y/n] Add stub for function main (only needed if it uses command-line arguments)? [y/N] Please define the architectural model (machdep) of the target machine.
Known machdeps: x86_16 x86_32 x86_64 gcc_x86_16 gcc_x86_32 gcc_x86_64 ppc_32 msvc_x86_64
-<<<<<<< HEAD
-Please enter the machdep [x86_32]: 'invalid_machdep' is not a standard machdep. Proceed anyway? [y/N]Please enter the machdep [x86_32]: warning: fc_stubs.c already exists. Overwrite? [y/N] Created stub for main function: fc_stubs.c
+Please enter the machdep [x86_64]: 'invalid_machdep' is not a standard machdep. Proceed anyway? [y/N]Please enter the machdep [x86_64]: warning: fc_stubs.c already exists. Overwrite? [y/N] Created stub for main function: fc_stubs.c
Template created: GNUmakefile
Path to Frama-C binaries written to: path.mk
-||||||| ac7807782d
-Please enter the machdep [x86_32]: 'invalid_machdep' is not a standard machdep. Proceed anyway? [y/N]Please enter the machdep [x86_32]: warning: result/fc_stubs.c already exists. Overwrite? [y/N] Created stub for main function: result/fc_stubs.c
-Template created: result/GNUmakefile
-=======
-Please enter the machdep [x86_64]: 'invalid_machdep' is not a standard machdep. Proceed anyway? [y/N]Please enter the machdep [x86_64]: warning: result/fc_stubs.c already exists. Overwrite? [y/N] Created stub for main function: result/fc_stubs.c
-Template created: result/GNUmakefile
-Path to Frama-C binaries written to: result/path.mk
->>>>>>> origin/master
Running ptests: cleaning up after tests...
diff --git a/tests/float/oracle/builtins.res.oracle b/tests/float/oracle/builtins.res.oracle
index 11f9db1fa3f..16705fbc5f8 100644
--- a/tests/float/oracle/builtins.res.oracle
+++ b/tests/float/oracle/builtins.res.oracle
@@ -112,7 +112,7 @@
[eva] builtins.c:104:
function exp: precondition 'finite_domain' got status valid.
[eva:alarm] builtins.c:107: Warning:
- pointer downcast. assert (unsigned int)(&d) ≤ 2147483647;
+ pointer downcast. assert (unsigned long)(&d) ≤ 2147483647;
[eva:alarm] builtins.c:107: Warning:
non-finite double value. assert \is_finite((double)((int)(&d)));
[eva] builtins.c:107: Call to builtin log
diff --git a/tests/float/oracle/nonlin.0.res.oracle b/tests/float/oracle/nonlin.0.res.oracle
index 495571bb79c..5f557f4a917 100644
--- a/tests/float/oracle/nonlin.0.res.oracle
+++ b/tests/float/oracle/nonlin.0.res.oracle
@@ -229,9 +229,9 @@
[eva] computing for function garbled <- main.
Called from nonlin.c:148.
[eva:alarm] nonlin.c:98: Warning:
- pointer downcast. assert (unsigned int)(&x_0) ≤ 2147483647;
+ pointer downcast. assert (unsigned long)(&x_0) ≤ 2147483647;
[eva:alarm] nonlin.c:98: Warning:
- pointer downcast. assert (unsigned int)(&x_0 + (int)(&x_0)) ≤ 2147483647;
+ pointer downcast. assert (unsigned long)(&x_0 + (int)(&x_0)) ≤ 2147483647;
[eva:alarm] nonlin.c:98: Warning:
non-finite float value.
assert \is_finite((float)((int)(&x_0 + (int)(&x_0))));
@@ -290,7 +290,7 @@
[eva] ====== VALUES COMPUTED ======
[eva:final-states] Values at end of function access_bits:
rbits1 ∈ {0; 1; 2}
- x0 ∈ [--..--]
+ x0 ∈ [0..13862255574906830848]
__retres ∈ {0; 1}
[eva:final-states] Values at end of function around_zeros:
Frama_C_entropy_source ∈ [--..--]
diff --git a/tests/float/oracle/nonlin.1.res.oracle b/tests/float/oracle/nonlin.1.res.oracle
index 5461af403dc..1a53ed97def 100644
--- a/tests/float/oracle/nonlin.1.res.oracle
+++ b/tests/float/oracle/nonlin.1.res.oracle
@@ -248,9 +248,9 @@
[eva] computing for function garbled <- main.
Called from nonlin.c:148.
[eva:alarm] nonlin.c:98: Warning:
- pointer downcast. assert (unsigned int)(&x_0) ≤ 2147483647;
+ pointer downcast. assert (unsigned long)(&x_0) ≤ 2147483647;
[eva:alarm] nonlin.c:98: Warning:
- pointer downcast. assert (unsigned int)(&x_0 + (int)(&x_0)) ≤ 2147483647;
+ pointer downcast. assert (unsigned long)(&x_0 + (int)(&x_0)) ≤ 2147483647;
[eva:alarm] nonlin.c:98: Warning:
non-finite float value.
assert \is_finite((float)((int)(&x_0 + (int)(&x_0))));
@@ -317,7 +317,7 @@
[eva] ====== VALUES COMPUTED ======
[eva:final-states] Values at end of function access_bits:
rbits1 ∈ {0; 1; 2}
- x0 ∈ [--..--]
+ x0 ∈ [0..13837573737886515191]
__retres ∈ {0; 1}
[eva:final-states] Values at end of function around_zeros:
Frama_C_entropy_source ∈ [--..--]
diff --git a/tests/float/oracle/nonlin.2.res.oracle b/tests/float/oracle/nonlin.2.res.oracle
index 1496199f2c4..61aad1229f0 100644
--- a/tests/float/oracle/nonlin.2.res.oracle
+++ b/tests/float/oracle/nonlin.2.res.oracle
@@ -238,9 +238,9 @@
[eva] computing for function garbled <- main.
Called from nonlin.c:148.
[eva:alarm] nonlin.c:98: Warning:
- pointer downcast. assert (unsigned int)(&x_0) ≤ 2147483647;
+ pointer downcast. assert (unsigned long)(&x_0) ≤ 2147483647;
[eva:alarm] nonlin.c:98: Warning:
- pointer downcast. assert (unsigned int)(&x_0 + (int)(&x_0)) ≤ 2147483647;
+ pointer downcast. assert (unsigned long)(&x_0 + (int)(&x_0)) ≤ 2147483647;
[eva] nonlin.c:98:
Assigning imprecise value to a_0.
The imprecision originates from Arithmetic {nonlin.c:98}
@@ -291,7 +291,7 @@
[eva] ====== VALUES COMPUTED ======
[eva:final-states] Values at end of function access_bits:
rbits1 ∈ {0; 1; 2}
- x0 ∈ [--..--]
+ x0 ∈ [0..13837573737886515191]
__retres ∈ {0; 1}
[eva:final-states] Values at end of function around_zeros:
Frama_C_entropy_source ∈ [--..--]
diff --git a/tests/float/oracle/nonlin.3.res.oracle b/tests/float/oracle/nonlin.3.res.oracle
index c9fb8e598b9..d186f93e10e 100644
--- a/tests/float/oracle/nonlin.3.res.oracle
+++ b/tests/float/oracle/nonlin.3.res.oracle
@@ -177,129 +177,18 @@
assert (int)\add_double((double)\mul_float(i, i), (double)2.0) < 10;
[eva] computing for function access_bits <- other <- main.
Called from nonlin.c:69.
+[eva:alarm] nonlin.c:52: Warning:
+ out of bounds read. assert \valid_read((unsigned long *)(&X));
[eva] Recording results for access_bits
[eva] Done for function access_bits
-[eva] computing for function Frama_C_interval <- other <- main.
- Called from nonlin.c:71.
-[eva] using specification for function Frama_C_interval
-[eva] nonlin.c:71:
- function Frama_C_interval: precondition 'order' got status valid.
-[eva] Done for function Frama_C_interval
-[eva:alarm] nonlin.c:72: Warning: division by zero. assert x ≢ 0;
[eva] Recording results for other
[eva] Done for function other
-[eva] computing for function split_alarm <- main.
- Called from nonlin.c:146.
-[eva:alarm] nonlin.c:76: Warning: non-finite float value. assert \is_finite(v);
-[eva:alarm] nonlin.c:77: Warning:
- non-finite double value.
- assert
- \is_finite(\div_double((double)1,
- \add_double(\mul_double((double)ff, (double)ff),
- (double)0.000000001)));
-[eva] Recording results for split_alarm
-[eva] Done for function split_alarm
-[eva] computing for function norm <- main.
- Called from nonlin.c:147.
-[eva:alarm] nonlin.c:81: Warning: non-finite float value. assert \is_finite(v);
-[eva:alarm] nonlin.c:82: Warning: non-finite float value. assert \is_finite(v);
-[eva] computing for function Frama_C_float_interval <- norm <- main.
- Called from nonlin.c:84.
-[eva] nonlin.c:84:
- function Frama_C_float_interval: precondition 'finite' got status valid.
-[eva] nonlin.c:84:
- function Frama_C_float_interval: precondition 'order' got status valid.
-[eva] Done for function Frama_C_float_interval
-[eva] computing for function Frama_C_float_interval <- norm <- main.
- Called from nonlin.c:85.
-[eva] nonlin.c:85:
- function Frama_C_float_interval: precondition 'finite' got status valid.
-[eva] nonlin.c:85:
- function Frama_C_float_interval: precondition 'order' got status valid.
-[eva] Done for function Frama_C_float_interval
-[eva:alarm] nonlin.c:92: Warning:
- non-finite float value. assert \is_finite(\mul_float(v1, v1));
-[eva:alarm] nonlin.c:92: Warning:
- non-finite float value. assert \is_finite(\mul_float(v2, v2));
-[eva:alarm] nonlin.c:92: Warning:
- non-finite float value.
- assert \is_finite(\add_float(\mul_float(v1, v1), \mul_float(v2, v2)));
-[eva] Recording results for norm
-[eva] Done for function norm
-[eva] computing for function garbled <- main.
- Called from nonlin.c:148.
-[eva:alarm] nonlin.c:98: Warning:
- pointer downcast. assert (unsigned int)(&x_0) ≤ 2147483647;
-[eva:alarm] nonlin.c:98: Warning:
- pointer downcast. assert (unsigned int)(&x_0 + (int)(&x_0)) ≤ 2147483647;
-[eva:alarm] nonlin.c:98: Warning:
- non-finite float value.
- assert \is_finite((float)((int)(&x_0 + (int)(&x_0))));
-[eva] nonlin.c:98:
- Assigning imprecise value to a_0.
- The imprecision originates from Arithmetic {nonlin.c:98}
-[eva:alarm] nonlin.c:99: Warning:
- non-finite float value. assert \is_finite(a_0);
-[eva:alarm] nonlin.c:99: Warning:
- non-finite float value. assert \is_finite(\add_float(a_0, a_0));
-[eva] nonlin.c:99:
- Assigning imprecise value to f.
- The imprecision originates from Arithmetic
-[eva] Recording results for garbled
-[eva] Done for function garbled
-[eva] computing for function around_zeros <- main.
- Called from nonlin.c:149.
-[eva] computing for function Frama_C_float_interval <- around_zeros <- main.
- Called from nonlin.c:108.
-[eva] nonlin.c:108:
- function Frama_C_float_interval: precondition 'finite' got status valid.
-[eva] nonlin.c:108:
- function Frama_C_float_interval: precondition 'order' got status valid.
-[eva] Done for function Frama_C_float_interval
-[eva:alarm] nonlin.c:113: Warning:
- non-finite float value.
- assert
- \is_finite(\div_float(f1, \sub_float(\sub_float(\add_float(f, f), f), f1)));
-[eva] Recording results for around_zeros
-[eva] Done for function around_zeros
-[eva] computing for function subdivide_strategy <- main.
- Called from nonlin.c:150.
-[eva] computing for function Frama_C_float_interval <- subdivide_strategy <- main.
- Called from nonlin.c:126.
-[eva] nonlin.c:126:
- function Frama_C_float_interval: precondition 'finite' got status valid.
-[eva] nonlin.c:126:
- function Frama_C_float_interval: precondition 'order' got status valid.
-[eva] Done for function Frama_C_float_interval
-[eva:alarm] nonlin.c:131: Warning:
- non-finite float value. assert \is_finite(nondet);
-[eva:alarm] nonlin.c:135: Warning:
- non-finite float value.
- assert \is_finite(\mul_float(\sub_float(x_0, d_0), \sub_float(x_0, d_0)));
-[eva] computing for function Frama_C_float_interval <- subdivide_strategy <- main.
- Called from nonlin.c:136.
-[eva] nonlin.c:136:
- function Frama_C_float_interval: precondition 'finite' got status valid.
-[eva] nonlin.c:136:
- function Frama_C_float_interval: precondition 'order' got status valid.
-[eva] Done for function Frama_C_float_interval
-[eva] Recording results for subdivide_strategy
-[eva] Done for function subdivide_strategy
[eva] Recording results for main
[eva] done for function main
+[eva] nonlin.c:52: assertion 'Eva,mem_access' got final status invalid.
[eva] ====== VALUES COMPUTED ======
[eva:final-states] Values at end of function access_bits:
- rbits1 ∈ {0; 1; 2}
- x0 ∈ [0..3271884800]
- __retres ∈ {0; 1}
-[eva:final-states] Values at end of function around_zeros:
- Frama_C_entropy_source ∈ [--..--]
- f1 ∈ {0x1.0000000000000p-149}
- f ∈ [-0x0.0000000000000p0 .. 0x1.0000000000000p-149]
- res ∈ [-0x1.fffffe0000000p127 .. 0x1.fffffe0000000p127]
-[eva:final-states] Values at end of function garbled:
- a_0 ∈ {{ garbled mix of &{x_0} (origin: Arithmetic {nonlin.c:98}) }}
- f ∈ {{ garbled mix of &{x_0} (origin: Arithmetic) }}
+ NON TERMINATING FUNCTION
[eva:final-states] Values at end of function nonlin_f:
Frama_C_entropy_source ∈ [--..--]
a ∈ [0x1.4000000000000p2 .. 0x1.c000000000000p2]
@@ -308,53 +197,7 @@
r1 ∈ [0x1.4000000000000p2 .. 0x1.2000000000000p3]
r2 ∈ [0x1.4000000000000p2 .. 0x1.c800000000000p2]
d ∈ [0x1.4000000000000p2 .. 0x1.c000000000000p2]
-[eva:final-states] Values at end of function norm:
- Frama_C_entropy_source ∈ [--..--]
- v1 ∈ [-0x1.0f0cf00000000p73 .. 0x1.bc16d60000000p59]
- v2 ∈ [-0x1.0f0cf00000000p73 .. 0x1.bc16d60000000p59]
- square ∈ [-0x1.fffffc0000020p256 .. 0x1.fffffc0000020p256]
- square2 ∈ [-0x1.fffffe0000000p127 .. 0x1.fffffe0000000p127]
[eva:final-states] Values at end of function other:
- Frama_C_entropy_source ∈ [--..--]
- i ∈ [-0x1.0a00000000000p7 .. 0x1.1c00000000000p7]
- s ∈ [-0x1.0a00000000000p7 .. 0x1.1c00000000000p7]
- zf ∈ [-0x1.1300000000000p8 .. 0x1.1300000000000p8]
- s2 ∈ [-0x1.0a00000000000p8 .. 0x1.1c00000000000p8]
- sq ∈ [-0x1.2718000000000p14 .. 0x1.3b10000000000p14]
- h ∈ [-0x1.38d8000000000p14 .. 0x1.2950000000000p14]
- r ∈ [2..11]
- x ∈ [1..42]
- y ∈ [0..42]
- z ∈ [-2750000..2750000]
- rbits1 ∈ {0; 1; 2}
- rbits2 ∈ {0; 1}
-[eva:final-states] Values at end of function split_alarm:
- ff ∈ [-0x1.fffffe0000000p127 .. 0x1.fffffe0000000p127]
- d_0 ∈ [-0x1.fffffffffffffp1023 .. 0x1.fffffffffffffp1023]
-[eva:final-states] Values at end of function subdivide_strategy:
- Frama_C_entropy_source ∈ [--..--]
- x_0 ∈ [-0x1.3880000000000p15 .. 0x1.3880000000000p15]
- d_0 ∈ {0x1.3880000000000p13}
- square1 ∈ [-0x1.4000000000000p3 .. 0x1.3880000000000p13]
- square2 ∈ [-0x1.fffffe0000000p127 .. 0x1.fffffe0000000p127]
- square3 ∈ [-0x1.65a0bc0000000p30 .. 0x1.2a05f20000000p31]
+ NON TERMINATING FUNCTION
[eva:final-states] Values at end of function main:
- Frama_C_entropy_source ∈ [--..--]
- a ∈ [0x1.4000000000000p2 .. 0x1.c000000000000p2]
- b ∈ [-0x0.0000000000000p0 .. 0x1.0000000000000p0]
- c ∈ {0x1.c000000000000p2}
- r1 ∈ [0x1.4000000000000p2 .. 0x1.2000000000000p3]
- r2 ∈ [0x1.4000000000000p2 .. 0x1.c800000000000p2]
- d ∈ [0x1.4000000000000p2 .. 0x1.c000000000000p2]
- i ∈ [-0x1.0a00000000000p7 .. 0x1.1c00000000000p7]
- s ∈ [-0x1.0a00000000000p7 .. 0x1.1c00000000000p7]
- zf ∈ [-0x1.1300000000000p8 .. 0x1.1300000000000p8]
- s2 ∈ [-0x1.0a00000000000p8 .. 0x1.1c00000000000p8]
- sq ∈ [-0x1.2718000000000p14 .. 0x1.3b10000000000p14]
- h ∈ [-0x1.38d8000000000p14 .. 0x1.2950000000000p14]
- r ∈ [2..11]
- x ∈ [1..42]
- y ∈ [0..42]
- z ∈ [-2750000..2750000]
- rbits1 ∈ {0; 1; 2}
- rbits2 ∈ {0; 1}
+ NON TERMINATING FUNCTION
diff --git a/tests/float/oracle/nonlin.4.res.oracle b/tests/float/oracle/nonlin.4.res.oracle
index 91a10acb728..e3b325201b3 100644
--- a/tests/float/oracle/nonlin.4.res.oracle
+++ b/tests/float/oracle/nonlin.4.res.oracle
@@ -190,143 +190,18 @@
[eva:nonlin] nonlin.c:68: subdividing on s
[eva] computing for function access_bits <- other <- main.
Called from nonlin.c:69.
+[eva:alarm] nonlin.c:52: Warning:
+ out of bounds read. assert \valid_read((unsigned long *)(&X));
[eva] Recording results for access_bits
[eva] Done for function access_bits
-[eva] computing for function Frama_C_interval <- other <- main.
- Called from nonlin.c:71.
-[eva] using specification for function Frama_C_interval
-[eva] nonlin.c:71:
- function Frama_C_interval: precondition 'order' got status valid.
-[eva] Done for function Frama_C_interval
-[eva:nonlin] nonlin.c:72: non-linear '(1 / x) * x', lv 'x'
-[eva:nonlin] nonlin.c:72: subdividing on x
-[eva:alarm] nonlin.c:72: Warning: division by zero. assert x ≢ 0;
[eva] Recording results for other
[eva] Done for function other
-[eva] computing for function split_alarm <- main.
- Called from nonlin.c:146.
-[eva:alarm] nonlin.c:76: Warning: non-finite float value. assert \is_finite(v);
-[eva:nonlin] nonlin.c:77: non-linear '(double)ff * (double)ff', lv 'ff'
-[eva:nonlin] nonlin.c:77: subdividing on ff
-[eva] Recording results for split_alarm
-[eva] Done for function split_alarm
-[eva] computing for function norm <- main.
- Called from nonlin.c:147.
-[eva:alarm] nonlin.c:81: Warning: non-finite float value. assert \is_finite(v);
-[eva:alarm] nonlin.c:82: Warning: non-finite float value. assert \is_finite(v);
-[eva:nonlin] nonlin.c:83: non-linear '(double)v1 * (double)v1', lv 'v1'
-[eva:nonlin] nonlin.c:83: non-linear '(double)v2 * (double)v2', lv 'v2'
-[eva:nonlin] nonlin.c:83: subdividing on v1
-[eva:nonlin] nonlin.c:83: subdividing on v2
-[eva] computing for function Frama_C_float_interval <- norm <- main.
- Called from nonlin.c:84.
-[eva] nonlin.c:84:
- function Frama_C_float_interval: precondition 'finite' got status valid.
-[eva] nonlin.c:84:
- function Frama_C_float_interval: precondition 'order' got status valid.
-[eva] Done for function Frama_C_float_interval
-[eva] computing for function Frama_C_float_interval <- norm <- main.
- Called from nonlin.c:85.
-[eva] nonlin.c:85:
- function Frama_C_float_interval: precondition 'finite' got status valid.
-[eva] nonlin.c:85:
- function Frama_C_float_interval: precondition 'order' got status valid.
-[eva] Done for function Frama_C_float_interval
-[eva:nonlin] nonlin.c:92: non-linear 'v1 * v1', lv 'v1'
-[eva:nonlin] nonlin.c:92: non-linear 'v2 * v2', lv 'v2'
-[eva:nonlin] nonlin.c:92: subdividing on v1
-[eva:nonlin] nonlin.c:92: subdividing on v2
-[eva:alarm] nonlin.c:92: Warning:
- non-finite float value. assert \is_finite(\mul_float(v1, v1));
-[eva:alarm] nonlin.c:92: Warning:
- non-finite float value. assert \is_finite(\mul_float(v2, v2));
-[eva:alarm] nonlin.c:92: Warning:
- non-finite float value.
- assert \is_finite(\add_float(\mul_float(v1, v1), \mul_float(v2, v2)));
-[eva] Recording results for norm
-[eva] Done for function norm
-[eva] computing for function garbled <- main.
- Called from nonlin.c:148.
-[eva:alarm] nonlin.c:98: Warning:
- pointer downcast. assert (unsigned int)(&x_0) ≤ 2147483647;
-[eva:alarm] nonlin.c:98: Warning:
- pointer downcast. assert (unsigned int)(&x_0 + (int)(&x_0)) ≤ 2147483647;
-[eva:alarm] nonlin.c:98: Warning:
- non-finite float value.
- assert \is_finite((float)((int)(&x_0 + (int)(&x_0))));
-[eva] nonlin.c:98:
- Assigning imprecise value to a_0.
- The imprecision originates from Arithmetic {nonlin.c:98}
-[eva:alarm] nonlin.c:99: Warning:
- non-finite float value. assert \is_finite(a_0);
-[eva:alarm] nonlin.c:99: Warning:
- non-finite float value. assert \is_finite(\add_float(a_0, a_0));
-[eva] nonlin.c:99:
- Assigning imprecise value to f.
- The imprecision originates from Arithmetic
-[eva] Recording results for garbled
-[eva] Done for function garbled
-[eva] computing for function around_zeros <- main.
- Called from nonlin.c:149.
-[eva] computing for function Frama_C_float_interval <- around_zeros <- main.
- Called from nonlin.c:108.
-[eva] nonlin.c:108:
- function Frama_C_float_interval: precondition 'finite' got status valid.
-[eva] nonlin.c:108:
- function Frama_C_float_interval: precondition 'order' got status valid.
-[eva] Done for function Frama_C_float_interval
-[eva:nonlin] nonlin.c:113: non-linear '(f + f) - f', lv 'f'
-[eva:nonlin] nonlin.c:113: non-linear 'f1 / (((f + f) - f) - f1)', lv 'f1'
-[eva:nonlin] nonlin.c:113: subdividing on f
-[eva:alarm] nonlin.c:113: Warning:
- non-finite float value.
- assert
- \is_finite(\div_float(f1, \sub_float(\sub_float(\add_float(f, f), f), f1)));
-[eva] Recording results for around_zeros
-[eva] Done for function around_zeros
-[eva] computing for function subdivide_strategy <- main.
- Called from nonlin.c:150.
-[eva] computing for function Frama_C_float_interval <- subdivide_strategy <- main.
- Called from nonlin.c:126.
-[eva] nonlin.c:126:
- function Frama_C_float_interval: precondition 'finite' got status valid.
-[eva] nonlin.c:126:
- function Frama_C_float_interval: precondition 'order' got status valid.
-[eva] Done for function Frama_C_float_interval
-[eva:nonlin] nonlin.c:130: non-linear 'x_0 * x_0', lv 'x_0'
-[eva:nonlin] nonlin.c:130: subdividing on x_0
-[eva:alarm] nonlin.c:131: Warning:
- non-finite float value. assert \is_finite(nondet);
-[eva:nonlin] nonlin.c:135: non-linear '(x_0 - d_0) * (x_0 - d_0)', lv 'd_0, x_0'
-[eva:nonlin] nonlin.c:135: subdividing on x_0
-[eva:alarm] nonlin.c:135: Warning:
- non-finite float value.
- assert \is_finite(\mul_float(\sub_float(x_0, d_0), \sub_float(x_0, d_0)));
-[eva] computing for function Frama_C_float_interval <- subdivide_strategy <- main.
- Called from nonlin.c:136.
-[eva] nonlin.c:136:
- function Frama_C_float_interval: precondition 'finite' got status valid.
-[eva] nonlin.c:136:
- function Frama_C_float_interval: precondition 'order' got status valid.
-[eva] Done for function Frama_C_float_interval
-[eva:nonlin] nonlin.c:140: subdividing on x_0
-[eva] Recording results for subdivide_strategy
-[eva] Done for function subdivide_strategy
[eva] Recording results for main
[eva] done for function main
+[eva] nonlin.c:52: assertion 'Eva,mem_access' got final status invalid.
[eva] ====== VALUES COMPUTED ======
[eva:final-states] Values at end of function access_bits:
- rbits1 ∈ {0; 1; 2}
- x0 ∈ [0..3225911288]
- __retres ∈ {0; 1}
-[eva:final-states] Values at end of function around_zeros:
- Frama_C_entropy_source ∈ [--..--]
- f1 ∈ {0x1.0000000000000p-149}
- f ∈ [-0x0.0000000000000p0 .. 0x0.0000000000000p0]
- res ∈ {-0x1.0000000000000p0}
-[eva:final-states] Values at end of function garbled:
- a_0 ∈ {{ garbled mix of &{x_0} (origin: Arithmetic {nonlin.c:98}) }}
- f ∈ {{ garbled mix of &{x_0} (origin: Arithmetic) }}
+ NON TERMINATING FUNCTION
[eva:final-states] Values at end of function nonlin_f:
Frama_C_entropy_source ∈ [--..--]
a ∈ [0x1.4000000000000p2 .. 0x1.c000000000000p2]
@@ -335,53 +210,7 @@
r1 ∈ [0x1.4000000000000p2 .. 0x1.cffffe0000000p2]
r2 ∈ [0x1.4000000000000p2 .. 0x1.c0fffe0000000p2]
d ∈ [0x1.4000000000000p2 .. 0x1.c000000000000p2]
-[eva:final-states] Values at end of function norm:
- Frama_C_entropy_source ∈ [--..--]
- v1 ∈ [-0x1.0f0cde0000000p64 .. 0x1.bc16d60000000p59]
- v2 ∈ [-0x1.0f0cf00000000p73 .. 0x1.bc16d60000000p59]
- square ∈ [0x0.0000000000000p0 .. 0x1.fffffc0000020p256]
- square2 ∈ [0x0.0000000000000p0 .. 0x1.fffffe0000000p127]
[eva:final-states] Values at end of function other:
- Frama_C_entropy_source ∈ [--..--]
- i ∈ [-0x1.8efff00000000p1 .. 0x1.8680000000000p1]
- s ∈ [-0x1.0a00000000000p7 .. 0x1.1c00000000000p7]
- zf ∈ [-0x1.1bfff80000000p4 .. 0x1.1bfff80000000p4]
- s2 ∈ [-0x1.0a00000000000p8 .. 0x1.1c00000000000p8]
- sq ∈ [0x0.0000000000000p0 .. 0x1.3b10000000000p14]
- h ∈ [-0x1.38d8000000000p14 .. 0x1.f9dffc0000000p-2]
- r ∈ {4; 5; 6; 7; 8; 9; 10; 11}
- x ∈ [1..42]
- y ∈ {0; 1}
- z ∈ [-177499..177499]
- rbits1 ∈ {0; 1; 2}
- rbits2 ∈ {0; 1}
-[eva:final-states] Values at end of function split_alarm:
- ff ∈ [-0x1.fffffe0000000p127 .. 0x1.fffffe0000000p127]
- d_0 ∈ [0x1.0000020000030p-256 .. 0x1.dcd64ffffffffp29]
-[eva:final-states] Values at end of function subdivide_strategy:
- Frama_C_entropy_source ∈ [--..--]
- x_0 ∈ [-0x1.3880000000000p15 .. 0x1.3880000000000p15]
- d_0 ∈ {0x1.3880000000000p13}
- square1 ∈ [0x0.0000000000000p0 .. 0x1.3880000000000p13]
- square2 ∈ [-0x1.fffffe0000000p105 .. 0x1.fffffe0000000p127]
- square3 ∈ [-0x0.0000000000000p0 .. 0x1.2a05f20000000p31]
+ NON TERMINATING FUNCTION
[eva:final-states] Values at end of function main:
- Frama_C_entropy_source ∈ [--..--]
- a ∈ [0x1.4000000000000p2 .. 0x1.c000000000000p2]
- b ∈ [-0x0.0000000000000p0 .. 0x1.0000000000000p0]
- c ∈ {0x1.c000000000000p2}
- r1 ∈ [0x1.4000000000000p2 .. 0x1.cffffe0000000p2]
- r2 ∈ [0x1.4000000000000p2 .. 0x1.c0fffe0000000p2]
- d ∈ [0x1.4000000000000p2 .. 0x1.c000000000000p2]
- i ∈ [-0x1.8efff00000000p1 .. 0x1.8680000000000p1]
- s ∈ [-0x1.0a00000000000p7 .. 0x1.1c00000000000p7]
- zf ∈ [-0x1.1bfff80000000p4 .. 0x1.1bfff80000000p4]
- s2 ∈ [-0x1.0a00000000000p8 .. 0x1.1c00000000000p8]
- sq ∈ [0x0.0000000000000p0 .. 0x1.3b10000000000p14]
- h ∈ [-0x1.38d8000000000p14 .. 0x1.f9dffc0000000p-2]
- r ∈ {4; 5; 6; 7; 8; 9; 10; 11}
- x ∈ [1..42]
- y ∈ {0; 1}
- z ∈ [-177499..177499]
- rbits1 ∈ {0; 1; 2}
- rbits2 ∈ {0; 1}
+ NON TERMINATING FUNCTION
diff --git a/tests/float/oracle/nonlin.5.res.oracle b/tests/float/oracle/nonlin.5.res.oracle
index 3fecb5cc6f2..e3b325201b3 100644
--- a/tests/float/oracle/nonlin.5.res.oracle
+++ b/tests/float/oracle/nonlin.5.res.oracle
@@ -190,117 +190,18 @@
[eva:nonlin] nonlin.c:68: subdividing on s
[eva] computing for function access_bits <- other <- main.
Called from nonlin.c:69.
+[eva:alarm] nonlin.c:52: Warning:
+ out of bounds read. assert \valid_read((unsigned long *)(&X));
[eva] Recording results for access_bits
[eva] Done for function access_bits
-[eva] computing for function Frama_C_interval <- other <- main.
- Called from nonlin.c:71.
-[eva] using specification for function Frama_C_interval
-[eva] nonlin.c:71:
- function Frama_C_interval: precondition 'order' got status valid.
-[eva] Done for function Frama_C_interval
-[eva:nonlin] nonlin.c:72: non-linear '(1 / x) * x', lv 'x'
-[eva:nonlin] nonlin.c:72: subdividing on x
-[eva:alarm] nonlin.c:72: Warning: division by zero. assert x ≢ 0;
[eva] Recording results for other
[eva] Done for function other
-[eva] computing for function split_alarm <- main.
- Called from nonlin.c:146.
-[eva:nonlin] nonlin.c:77: non-linear '(double)ff * (double)ff', lv 'ff'
-[eva:nonlin] nonlin.c:77: subdividing on ff
-[eva] Recording results for split_alarm
-[eva] Done for function split_alarm
-[eva] computing for function norm <- main.
- Called from nonlin.c:147.
-[eva:nonlin] nonlin.c:83: non-linear '(double)v1 * (double)v1', lv 'v1'
-[eva:nonlin] nonlin.c:83: non-linear '(double)v2 * (double)v2', lv 'v2'
-[eva:nonlin] nonlin.c:83: subdividing on v1
-[eva:nonlin] nonlin.c:83: subdividing on v2
-[eva] computing for function Frama_C_float_interval <- norm <- main.
- Called from nonlin.c:84.
-[eva] nonlin.c:84:
- function Frama_C_float_interval: precondition 'finite' got status valid.
-[eva] nonlin.c:84:
- function Frama_C_float_interval: precondition 'order' got status valid.
-[eva] Done for function Frama_C_float_interval
-[eva] computing for function Frama_C_float_interval <- norm <- main.
- Called from nonlin.c:85.
-[eva] nonlin.c:85:
- function Frama_C_float_interval: precondition 'finite' got status valid.
-[eva] nonlin.c:85:
- function Frama_C_float_interval: precondition 'order' got status valid.
-[eva] Done for function Frama_C_float_interval
-[eva:nonlin] nonlin.c:92: non-linear 'v1 * v1', lv 'v1'
-[eva:nonlin] nonlin.c:92: non-linear 'v2 * v2', lv 'v2'
-[eva:nonlin] nonlin.c:92: subdividing on v1
-[eva:nonlin] nonlin.c:92: subdividing on v2
-[eva] Recording results for norm
-[eva] Done for function norm
-[eva] computing for function garbled <- main.
- Called from nonlin.c:148.
-[eva:alarm] nonlin.c:98: Warning:
- pointer downcast. assert (unsigned int)(&x_0) ≤ 2147483647;
-[eva:alarm] nonlin.c:98: Warning:
- pointer downcast. assert (unsigned int)(&x_0 + (int)(&x_0)) ≤ 2147483647;
-[eva] nonlin.c:98:
- Assigning imprecise value to a_0.
- The imprecision originates from Arithmetic {nonlin.c:98}
-[eva] nonlin.c:99:
- Assigning imprecise value to f.
- The imprecision originates from Arithmetic
-[eva] Recording results for garbled
-[eva] Done for function garbled
-[eva] computing for function around_zeros <- main.
- Called from nonlin.c:149.
-[eva] computing for function Frama_C_float_interval <- around_zeros <- main.
- Called from nonlin.c:108.
-[eva] nonlin.c:108:
- function Frama_C_float_interval: precondition 'finite' got status valid.
-[eva] nonlin.c:108:
- function Frama_C_float_interval: precondition 'order' got status valid.
-[eva] Done for function Frama_C_float_interval
-[eva:nonlin] nonlin.c:113: non-linear '(f + f) - f', lv 'f'
-[eva:nonlin] nonlin.c:113: non-linear 'f1 / (((f + f) - f) - f1)', lv 'f1'
-[eva:nonlin] nonlin.c:113: subdividing on f
-[eva] Recording results for around_zeros
-[eva] Done for function around_zeros
-[eva] computing for function subdivide_strategy <- main.
- Called from nonlin.c:150.
-[eva] computing for function Frama_C_float_interval <- subdivide_strategy <- main.
- Called from nonlin.c:126.
-[eva] nonlin.c:126:
- function Frama_C_float_interval: precondition 'finite' got status valid.
-[eva] nonlin.c:126:
- function Frama_C_float_interval: precondition 'order' got status valid.
-[eva] Done for function Frama_C_float_interval
-[eva:nonlin] nonlin.c:130: non-linear 'x_0 * x_0', lv 'x_0'
-[eva:nonlin] nonlin.c:130: subdividing on x_0
-[eva:nonlin] nonlin.c:135: non-linear '(x_0 - d_0) * (x_0 - d_0)', lv 'd_0, x_0'
-[eva:nonlin] nonlin.c:135: subdividing on x_0
-[eva] computing for function Frama_C_float_interval <- subdivide_strategy <- main.
- Called from nonlin.c:136.
-[eva] nonlin.c:136:
- function Frama_C_float_interval: precondition 'finite' got status valid.
-[eva] nonlin.c:136:
- function Frama_C_float_interval: precondition 'order' got status valid.
-[eva] Done for function Frama_C_float_interval
-[eva:nonlin] nonlin.c:140: subdividing on x_0
-[eva] Recording results for subdivide_strategy
-[eva] Done for function subdivide_strategy
[eva] Recording results for main
[eva] done for function main
+[eva] nonlin.c:52: assertion 'Eva,mem_access' got final status invalid.
[eva] ====== VALUES COMPUTED ======
[eva:final-states] Values at end of function access_bits:
- rbits1 ∈ {0; 1; 2}
- x0 ∈ [0..3225911288]
- __retres ∈ {0; 1}
-[eva:final-states] Values at end of function around_zeros:
- Frama_C_entropy_source ∈ [--..--]
- f1 ∈ {0x1.0000000000000p-149}
- f ∈ [-0x0.0000000000000p0 .. 0x1.0000000000000p-149]
- res ∈ [-0x1.0000000000000p0 .. inf]
-[eva:final-states] Values at end of function garbled:
- a_0 ∈ {{ garbled mix of &{x_0} (origin: Arithmetic {nonlin.c:98}) }}
- f ∈ {{ garbled mix of &{x_0} (origin: Arithmetic) }}
+ NON TERMINATING FUNCTION
[eva:final-states] Values at end of function nonlin_f:
Frama_C_entropy_source ∈ [--..--]
a ∈ [0x1.4000000000000p2 .. 0x1.c000000000000p2]
@@ -309,53 +210,7 @@
r1 ∈ [0x1.4000000000000p2 .. 0x1.cffffe0000000p2]
r2 ∈ [0x1.4000000000000p2 .. 0x1.c0fffe0000000p2]
d ∈ [0x1.4000000000000p2 .. 0x1.c000000000000p2]
-[eva:final-states] Values at end of function norm:
- Frama_C_entropy_source ∈ [--..--]
- v1 ∈ [-0x1.0f0cf00000000p73 .. 0x1.bc16d60000000p59]
- v2 ∈ [-0x1.0f0cf00000000p73 .. 0x1.bc16d60000000p59]
- square ∈ [0x0.0000000000000p0 .. inf] ∪ {NaN}
- square2 ∈ [0x0.0000000000000p0 .. inf]
[eva:final-states] Values at end of function other:
- Frama_C_entropy_source ∈ [--..--]
- i ∈ [-0x1.8efff00000000p1 .. 0x1.8680000000000p1]
- s ∈ [-0x1.0a00000000000p7 .. 0x1.1c00000000000p7]
- zf ∈ [-0x1.1bfff80000000p4 .. 0x1.1bfff80000000p4]
- s2 ∈ [-0x1.0a00000000000p8 .. 0x1.1c00000000000p8]
- sq ∈ [0x0.0000000000000p0 .. 0x1.3b10000000000p14]
- h ∈ [-0x1.38d8000000000p14 .. 0x1.f9dffc0000000p-2]
- r ∈ {4; 5; 6; 7; 8; 9; 10; 11}
- x ∈ [1..42]
- y ∈ {0; 1}
- z ∈ [-177499..177499]
- rbits1 ∈ {0; 1; 2}
- rbits2 ∈ {0; 1}
-[eva:final-states] Values at end of function split_alarm:
- ff ∈ [-inf .. inf] ∪ {NaN}
- d_0 ∈ [0x0.0000000000000p0 .. 0x1.dcd64ffffffffp29] ∪ {NaN}
-[eva:final-states] Values at end of function subdivide_strategy:
- Frama_C_entropy_source ∈ [--..--]
- x_0 ∈ [-0x1.3880000000000p15 .. 0x1.3880000000000p15]
- d_0 ∈ {0x1.3880000000000p13}
- square1 ∈ [0x0.0000000000000p0 .. 0x1.3880000000000p13]
- square2 ∈ [-0x1.fffffe0000000p118 .. inf] ∪ {NaN}
- square3 ∈ [-0x0.0000000000000p0 .. 0x1.2a05f20000000p31]
+ NON TERMINATING FUNCTION
[eva:final-states] Values at end of function main:
- Frama_C_entropy_source ∈ [--..--]
- a ∈ [0x1.4000000000000p2 .. 0x1.c000000000000p2]
- b ∈ [-0x0.0000000000000p0 .. 0x1.0000000000000p0]
- c ∈ {0x1.c000000000000p2}
- r1 ∈ [0x1.4000000000000p2 .. 0x1.cffffe0000000p2]
- r2 ∈ [0x1.4000000000000p2 .. 0x1.c0fffe0000000p2]
- d ∈ [0x1.4000000000000p2 .. 0x1.c000000000000p2]
- i ∈ [-0x1.8efff00000000p1 .. 0x1.8680000000000p1]
- s ∈ [-0x1.0a00000000000p7 .. 0x1.1c00000000000p7]
- zf ∈ [-0x1.1bfff80000000p4 .. 0x1.1bfff80000000p4]
- s2 ∈ [-0x1.0a00000000000p8 .. 0x1.1c00000000000p8]
- sq ∈ [0x0.0000000000000p0 .. 0x1.3b10000000000p14]
- h ∈ [-0x1.38d8000000000p14 .. 0x1.f9dffc0000000p-2]
- r ∈ {4; 5; 6; 7; 8; 9; 10; 11}
- x ∈ [1..42]
- y ∈ {0; 1}
- z ∈ [-177499..177499]
- rbits1 ∈ {0; 1; 2}
- rbits2 ∈ {0; 1}
+ NON TERMINATING FUNCTION
diff --git a/tests/idct/oracle/ieee_1180_1990.res.oracle b/tests/idct/oracle/ieee_1180_1990.res.oracle
index 085959786a7..3d4e7cf9377 100644
--- a/tests/idct/oracle/ieee_1180_1990.res.oracle
+++ b/tests/idct/oracle/ieee_1180_1990.res.oracle
@@ -3364,7 +3364,7 @@
[ Extern ] Assigns nothing
assigns \nothing;
Unverifiable but considered Valid.
-[ Extern ] Froms (file share/libc/math.h, line 706)
+[ Extern ] Froms (file FRAMAC_SHARE/libc/math.h, line 706)
assigns \result \from f;
Unverifiable but considered Valid.
[ Valid ] Default behavior
@@ -3390,7 +3390,7 @@
[ Extern ] Assigns nothing
assigns \nothing;
Unverifiable but considered Valid.
-[ Extern ] Froms (file share/libc/math.h, line 719)
+[ Extern ] Froms (file FRAMAC_SHARE/libc/math.h, line 719)
assigns \result \from d;
Unverifiable but considered Valid.
[ Valid ] Default behavior
@@ -3413,13 +3413,7 @@
[ Extern ] Assigns nothing
assigns \nothing;
Unverifiable but considered Valid.
-<<<<<<< HEAD
-[ Extern ] Froms (file FRAMAC_SHARE/libc/math.h, line 724)
-||||||| ac7807782d
-[ Extern ] Froms (file share/libc/math.h, line 724)
-=======
-[ Extern ] Froms (file share/libc/math.h, line 746)
->>>>>>> origin/master
+[ Extern ] Froms (file FRAMAC_SHARE/libc/math.h, line 746)
assigns \result \from \nothing;
Unverifiable but considered Valid.
[ Valid ] Default behavior
@@ -3436,13 +3430,7 @@
[ Extern ] Assigns nothing
assigns \nothing;
Unverifiable but considered Valid.
-<<<<<<< HEAD
-[ Extern ] Froms (file FRAMAC_SHARE/libc/math.h, line 730)
-||||||| ac7807782d
-[ Extern ] Froms (file share/libc/math.h, line 730)
-=======
-[ Extern ] Froms (file share/libc/math.h, line 752)
->>>>>>> origin/master
+[ Extern ] Froms (file FRAMAC_SHARE/libc/math.h, line 752)
assigns \result \from \nothing;
Unverifiable but considered Valid.
[ Valid ] Default behavior
diff --git a/tests/libc/fc_libc.c b/tests/libc/fc_libc.c
index 6ac81ce2fed..cf60494482a 100644
--- a/tests/libc/fc_libc.c
+++ b/tests/libc/fc_libc.c
@@ -1,5 +1,4 @@
/* run.config*
-<<<<<<< HEAD
CMXS: check_libc_naming_conventions
CMXS: check_const
CMXS: check_parsing_individual_headers
@@ -13,31 +12,6 @@
OPT: -load-module %{dep:check_compliance.cmxs} -kernel-msg-key printer:attrs
DEPS: ./check_full_libc.sh
CMD: ./check_full_libc.sh
-||||||| ac7807782d
- EXECNOW: make -s @PTEST_DIR@/check_libc_naming_conventions.cmxs
- EXECNOW: make -s @PTEST_DIR@/check_const.cmxs
- EXECNOW: make -s @PTEST_DIR@/check_parsing_individual_headers.cmxs
- EXECNOW: make -s @PTEST_DIR@/check_libc_anonymous_tags.cmxs
- EXECNOW: make -s @PTEST_DIR@/check_compliance.cmxs
- OPT: -load-module @PTEST_DIR@/check_libc_naming_conventions -print -cpp-extra-args='-nostdinc -Ishare/libc' -metrics -metrics-libc -load-module @PTEST_DIR@/check_const -load-module metrics -eva @EVA_CONFIG@ -then -lib-entry -no-print -metrics-no-libc
- OPT: -print -print-libc
- OPT: -load-module @PTEST_DIR@/check_parsing_individual_headers
- OPT: -load-module @PTEST_DIR@/check_libc_anonymous_tags
- OPT: -load-module @PTEST_DIR@/check_compliance -kernel-msg-key printer:attrs
- CMD: ./tests/libc/check_full_libc.sh
-=======
- EXECNOW: make -s @PTEST_DIR@/check_libc_naming_conventions.cmxs
- EXECNOW: make -s @PTEST_DIR@/check_const.cmxs
- EXECNOW: make -s @PTEST_DIR@/check_parsing_individual_headers.cmxs
- EXECNOW: make -s @PTEST_DIR@/check_libc_anonymous_tags.cmxs
- EXECNOW: make -s @PTEST_DIR@/check_compliance.cmxs
- OPT: -load-module @PTEST_DIR@/check_libc_naming_conventions -print -cpp-extra-args='-nostdinc -Ishare/libc' -metrics -metrics-libc -load-module @PTEST_DIR@/check_const -load-module metrics -eva @EVA_CONFIG@ -then -lib-entry -no-print -metrics-no-libc
- OPT: -print -print-libc -machdep x86_32
- OPT: -load-module @PTEST_DIR@/check_parsing_individual_headers
- OPT: -load-module @PTEST_DIR@/check_libc_anonymous_tags
- OPT: -load-module @PTEST_DIR@/check_compliance -kernel-msg-key printer:attrs
- CMD: ./tests/libc/check_full_libc.sh
->>>>>>> origin/master
OPT:
**/
#define __FC_REG_TEST
diff --git a/tests/libc/oracle/fc_libc.0.res.oracle b/tests/libc/oracle/fc_libc.0.res.oracle
index 901359259fb..4179172a4a5 100644
--- a/tests/libc/oracle/fc_libc.0.res.oracle
+++ b/tests/libc/oracle/fc_libc.0.res.oracle
@@ -1,12 +1,4 @@
-<<<<<<< HEAD
[kernel] Parsing fc_libc.c (with preprocessing)
-||||||| ac7807782d
-[kernel] Parsing tests/libc/fc_libc.c (with preprocessing)
-=======
-[kernel] Parsing tests/libc/fc_libc.c (with preprocessing)
-[kernel] share/libc/sys/socket.h:451: Warning:
- clause with '\initialized' must contain name 'initialization'
->>>>>>> origin/master
[eva] Analyzing a complete application starting at main
[eva] Computing initial state
[eva] Initial state computed
@@ -49,13 +41,7 @@
wcscpy (0 call); wcslen (2 calls); wcsncat (0 call); wcsncpy (0 call);
wmemcpy (0 call); wmemset (0 call);
-<<<<<<< HEAD
- Specified-only functions (414)
-||||||| ac7807782d
- Specified-only functions (411)
-=======
- Specified-only functions (413)
->>>>>>> origin/master
+ Specified-only functions (416)
==============================
FD_CLR (0 call); FD_ISSET (0 call); FD_SET (0 call); FD_ZERO (0 call);
Frama_C_abstract_cardinal (0 call); Frama_C_abstract_max (0 call);
@@ -208,16 +194,12 @@
Goto = 97
Assignment = 459
Exit point = 83
-<<<<<<< HEAD
- Function = 498
-||||||| ac7807782d
- Function = 495
-=======
- Function = 497
->>>>>>> origin/master
+ Function = 500
Function call = 93
Pointer dereferencing = 159
Cyclomatic complexity = 296
+[kernel] FRAMAC_SHARE/libc/sys/socket.h:451: Warning:
+ clause with '\initialized' must contain name 'initialization'
/* Generated by Frama-C */
#include "__fc_builtin.c"
#include "__fc_builtin.h"
diff --git a/tests/libc/oracle/fc_libc.4.res.oracle b/tests/libc/oracle/fc_libc.4.res.oracle
index e1704e664e9..3f2a38d68be 100644
--- a/tests/libc/oracle/fc_libc.4.res.oracle
+++ b/tests/libc/oracle/fc_libc.4.res.oracle
@@ -1,20 +1,6 @@
-<<<<<<< HEAD
[kernel] Parsing fc_libc.c (with preprocessing)
-[kernel] parsing c11_functions.json
-[kernel] parsing glibc_functions.json
-[kernel] parsing posix_identifiers.json
-[kernel] parsing nonstandard_identifiers.json
-||||||| ac7807782d
-[kernel] Parsing tests/libc/fc_libc.c (with preprocessing)
-[kernel] parsing c11_functions.json
-[kernel] parsing glibc_functions.json
-[kernel] parsing posix_identifiers.json
-[kernel] parsing nonstandard_identifiers.json
-=======
-[kernel] Parsing tests/libc/fc_libc.c (with preprocessing)
[kernel] Parsing c11_functions.json
[kernel] Parsing c11_headers.json
[kernel] Parsing glibc_functions.json
[kernel] Parsing posix_identifiers.json
[kernel] Parsing nonstandard_identifiers.json
->>>>>>> origin/master
diff --git a/tests/libc/oracle/inttypes_h2.res.oracle b/tests/libc/oracle/inttypes_h2.res.oracle
index 8b1cf43b64e..29080218bc9 100644
--- a/tests/libc/oracle/inttypes_h2.res.oracle
+++ b/tests/libc/oracle/inttypes_h2.res.oracle
@@ -26,35 +26,27 @@
[eva] inttypes_h2.c:22:
function imaxdiv: precondition 'no_overflow' got status valid.
[eva] Done for function imaxdiv
-<<<<<<< HEAD
[eva] inttypes_h2.c:23: assertion got status valid.
[eva] inttypes_h2.c:24: assertion got status valid.
-||||||| ac7807782d
-[eva] tests/libc/inttypes_h2.c:23: assertion got status valid.
-[eva] tests/libc/inttypes_h2.c:24: assertion got status valid.
-=======
-[eva] tests/libc/inttypes_h2.c:23: assertion got status valid.
-[eva] tests/libc/inttypes_h2.c:24: assertion got status valid.
[eva] computing for function imaxabs <- main.
- Called from tests/libc/inttypes_h2.c:26.
+ Called from inttypes_h2.c:26.
[eva] using specification for function imaxabs
-[eva] tests/libc/inttypes_h2.c:26:
+[eva] inttypes_h2.c:26:
function imaxabs: precondition 'abs_representable' got status valid.
[eva] Done for function imaxabs
-[eva] tests/libc/inttypes_h2.c:27: assertion got status valid.
+[eva] inttypes_h2.c:27: assertion got status valid.
[eva] computing for function imaxabs <- main.
- Called from tests/libc/inttypes_h2.c:28.
-[eva] tests/libc/inttypes_h2.c:28:
+ Called from inttypes_h2.c:28.
+[eva] inttypes_h2.c:28:
function imaxabs: precondition 'abs_representable' got status valid.
[eva] Done for function imaxabs
-[eva] tests/libc/inttypes_h2.c:29: assertion got status valid.
+[eva] inttypes_h2.c:29: assertion got status valid.
[eva] computing for function imaxabs <- main.
- Called from tests/libc/inttypes_h2.c:30.
-[eva] tests/libc/inttypes_h2.c:30:
+ Called from inttypes_h2.c:30.
+[eva] inttypes_h2.c:30:
function imaxabs: precondition 'abs_representable' got status valid.
[eva] Done for function imaxabs
-[eva] tests/libc/inttypes_h2.c:31: assertion got status valid.
->>>>>>> origin/master
+[eva] inttypes_h2.c:31: assertion got status valid.
[eva] Recording results for main
[eva] done for function main
[eva] ====== VALUES COMPUTED ======
diff --git a/tests/libc/oracle/math_h.res.oracle b/tests/libc/oracle/math_h.res.oracle
index e90addd6f9f..e6809f6bf5f 100644
--- a/tests/libc/oracle/math_h.res.oracle
+++ b/tests/libc/oracle/math_h.res.oracle
@@ -1,13 +1,5 @@
-<<<<<<< HEAD
[kernel] Parsing math_h.c (with preprocessing)
-[kernel:parser:decimal-float] math_h.c:5: Warning:
-||||||| ac7807782d
-[kernel] Parsing tests/libc/math_h.c (with preprocessing)
-[kernel:parser:decimal-float] tests/libc/math_h.c:5: Warning:
-=======
-[kernel] Parsing tests/libc/math_h.c (with preprocessing)
-[kernel:parser:decimal-float] tests/libc/math_h.c:6: Warning:
->>>>>>> origin/master
+[kernel:parser:decimal-float] math_h.c:6: Warning:
Floating-point constant 3.14159265358979323846264338327950288 is not represented exactly. Will use 0x1.921fb54442d18p1.
(warn-once: no further messages from category 'parser:decimal-float' will be emitted)
[eva] Analyzing a complete application starting at main
@@ -228,40 +220,40 @@
function fabsl: precondition 'finite_arg' got status unknown.
[eva] Done for function fabsl
[eva] computing for function __finite <- main.
- Called from tests/libc/math_h.c:54.
+ Called from math_h.c:54.
[eva] using specification for function __finite
[eva] Done for function __finite
-[eva] tests/libc/math_h.c:55: assertion got status valid.
+[eva] math_h.c:55: assertion got status valid.
[eva] computing for function __finite <- main.
- Called from tests/libc/math_h.c:56.
+ Called from math_h.c:56.
[eva] Done for function __finite
[eva] computing for function __finite <- main.
- Called from tests/libc/math_h.c:56.
+ Called from math_h.c:56.
[eva] Done for function __finite
-[eva] tests/libc/math_h.c:57: assertion got status valid.
+[eva] math_h.c:57: assertion got status valid.
[eva] computing for function __finitef <- main.
- Called from tests/libc/math_h.c:58.
+ Called from math_h.c:58.
[eva] using specification for function __finitef
[eva] Done for function __finitef
[eva] computing for function __finitef <- main.
- Called from tests/libc/math_h.c:58.
+ Called from math_h.c:58.
[eva] Done for function __finitef
-[eva] tests/libc/math_h.c:59: assertion got status valid.
+[eva] math_h.c:59: assertion got status valid.
[eva] computing for function __finite <- main.
- Called from tests/libc/math_h.c:60.
+ Called from math_h.c:60.
[eva] Done for function __finite
[eva] computing for function __finite <- main.
- Called from tests/libc/math_h.c:60.
+ Called from math_h.c:60.
[eva] Done for function __finite
-[eva] tests/libc/math_h.c:61: assertion got status valid.
+[eva] math_h.c:61: assertion got status valid.
[eva] computing for function __finitef <- main.
- Called from tests/libc/math_h.c:62.
+ Called from math_h.c:62.
[eva] Done for function __finitef
-[eva] tests/libc/math_h.c:63: assertion got status valid.
+[eva] math_h.c:63: assertion got status valid.
[eva] computing for function __finitef <- main.
- Called from tests/libc/math_h.c:64.
+ Called from math_h.c:64.
[eva] Done for function __finitef
-[eva] tests/libc/math_h.c:65: assertion got status valid.
+[eva] math_h.c:65: assertion got status valid.
[eva] Recording results for main
[eva] done for function main
[eva] ====== VALUES COMPUTED ======
diff --git a/tests/libc/oracle/socket_h.res.oracle b/tests/libc/oracle/socket_h.res.oracle
index 5b84d2f1e1e..1b50d5781ff 100644
--- a/tests/libc/oracle/socket_h.res.oracle
+++ b/tests/libc/oracle/socket_h.res.oracle
@@ -60,42 +60,42 @@
function getsockname: precondition 'valid_address' got status valid.
[eva] Done for function getsockname
[eva] computing for function sendto <- main.
- Called from tests/libc/socket_h.c:24.
+ Called from socket_h.c:24.
[eva] using specification for function sendto
-[eva] tests/libc/socket_h.c:24:
+[eva] socket_h.c:24:
function sendto: precondition 'available_sockfd' got status valid.
-[eva] tests/libc/socket_h.c:24:
+[eva] socket_h.c:24:
function sendto: precondition 'buf_len_ok' got status valid.
[eva] Done for function sendto
[eva] computing for function sendto <- main.
- Called from tests/libc/socket_h.c:27.
-[eva] tests/libc/socket_h.c:27:
+ Called from socket_h.c:27.
+[eva] socket_h.c:27:
function sendto: precondition 'available_sockfd' got status valid.
-[eva] tests/libc/socket_h.c:27:
+[eva] socket_h.c:27:
function sendto: precondition 'buf_len_ok' got status valid.
[eva] Done for function sendto
[eva] computing for function recvfrom <- main.
- Called from tests/libc/socket_h.c:31.
+ Called from socket_h.c:31.
[eva] using specification for function recvfrom
-[eva] tests/libc/socket_h.c:31:
+[eva] socket_h.c:31:
function recvfrom: precondition 'valid_sockfd' got status valid.
-[eva] tests/libc/socket_h.c:31:
+[eva] socket_h.c:31:
function recvfrom: precondition 'valid_buffer_length' got status valid.
-[eva] tests/libc/socket_h.c:31:
+[eva] socket_h.c:31:
function recvfrom: precondition 'valid_addrbuf_or_null' got status valid.
[eva] Done for function recvfrom
-[eva] tests/libc/socket_h.c:35: assertion got status valid.
+[eva] socket_h.c:35: assertion got status valid.
[eva] computing for function recvfrom <- main.
- Called from tests/libc/socket_h.c:37.
-[eva] tests/libc/socket_h.c:37:
+ Called from socket_h.c:37.
+[eva] socket_h.c:37:
function recvfrom: precondition 'valid_sockfd' got status valid.
-[eva] tests/libc/socket_h.c:37:
+[eva] socket_h.c:37:
function recvfrom: precondition 'valid_buffer_length' got status valid.
-[eva] tests/libc/socket_h.c:37:
+[eva] socket_h.c:37:
function recvfrom: precondition 'valid_addrbuf_or_null' got status valid.
-[eva:invalid-assigns] tests/libc/socket_h.c:37:
+[eva:invalid-assigns] socket_h.c:37:
Completely invalid destination for assigns clause *addrbuf_len. Ignoring.
-[eva:invalid-assigns] tests/libc/socket_h.c:37:
+[eva:invalid-assigns] socket_h.c:37:
Completely invalid destination
for assigns clause *((char *)addrbuf + (0 .. \old(*addrbuf_len) - 1)).
Ignoring.
diff --git a/tests/metrics/libc.c b/tests/metrics/libc.c
index 83556b3d9b4..a234eb919b9 100644
--- a/tests/metrics/libc.c
+++ b/tests/metrics/libc.c
@@ -2,7 +2,7 @@
STDOPT: #"-metrics-no-libc -metrics-eva-cover"
STDOPT: #"-metrics-libc -metrics-eva-cover"
LOG: libc.json
- STDOPT: #"-metrics-libc -metrics-output @PTEST_DIR@/result/libc.json"
+ STDOPT: #"-metrics-libc -metrics-output libc.json"
*/
#include <ctype.h>
#include <stdio.h> // defines external variables
diff --git a/tests/metrics/oracle/libc.0.res.oracle b/tests/metrics/oracle/libc.0.res.oracle
index 781b6e7b467..5756abd305c 100644
--- a/tests/metrics/oracle/libc.0.res.oracle
+++ b/tests/metrics/oracle/libc.0.res.oracle
@@ -1,13 +1,5 @@
-<<<<<<< HEAD
[kernel] Parsing libc.c (with preprocessing)
-[metrics] Defined functions (5)
-||||||| ac7807782d
-[kernel] Parsing tests/metrics/libc.c (with preprocessing)
-[metrics] Defined functions (5)
-=======
-[kernel] Parsing tests/metrics/libc.c (with preprocessing)
[metrics] Defined functions (6)
->>>>>>> origin/master
=====================
bar (0 call); f (0 call); foo (0 call); g (address taken) (0 call);
h (1 call); main (0 call);
diff --git a/tests/metrics/oracle/libc.1.res.oracle b/tests/metrics/oracle/libc.1.res.oracle
index 5eebdb80cc8..68217f8e11d 100644
--- a/tests/metrics/oracle/libc.1.res.oracle
+++ b/tests/metrics/oracle/libc.1.res.oracle
@@ -1,13 +1,5 @@
-<<<<<<< HEAD
[kernel] Parsing libc.c (with preprocessing)
-[metrics] Defined functions (6)
-||||||| ac7807782d
-[kernel] Parsing tests/metrics/libc.c (with preprocessing)
-[metrics] Defined functions (6)
-=======
-[kernel] Parsing tests/metrics/libc.c (with preprocessing)
[metrics] Defined functions (7)
->>>>>>> origin/master
=====================
bar (1 call); f (0 call); foo (1 call); g (address taken) (0 call);
getopt (1 call); h (1 call); main (0 call);
diff --git a/tests/metrics/oracle/libc.2.res.oracle b/tests/metrics/oracle/libc.2.res.oracle
index eeb5977dbc5..1334ea6ba7f 100644
--- a/tests/metrics/oracle/libc.2.res.oracle
+++ b/tests/metrics/oracle/libc.2.res.oracle
@@ -1 +1 @@
-[kernel] Parsing tests/metrics/libc.c (with preprocessing)
+[kernel] Parsing libc.c (with preprocessing)
diff --git a/tests/misc/oracle/widen_hints.2.res.oracle b/tests/misc/oracle/widen_hints.2.res.oracle
index ffffe72148a..572b8074f8d 100644
--- a/tests/misc/oracle/widen_hints.2.res.oracle
+++ b/tests/misc/oracle/widen_hints.2.res.oracle
@@ -65,7 +65,7 @@
m ∈ {10}
n ∈ {43}
ss.i ∈ {87}
- .d ∈ UNINITIALIZED
+ {.d; .[bits 32 to 63]} ∈ UNINITIALIZED
ip ∈ {87}
p ∈ {{ &ip }}
ip2 ∈ {87}
diff --git a/tests/misc/oracle/widen_hints.3.res.oracle b/tests/misc/oracle/widen_hints.3.res.oracle
index 704d29246f7..2f46ad5d59f 100644
--- a/tests/misc/oracle/widen_hints.3.res.oracle
+++ b/tests/misc/oracle/widen_hints.3.res.oracle
@@ -76,7 +76,7 @@
m ∈ {10}
n ∈ {43}
ss.i ∈ {87}
- .d ∈ UNINITIALIZED
+ {.d; .[bits 32 to 63]} ∈ UNINITIALIZED
ip ∈ {87}
p ∈ {{ &ip }}
ip2 ∈ {87}
diff --git a/tests/misc/pragma-pack.c b/tests/misc/pragma-pack.c
index 3b845786011..2f1dbe59e2f 100644
--- a/tests/misc/pragma-pack.c
+++ b/tests/misc/pragma-pack.c
@@ -1,18 +1,8 @@
/*run.config
-<<<<<<< HEAD
DEPS: pragma-pack-utils.h
STDOPT: +"-machdep gcc_x86_64 -kernel-msg-key typing:pragma"
STDOPT: +"-machdep gcc_x86_32"
STDOPT: +"-machdep msvc_x86_64"
-||||||| ac7807782d
- STDOPT: #"-machdep gcc_x86_64 -kernel-msg-key typing:pragma"
- STDOPT: #"-cpp-command=\"gcc -E -C -I. -m32\" -cpp-frama-c-compliant"
- STDOPT: #"-machdep msvc_x86_64"
-=======
- STDOPT: +"-machdep gcc_x86_64 -kernel-msg-key typing:pragma"
- STDOPT: +"-machdep gcc_x86_32"
- STDOPT: +"-machdep msvc_x86_64"
->>>>>>> origin/master
*/
#include "pragma-pack-utils.h"
diff --git a/tests/ptests_config b/tests/ptests_config
index c1813ec1a2e..eefa38fff20 100644
--- a/tests/ptests_config
+++ b/tests/ptests_config
@@ -3,10 +3,13 @@
# todo: adds dynamic_plugin? No, will be removed from master branch.
# todo: adds verisec?
-DEFAULT_SUITES= builtins callgraph cil constant_propagation dynamic fc_script float idct impact
+DEFAULT_SUITES= builtins callgraph cil constant_propagation dynamic float idct impact
DEFAULT_SUITES= jcdb journal libc metrics misc occurrence pdg pretty_printing rte rte_manual
DEFAULT_SUITES= saveload scope slicing sparecode spec syntax test value value/traces
+# todo: fixes fc_script
+IGNORE= DEFAULT_SUITES= fc_script
+
# todo: adds make_run_script?
# todo: adds value/numerors (requires opam package mlgmpidl and system libraries for MPFR)
IGNORE= DEFAULT_SUITES= make_run_script
diff --git a/tests/rte/oracle/assign5.res.oracle b/tests/rte/oracle/assign5.res.oracle
index 252e7078667..838610a781c 100644
--- a/tests/rte/oracle/assign5.res.oracle
+++ b/tests/rte/oracle/assign5.res.oracle
@@ -1,14 +1,8 @@
-<<<<<<< HEAD
[kernel] Parsing assign5.c (with preprocessing)
-||||||| ac7807782d
-[kernel] Parsing tests/rte/assign5.c (with preprocessing)
-=======
-[kernel] Parsing tests/rte/assign5.c (with preprocessing)
[kernel:annot:multi-from] Warning:
- Drop '*p' \from at tests/rte/assign5.c:9 for more precise one at tests/rte/assign5.c:10
+ Drop '*p' \from at assign5.c:9 for more precise one at assign5.c:10
[kernel:annot:multi-from] Warning:
- Drop '*p' \from at tests/rte/assign5.c:19 for more precise one at tests/rte/assign5.c:18
->>>>>>> origin/master
+ Drop '*p' \from at assign5.c:19 for more precise one at assign5.c:18
[rte] annotating function main
/* Generated by Frama-C */
/*@ assigns *p;
diff --git a/tests/rte/oracle/initialized_union.0.res.oracle b/tests/rte/oracle/initialized_union.0.res.oracle
index 550af6851ce..5047a92e242 100644
--- a/tests/rte/oracle/initialized_union.0.res.oracle
+++ b/tests/rte/oracle/initialized_union.0.res.oracle
@@ -1,4 +1,4 @@
-[kernel] Parsing tests/rte/initialized_union.c (with preprocessing)
+[kernel] Parsing initialized_union.c (with preprocessing)
[rte] annotating function main
/* Generated by Frama-C */
union U {
diff --git a/tests/rte/oracle/invalid_fptr.res.oracle b/tests/rte/oracle/invalid_fptr.res.oracle
index c1d6edf050a..8e8c9e80b62 100644
--- a/tests/rte/oracle/invalid_fptr.res.oracle
+++ b/tests/rte/oracle/invalid_fptr.res.oracle
@@ -1,4 +1,4 @@
-[kernel] Parsing tests/rte/invalid_fptr.i (no preprocessing)
+[kernel] Parsing invalid_fptr.i (no preprocessing)
[rte] annotating function f
[rte] annotating function g
[rte] annotating function h
diff --git a/tests/rte/u64.i b/tests/rte/u64.i
index 8f23354dfb7..c8366a37a97 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
+ OPT: -rte -warn-unsigned-overflow -print -machdep x86_32
+ OPT: -rte -warn-unsigned-overflow -print -machdep x86_64
*/
unsigned long f(unsigned int n)
{
diff --git a/tests/saveload/bool.c b/tests/saveload/bool.c
index bb295c81a31..200d545f557 100644
--- a/tests/saveload/bool.c
+++ b/tests/saveload/bool.c
@@ -1,17 +1,7 @@
/* run.config
-<<<<<<< HEAD
EXECNOW: BIN bool.sav LOG bool_sav.res LOG bool_sav.err @frama-c@ -save bool.sav -machdep x86_32 -eva @EVA_OPTIONS@ > bool_sav.res 2> bool_sav.err
STDOPT: +"-load %{dep:bool.sav} -out -input -deps"
STDOPT: +"-load %{dep:bool.sav} -eva @EVA_OPTIONS@"
-||||||| ac7807782d
- EXECNOW: BIN bool.sav LOG bool_sav.res LOG bool_sav.err ./bin/toplevel.opt -save ./tests/saveload/result/bool.sav -eva @EVA_OPTIONS@ ./tests/saveload/bool.c > tests/saveload/result/bool_sav.res 2> tests/saveload/result/bool_sav.err
- STDOPT: +"-load ./tests/saveload/result/bool.sav -out -input -deps"
- STDOPT: +"-load ./tests/saveload/result/bool.sav -eva @EVA_OPTIONS@"
-=======
- EXECNOW: BIN bool.sav LOG bool_sav.res LOG bool_sav.err ./bin/toplevel.opt -save ./tests/saveload/result/bool.sav -machdep x86_32 -eva @EVA_OPTIONS@ ./tests/saveload/bool.c > tests/saveload/result/bool_sav.res 2> tests/saveload/result/bool_sav.err
- STDOPT: +"-load ./tests/saveload/result/bool.sav -out -input -deps"
- STDOPT: +"-load ./tests/saveload/result/bool.sav -eva @EVA_OPTIONS@"
->>>>>>> origin/master
*/
#include "stdbool.h"
diff --git a/tests/slicing/min_call.c b/tests/slicing/min_call.c
index 68ec3eade51..4b9bafde7c1 100644
--- a/tests/slicing/min_call.c
+++ b/tests/slicing/min_call.c
@@ -1,10 +1,10 @@
/* run.config
- EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
- CMD: @frama-c@ -load-module tests/slicing/libSelect.cmxs -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
+ DEPS: select_return.i
+ LIBS: libSelect
+ MODULE: @PTEST_NAME@
OPT: @EVA_OPTIONS@ -deps -lib-entry -main g -journal-disable -slicing-level 3
*/
/* dummy source file in order to test minimal calls feature
* on select_return.i */
-
-#include "tests/slicing/select_return.i"
+#include "select_return.i"
diff --git a/tests/slicing/oracle/adpcm.res.oracle b/tests/slicing/oracle/adpcm.res.oracle
index f181bacaf22..2cfa0128f76 100644
--- a/tests/slicing/oracle/adpcm.res.oracle
+++ b/tests/slicing/oracle/adpcm.res.oracle
@@ -377,599 +377,629 @@
[4..9] ∈ {1}
compressed[0..9] ∈ {0}
[eva] computing for function encode <- main.
- Called from TESTS_DIR/test/adpcm.c:608.
-[eva] TESTS_DIR/test/adpcm.c:277: starting to merge loop iterations
-[eva:alarm] TESTS_DIR/test/adpcm.c:278: Warning:
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:608.
+[eva] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:277:
+ starting to merge loop iterations
+[eva:alarm] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:278: Warning:
out of bounds read. assert \valid_read(tmp_3);
(tmp_3 from tqmf_ptr++)
-[eva:alarm] TESTS_DIR/test/adpcm.c:278: Warning:
+[eva:alarm] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:278: Warning:
out of bounds read. assert \valid_read(tmp_4);
(tmp_4 from h_ptr++)
-[eva:alarm] TESTS_DIR/test/adpcm.c:279: Warning:
+[eva:alarm] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:279: Warning:
out of bounds read. assert \valid_read(tmp_5);
(tmp_5 from tqmf_ptr++)
-[eva:alarm] TESTS_DIR/test/adpcm.c:279: Warning:
+[eva:alarm] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:279: Warning:
out of bounds read. assert \valid_read(tmp_6);
(tmp_6 from h_ptr++)
-[eva:alarm] TESTS_DIR/test/adpcm.c:282: Warning:
+[eva:alarm] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:282: Warning:
out of bounds read. assert \valid_read(tmp_7);
(tmp_7 from tqmf_ptr++)
-[eva:alarm] TESTS_DIR/test/adpcm.c:282: Warning:
+[eva:alarm] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:282: Warning:
out of bounds read. assert \valid_read(tmp_8);
(tmp_8 from h_ptr++)
-[eva:alarm] TESTS_DIR/test/adpcm.c:283: Warning:
+[eva:alarm] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:283: Warning:
out of bounds read. assert \valid_read(tqmf_ptr);
-[eva:alarm] TESTS_DIR/test/adpcm.c:283: Warning:
+[eva:alarm] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:283: Warning:
out of bounds read. assert \valid_read(tmp_9);
(tmp_9 from h_ptr++)
-[eva] TESTS_DIR/test/adpcm.c:288: starting to merge loop iterations
-[eva:alarm] TESTS_DIR/test/adpcm.c:288: Warning:
+[eva] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:288:
+ starting to merge loop iterations
+[eva:alarm] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:288: Warning:
out of bounds read. assert \valid_read(tmp_11);
(tmp_11 from tqmf_ptr1--)
-[eva:alarm] TESTS_DIR/test/adpcm.c:288: Warning:
+[eva:alarm] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:288: Warning:
out of bounds write. assert \valid(tmp_10);
(tmp_10 from tqmf_ptr--)
-[eva:alarm] TESTS_DIR/test/adpcm.c:289: Warning:
+[eva:alarm] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:289: Warning:
out of bounds write. assert \valid(tmp_12);
(tmp_12 from tqmf_ptr--)
-[eva:alarm] TESTS_DIR/test/adpcm.c:290: Warning:
+[eva:alarm] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:290: Warning:
out of bounds write. assert \valid(tqmf_ptr);
[eva] computing for function filtez <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:301.
-[eva] TESTS_DIR/test/adpcm.c:418: starting to merge loop iterations
-[eva:alarm] TESTS_DIR/test/adpcm.c:419: Warning:
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:301.
+[eva] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:418:
+ starting to merge loop iterations
+[eva:alarm] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:419: Warning:
out of bounds read. assert \valid_read(tmp_1);
(tmp_1 from bpl++)
-[eva:alarm] TESTS_DIR/test/adpcm.c:419: Warning:
+[eva:alarm] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:419: Warning:
out of bounds read. assert \valid_read(tmp_2);
(tmp_2 from dlt_0++)
[eva] Recording results for filtez
[eva] Done for function filtez
[eva] computing for function filtep <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:304.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:304.
[eva] Recording results for filtep
[eva] Done for function filtep
[eva] computing for function quantl <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:311.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:311.
[eva] computing for function abs <- quantl <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:444.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:444.
[eva] Recording results for abs
[eva] Done for function abs
-[eva] TESTS_DIR/test/adpcm.c:453: starting to merge loop iterations
+[eva] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:453:
+ starting to merge loop iterations
[eva] Recording results for quantl
[eva] Done for function quantl
[eva] computing for function logscl <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:318.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:318.
[eva] Recording results for logscl
[eva] Done for function logscl
[eva] computing for function scalel <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:322.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:322.
[eva] Recording results for scalel
[eva] Done for function scalel
[eva] computing for function upzero <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:331.
-[eva] TESTS_DIR/test/adpcm.c:506: starting to merge loop iterations
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:331.
+[eva] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:506:
+ starting to merge loop iterations
[eva] Recording results for upzero
[eva] Done for function upzero
[eva] computing for function uppol2 <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:335.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:335.
[eva] Recording results for uppol2
[eva] Done for function uppol2
[eva] computing for function uppol1 <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:339.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:339.
[eva] Recording results for uppol1
[eva] Done for function uppol1
[eva] computing for function filtez <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:352.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:352.
[eva] Recording results for filtez
[eva] Done for function filtez
-[eva] TESTS_DIR/test/adpcm.c:354: Reusing old results for call to filtep
-[eva] TESTS_DIR/test/adpcm.c:370: Reusing old results for call to abs
+[eva] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:354:
+ Reusing old results for call to filtep
+[eva] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:370:
+ Reusing old results for call to abs
[eva] computing for function logsch <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:376.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:376.
[eva] Recording results for logsch
[eva] Done for function logsch
[eva] computing for function scalel <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:379.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:379.
[eva] Recording results for scalel
[eva] Done for function scalel
[eva] computing for function upzero <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:387.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:387.
[eva] Recording results for upzero
[eva] Done for function upzero
-[eva] TESTS_DIR/test/adpcm.c:391: Reusing old results for call to uppol2
-[eva] TESTS_DIR/test/adpcm.c:394: Reusing old results for call to uppol1
-[eva] TESTS_DIR/test/adpcm.c:262:
+[eva] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:391:
+ Reusing old results for call to uppol2
+[eva] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:394:
+ Reusing old results for call to uppol1
+[eva] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:262:
function encode: postcondition got status valid.
[eva] Recording results for encode
[eva] Done for function encode
-[eva] TESTS_DIR/test/adpcm.c:607: starting to merge loop iterations
+[eva] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:607:
+ starting to merge loop iterations
[eva] computing for function encode <- main.
- Called from TESTS_DIR/test/adpcm.c:608.
-[eva:alarm] TESTS_DIR/test/adpcm.c:278: Warning:
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:608.
+[eva:alarm] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:278: Warning:
signed overflow.
assert -2147483648 ≤ xa + (long)((long)*tmp_3 * (long)*tmp_4);
(tmp_3 from tqmf_ptr++, tmp_4 from h_ptr++)
-[eva:alarm] TESTS_DIR/test/adpcm.c:278: Warning:
+[eva:alarm] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:278: Warning:
signed overflow.
assert xa + (long)((long)*tmp_3 * (long)*tmp_4) ≤ 2147483647;
(tmp_3 from tqmf_ptr++, tmp_4 from h_ptr++)
-[eva:alarm] TESTS_DIR/test/adpcm.c:279: Warning:
+[eva:alarm] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:279: Warning:
signed overflow.
assert -2147483648 ≤ xb + (long)((long)*tmp_5 * (long)*tmp_6);
(tmp_5 from tqmf_ptr++, tmp_6 from h_ptr++)
-[eva:alarm] TESTS_DIR/test/adpcm.c:279: Warning:
+[eva:alarm] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:279: Warning:
signed overflow.
assert xb + (long)((long)*tmp_5 * (long)*tmp_6) ≤ 2147483647;
(tmp_5 from tqmf_ptr++, tmp_6 from h_ptr++)
-[eva:alarm] TESTS_DIR/test/adpcm.c:282: Warning:
+[eva:alarm] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:282: Warning:
signed overflow.
assert -2147483648 ≤ xa + (long)((long)*tmp_7 * (long)*tmp_8);
(tmp_7 from tqmf_ptr++, tmp_8 from h_ptr++)
-[eva:alarm] TESTS_DIR/test/adpcm.c:282: Warning:
+[eva:alarm] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:282: Warning:
signed overflow.
assert xa + (long)((long)*tmp_7 * (long)*tmp_8) ≤ 2147483647;
(tmp_7 from tqmf_ptr++, tmp_8 from h_ptr++)
-[eva:alarm] TESTS_DIR/test/adpcm.c:283: Warning:
+[eva:alarm] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:283: Warning:
signed overflow.
assert -2147483648 ≤ xb + (long)((long)*tqmf_ptr * (long)*tmp_9);
(tmp_9 from h_ptr++)
-[eva:alarm] TESTS_DIR/test/adpcm.c:283: Warning:
+[eva:alarm] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:283: Warning:
signed overflow.
assert xb + (long)((long)*tqmf_ptr * (long)*tmp_9) ≤ 2147483647;
(tmp_9 from h_ptr++)
-[eva:alarm] TESTS_DIR/test/adpcm.c:293: Warning:
+[eva:alarm] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:293: Warning:
signed overflow. assert -2147483648 ≤ xa + xb;
-[eva:alarm] TESTS_DIR/test/adpcm.c:293: Warning:
+[eva:alarm] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:293: Warning:
signed overflow. assert xa + xb ≤ 2147483647;
-[eva:alarm] TESTS_DIR/test/adpcm.c:294: Warning:
+[eva:alarm] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:294: Warning:
signed overflow. assert -2147483648 ≤ xa - xb;
-[eva:alarm] TESTS_DIR/test/adpcm.c:294: Warning:
+[eva:alarm] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:294: Warning:
signed overflow. assert xa - xb ≤ 2147483647;
-[eva] TESTS_DIR/test/adpcm.c:301: Reusing old results for call to filtez
+[eva] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:301:
+ Reusing old results for call to filtez
[eva] computing for function filtep <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:304.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:304.
[eva] Recording results for filtep
[eva] Done for function filtep
[eva] computing for function quantl <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:311.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:311.
[eva] computing for function abs <- quantl <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:444.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:444.
[eva] Recording results for abs
[eva] Done for function abs
[eva] Recording results for quantl
[eva] Done for function quantl
[eva] computing for function logscl <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:318.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:318.
[eva] Recording results for logscl
[eva] Done for function logscl
[eva] computing for function scalel <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:322.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:322.
[eva] Recording results for scalel
[eva] Done for function scalel
[eva] computing for function upzero <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:331.
-[eva] TESTS_DIR/test/adpcm.c:512: starting to merge loop iterations
-[eva:alarm] TESTS_DIR/test/adpcm.c:514: Warning:
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:331.
+[eva] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:512:
+ starting to merge loop iterations
+[eva:alarm] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:514: Warning:
signed overflow. assert 255L * (long)*(bli + i) ≤ 2147483647;
[eva] Recording results for upzero
[eva] Done for function upzero
[eva] computing for function uppol2 <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:335.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:335.
[eva] Recording results for uppol2
[eva] Done for function uppol2
[eva] computing for function uppol1 <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:339.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:339.
[eva] Recording results for uppol1
[eva] Done for function uppol1
-[eva] TESTS_DIR/test/adpcm.c:352: Reusing old results for call to filtez
-[eva] TESTS_DIR/test/adpcm.c:354: Reusing old results for call to filtep
-[eva] TESTS_DIR/test/adpcm.c:370: Reusing old results for call to abs
+[eva] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:352:
+ Reusing old results for call to filtez
+[eva] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:354:
+ Reusing old results for call to filtep
+[eva] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:370:
+ Reusing old results for call to abs
[eva] computing for function logsch <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:376.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:376.
[eva] Recording results for logsch
[eva] Done for function logsch
[eva] computing for function scalel <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:379.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:379.
[eva] Recording results for scalel
[eva] Done for function scalel
[eva] computing for function upzero <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:387.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:387.
[eva] Recording results for upzero
[eva] Done for function upzero
[eva] computing for function uppol2 <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:391.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:391.
[eva] Recording results for uppol2
[eva] Done for function uppol2
[eva] computing for function uppol1 <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:394.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:394.
[eva] Recording results for uppol1
[eva] Done for function uppol1
[eva] Recording results for encode
[eva] Done for function encode
[eva] computing for function encode <- main.
- Called from TESTS_DIR/test/adpcm.c:608.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:608.
[eva] computing for function filtez <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:301.
-[eva:alarm] TESTS_DIR/test/adpcm.c:416: Warning:
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:301.
+[eva:alarm] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:416: Warning:
signed overflow.
assert -2147483648 ≤ (long)*tmp * (long)*tmp_0;
(tmp from bpl++, tmp_0 from dlt_0++)
-[eva:alarm] TESTS_DIR/test/adpcm.c:416: Warning:
+[eva:alarm] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:416: Warning:
signed overflow.
assert (long)*tmp * (long)*tmp_0 ≤ 2147483647;
(tmp from bpl++, tmp_0 from dlt_0++)
[eva] Recording results for filtez
[eva] Done for function filtez
[eva] computing for function filtep <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:304.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:304.
[eva] Recording results for filtep
[eva] Done for function filtep
[eva] computing for function quantl <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:311.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:311.
[eva] computing for function abs <- quantl <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:444.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:444.
[eva] Recording results for abs
[eva] Done for function abs
[eva] Recording results for quantl
[eva] Done for function quantl
[eva] computing for function logscl <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:318.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:318.
[eva] Recording results for logscl
[eva] Done for function logscl
[eva] computing for function scalel <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:322.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:322.
[eva] Recording results for scalel
[eva] Done for function scalel
[eva] computing for function upzero <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:331.
-[eva:alarm] TESTS_DIR/test/adpcm.c:507: Warning:
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:331.
+[eva:alarm] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:507: Warning:
signed overflow. assert 255L * (long)*(bli + i) ≤ 2147483647;
-[eva:alarm] TESTS_DIR/test/adpcm.c:514: Warning:
+[eva:alarm] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:514: Warning:
signed overflow. assert -2147483648 ≤ 255L * (long)*(bli + i);
[eva] Recording results for upzero
[eva] Done for function upzero
[eva] computing for function uppol2 <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:335.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:335.
[eva] Recording results for uppol2
[eva] Done for function uppol2
[eva] computing for function uppol1 <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:339.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:339.
[eva] Recording results for uppol1
[eva] Done for function uppol1
[eva] computing for function filtez <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:352.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:352.
[eva] Recording results for filtez
[eva] Done for function filtez
[eva] computing for function filtep <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:354.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:354.
[eva] Recording results for filtep
[eva] Done for function filtep
[eva] computing for function abs <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:370.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:370.
[eva] Recording results for abs
[eva] Done for function abs
[eva] computing for function logsch <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:376.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:376.
[eva] Recording results for logsch
[eva] Done for function logsch
[eva] computing for function scalel <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:379.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:379.
[eva] Recording results for scalel
[eva] Done for function scalel
[eva] computing for function upzero <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:387.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:387.
[eva] Recording results for upzero
[eva] Done for function upzero
[eva] computing for function uppol2 <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:391.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:391.
[eva] Recording results for uppol2
[eva] Done for function uppol2
[eva] computing for function uppol1 <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:394.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:394.
[eva] Recording results for uppol1
[eva] Done for function uppol1
-[eva:alarm] TESTS_DIR/test/adpcm.c:262: Warning:
+[eva:alarm] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:262: Warning:
function encode: postcondition got status unknown.
[eva] Recording results for encode
[eva] Done for function encode
[eva] computing for function encode <- main.
- Called from TESTS_DIR/test/adpcm.c:608.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:608.
[eva] computing for function filtez <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:301.
-[eva:alarm] TESTS_DIR/test/adpcm.c:419: Warning:
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:301.
+[eva:alarm] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:419: Warning:
signed overflow.
assert -2147483648 ≤ (long)*tmp_1 * (long)*tmp_2;
(tmp_1 from bpl++, tmp_2 from dlt_0++)
-[eva:alarm] TESTS_DIR/test/adpcm.c:419: Warning:
+[eva:alarm] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:419: Warning:
signed overflow.
assert (long)*tmp_1 * (long)*tmp_2 ≤ 2147483647;
(tmp_1 from bpl++, tmp_2 from dlt_0++)
-[eva:alarm] TESTS_DIR/test/adpcm.c:419: Warning:
+[eva:alarm] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:419: Warning:
signed overflow.
assert -2147483648 ≤ zl + (long)((long)*tmp_1 * (long)*tmp_2);
(tmp_1 from bpl++, tmp_2 from dlt_0++)
-[eva:alarm] TESTS_DIR/test/adpcm.c:419: Warning:
+[eva:alarm] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:419: Warning:
signed overflow.
assert zl + (long)((long)*tmp_1 * (long)*tmp_2) ≤ 2147483647;
(tmp_1 from bpl++, tmp_2 from dlt_0++)
[eva] Recording results for filtez
[eva] Done for function filtez
[eva] computing for function filtep <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:304.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:304.
[eva] Recording results for filtep
[eva] Done for function filtep
[eva] computing for function quantl <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:311.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:311.
[eva] computing for function abs <- quantl <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:444.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:444.
[eva] Recording results for abs
[eva] Done for function abs
[eva] Recording results for quantl
[eva] Done for function quantl
[eva] computing for function logscl <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:318.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:318.
[eva] Recording results for logscl
[eva] Done for function logscl
[eva] computing for function scalel <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:322.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:322.
[eva] Recording results for scalel
[eva] Done for function scalel
[eva] computing for function upzero <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:331.
-[eva:alarm] TESTS_DIR/test/adpcm.c:507: Warning:
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:331.
+[eva:alarm] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:507: Warning:
signed overflow. assert -2147483648 ≤ 255L * (long)*(bli + i);
[eva] Recording results for upzero
[eva] Done for function upzero
[eva] computing for function uppol2 <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:335.
-[eva:alarm] TESTS_DIR/test/adpcm.c:534: Warning:
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:335.
+[eva:alarm] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:534: Warning:
signed overflow. assert -2147483648 ≤ (long)plt_0 * (long)plt1_0;
-[eva:alarm] TESTS_DIR/test/adpcm.c:534: Warning:
+[eva:alarm] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:534: Warning:
signed overflow. assert (long)plt_0 * (long)plt1_0 ≤ 2147483647;
[eva] Recording results for uppol2
[eva] Done for function uppol2
[eva] computing for function uppol1 <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:339.
-[eva:alarm] TESTS_DIR/test/adpcm.c:558: Warning:
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:339.
+[eva:alarm] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:558: Warning:
signed overflow. assert -2147483648 ≤ (long)plt_0 * (long)plt1_0;
-[eva:alarm] TESTS_DIR/test/adpcm.c:558: Warning:
+[eva:alarm] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:558: Warning:
signed overflow. assert (long)plt_0 * (long)plt1_0 ≤ 2147483647;
[eva] Recording results for uppol1
[eva] Done for function uppol1
[eva] computing for function filtez <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:352.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:352.
[eva] Recording results for filtez
[eva] Done for function filtez
[eva] computing for function filtep <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:354.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:354.
[eva] Recording results for filtep
[eva] Done for function filtep
[eva] computing for function abs <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:370.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:370.
[eva] Recording results for abs
[eva] Done for function abs
[eva] computing for function logsch <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:376.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:376.
[eva] Recording results for logsch
[eva] Done for function logsch
[eva] computing for function scalel <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:379.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:379.
[eva] Recording results for scalel
[eva] Done for function scalel
[eva] computing for function upzero <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:387.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:387.
[eva] Recording results for upzero
[eva] Done for function upzero
[eva] computing for function uppol2 <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:391.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:391.
[eva] Recording results for uppol2
[eva] Done for function uppol2
[eva] computing for function uppol1 <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:394.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:394.
[eva] Recording results for uppol1
[eva] Done for function uppol1
[eva] Recording results for encode
[eva] Done for function encode
[eva] computing for function encode <- main.
- Called from TESTS_DIR/test/adpcm.c:608.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:608.
[eva] computing for function filtez <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:301.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:301.
[eva] Recording results for filtez
[eva] Done for function filtez
[eva] computing for function filtep <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:304.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:304.
[eva] Recording results for filtep
[eva] Done for function filtep
[eva] computing for function quantl <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:311.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:311.
[eva] computing for function abs <- quantl <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:444.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:444.
[eva] Recording results for abs
[eva] Done for function abs
[eva] Recording results for quantl
[eva] Done for function quantl
[eva] computing for function logscl <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:318.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:318.
[eva] Recording results for logscl
[eva] Done for function logscl
[eva] computing for function scalel <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:322.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:322.
[eva] Recording results for scalel
[eva] Done for function scalel
[eva] computing for function upzero <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:331.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:331.
[eva] Recording results for upzero
[eva] Done for function upzero
[eva] computing for function uppol2 <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:335.
-[eva:alarm] TESTS_DIR/test/adpcm.c:536: Warning:
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:335.
+[eva:alarm] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:536: Warning:
signed overflow. assert -2147483648 ≤ (long)plt_0 * (long)plt2_0;
-[eva:alarm] TESTS_DIR/test/adpcm.c:536: Warning:
+[eva:alarm] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:536: Warning:
signed overflow. assert (long)plt_0 * (long)plt2_0 ≤ 2147483647;
[eva] Recording results for uppol2
[eva] Done for function uppol2
[eva] computing for function uppol1 <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:339.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:339.
[eva] Recording results for uppol1
[eva] Done for function uppol1
-[eva] TESTS_DIR/test/adpcm.c:352: Reusing old results for call to filtez
+[eva] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:352:
+ Reusing old results for call to filtez
[eva] computing for function filtep <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:354.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:354.
[eva] Recording results for filtep
[eva] Done for function filtep
[eva] computing for function abs <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:370.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:370.
[eva] Recording results for abs
[eva] Done for function abs
[eva] computing for function logsch <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:376.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:376.
[eva] Recording results for logsch
[eva] Done for function logsch
[eva] computing for function scalel <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:379.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:379.
[eva] Recording results for scalel
[eva] Done for function scalel
[eva] computing for function upzero <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:387.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:387.
[eva] Recording results for upzero
[eva] Done for function upzero
[eva] computing for function uppol2 <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:391.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:391.
[eva] Recording results for uppol2
[eva] Done for function uppol2
[eva] computing for function uppol1 <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:394.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:394.
[eva] Recording results for uppol1
[eva] Done for function uppol1
[eva] Recording results for encode
[eva] Done for function encode
[eva] computing for function encode <- main.
- Called from TESTS_DIR/test/adpcm.c:608.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:608.
[eva] computing for function filtez <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:301.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:301.
[eva] Recording results for filtez
[eva] Done for function filtez
[eva] computing for function filtep <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:304.
-[eva:alarm] TESTS_DIR/test/adpcm.c:430: Warning:
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:304.
+[eva:alarm] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:430: Warning:
signed overflow. assert -2147483648 ≤ 2 * rlt1_0;
-[eva:alarm] TESTS_DIR/test/adpcm.c:430: Warning:
+[eva:alarm] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:430: Warning:
signed overflow. assert 2 * rlt1_0 ≤ 2147483647;
-[eva:alarm] TESTS_DIR/test/adpcm.c:431: Warning:
+[eva:alarm] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:431: Warning:
signed overflow. assert -2147483648 ≤ (long)al1_0 * pl;
-[eva:alarm] TESTS_DIR/test/adpcm.c:431: Warning:
+[eva:alarm] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:431: Warning:
signed overflow. assert (long)al1_0 * pl ≤ 2147483647;
-[eva:alarm] TESTS_DIR/test/adpcm.c:432: Warning:
+[eva:alarm] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:432: Warning:
signed overflow. assert -2147483648 ≤ 2 * rlt2_0;
-[eva:alarm] TESTS_DIR/test/adpcm.c:432: Warning:
+[eva:alarm] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:432: Warning:
signed overflow. assert 2 * rlt2_0 ≤ 2147483647;
-[eva:alarm] TESTS_DIR/test/adpcm.c:433: Warning:
+[eva:alarm] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:433: Warning:
signed overflow. assert -2147483648 ≤ (long)al2_0 * pl2;
-[eva:alarm] TESTS_DIR/test/adpcm.c:433: Warning:
+[eva:alarm] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:433: Warning:
signed overflow. assert (long)al2_0 * pl2 ≤ 2147483647;
-[eva:alarm] TESTS_DIR/test/adpcm.c:433: Warning:
+[eva:alarm] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:433: Warning:
signed overflow. assert -2147483648 ≤ pl + (long)((long)al2_0 * pl2);
-[eva:alarm] TESTS_DIR/test/adpcm.c:433: Warning:
+[eva:alarm] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:433: Warning:
signed overflow. assert pl + (long)((long)al2_0 * pl2) ≤ 2147483647;
[eva] Recording results for filtep
[eva] Done for function filtep
[eva] computing for function quantl <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:311.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:311.
[eva] computing for function abs <- quantl <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:444.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:444.
[eva] Recording results for abs
[eva] Done for function abs
[eva] Recording results for quantl
[eva] Done for function quantl
[eva] computing for function logscl <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:318.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:318.
[eva] Recording results for logscl
[eva] Done for function logscl
[eva] computing for function scalel <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:322.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:322.
[eva] Recording results for scalel
[eva] Done for function scalel
[eva] computing for function upzero <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:331.
-[eva:alarm] TESTS_DIR/test/adpcm.c:513: Warning:
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:331.
+[eva:alarm] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:513: Warning:
signed overflow. assert -2147483648 ≤ (long)dlt_0 * (long)*(dlti + i);
-[eva:alarm] TESTS_DIR/test/adpcm.c:513: Warning:
+[eva:alarm] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:513: Warning:
signed overflow. assert (long)dlt_0 * (long)*(dlti + i) ≤ 2147483647;
[eva] Recording results for upzero
[eva] Done for function upzero
[eva] computing for function uppol2 <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:335.
-[eva:alarm] TESTS_DIR/test/adpcm.c:533: Warning:
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:335.
+[eva:alarm] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:533: Warning:
signed overflow. assert -2147483648 ≤ 4L * (long)al1_0;
-[eva:alarm] TESTS_DIR/test/adpcm.c:534: Warning:
+[eva:alarm] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:534: Warning:
signed overflow. assert -wd2 ≤ 2147483647;
-[eva:alarm] TESTS_DIR/test/adpcm.c:542: Warning:
+[eva:alarm] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:542: Warning:
signed overflow. assert -2147483648 ≤ 127L * (long)al2_0;
[eva] Recording results for uppol2
[eva] Done for function uppol2
[eva] computing for function uppol1 <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:339.
-[eva:alarm] TESTS_DIR/test/adpcm.c:557: Warning:
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:339.
+[eva:alarm] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:557: Warning:
signed overflow. assert -2147483648 ≤ (long)al1_0 * 255L;
[eva] Recording results for uppol1
[eva] Done for function uppol1
[eva] computing for function filtez <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:352.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:352.
[eva] Recording results for filtez
[eva] Done for function filtez
-[eva] TESTS_DIR/test/adpcm.c:354: Reusing old results for call to filtep
-[eva] TESTS_DIR/test/adpcm.c:370: Reusing old results for call to abs
+[eva] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:354:
+ Reusing old results for call to filtep
+[eva] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:370:
+ Reusing old results for call to abs
[eva] computing for function logsch <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:376.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:376.
[eva] Recording results for logsch
[eva] Done for function logsch
[eva] computing for function scalel <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:379.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:379.
[eva] Recording results for scalel
[eva] Done for function scalel
[eva] computing for function upzero <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:387.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:387.
[eva] Recording results for upzero
[eva] Done for function upzero
[eva] computing for function uppol2 <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:391.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:391.
[eva] Recording results for uppol2
[eva] Done for function uppol2
[eva] computing for function uppol1 <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:394.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:394.
[eva] Recording results for uppol1
[eva] Done for function uppol1
[eva] Recording results for encode
[eva] Done for function encode
[eva] computing for function encode <- main.
- Called from TESTS_DIR/test/adpcm.c:608.
-[eva] TESTS_DIR/test/adpcm.c:301: Reusing old results for call to filtez
-[eva] TESTS_DIR/test/adpcm.c:304: Reusing old results for call to filtep
-[eva] TESTS_DIR/test/adpcm.c:311: Reusing old results for call to quantl
-[eva] TESTS_DIR/test/adpcm.c:318: Reusing old results for call to logscl
-[eva] TESTS_DIR/test/adpcm.c:322: Reusing old results for call to scalel
-[eva] TESTS_DIR/test/adpcm.c:331: Reusing old results for call to upzero
-[eva] TESTS_DIR/test/adpcm.c:335: Reusing old results for call to uppol2
-[eva] TESTS_DIR/test/adpcm.c:339: Reusing old results for call to uppol1
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:608.
+[eva] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:301:
+ Reusing old results for call to filtez
+[eva] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:304:
+ Reusing old results for call to filtep
+[eva] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:311:
+ Reusing old results for call to quantl
+[eva] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:318:
+ Reusing old results for call to logscl
+[eva] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:322:
+ Reusing old results for call to scalel
+[eva] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:331:
+ Reusing old results for call to upzero
+[eva] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:335:
+ Reusing old results for call to uppol2
+[eva] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:339:
+ Reusing old results for call to uppol1
[eva] computing for function filtez <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:352.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:352.
[eva] Recording results for filtez
[eva] Done for function filtez
-[eva] TESTS_DIR/test/adpcm.c:354: Reusing old results for call to filtep
-[eva] TESTS_DIR/test/adpcm.c:370: Reusing old results for call to abs
-[eva] TESTS_DIR/test/adpcm.c:376: Reusing old results for call to logsch
-[eva] TESTS_DIR/test/adpcm.c:379: Reusing old results for call to scalel
+[eva] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:354:
+ Reusing old results for call to filtep
+[eva] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:370:
+ Reusing old results for call to abs
+[eva] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:376:
+ Reusing old results for call to logsch
+[eva] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:379:
+ Reusing old results for call to scalel
[eva] computing for function upzero <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:387.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:387.
[eva] Recording results for upzero
[eva] Done for function upzero
[eva] computing for function uppol2 <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:391.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:391.
[eva] Recording results for uppol2
[eva] Done for function uppol2
[eva] computing for function uppol1 <- encode <- main.
- Called from TESTS_DIR/test/adpcm.c:394.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/test/adpcm.c:394.
[eva] Recording results for uppol1
[eva] Done for function uppol1
[eva] Recording results for encode
diff --git a/tests/slicing/oracle/min_call.res.oracle b/tests/slicing/oracle/min_call.res.oracle
index 4251766b82a..858153ee937 100644
--- a/tests/slicing/oracle/min_call.res.oracle
+++ b/tests/slicing/oracle/min_call.res.oracle
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
[kernel] Parsing min_call.c (with preprocessing)
[kernel:typing:implicit-function-declaration] select_return.i:45: Warning:
Calling undeclared function f. Old style K&R code?
@@ -593,604 +592,3 @@ void f_slice_1(void)
}
-||||||| ac7807782d
-[kernel] Parsing tests/slicing/min_call.i (no preprocessing)
-[kernel] User Error: cannot find entry point `g'.
- Please use option `-main' for specifying a valid entry point.
-[kernel] Frama-C aborted: invalid user input.
-=======
-[kernel] Parsing tests/slicing/min_call.c (with preprocessing)
-[kernel:typing:implicit-function-declaration] tests/slicing/select_return.i:45: Warning:
- Calling undeclared function f. Old style K&R code?
-[eva] Analyzing an incomplete application starting at g
-[eva] Computing initial state
-[eva] Initial state computed
-[eva:initial-state] Values of globals at initialization
- G ∈ [--..--]
- H ∈ [--..--]
- I ∈ [--..--]
-[eva] computing for function k <- g.
- Called from tests/slicing/select_return.i:44.
-[eva] computing for function get <- k <- g.
- Called from tests/slicing/select_return.i:35.
-[kernel:annot:missing-spec] tests/slicing/select_return.i:35: Warning:
- Neither code nor specification for function get, generating default assigns from the prototype
-[eva] using specification for function get
-[eva] Done for function get
-[eva] computing for function send_bis <- k <- g.
- Called from tests/slicing/select_return.i:39.
-[kernel:annot:missing-spec] tests/slicing/select_return.i:39: Warning:
- Neither code nor specification for function send_bis, generating default assigns from the prototype
-[eva] using specification for function send_bis
-[eva] Done for function send_bis
-[eva] Recording results for k
-[eva] Done for function k
-[eva] computing for function f <- g.
- Called from tests/slicing/select_return.i:45.
-[eva] computing for function k <- f <- g.
- Called from tests/slicing/select_return.i:49.
-[eva] computing for function get <- k <- f <- g.
- Called from tests/slicing/select_return.i:35.
-[eva] Done for function get
-[eva] computing for function send_bis <- k <- f <- g.
- Called from tests/slicing/select_return.i:39.
-[eva] Done for function send_bis
-[eva] Recording results for k
-[eva] Done for function k
-[eva] computing for function k <- f <- g.
- Called from tests/slicing/select_return.i:50.
-[eva] computing for function get <- k <- f <- g.
- Called from tests/slicing/select_return.i:35.
-[eva] Done for function get
-[eva] computing for function send_bis <- k <- f <- g.
- Called from tests/slicing/select_return.i:39.
-[eva] Done for function send_bis
-[eva] Recording results for k
-[eva] Done for function k
-[eva] computing for function k <- f <- g.
- Called from tests/slicing/select_return.i:51.
-[eva] computing for function get <- k <- f <- g.
- Called from tests/slicing/select_return.i:35.
-[eva] Done for function get
-[eva] computing for function send_bis <- k <- f <- g.
- Called from tests/slicing/select_return.i:39.
-[eva] Done for function send_bis
-[eva] Recording results for k
-[eva] Done for function k
-[eva] computing for function send <- f <- g.
- Called from tests/slicing/select_return.i:53.
-[kernel:annot:missing-spec] tests/slicing/select_return.i:53: Warning:
- Neither code nor specification for function send, generating default assigns from the prototype
-[eva] using specification for function send
-[eva] Done for function send
-[eva] Recording results for f
-[eva] Done for function f
-[eva] Recording results for g
-[eva] done for function g
-[from] Computing for function k
-[from] Computing for function get <-k
-[from] Done for function get
-[from] Computing for function send_bis <-k
-[from] Done for function send_bis
-[from] Done for function k
-[from] Computing for function f
-[from] Computing for function send <-f
-[from] Done for function send
-[from] Done for function f
-[from] Computing for function g
-[from] Done for function g
-[from] ====== DEPENDENCIES COMPUTED ======
- These dependencies hold at termination for the executions that terminate:
-[from] Function get:
- \result FROM y
-[from] Function send:
- NO EFFECTS
-[from] Function send_bis:
- NO EFFECTS
-[from] Function k:
- G FROM b
- H FROM c
- \result FROM a
-[from] Function f:
- G FROM \nothing
- H FROM \nothing
- \result FROM y
-[from] Function g:
- G FROM \nothing
- H FROM \nothing
-[from] ====== END OF DEPENDENCIES ======
-[slicing] initializing slicing ...
-[pdg] computing for function k
-[pdg] done for function k
-[slicing] applying all slicing requests...
-[slicing] applying 1 actions...
-[slicing] applying actions: 1/1...
-[pdg] computing for function f
-[pdg] done for function f
-[pdg] computing for function g
-[pdg] done for function g
-Project1 - result1 :
-[slicing] exporting project to 'Sliced code'...
-[slicing] applying all slicing requests...
-[slicing] applying 0 actions...
-[sparecode] remove unused global declarations from project 'Sliced code tmp'
-[sparecode] removed unused global declarations in new project 'Sliced code'
-/* Generated by Frama-C */
-int get(int y);
-
-/*@ assigns \nothing; */
-void send_bis(int x);
-
-void k_slice_1(int d)
-{
- int cond = get(d);
- if (cond) send_bis(d);
- return;
-}
-
-void f_slice_1(void);
-
-void g(void)
-{
- k_slice_1(0);
- f_slice_1();
- return;
-}
-
-void f_slice_1(void)
-{
- k_slice_1(0);
- k_slice_1(0);
- k_slice_1(0);
- return;
-}
-
-
-Project1 - result2 :
-int G;
-int H;
-int I;
-/*@ assigns \result;
- assigns \result \from y; */
-int get(int y);
-
-/*@ assigns \nothing; */
-void send(int x);
-
-/*@ assigns \nothing; */
-void send_bis(int x);
-
-Print slice = k_slice_2: (InCtrl: <[ S ], [---]>)
- (In4: <[--d], [---]>)
-
-/**/int k(/* <[---], [---]> */ int a, /* <[---], [---]> */ int b,
- /* <[---], [---]> */ int c, /* <[--d], [---]> */ int d)
-{
- /* sig call:
- (InCtrl: <[ S ], [---]>)
- (In1: <[ S ], [---]>)
- (OutRet: <[ S ], [---]>) */
- /* undetermined call */
- /* <[ S ], [---]> */
- /* <[ S ], [---]> */ int cond = get(d);
- /* <[---], [---]> */
- G = b;
- /* <[---], [---]> */
- H = c;
- /* <[ S ], [---]> */
- if (cond) {
- /* sig call: (InCtrl: <[ S ], [---]>)
- (In1: <[ S ], [---]>) */
- /* undetermined call */
- /* <[ S ], [---]> */
- send_bis(d);
- }
- /* <[---], [---]> */
- return a;
-}
-
-Print slice = k_slice_1: (InCtrl: <[ S ], [ S ]>)
- (In4: <[--d], [ S ]>)
-
-/**/int k(/* <[---], [---]> */ int a, /* <[---], [---]> */ int b,
- /* <[---], [---]> */ int c, /* <[--d], [ S ]> */ int d)
-{
- /* sig call:
- (InCtrl: <[ S ], [ S ]>)
- (In1: <[ S ], [ S ]>)
- (OutRet: <[ S ], [ S ]>) */
- /* call to source function */
- /* <[ S ], [ S ]> */
- /* <[ S ], [ S ]> */ int cond = get(d);
- /* <[---], [---]> */
- G = b;
- /* <[---], [---]> */
- H = c;
- /* <[ S ], [ S ]> */
- if (cond) {
- /* sig call: (InCtrl: <[ S ], [ S ]>)
- (In1: <[ S ], [ S ]>) */
- /* call to source function */
- /* <[ S ], [ S ]> */
- send_bis(d);
- }
- /* <[---], [---]> */
- return a;
-}
-
-int f(int y);
-
-Print slice = g_slice_1: (InCtrl: <[--d], [ S ]>)
-
-/**/void g(/* <[---], [---]> */ int b, /* <[---], [---]> */ int c)
-{
- /* <[---], [---]> */ int r;
- /* sig call: (InCtrl: <[--d], [ S ]>)
- (In4: <[--d], [ S ]>) */
- /* call to k_slice_1: (InCtrl: <[ S ], [ S ]>)
- (In4: <[--d], [ S ]>) */
- /* <[--d], [ S ]> */
- /* <[---], [---]> */ int r = k(0,0,c,0);
- /* sig call: (InCtrl: <[--d], [ S ]>) */
- /* call to f_slice_1: (InCtrl: <[--d], [ S ]>) */
- /* <[--d], [ S ]> */
- f(b);
- /* <[---], [---]> */
- return;
-}
-
-Print slice = f_slice_1: (InCtrl: <[--d], [ S ]>)
-
-/**/int f(/* <[---], [---]> */ int y)
-{
- /* <[---], [---]> */ int r;
- /* <[---], [---]> */ int z;
- /* sig call: (InCtrl: <[--d], [ S ]>)
- (In4: <[--d], [ S ]>) */
- /* call to k_slice_1: (InCtrl: <[ S ], [ S ]>)
- (In4: <[--d], [ S ]>) */
- /* <[--d], [ S ]> */
- k(0,0,0,0);
- /* sig call: (InCtrl: <[--d], [ S ]>)
- (In4: <[--d], [ S ]>) */
- /* call to k_slice_1: (InCtrl: <[ S ], [ S ]>)
- (In4: <[--d], [ S ]>) */
- /* <[--d], [ S ]> */
- /* <[---], [---]> */ int r = k(0,y,0,0);
- /* sig call: (InCtrl: <[--d], [ S ]>)
- (In4: <[--d], [ S ]>) */
- /* call to k_slice_1: (InCtrl: <[ S ], [ S ]>)
- (In4: <[--d], [ S ]>) */
- /* <[--d], [ S ]> */
- /* <[---], [---]> */ int z = k(G,0,0,0);
- /*@ slice pragma expr z; */ /* <[---], [---]> */
- ;
- /* invisible call */ /* <[---], [---]> */
- send(z);
- /* <[---], [---]> */
- return z;
-}
-
-Slicing project worklist [default] =
-[k_slice_2 = choose_call for call 6][k_slice_2 = choose_call for call 1]
-
-[slicing] exporting project to 'Sliced code'...
-[slicing] applying all slicing requests...
-[slicing] applying 2 actions...
-[slicing] applying actions: 1/2...
-[slicing] applying actions: 2/2...
-[sparecode] remove unused global declarations from project 'Sliced code tmp'
-[sparecode] removed unused global declarations in new project 'Sliced code'
-/* Generated by Frama-C */
-int get(int y);
-
-/*@ assigns \nothing; */
-void send_bis(int x);
-
-void k_slice_2(int d)
-{
- int cond = get(d);
- if (cond) send_bis(d);
- return;
-}
-
-void k_slice_1(int d)
-{
- int cond = get(d);
- if (cond) send_bis(d);
- return;
-}
-
-void f_slice_1(void);
-
-void g(void)
-{
- k_slice_1(0);
- f_slice_1();
- return;
-}
-
-void f_slice_1(void)
-{
- k_slice_1(0);
- k_slice_1(0);
- k_slice_1(0);
- return;
-}
-
-
-[slicing] reinitializing slicing ...
-Slicing project worklist [default] =
-[k = (n:17 ,<[--d], [---]>)]
-
-[slicing] applying all slicing requests...
-[slicing] applying 1 actions...
-[slicing] applying actions: 1/1...
-Project3 - result :
-int G;
-int H;
-int I;
-/*@ assigns \result;
- assigns \result \from y; */
-int get(int y);
-
-/*@ assigns \nothing; */
-void send(int x);
-
-/*@ assigns \nothing; */
-void send_bis(int x);
-
-Print slice = k_slice_1: (InCtrl: <[--d], [ S ]>)
- (In4: <[--d], [ S ]>)
-
-/**/int k(/* <[---], [---]> */ int a, /* <[---], [---]> */ int b,
- /* <[---], [---]> */ int c, /* <[--d], [ S ]> */ int d)
-{
- /* sig call:
- (InCtrl: <[--d], [ S ]>)
- (In1: <[--d], [ S ]>)
- (OutRet: <[--d], [ S ]>) */
- /* call to source function */
- /* <[--d], [ S ]> */
- /* <[--d], [ S ]> */ int cond = get(d);
- /* <[---], [---]> */
- G = b;
- /* <[---], [---]> */
- H = c;
- /* <[--d], [ S ]> */
- if (cond) {
- /* sig call: (InCtrl: <[--d], [ S ]>)
- (In1: <[---], [ S ]>) */
- /* call to source function */
- /* <[--d], [ S ]> */
- send_bis(d);
- }
- /* <[---], [---]> */
- return a;
-}
-
-int f(int y);
-
-Print slice = g_slice_1: (InCtrl: <[--d], [ S ]>)
-
-/**/void g(/* <[---], [---]> */ int b, /* <[---], [---]> */ int c)
-{
- /* <[---], [---]> */ int r;
- /* sig call: (InCtrl: <[--d], [ S ]>)
- (In4: <[--d], [ S ]>) */
- /* call to k_slice_1: (InCtrl: <[--d], [ S ]>)
- (In4: <[--d], [ S ]>) */
- /* <[--d], [ S ]> */
- /* <[---], [---]> */ int r = k(0,0,c,0);
- /* sig call: (InCtrl: <[--d], [ S ]>) */
- /* call to f_slice_1: (InCtrl: <[--d], [ S ]>) */
- /* <[--d], [ S ]> */
- f(b);
- /* <[---], [---]> */
- return;
-}
-
-Print slice = f_slice_1: (InCtrl: <[--d], [ S ]>)
-
-/**/int f(/* <[---], [---]> */ int y)
-{
- /* <[---], [---]> */ int r;
- /* <[---], [---]> */ int z;
- /* sig call: (InCtrl: <[--d], [ S ]>)
- (In4: <[--d], [ S ]>) */
- /* call to k_slice_1: (InCtrl: <[--d], [ S ]>)
- (In4: <[--d], [ S ]>) */
- /* <[--d], [ S ]> */
- k(0,0,0,0);
- /* sig call: (InCtrl: <[--d], [ S ]>)
- (In4: <[--d], [ S ]>) */
- /* call to k_slice_1: (InCtrl: <[--d], [ S ]>)
- (In4: <[--d], [ S ]>) */
- /* <[--d], [ S ]> */
- /* <[---], [---]> */ int r = k(0,y,0,0);
- /* sig call: (InCtrl: <[--d], [ S ]>)
- (In4: <[--d], [ S ]>) */
- /* call to k_slice_1: (InCtrl: <[--d], [ S ]>)
- (In4: <[--d], [ S ]>) */
- /* <[--d], [ S ]> */
- /* <[---], [---]> */ int z = k(G,0,0,0);
- /*@ slice pragma expr z; */ /* <[---], [---]> */
- ;
- /* invisible call */ /* <[---], [---]> */
- send(z);
- /* <[---], [---]> */
- return z;
-}
-
-Slicing project worklist [default] =
-
-
-[slicing] exporting project to 'Sliced code'...
-[slicing] applying all slicing requests...
-[slicing] applying 0 actions...
-[sparecode] remove unused global declarations from project 'Sliced code tmp'
-[sparecode] removed unused global declarations in new project 'Sliced code'
-/* Generated by Frama-C */
-int get(int y);
-
-/*@ assigns \nothing; */
-void send_bis(int x);
-
-void k_slice_1(int d)
-{
- int cond = get(d);
- if (cond) send_bis(d);
- return;
-}
-
-void f_slice_1(void);
-
-void g(void)
-{
- k_slice_1(0);
- f_slice_1();
- return;
-}
-
-void f_slice_1(void)
-{
- k_slice_1(0);
- k_slice_1(0);
- k_slice_1(0);
- return;
-}
-
-
-[slicing] reinitializing slicing ...
-[slicing] applying all slicing requests...
-[slicing] applying 0 actions...
-Slicing project worklist [default] =
-[f = (n:26 ,<[acd], [---]>)(n:33 ,<[acd], [---]>)(n:41 ,<[acd], [---]>)][g = (n:60 ,
-<[acd],
-[---]>)]
-
-Slicing project worklist [default] =
-[f_slice_1 = choose_call for call 17][f_slice_1 = choose_call for call 16][f_slice_1 = choose_call for call 15][g = propagate (n:68 ,
-<[acd],
-[---]>)][Appli : calls to f][g = (n:60 ,<[acd], [---]>)]
-
-[slicing] applying all slicing requests...
-[slicing] applying 6 actions...
-[slicing] applying actions: 1/6...
-[slicing] applying actions: 2/6...
-[slicing] applying actions: 3/6...
-[slicing] applying actions: 4/6...
-[slicing] applying actions: 5/6...
-[slicing] applying actions: 6/6...
-Project3 - result :
-int G;
-int H;
-int I;
-/*@ assigns \result;
- assigns \result \from y; */
-int get(int y);
-
-/*@ assigns \nothing; */
-void send(int x);
-
-/*@ assigns \nothing; */
-void send_bis(int x);
-
-Print slice = k_slice_1:
-
-/**/int k(/* <[---], [---]> */ int a, /* <[---], [---]> */ int b,
- /* <[---], [---]> */ int c, /* <[---], [---]> */ int d)
-{
- /* invisible call */ /* <[---], [---]> */
- /* <[---], [---]> */ int cond = get(d);
- /* <[---], [---]> */
- G = b;
- /* <[---], [---]> */
- H = c;
- /* <[---], [---]> */
- if (cond) {
- /* invisible call */ /* <[---], [---]> */
- send_bis(d);
- }
- /* <[---], [---]> */
- return a;
-}
-
-int f(int y);
-
-Print slice = g_slice_1: (InCtrl: <[acd], [---]>)
-
-/**/void g(/* <[---], [---]> */ int b, /* <[---], [---]> */ int c)
-{
- /* <[---], [---]> */ int r;
- /* sig call: (InCtrl: <[acd], [---]>) */
- /* call to k_slice_1: */
- /* <[acd], [---]> */
- /* <[---], [---]> */ int r = k(0,0,c,0);
- /* sig call: (InCtrl: <[acd], [---]>) */
- /* call to f_slice_1: (InCtrl: <[acd], [---]>) */
- /* <[acd], [---]> */
- f(b);
- /* <[---], [---]> */
- return;
-}
-
-Print slice = f_slice_1: (InCtrl: <[acd], [---]>)
-
-/**/int f(/* <[---], [---]> */ int y)
-{
- /* <[---], [---]> */ int r;
- /* <[---], [---]> */ int z;
- /* sig call: (InCtrl: <[acd], [---]>) */
- /* call to k_slice_1: */
- /* <[acd], [---]> */
- k(0,0,0,0);
- /* sig call: (InCtrl: <[acd], [---]>) */
- /* call to k_slice_1: */
- /* <[acd], [---]> */
- /* <[---], [---]> */ int r = k(0,y,0,0);
- /* sig call: (InCtrl: <[acd], [---]>) */
- /* call to k_slice_1: */
- /* <[acd], [---]> */
- /* <[---], [---]> */ int z = k(G,0,0,0);
- /*@ slice pragma expr z; */ /* <[---], [---]> */
- ;
- /* invisible call */ /* <[---], [---]> */
- send(z);
- /* <[---], [---]> */
- return z;
-}
-
-Slicing project worklist [default] =
-
-
-[slicing] exporting project to 'Sliced code'...
-[slicing] applying all slicing requests...
-[slicing] applying 0 actions...
-[sparecode] remove unused global declarations from project 'Sliced code tmp'
-[sparecode] removed unused global declarations in new project 'Sliced code'
-/* Generated by Frama-C */
-void k_slice_1(void)
-{
- return;
-}
-
-void f_slice_1(void);
-
-void g(void)
-{
- k_slice_1();
- f_slice_1();
- return;
-}
-
-void f_slice_1(void)
-{
- k_slice_1();
- k_slice_1();
- k_slice_1();
- return;
-}
-
-
->>>>>>> origin/master
diff --git a/tests/slicing/oracle/select_simple.res.oracle b/tests/slicing/oracle/select_simple.res.oracle
index c359bc624e0..0dece58c73a 100644
--- a/tests/slicing/oracle/select_simple.res.oracle
+++ b/tests/slicing/oracle/select_simple.res.oracle
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
[kernel] Parsing select_simple.c (with preprocessing)
[eva] Analyzing a complete application starting at main
[eva] Computing initial state
@@ -429,440 +428,3 @@ void f8_slice_1(Tstr *ps)
}
-||||||| ac7807782d
-[kernel] Parsing tests/slicing/select_simple.i (no preprocessing)
-[kernel] User Error: cannot find entry point `main'.
- Please use option `-main' for specifying a valid entry point.
-[kernel] Frama-C aborted: invalid user input.
-=======
-[kernel] Parsing tests/slicing/select_simple.c (with preprocessing)
-[eva] Analyzing a complete application starting at main
-[eva] Computing initial state
-[eva] Initial state computed
-[eva:initial-state] Values of globals at initialization
- Unknown ∈ {0}
- G ∈ {0}
- S ∈ {0}
- S1 ∈ {0}
- S2 ∈ {0}
-[eva:alarm] tests/slicing/simple_intra_slice.i:99: Warning:
- signed overflow. assert -2147483648 ≤ uninit - 1;
-[eva] tests/slicing/simple_intra_slice.i:98: starting to merge loop iterations
-[eva:alarm] tests/slicing/simple_intra_slice.i:99: Warning:
- signed overflow. assert Unknown + 1 ≤ 2147483647;
-[eva:alarm] tests/slicing/simple_intra_slice.i:99: Warning:
- signed overflow. assert -2147483648 ≤ Unknown - 1;
-[eva:alarm] tests/slicing/simple_intra_slice.i:101: Warning:
- signed overflow. assert -2147483648 ≤ uninit2 - 1;
-[eva] tests/slicing/simple_intra_slice.i:100: starting to merge loop iterations
-[eva:alarm] tests/slicing/simple_intra_slice.i:101: Warning:
- signed overflow. assert S.a + 1 ≤ 2147483647;
-[eva:alarm] tests/slicing/simple_intra_slice.i:101: Warning:
- signed overflow. assert -2147483648 ≤ S.a - 1;
-[eva] computing for function f2 <- main.
- Called from tests/slicing/simple_intra_slice.i:103.
-[eva] computing for function f1 <- f2 <- main.
- Called from tests/slicing/simple_intra_slice.i:23.
-[eva] Recording results for f1
-[eva] Done for function f1
-[eva] Recording results for f2
-[eva] Done for function f2
-[eva] computing for function f3 <- main.
- Called from tests/slicing/simple_intra_slice.i:104.
-[eva] Recording results for f3
-[eva] Done for function f3
-[eva] computing for function f4 <- main.
- Called from tests/slicing/simple_intra_slice.i:105.
-[eva] Recording results for f4
-[eva] Done for function f4
-[eva] computing for function f5 <- main.
- Called from tests/slicing/simple_intra_slice.i:106.
-[eva] Recording results for f5
-[eva] Done for function f5
-[eva] computing for function f6 <- main.
- Called from tests/slicing/simple_intra_slice.i:107.
-[eva:alarm] tests/slicing/simple_intra_slice.i:71: Warning:
- signed overflow. assert -2147483648 ≤ 10 * n;
-[eva:alarm] tests/slicing/simple_intra_slice.i:71: Warning:
- signed overflow. assert 10 * n ≤ 2147483647;
-[eva] Recording results for f6
-[eva] Done for function f6
-[eva:alarm] tests/slicing/simple_intra_slice.i:107: Warning:
- signed overflow. assert res + tmp_3 ≤ 2147483647;
- (tmp_3 from f6(Unknown))
-[eva] computing for function f7 <- main.
- Called from tests/slicing/simple_intra_slice.i:108.
-[eva:alarm] tests/slicing/simple_intra_slice.i:79: Warning:
- signed overflow. assert S.a + 3 ≤ 2147483647;
-[eva:alarm] tests/slicing/simple_intra_slice.i:82: Warning:
- signed overflow. assert s0.a + 1 ≤ 2147483647;
-[eva] Recording results for f7
-[eva] Done for function f7
-[eva] computing for function f8 <- main.
- Called from tests/slicing/simple_intra_slice.i:110.
-[eva] Recording results for f8
-[eva] Done for function f8
-[eva] computing for function f8 <- main.
- Called from tests/slicing/simple_intra_slice.i:112.
-[eva] Recording results for f8
-[eva] Done for function f8
-[eva] Recording results for main
-[eva] done for function main
-[from] Computing for function f1
-[from] Done for function f1
-[from] Computing for function f2
-[from] Done for function f2
-[from] Computing for function f3
-[from] Done for function f3
-[from] Computing for function f4
-[from] Done for function f4
-[from] Computing for function f5
-[from] Done for function f5
-[from] Computing for function f6
-[from] Done for function f6
-[from] Computing for function f7
-[from] Done for function f7
-[from] Computing for function f8
-[from] Done for function f8
-[from] Computing for function main
-[from] Done for function main
-[from] ====== DEPENDENCIES COMPUTED ======
- These dependencies hold at termination for the executions that terminate:
-[from] Function f1:
- G FROM x
- \result FROM y
-[from] Function f2:
- G FROM \nothing
- \result FROM \nothing
-[from] Function f3:
- G FROM Unknown; c (and SELF)
- \result FROM Unknown; c
-[from] Function f4:
- G FROM Unknown; c (and SELF)
- \result FROM Unknown; c
-[from] Function f5:
- G FROM Unknown; G; c (and SELF)
- \result FROM Unknown; c
-[from] Function f6:
- \result FROM Unknown; n
-[from] Function f7:
- S.a FROM S.a; s0
- {.b; .c} FROM S.a; s0 (and SELF)
-[from] Function f8:
- S1.a FROM S1.a; S2.a; ps (and SELF)
- .b FROM S1.b; S2.b; ps (and SELF)
- S2.a FROM S1.a; S2.a; ps (and SELF)
- .b FROM S1.b; S2.b; ps (and SELF)
-[from] Function main:
- Unknown FROM Unknown (and SELF)
- G FROM Unknown
- S.a FROM S
- {.b; .c} FROM S (and SELF)
- S1.a FROM Unknown; S1.a; S2.a (and SELF)
- .b FROM Unknown; S1.b; S2.b (and SELF)
- S2.a FROM Unknown; S1.a; S2.a (and SELF)
- .b FROM Unknown; S1.b; S2.b (and SELF)
- \result FROM Unknown
-[from] ====== END OF DEPENDENCIES ======
-[slicing] initializing slicing ...
-[pdg] computing for function f1
-[pdg] done for function f1
-Slicing project worklist [default] =
-[f1_slice_1 = (n:11(restrict to G) ,<[--d], [---]>)]
-
-[slicing] exporting project to 'Sliced code'...
-[slicing] applying all slicing requests...
-[slicing] applying 1 actions...
-[slicing] applying actions: 1/1...
-[sparecode] remove unused global declarations from project 'Sliced code tmp'
-[sparecode] removed unused global declarations in new project 'Sliced code'
-/* Generated by Frama-C */
-int G;
-void f1_slice_1(int x)
-{
- int a = 1;
- G = x + a;
- return;
-}
-
-
-[slicing] reinitializing slicing ...
-Slicing project worklist [default] =
-[f1_slice_1 = (n:13(restrict to __retres) ,<[--d], [---]>)]
-
-[slicing] exporting project to 'Sliced code'...
-[slicing] applying all slicing requests...
-[slicing] applying 1 actions...
-[slicing] applying actions: 1/1...
-[sparecode] remove unused global declarations from project 'Sliced code tmp'
-[sparecode] removed unused global declarations in new project 'Sliced code'
-/* Generated by Frama-C */
-int f1_slice_1(int y)
-{
- int __retres;
- int b = 2;
- __retres = y + b;
- return __retres;
-}
-
-
-[slicing] reinitializing slicing ...
-[pdg] computing for function f2
-[pdg] done for function f2
-Slicing project worklist [default] =
-[f2_slice_1 = (n:28(restrict to tmp) ,<[--d], [---]>)]
-
-[slicing] exporting project to 'Sliced code'...
-[slicing] applying all slicing requests...
-[slicing] applying 1 actions...
-[slicing] applying actions: 1/1...
-[sparecode] remove unused global declarations from project 'Sliced code tmp'
-[sparecode] removed unused global declarations in new project 'Sliced code'
-/* Generated by Frama-C */
-int f1_slice_1(int y)
-{
- int __retres;
- int b = 2;
- __retres = y + b;
- return __retres;
-}
-
-int f2_slice_1(void)
-{
- int tmp;
- int c = 3;
- tmp = f1_slice_1(c);
- return tmp;
-}
-
-
-[slicing] reinitializing slicing ...
-[pdg] computing for function f6
-[pdg] done for function f6
-Slicing project worklist [default] =
-[f6_slice_1 = (n:32(restrict to n) ,<[--d], [---]>)(n:42(restrict to
-n) ,<[--d], [---]>)]
-
-[slicing] exporting project to 'Sliced code'...
-[slicing] applying all slicing requests...
-[slicing] applying 1 actions...
-[slicing] applying actions: 1/1...
-[sparecode] remove unused global declarations from project 'Sliced code tmp'
-[sparecode] removed unused global declarations in new project 'Sliced code'
-/* Generated by Frama-C */
-int Unknown;
-void f6_slice_1(int n)
-{
- while (n < 10) {
- if (Unknown > 3) break;
- if (n % 2) continue;
- n ++;
- }
- return;
-}
-
-
-[slicing] reinitializing slicing ...
-[pdg] computing for function f7
-[pdg] done for function f7
-[slicing] reinitializing slicing ...
-Impossible to select 'retres' for a void function (f7)
-Slicing project worklist [default] =
-[f7_slice_1 = (n:63(restrict to S.a) ,<[--d], [---]>)(n:65(restrict to
-S.a) ,<[--d], [---]>)]
-
-[slicing] exporting project to 'Sliced code'...
-[slicing] applying all slicing requests...
-[slicing] applying 1 actions...
-[slicing] applying actions: 1/1...
-[sparecode] remove unused global declarations from project 'Sliced code tmp'
-[sparecode] removed unused global declarations in new project 'Sliced code'
-/* Generated by Frama-C */
-struct __anonstruct_Tstr_1 {
- int a ;
- int b ;
- int c ;
-};
-typedef struct __anonstruct_Tstr_1 Tstr;
-Tstr S;
-void f7_slice_1(Tstr s0)
-{
- int x = S.a;
- if (x > 0) S.a += 3;
- else {
- (s0.a) ++;
- S = s0;
- }
- return;
-}
-
-
-[slicing] reinitializing slicing ...
-Slicing project worklist [default] =
-[f7_slice_1 = (UndefIn S.b:<[--d], [---]>)(n:65(restrict to S.b) ,<[--d],
- [---]>)]
-
-[slicing] exporting project to 'Sliced code'...
-[slicing] applying all slicing requests...
-[slicing] applying 1 actions...
-[slicing] applying actions: 1/1...
-[sparecode] remove unused global declarations from project 'Sliced code tmp'
-[sparecode] removed unused global declarations in new project 'Sliced code'
-/* Generated by Frama-C */
-struct __anonstruct_Tstr_1 {
- int a ;
- int b ;
- int c ;
-};
-typedef struct __anonstruct_Tstr_1 Tstr;
-Tstr S;
-void f7_slice_1(Tstr s0)
-{
- int x = S.a;
- if (! (x > 0)) {
- (s0.a) ++;
- S = s0;
- }
- return;
-}
-
-
-[slicing] reinitializing slicing ...
-Slicing project worklist [default] =
-[f7_slice_1 = (UndefIn S{.b; .c}:<[--d], [---]>)(n:63(restrict to S.a) ,
-<[--d],
-[---]>)(n:65(restrict to S.a) ,<[--d], [---]>)(n:65(restrict to S{.b; .c}) ,
-<[--d],
-[---]>)]
-
-[slicing] exporting project to 'Sliced code'...
-[slicing] applying all slicing requests...
-[slicing] applying 1 actions...
-[slicing] applying actions: 1/1...
-[sparecode] remove unused global declarations from project 'Sliced code tmp'
-[sparecode] removed unused global declarations in new project 'Sliced code'
-/* Generated by Frama-C */
-struct __anonstruct_Tstr_1 {
- int a ;
- int b ;
- int c ;
-};
-typedef struct __anonstruct_Tstr_1 Tstr;
-Tstr S;
-void f7_slice_1(Tstr s0)
-{
- int x = S.a;
- if (x > 0) S.a += 3;
- else {
- (s0.a) ++;
- S = s0;
- }
- return;
-}
-
-
-[slicing] reinitializing slicing ...
-[slicing] reinitializing slicing ...
-[pdg] computing for function f8
-[pdg] done for function f8
-Impossible to select this data : XXX in f7
-Slicing project worklist [default] =
-[f8_slice_1 = (n:71(restrict to S1.a) ,<[--d], [---]>)(n:71(restrict to
-S2.a) ,<[--d], [---]>)(n:77(restrict to S2.a) ,<[--d], [---]>)(n:76(restrict to
-S1.a) ,<[--d], [---]>)]
-
-[slicing] exporting project to 'Sliced code'...
-[slicing] applying all slicing requests...
-[slicing] applying 1 actions...
-[slicing] applying actions: 1/1...
-[sparecode] remove unused global declarations from project 'Sliced code tmp'
-[sparecode] removed unused global declarations in new project 'Sliced code'
-/* Generated by Frama-C */
-struct __anonstruct_Tstr_1 {
- int a ;
- int b ;
- int c ;
-};
-typedef struct __anonstruct_Tstr_1 Tstr;
-void f8_slice_1(Tstr *ps)
-{
- (ps->a) ++;
- return;
-}
-
-
-[slicing] reinitializing slicing ...
-Slicing project worklist [default] =
-[f8_slice_1 = (n:72(restrict to S1.b) ,<[--d], [---]>)(n:72(restrict to
-S2.b) ,<[--d], [---]>)(n:75(restrict to S2.b) ,<[--d], [---]>)(n:74(restrict to
-S1.b) ,<[--d], [---]>)]
-
-[slicing] exporting project to 'Sliced code'...
-[slicing] applying all slicing requests...
-[slicing] applying 1 actions...
-[slicing] applying actions: 1/1...
-[sparecode] remove unused global declarations from project 'Sliced code tmp'
-[sparecode] removed unused global declarations in new project 'Sliced code'
-/* Generated by Frama-C */
-struct __anonstruct_Tstr_1 {
- int a ;
- int b ;
- int c ;
-};
-typedef struct __anonstruct_Tstr_1 Tstr;
-void f8_slice_1(Tstr *ps)
-{
- (ps->b) ++;
- return;
-}
-
-
-[slicing] reinitializing slicing ...
-Slicing project worklist [default] =
-[f8_slice_1 = (UndefIn S1.c;
-S2.c:<[--d], [---]>)]
-
-[slicing] exporting project to 'Sliced code'...
-[slicing] applying all slicing requests...
-[slicing] applying 1 actions...
-[slicing] applying actions: 1/1...
-[sparecode] remove unused global declarations from project 'Sliced code tmp'
-[sparecode] removed unused global declarations in new project 'Sliced code'
-/* Generated by Frama-C */
-void f8_slice_1(void)
-{
- return;
-}
-
-
-[slicing] reinitializing slicing ...
-Slicing project worklist [default] =
-[f8_slice_1 = (UndefIn S1.c;
-S2.c:<[--d], [---]>)(n:71(restrict to S1.a) ,<[--d], [---]>)(n:72(restrict to
-S1.b) ,<[--d], [---]>)(n:71(restrict to S2.a) ,<[--d], [---]>)(n:72(restrict to
-S2.b) ,<[--d], [---]>)(n:75(restrict to S2.b) ,<[--d], [---]>)(n:77(restrict to
-S2.a) ,<[--d], [---]>)(n:74(restrict to S1.b) ,<[--d], [---]>)(n:76(restrict to
-S1.a) ,<[--d], [---]>)]
-
-[slicing] exporting project to 'Sliced code'...
-[slicing] applying all slicing requests...
-[slicing] applying 1 actions...
-[slicing] applying actions: 1/1...
-[sparecode] remove unused global declarations from project 'Sliced code tmp'
-[sparecode] removed unused global declarations in new project 'Sliced code'
-/* Generated by Frama-C */
-struct __anonstruct_Tstr_1 {
- int a ;
- int b ;
- int c ;
-};
-typedef struct __anonstruct_Tstr_1 Tstr;
-void f8_slice_1(Tstr *ps)
-{
- (ps->a) ++;
- (ps->b) ++;
- return;
-}
-
-
->>>>>>> origin/master
diff --git a/tests/slicing/oracle/variadic.0.res.oracle b/tests/slicing/oracle/variadic.0.res.oracle
index 601275105a3..61024996a47 100644
--- a/tests/slicing/oracle/variadic.0.res.oracle
+++ b/tests/slicing/oracle/variadic.0.res.oracle
@@ -6,33 +6,33 @@
[eva:initial-state] Values of globals at initialization
[eva] computing for function f1 <- main.
- Called from TESTS/pdg/variadic.c:37.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/pdg/variadic.c:37.
[eva] computing for function lib_f <- f1 <- main.
- Called from TESTS/pdg/variadic.c:23.
-[kernel:annot:missing-spec] TESTS/pdg/variadic.c:23: Warning:
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/pdg/variadic.c:23.
+[kernel:annot:missing-spec] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/pdg/variadic.c:23: Warning:
Neither code nor specification for function lib_f, generating default assigns from the prototype
[eva] using specification for function lib_f
[eva] Done for function lib_f
[eva] Recording results for f1
[eva] Done for function f1
[eva] computing for function f2 <- main.
- Called from TESTS/pdg/variadic.c:38.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/pdg/variadic.c:38.
[eva] computing for function lib_f <- f2 <- main.
- Called from TESTS/pdg/variadic.c:27.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/pdg/variadic.c:27.
[eva] Done for function lib_f
[eva] Recording results for f2
[eva] Done for function f2
[eva] computing for function f3 <- main.
- Called from TESTS/pdg/variadic.c:39.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/pdg/variadic.c:39.
[eva] computing for function lib_f <- f3 <- main.
- Called from TESTS/pdg/variadic.c:31.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/pdg/variadic.c:31.
[eva] Done for function lib_f
[eva] Recording results for f3
[eva] Done for function f3
[eva] computing for function f2 <- main.
- Called from TESTS/pdg/variadic.c:40.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/pdg/variadic.c:40.
[eva] computing for function lib_f <- f2 <- main.
- Called from TESTS/pdg/variadic.c:27.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/pdg/variadic.c:27.
[eva] Done for function lib_f
[eva] Recording results for f2
[eva] Done for function f2
diff --git a/tests/slicing/oracle/variadic.1.res.oracle b/tests/slicing/oracle/variadic.1.res.oracle
index 3c686905b1f..a45bc593718 100644
--- a/tests/slicing/oracle/variadic.1.res.oracle
+++ b/tests/slicing/oracle/variadic.1.res.oracle
@@ -6,33 +6,33 @@
[eva:initial-state] Values of globals at initialization
[eva] computing for function f1 <- main.
- Called from TESTS/pdg/variadic.c:37.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/pdg/variadic.c:37.
[eva] computing for function lib_f <- f1 <- main.
- Called from TESTS/pdg/variadic.c:23.
-[kernel:annot:missing-spec] TESTS/pdg/variadic.c:23: Warning:
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/pdg/variadic.c:23.
+[kernel:annot:missing-spec] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/pdg/variadic.c:23: Warning:
Neither code nor specification for function lib_f, generating default assigns from the prototype
[eva] using specification for function lib_f
[eva] Done for function lib_f
[eva] Recording results for f1
[eva] Done for function f1
[eva] computing for function f2 <- main.
- Called from TESTS/pdg/variadic.c:38.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/pdg/variadic.c:38.
[eva] computing for function lib_f <- f2 <- main.
- Called from TESTS/pdg/variadic.c:27.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/pdg/variadic.c:27.
[eva] Done for function lib_f
[eva] Recording results for f2
[eva] Done for function f2
[eva] computing for function f3 <- main.
- Called from TESTS/pdg/variadic.c:39.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/pdg/variadic.c:39.
[eva] computing for function lib_f <- f3 <- main.
- Called from TESTS/pdg/variadic.c:31.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/pdg/variadic.c:31.
[eva] Done for function lib_f
[eva] Recording results for f3
[eva] Done for function f3
[eva] computing for function f2 <- main.
- Called from TESTS/pdg/variadic.c:40.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/pdg/variadic.c:40.
[eva] computing for function lib_f <- f2 <- main.
- Called from TESTS/pdg/variadic.c:27.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/pdg/variadic.c:27.
[eva] Done for function lib_f
[eva] Recording results for f2
[eva] Done for function f2
diff --git a/tests/slicing/oracle/variadic.2.res.oracle b/tests/slicing/oracle/variadic.2.res.oracle
index 9b5a8a3007b..8a9d55c2197 100644
--- a/tests/slicing/oracle/variadic.2.res.oracle
+++ b/tests/slicing/oracle/variadic.2.res.oracle
@@ -6,33 +6,33 @@
[eva:initial-state] Values of globals at initialization
[eva] computing for function f1 <- main.
- Called from TESTS/pdg/variadic.c:37.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/pdg/variadic.c:37.
[eva] computing for function lib_f <- f1 <- main.
- Called from TESTS/pdg/variadic.c:23.
-[kernel:annot:missing-spec] TESTS/pdg/variadic.c:23: Warning:
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/pdg/variadic.c:23.
+[kernel:annot:missing-spec] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/pdg/variadic.c:23: Warning:
Neither code nor specification for function lib_f, generating default assigns from the prototype
[eva] using specification for function lib_f
[eva] Done for function lib_f
[eva] Recording results for f1
[eva] Done for function f1
[eva] computing for function f2 <- main.
- Called from TESTS/pdg/variadic.c:38.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/pdg/variadic.c:38.
[eva] computing for function lib_f <- f2 <- main.
- Called from TESTS/pdg/variadic.c:27.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/pdg/variadic.c:27.
[eva] Done for function lib_f
[eva] Recording results for f2
[eva] Done for function f2
[eva] computing for function f3 <- main.
- Called from TESTS/pdg/variadic.c:39.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/pdg/variadic.c:39.
[eva] computing for function lib_f <- f3 <- main.
- Called from TESTS/pdg/variadic.c:31.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/pdg/variadic.c:31.
[eva] Done for function lib_f
[eva] Recording results for f3
[eva] Done for function f3
[eva] computing for function f2 <- main.
- Called from TESTS/pdg/variadic.c:40.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/pdg/variadic.c:40.
[eva] computing for function lib_f <- f2 <- main.
- Called from TESTS/pdg/variadic.c:27.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/pdg/variadic.c:27.
[eva] Done for function lib_f
[eva] Recording results for f2
[eva] Done for function f2
diff --git a/tests/slicing/oracle/variadic.3.res.oracle b/tests/slicing/oracle/variadic.3.res.oracle
index 7b22f34440d..ce0e853e7fc 100644
--- a/tests/slicing/oracle/variadic.3.res.oracle
+++ b/tests/slicing/oracle/variadic.3.res.oracle
@@ -6,33 +6,33 @@
[eva:initial-state] Values of globals at initialization
[eva] computing for function f1 <- main.
- Called from TESTS/pdg/variadic.c:37.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/pdg/variadic.c:37.
[eva] computing for function lib_f <- f1 <- main.
- Called from TESTS/pdg/variadic.c:23.
-[kernel:annot:missing-spec] TESTS/pdg/variadic.c:23: Warning:
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/pdg/variadic.c:23.
+[kernel:annot:missing-spec] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/pdg/variadic.c:23: Warning:
Neither code nor specification for function lib_f, generating default assigns from the prototype
[eva] using specification for function lib_f
[eva] Done for function lib_f
[eva] Recording results for f1
[eva] Done for function f1
[eva] computing for function f2 <- main.
- Called from TESTS/pdg/variadic.c:38.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/pdg/variadic.c:38.
[eva] computing for function lib_f <- f2 <- main.
- Called from TESTS/pdg/variadic.c:27.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/pdg/variadic.c:27.
[eva] Done for function lib_f
[eva] Recording results for f2
[eva] Done for function f2
[eva] computing for function f3 <- main.
- Called from TESTS/pdg/variadic.c:39.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/pdg/variadic.c:39.
[eva] computing for function lib_f <- f3 <- main.
- Called from TESTS/pdg/variadic.c:31.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/pdg/variadic.c:31.
[eva] Done for function lib_f
[eva] Recording results for f3
[eva] Done for function f3
[eva] computing for function f2 <- main.
- Called from TESTS/pdg/variadic.c:40.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/pdg/variadic.c:40.
[eva] computing for function lib_f <- f2 <- main.
- Called from TESTS/pdg/variadic.c:27.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/pdg/variadic.c:27.
[eva] Done for function lib_f
[eva] Recording results for f2
[eva] Done for function f2
diff --git a/tests/slicing/oracle/variadic.4.res.oracle b/tests/slicing/oracle/variadic.4.res.oracle
index 7b22f34440d..ce0e853e7fc 100644
--- a/tests/slicing/oracle/variadic.4.res.oracle
+++ b/tests/slicing/oracle/variadic.4.res.oracle
@@ -6,33 +6,33 @@
[eva:initial-state] Values of globals at initialization
[eva] computing for function f1 <- main.
- Called from TESTS/pdg/variadic.c:37.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/pdg/variadic.c:37.
[eva] computing for function lib_f <- f1 <- main.
- Called from TESTS/pdg/variadic.c:23.
-[kernel:annot:missing-spec] TESTS/pdg/variadic.c:23: Warning:
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/pdg/variadic.c:23.
+[kernel:annot:missing-spec] /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/pdg/variadic.c:23: Warning:
Neither code nor specification for function lib_f, generating default assigns from the prototype
[eva] using specification for function lib_f
[eva] Done for function lib_f
[eva] Recording results for f1
[eva] Done for function f1
[eva] computing for function f2 <- main.
- Called from TESTS/pdg/variadic.c:38.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/pdg/variadic.c:38.
[eva] computing for function lib_f <- f2 <- main.
- Called from TESTS/pdg/variadic.c:27.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/pdg/variadic.c:27.
[eva] Done for function lib_f
[eva] Recording results for f2
[eva] Done for function f2
[eva] computing for function f3 <- main.
- Called from TESTS/pdg/variadic.c:39.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/pdg/variadic.c:39.
[eva] computing for function lib_f <- f3 <- main.
- Called from TESTS/pdg/variadic.c:31.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/pdg/variadic.c:31.
[eva] Done for function lib_f
[eva] Recording results for f3
[eva] Done for function f3
[eva] computing for function f2 <- main.
- Called from TESTS/pdg/variadic.c:40.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/pdg/variadic.c:40.
[eva] computing for function lib_f <- f2 <- main.
- Called from TESTS/pdg/variadic.c:27.
+ Called from /home/pb122476/export-local/frama-c/dune-frama-c/trunk/_build/default/tests/pdg/variadic.c:27.
[eva] Done for function lib_f
[eva] Recording results for f2
[eva] Done for function f2
diff --git a/tests/slicing/select_simple.c b/tests/slicing/select_simple.c
index 6efa6fae656..120c7d85790 100644
--- a/tests/slicing/select_simple.c
+++ b/tests/slicing/select_simple.c
@@ -1,9 +1,10 @@
/* run.config
- EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
- CMD: @frama-c@ -load-module tests/slicing/libSelect.cmxs -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
+ DEPS: simple_intra_slice.i
+ LIBS: libSelect
+ MODULE: @PTEST_NAME@
OPT: @EVA_OPTIONS@ -deps -journal-disable
*/
/* dummy source file in order to test select_simple.ml */
-#include "tests/slicing/simple_intra_slice.i"
+#include "simple_intra_slice.i"
diff --git a/tests/slicing/test_config b/tests/slicing/test_config
index 151008b9a6d..70059f8e01c 100644
--- a/tests/slicing/test_config
+++ b/tests/slicing/test_config
@@ -1,10 +1,2 @@
-<<<<<<< HEAD
PLUGIN: slicing @EVA_PLUGINS@
OPT: @EVA_OPTIONS@ -machdep x86_32
-||||||| ac7807782d
-EXECNOW: make -s tests/slicing/libSelect.cmxs tests/slicing/libAnim.cmxs
-OPT: @EVA_OPTIONS@
-=======
-EXECNOW: make -s tests/slicing/libSelect.cmxs tests/slicing/libAnim.cmxs
-OPT: @EVA_OPTIONS@ -machdep x86_32
->>>>>>> origin/master
diff --git a/tests/sparecode/oracle/intra.2.res.oracle b/tests/sparecode/oracle/intra.2.res.oracle
index ff10ab1e447..ed9f8d27e14 100644
--- a/tests/sparecode/oracle/intra.2.res.oracle
+++ b/tests/sparecode/oracle/intra.2.res.oracle
@@ -40,13 +40,7 @@
[pdg] Bottom for function spare_called_fct
[pdg] computing for function stop
[from] Computing for function stop
-<<<<<<< HEAD
-[kernel:annot:missing-spec] intra.i:110: Warning:
-||||||| ac7807782d
-[kernel:annot:missing-spec] tests/sparecode/intra.i:110: Warning:
-=======
-[kernel:annot:missing-spec] tests/sparecode/intra.i:93: Warning:
->>>>>>> origin/master
+[kernel:annot:missing-spec] intra.i:93: Warning:
Neither code nor specification for function stop, generating default assigns from the prototype
[from] Done for function stop
[pdg] done for function stop
diff --git a/tests/spec/Extend_recursive_preprocess.i b/tests/spec/Extend_recursive_preprocess.i
index 319f9310fa3..af73dea137c 100644
--- a/tests/spec/Extend_recursive_preprocess.i
+++ b/tests/spec/Extend_recursive_preprocess.i
@@ -1,6 +1,6 @@
/* run.config
-MODULE: @PTEST_DIR@/@PTEST_NAME@.cmxs
-OPT: -no-autoload-plugins -kernel-warn-key=annot-error=active -print
+MODULE: @PTEST_NAME@.cmxs
+OPT: -kernel-warn-key=annot-error=active -print
*/
/*@ gl_foo foo1 {
diff --git a/tests/spec/boolean_conversion.i b/tests/spec/boolean_conversion.i
index 1c815309a3d..78edea3a0b7 100644
--- a/tests/spec/boolean_conversion.i
+++ b/tests/spec/boolean_conversion.i
@@ -1,5 +1,5 @@
/* run.config*
-MODULE: @PTEST_DIR@/@PTEST_NAME@.cmxs
+MODULE: @PTEST_NAME@
STDOPT:
*/
void __FC_assert(int c);
diff --git a/tests/spec/generalized_check.i b/tests/spec/generalized_check.i
index d667336c3b3..2c04a602e44 100644
--- a/tests/spec/generalized_check.i
+++ b/tests/spec/generalized_check.i
@@ -1,10 +1,5 @@
/* run.config
-<<<<<<< HEAD
PLUGIN: @EVA_PLUGINS@
-||||||| ac7807782d
-OPT: -wp -wp-prover qed -wp-msg-key shell
-=======
->>>>>>> origin/master
OPT: -eva -eva-use-spec f
OPT: -print
*/
diff --git a/tests/spec/oracle/Extend_recursive_preprocess.res.oracle b/tests/spec/oracle/Extend_recursive_preprocess.res.oracle
index 73af51bd109..50d3a446f89 100644
--- a/tests/spec/oracle/Extend_recursive_preprocess.res.oracle
+++ b/tests/spec/oracle/Extend_recursive_preprocess.res.oracle
@@ -1,4 +1,4 @@
-[kernel] Parsing tests/spec/Extend_recursive_preprocess.i (no preprocessing)
+[kernel] Parsing Extend_recursive_preprocess.i (no preprocessing)
/* Generated by Frama-C */
/*@
gl_foo foo1_ok_ok {
diff --git a/tests/spec/oracle/array_typedef.res.oracle b/tests/spec/oracle/array_typedef.res.oracle
index 585ed5bea14..efefb11801a 100644
--- a/tests/spec/oracle/array_typedef.res.oracle
+++ b/tests/spec/oracle/array_typedef.res.oracle
@@ -80,7 +80,7 @@ void send_msg(msg const *msg)
void host_address(int * /*[4]*/ ip)
{
- unsigned int i = sizeof(int [4]) / sizeof(int);
+ unsigned int i = (unsigned int)(sizeof(int [4]) / sizeof(int));
*(ip + 0) = 192;
*(ip + 1) = 100;
*(ip + 2) = 200;
diff --git a/tests/spec/oracle/assignable_location.res.oracle b/tests/spec/oracle/assignable_location.res.oracle
index a54ad3a7ba1..cdd3b854f29 100644
--- a/tests/spec/oracle/assignable_location.res.oracle
+++ b/tests/spec/oracle/assignable_location.res.oracle
@@ -1,90 +1,26 @@
-<<<<<<< HEAD
[kernel] Parsing assignable_location.i (no preprocessing)
-[kernel:annot-error] assignable_location.i:36: Warning: unexpected token ';'
-[kernel:annot-error] assignable_location.i:28: Warning:
-||||||| ac7807782d
-[kernel] Parsing tests/spec/assignable_location.i (no preprocessing)
-[kernel:annot-error] tests/spec/assignable_location.i:36: Warning:
- unexpected token ';'
-[kernel:annot-error] tests/spec/assignable_location.i:28: Warning:
-=======
-[kernel] Parsing tests/spec/assignable_location.i (no preprocessing)
-[kernel:annot-error] tests/spec/assignable_location.i:43: Warning:
- unexpected token ';'
-[kernel:annot-error] tests/spec/assignable_location.i:35: Warning:
->>>>>>> origin/master
+[kernel:annot-error] assignable_location.i:43: Warning: unexpected token ';'
+[kernel:annot-error] assignable_location.i:35: Warning:
not an addressable left value: \result. Ignoring logic specification of function annotations_to_reject
-<<<<<<< HEAD
-[kernel:annot-error] assignable_location.i:30: Warning:
-||||||| ac7807782d
-[kernel:annot-error] tests/spec/assignable_location.i:30: Warning:
-=======
-[kernel:annot-error] tests/spec/assignable_location.i:37: Warning:
->>>>>>> origin/master
+[kernel:annot-error] assignable_location.i:37: Warning:
not an assignable left value: *t. Ignoring code annotation
-<<<<<<< HEAD
-[kernel:annot-error] assignable_location.i:31: Warning:
-||||||| ac7807782d
-[kernel:annot-error] tests/spec/assignable_location.i:31: Warning:
-=======
-[kernel:annot-error] tests/spec/assignable_location.i:38: Warning:
->>>>>>> origin/master
+[kernel:annot-error] assignable_location.i:38: Warning:
not an assignable left value: *(t + 0). Ignoring code annotation
-<<<<<<< HEAD
-[kernel:annot-error] assignable_location.i:32: Warning:
-||||||| ac7807782d
-[kernel:annot-error] tests/spec/assignable_location.i:32: Warning:
-=======
-[kernel:annot-error] tests/spec/assignable_location.i:39: Warning:
->>>>>>> origin/master
+[kernel:annot-error] assignable_location.i:39: Warning:
not an assignable left value: *(t + (0 .. 0)). Ignoring code annotation
-<<<<<<< HEAD
-[kernel:annot-error] assignable_location.i:33: Warning:
-||||||| ac7807782d
-[kernel:annot-error] tests/spec/assignable_location.i:33: Warning:
-=======
-[kernel:annot-error] tests/spec/assignable_location.i:40: Warning:
->>>>>>> origin/master
+[kernel:annot-error] assignable_location.i:40: Warning:
not an assignable left value: (int)x. Ignoring code annotation
-<<<<<<< HEAD
-[kernel:annot-error] assignable_location.i:34: Warning:
-||||||| ac7807782d
-[kernel:annot-error] tests/spec/assignable_location.i:34: Warning:
-=======
-[kernel:annot-error] tests/spec/assignable_location.i:41: Warning:
->>>>>>> origin/master
+[kernel:annot-error] assignable_location.i:41: Warning:
not an assignable left value: (char)x. Ignoring code annotation
-<<<<<<< HEAD
-[kernel:annot-error] assignable_location.i:35: Warning:
-||||||| ac7807782d
-[kernel:annot-error] tests/spec/assignable_location.i:35: Warning:
-=======
-[kernel:annot-error] tests/spec/assignable_location.i:42: Warning:
->>>>>>> origin/master
+[kernel:annot-error] assignable_location.i:42: Warning:
not an addressable left value: (char)x. Ignoring code annotation
-<<<<<<< HEAD
-[kernel:annot-error] assignable_location.i:37: Warning:
-||||||| ac7807782d
-[kernel:annot-error] tests/spec/assignable_location.i:37: Warning:
-=======
-[kernel:annot-error] tests/spec/assignable_location.i:44: Warning:
->>>>>>> origin/master
+[kernel:annot-error] assignable_location.i:44: Warning:
not an addressable left value: \empty. Ignoring code annotation
-<<<<<<< HEAD
-[kernel:annot-error] assignable_location.i:38: Warning:
- not an assignable left value: lx. Ignoring code annotation
-[kernel:annot-error] assignable_location.i:39: Warning:
-||||||| ac7807782d
-[kernel:annot-error] tests/spec/assignable_location.i:38: Warning:
- not an assignable left value: lx. Ignoring code annotation
-[kernel:annot-error] tests/spec/assignable_location.i:39: Warning:
-=======
-[kernel:annot-error] tests/spec/assignable_location.i:45: Warning:
->>>>>>> origin/master
+[kernel:annot-error] assignable_location.i:45: Warning:
not an assignable left value: lx. Ignoring code annotation
-[kernel:annot-error] tests/spec/assignable_location.i:46: Warning:
+[kernel:annot-error] assignable_location.i:46: Warning:
not a valid dependency: lx. Ignoring code annotation
-[kernel:annot-error] tests/spec/assignable_location.i:50: Warning:
+[kernel:annot-error] assignable_location.i:50: Warning:
unbound logic variable l. Ignoring logic specification of function from_address_to_reject
-[kernel:annot-error] tests/spec/assignable_location.i:53: Warning:
+[kernel:annot-error] assignable_location.i:53: Warning:
not an addressable left value: lx. Ignoring code annotation
diff --git a/tests/spec/oracle/assigns_const.res.oracle b/tests/spec/oracle/assigns_const.res.oracle
index 9279fd42e10..27605bb519b 100644
--- a/tests/spec/oracle/assigns_const.res.oracle
+++ b/tests/spec/oracle/assigns_const.res.oracle
@@ -1,13 +1,13 @@
-[kernel] Parsing tests/spec/assigns_const.i (no preprocessing)
-[kernel:annot-error] tests/spec/assigns_const.i:7: Warning:
+[kernel] Parsing assigns_const.i (no preprocessing)
+[kernel:annot-error] assigns_const.i:7: Warning:
not an assignable left value: c. Ignoring specification of function refuse_const
-[kernel:annot-error] tests/spec/assigns_const.i:12: Warning:
+[kernel:annot-error] assigns_const.i:12: Warning:
not an assignable left value: a[0]. Ignoring specification of function refuse_const_array
-[kernel:annot-error] tests/spec/assigns_const.i:15: Warning:
+[kernel:annot-error] assigns_const.i:15: Warning:
not an assignable left value: {i, c}. Ignoring specification of function refuse_const_in_set
-[kernel:annot-error] tests/spec/assigns_const.i:22: Warning:
+[kernel:annot-error] assigns_const.i:22: Warning:
not an assignable left value: y.a[4].f. Ignoring specification of function refuse_const_field
-[kernel:annot-error] tests/spec/assigns_const.i:25: Warning:
+[kernel:annot-error] assigns_const.i:25: Warning:
not an assignable left value: ptr->a[4].f. Ignoring specification of function refuse_field_via_pointer
/* Generated by Frama-C */
struct X {
diff --git a/tests/spec/oracle/boolean_conversion.res.oracle b/tests/spec/oracle/boolean_conversion.res.oracle
index 293127a887e..84a8655e6d9 100644
--- a/tests/spec/oracle/boolean_conversion.res.oracle
+++ b/tests/spec/oracle/boolean_conversion.res.oracle
@@ -1,4 +1,4 @@
-[kernel] Parsing tests/spec/boolean_conversion.i (no preprocessing)
+[kernel] Parsing boolean_conversion.i (no preprocessing)
/* Generated by Frama-C */
enum a {
HA = 0
diff --git a/tests/spec/oracle/generalized_check.0.res.oracle b/tests/spec/oracle/generalized_check.0.res.oracle
index 315619afdb7..60b7e824fa4 100644
--- a/tests/spec/oracle/generalized_check.0.res.oracle
+++ b/tests/spec/oracle/generalized_check.0.res.oracle
@@ -1,97 +1,23 @@
-<<<<<<< HEAD
[kernel] Parsing generalized_check.i (no preprocessing)
[eva] Analyzing a complete application starting at main
[eva] Computing initial state
[eva] Initial state computed
[eva:initial-state] Values of globals at initialization
-[eva:alarm] generalized_check.i:23: Warning:
- accessing uninitialized left-value. assert \initialized(&c);
-[eva] using specification for function f
[eva:alarm] generalized_check.i:24: Warning:
- function f: precondition 'f_valid_x' got status unknown.
-[eva] generalized_check.i:9: Warning: no \from part for clause 'assigns *x;'
-[eva:alarm] generalized_check.i:25: Warning:
- check 'main_valid_ko' got status unknown.
-[eva:alarm] generalized_check.i:26: Warning:
- check 'main_p_content_ko' got status unknown.
-[eva:alarm] generalized_check.i:32: Warning:
- loop invariant 'false_but_preserved' got status invalid.
-[eva] generalized_check.i:35: starting to merge loop iterations
-[eva:alarm] generalized_check.i:36: Warning:
- check 'implied_by_false_invariant' got status invalid.
-[eva] done for function main
-[eva] ====== VALUES COMPUTED ======
-[eva:final-states] Values at end of function loop:
- j ∈ {10}
-[eva:final-states] Values at end of function main:
- a ∈ [--..--]
- p ∈ {{ NULL ; &a }}
- __retres ∈ {0}
-[eva:summary] ====== ANALYSIS SUMMARY ======
- ----------------------------------------------------------------------------
- 3 functions analyzed (out of 3): 100% coverage.
- In these functions, 25 statements reached (out of 28): 89% coverage.
- ----------------------------------------------------------------------------
- Some errors and warnings have been raised during the analysis:
- by the Eva analyzer: 0 errors 1 warning
- by the Frama-C kernel: 0 errors 0 warnings
- ----------------------------------------------------------------------------
- 1 alarm generated by the analysis:
- 1 access to uninitialized left-values
- ----------------------------------------------------------------------------
- Evaluation of the logical properties reached by the analysis:
- Assertions 0 valid 2 unknown 2 invalid 4 total
- Preconditions 0 valid 1 unknown 0 invalid 1 total
- 0% of the logical properties reached have been proven.
- ----------------------------------------------------------------------------
-||||||| ac7807782d
-# frama-c -wp [...]
-[kernel] Parsing tests/spec/generalized_check.i (no preprocessing)
-[wp] Running WP plugin...
-[wp] tests/spec/generalized_check.i:30: Warning:
- Unsupported generalized invariant, use loop invariant instead.
- Ignored invariant
- check invariant \true;
-[wp] Warning: Missing RTE guards
-[wp] tests/spec/generalized_check.i:37: Warning:
- Missing assigns clause (assigns 'everything' instead)
-[wp] 11 goals scheduled
-[wp] [Qed] Goal typed_f_assigns : Valid
-[wp] [Failed] Goal typed_f_check_f_valid_ko
-[wp] [Qed] Goal typed_f_check_ensures_f_init_x : Valid
-[wp] [Failed] Goal typed_check_lemma_easy_proof
-[wp] [Qed] Goal typed_loop_loop_assigns : Valid
-[wp] [Failed] Goal typed_loop_check_implied_by_false_invariant
-[wp] [Failed] Goal typed_loop_check_loop_invariant_false_but_preserved_established
-[wp] [Failed] Goal typed_loop_check_loop_invariant_false_but_preserved_preserved
-[wp] [Failed] Goal typed_main_call_f_check_requires_f_valid_x
-[wp] [Failed] Goal typed_main_check_main_p_content_ko
-[wp] [Failed] Goal typed_main_check_main_valid_ko
-[wp] Proved goals: 3 / 11
- Qed: 3
-=======
-[kernel] Parsing tests/spec/generalized_check.i (no preprocessing)
-[eva] Analyzing a complete application starting at main
-[eva] Computing initial state
-[eva] Initial state computed
-[eva:initial-state] Values of globals at initialization
-
-[eva:alarm] tests/spec/generalized_check.i:23: Warning:
accessing uninitialized left-value. assert \initialized(&c);
[eva] using specification for function f
-[eva:alarm] tests/spec/generalized_check.i:24: Warning:
+[eva:alarm] generalized_check.i:25: Warning:
function f: precondition 'f_valid_x' got status unknown.
-[eva] tests/spec/generalized_check.i:9: Warning:
- no \from part for clause 'assigns *x;'
-[eva:alarm] tests/spec/generalized_check.i:25: Warning:
+[eva] generalized_check.i:10: Warning: no \from part for clause 'assigns *x;'
+[eva:alarm] generalized_check.i:26: Warning:
check 'main_valid_ko' got status unknown.
-[eva:alarm] tests/spec/generalized_check.i:26: Warning:
+[eva:alarm] generalized_check.i:27: Warning:
check 'main_p_content_ko' got status unknown.
-[eva:alarm] tests/spec/generalized_check.i:32: Warning:
+[eva:alarm] generalized_check.i:33: Warning:
loop invariant 'false_but_preserved' got status invalid.
-[eva] tests/spec/generalized_check.i:35: starting to merge loop iterations
-[eva:alarm] tests/spec/generalized_check.i:36: Warning:
+[eva] generalized_check.i:36: starting to merge loop iterations
+[eva:alarm] generalized_check.i:37: Warning:
check 'implied_by_false_invariant' got status invalid.
[eva] done for function main
[eva] ====== VALUES COMPUTED ======
@@ -118,4 +44,3 @@
Preconditions 0 valid 1 unknown 0 invalid 1 total
0% of the logical properties reached have been proven.
----------------------------------------------------------------------------
->>>>>>> origin/master
diff --git a/tests/spec/oracle/generalized_check.1.res.oracle b/tests/spec/oracle/generalized_check.1.res.oracle
index a3be4ae11b8..7e0503ac2ae 100644
--- a/tests/spec/oracle/generalized_check.1.res.oracle
+++ b/tests/spec/oracle/generalized_check.1.res.oracle
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
[kernel] Parsing generalized_check.i (no preprocessing)
/* Generated by Frama-C */
/*@ check lemma easy_proof: \false;
@@ -50,104 +49,3 @@ void loop(void)
}
-||||||| ac7807782d
-[kernel] Parsing tests/spec/generalized_check.i (no preprocessing)
-[eva] Analyzing a complete application starting at main
-[eva] Computing initial state
-[eva] Initial state computed
-[eva:initial-state] Values of globals at initialization
-
-[eva:alarm] tests/spec/generalized_check.i:23: Warning:
- accessing uninitialized left-value. assert \initialized(&c);
-[eva] using specification for function f
-[eva:alarm] tests/spec/generalized_check.i:24: Warning:
- function f: precondition 'f_valid_x' got status unknown.
-[eva] tests/spec/generalized_check.i:9: Warning:
- no \from part for clause 'assigns *x;'
-[eva:alarm] tests/spec/generalized_check.i:25: Warning:
- check 'main_valid_ko' got status unknown.
-[eva:alarm] tests/spec/generalized_check.i:26: Warning:
- check 'main_p_content_ko' got status unknown.
-[eva:alarm] tests/spec/generalized_check.i:32: Warning:
- loop invariant 'false_but_preserved' got status invalid.
-[eva] tests/spec/generalized_check.i:35: starting to merge loop iterations
-[eva:alarm] tests/spec/generalized_check.i:36: Warning:
- check 'implied_by_false_invariant' got status invalid.
-[eva] done for function main
-[eva] ====== VALUES COMPUTED ======
-[eva:final-states] Values at end of function loop:
- j ∈ {10}
-[eva:final-states] Values at end of function main:
- a ∈ [--..--]
- p ∈ {{ NULL ; &a }}
- __retres ∈ {0}
-[eva:summary] ====== ANALYSIS SUMMARY ======
- ----------------------------------------------------------------------------
- 3 functions analyzed (out of 3): 100% coverage.
- In these functions, 25 statements reached (out of 28): 89% coverage.
- ----------------------------------------------------------------------------
- Some errors and warnings have been raised during the analysis:
- by the Eva analyzer: 0 errors 1 warning
- by the Frama-C kernel: 0 errors 0 warnings
- ----------------------------------------------------------------------------
- 1 alarm generated by the analysis:
- 1 access to uninitialized left-values
- ----------------------------------------------------------------------------
- Evaluation of the logical properties reached by the analysis:
- Assertions 0 valid 2 unknown 2 invalid 4 total
- Preconditions 0 valid 1 unknown 0 invalid 1 total
- 0% of the logical properties reached have been proven.
- ----------------------------------------------------------------------------
-=======
-[kernel] Parsing tests/spec/generalized_check.i (no preprocessing)
-/* Generated by Frama-C */
-/*@ check lemma easy_proof: \false;
- */
-/*@ check requires f_valid_x: \valid(x);
- check ensures f_init_x: *\old(x) ≡ 0;
- assigns *x;
- */
-void f(int *x)
-{
- /*@ check f_valid_ko: \valid(x); */ ;
- *x = 0;
- return;
-}
-
-void loop(void);
-
-int main(void)
-{
- int __retres;
- int volatile c;
- int a = 4;
- int *p = (int *)0;
- if (c) p = & a;
- f(p);
- /*@ check main_valid_ko: \valid(p); */ ;
- /*@ check main_p_content_ko: *p ≡ 0; */ ;
- loop();
- __retres = 0;
- return __retres;
-}
-
-void loop(void)
-{
- int j = 0;
- {
- int i = 0;
- /*@ check loop invariant false_but_preserved: j ≡ 10;
- loop assigns i; */
- while (i < 10) i ++;
- }
- /*@ check implied_by_false_invariant: j ≡ 10; */ ;
- l: /*@ check invariant \true; */ ;
- if (j >= 10) goto l1;
- j ++;
- goto l;
- l1: ;
- return;
-}
-
-
->>>>>>> origin/master
diff --git a/tests/spec/oracle/qarrsize.res.oracle b/tests/spec/oracle/qarrsize.res.oracle
index 093a9470ebb..104c61bac02 100644
--- a/tests/spec/oracle/qarrsize.res.oracle
+++ b/tests/spec/oracle/qarrsize.res.oracle
@@ -1,4 +1,4 @@
-[kernel] Parsing tests/spec/qarrsize.c (with preprocessing)
+[kernel] Parsing qarrsize.c (with preprocessing)
/* Generated by Frama-C */
int a[0xFFu];
int b[128L];
diff --git a/tests/spec/oracle/reset_env.res.oracle b/tests/spec/oracle/reset_env.res.oracle
index 7acf6291108..3b1ae6dc368 100644
--- a/tests/spec/oracle/reset_env.res.oracle
+++ b/tests/spec/oracle/reset_env.res.oracle
@@ -1,15 +1,7 @@
[kernel] Parsing reset_env.i (no preprocessing)
[kernel:annot-error] reset_env.i:5: Warning:
unbound logic variable INEXISTENT_SYMBOL. Ignoring global annotation
-<<<<<<< HEAD
[kernel:annot-error] reset_env.i:9: Warning:
- unbound function bla. Ignoring specification of function f
-||||||| ac7807782d
-[kernel:annot-error] tests/spec/reset_env.i:9: Warning:
- unbound function bla. Ignoring specification of function f
-=======
-[kernel:annot-error] tests/spec/reset_env.i:9: Warning:
unbound logic function bla. Ignoring specification of function f
->>>>>>> origin/master
/* Generated by Frama-C */
diff --git a/tests/spec/test_config b/tests/spec/test_config
index b95d8ceb668..3451196c953 100644
--- a/tests/spec/test_config
+++ b/tests/spec/test_config
@@ -1,7 +1,6 @@
COMMENT: for now, this directory mainly tests the annotations syntax.
COMMENT: we continue on annotation errors, as this allows to put
COMMENT: various variations of the same test in one file.
-<<<<<<< HEAD
COMMENT: by default, no analysis is performed (since the PLUGIN directive
COMMENT: is empty).
COMMENT: to perform value analyses, the macro @EVA_PLUGINS@ (resp. @EVA_OPTIONS@)
@@ -9,8 +8,3 @@ COMMENT: can be used into PLUGIN (resp. OPT) directives of specific test files.
PLUGIN:
OPT: -pp-annot -print -kernel-warn-key=annot-error=active -machdep x86_32
-||||||| ac7807782d
-OPT: -pp-annot -print -journal-disable -kernel-warn-key=annot-error=active -check
-=======
-OPT: -pp-annot -print -journal-disable -kernel-warn-key=annot-error=active -check -machdep x86_32
->>>>>>> origin/master
diff --git a/tests/syntax/anon_enum_libc.c b/tests/syntax/anon_enum_libc.c
index 60b470c1fe6..8ab5eeec2c9 100644
--- a/tests/syntax/anon_enum_libc.c
+++ b/tests/syntax/anon_enum_libc.c
@@ -1,15 +1,7 @@
/* run.config
-<<<<<<< HEAD
DEPS: anon_enum_libc.h
FILTER: sed -e 's|#include *"\([^/]*[/]\)*\([^/]*\)"|#include "PTESTS_DIR/\2"|'
OPT: -cpp-extra-args="-I ." -ocode ocode_@PTEST_NUMBER@_@PTEST_NAME@.c -print -then -ocode="" ocode_@PTEST_NUMBER@_@PTEST_NAME@.c -print
-||||||| ac7807782d
-FILTER: sed -e 's|#include *"\([^/]*[/]\)*\([^/]*\)"|#include "PTESTS_DIR/\2"|'
-OPT: -cpp-extra-args="-I @PTEST_DIR@" -ocode @PTEST_DIR@/result/@PTEST_NAME@.c -print -then -ocode="" @PTEST_DIR@/result/@PTEST_NAME@.c -print
-=======
-
-OPT: -cpp-extra-args="-I @PTEST_DIR@" -ocode @PTEST_DIR@/result/@PTEST_NAME@.c -print -then -ocode="" @PTEST_DIR@/result/@PTEST_NAME@.c -print
->>>>>>> origin/master
*/
struct { int x; float y; } s1;
diff --git a/tests/syntax/cpp-command.c b/tests/syntax/cpp-command.c
index ea2789c87f3..17a90fb7796 100644
--- a/tests/syntax/cpp-command.c
+++ b/tests/syntax/cpp-command.c
@@ -1,24 +1,8 @@
/* run.config*
-<<<<<<< HEAD
FILTER: sed -e "s:/\(tmp\|var\|build\)/[^ ]*\.i:/tmp/FILE.i:g; s:$PWD:.:g; s:-I.*share/frama-c/share/libc:-I LIBC:g"
OPT: -machdep x86_32 -cpp-frama-c-compliant -cpp-command "echo [\$(basename '%1') \$(basename '%1') \$(basename '%i') \$(basename '%input')] ['%2' '%2' '%o' '%output'] ['%args']"
OPT: -machdep x86_32 -cpp-frama-c-compliant -cpp-command "echo %%1 = \$(basename '%1') %%2 = '%2' %%args = '%args'"
OPT: -machdep x86_32 -cpp-frama-c-compliant -cpp-command "printf \"%s\" \"using \\% has no effect : \$(basename \"\%input\")\""
OPT: -machdep x86_32 -cpp-frama-c-compliant -cpp-command "echo %var is not an interpreted placeholder"
OPT: -machdep x86_32 -print-cpp-commands
-||||||| ac7807782d
- FILTER: sed "s:/\(tmp\|var\|build\)/[^ ]*\.i:/tmp/FILE.i:g; s:$PWD/::"
- OPT: -no-autoload-plugins -cpp-frama-c-compliant -cpp-command "echo [\$(basename '%1') \$(basename '%1') \$(basename '%i') \$(basename '%input')] ['%2' '%2' '%o' '%output'] ['%args']"
- OPT: -no-autoload-plugins -cpp-frama-c-compliant -cpp-command "echo %%1 = \$(basename '%1') %%2 = '%2' %%args = '%args'"
- OPT: -no-autoload-plugins -cpp-frama-c-compliant -cpp-command "printf \"%s\" \"using \\% has no effect : \$(basename \"\%input\")\""
- OPT: -no-autoload-plugins -cpp-frama-c-compliant -cpp-command "echo %var is not an interpreted placeholder"
- OPT: -no-autoload-plugins -print-cpp-commands
-=======
- FILTER: sed "s:/[^ ]*/cpp-command\.[^ ]*\.i:TMPDIR/FILE.i:g; s:$PWD/::; s: -m32::"
- OPT: -machdep x86_32 -no-autoload-plugins -cpp-frama-c-compliant -cpp-command "echo [\$(basename '%1') \$(basename '%1') \$(basename '%i') \$(basename '%input')] ['%2' '%2' '%o' '%output'] ['%args']"
- OPT: -machdep x86_32 -no-autoload-plugins -cpp-frama-c-compliant -cpp-command "echo %%1 = \$(basename '%1') %%2 = '%2' %%args = '%args'"
- OPT: -machdep x86_32 -no-autoload-plugins -cpp-frama-c-compliant -cpp-command "printf \"%s\n\" \"using \\% has no effect : \$(basename \"\%input\")\""
- OPT: -machdep x86_32 -no-autoload-plugins -cpp-frama-c-compliant -cpp-command "echo %var is not an interpreted placeholder"
- OPT: -machdep x86_32 -no-autoload-plugins -print-cpp-commands
->>>>>>> origin/master
*/
diff --git a/tests/syntax/enum_repr.i b/tests/syntax/enum_repr.i
index 5de4cbef726..aa311e5edf9 100644
--- a/tests/syntax/enum_repr.i
+++ b/tests/syntax/enum_repr.i
@@ -1,23 +1,11 @@
/* run.config
-<<<<<<< HEAD
MODULE: Enum_repr
STDOPT: #"-enums int"
STDOPT: #"-enums gcc-short-enums"
STDOPT: #"-enums gcc-enums"
-||||||| ac7807782d
-EXECNOW: make -s tests/syntax/Enum_repr.cmxs
-OPT: -load-module tests/syntax/Enum_repr.cmxs -enums int -print
-OPT: -load-module tests/syntax/Enum_repr.cmxs -enums gcc-short-enums -print
-OPT: -load-module tests/syntax/Enum_repr.cmxs -enums gcc-enums -print
-=======
-EXECNOW: make -s tests/syntax/Enum_repr.cmxs
-OPT: -machdep x86_32 -load-module tests/syntax/Enum_repr.cmxs -enums int -print
-OPT: -machdep x86_32 -load-module tests/syntax/Enum_repr.cmxs -enums gcc-short-enums -print
-OPT: -machdep x86_32 -load-module tests/syntax/Enum_repr.cmxs -enums gcc-enums -print
->>>>>>> origin/master
*/
-// is represented by | int | gcc-enums | gcc-short-enums
+// is represented by | int | gcc-enums | gcc-short-enums
// foo | int | unsigned int | unsigned char
// bar | int | unsigned char | unsigned char
// bu1 | int | unsigned int | unsigned int
diff --git a/tests/syntax/gnu-asm-aesni.c b/tests/syntax/gnu-asm-aesni.c
index 1e2b0f7f452..57f21d3dc98 100644
--- a/tests/syntax/gnu-asm-aesni.c
+++ b/tests/syntax/gnu-asm-aesni.c
@@ -7,7 +7,7 @@
COMMENT: TEST_TITLE: Chiffrement via AES-NI
COMMENT: TEST_MAIN: encrypt_aesni
COMMENT: TEST_DESCRIPTION: Un message de 64 octets est initialisé à une valeur précise. Le nombre de tours est fixé à 12 et la clé de chiffrement étendue est initialisée à une valeur abstraite. L'appel à la fonction do_aesni_enc effectue le chiffrement et place le résultat à l'adresse mémoire pointée par le paramètre b. On vérifie ensuite que les cases du tableau b ont bien été initialisées et que le tableau a n'a pas été modifié.
- OPT: -machdep x86_32 -cpp-extra-args='-DUSE_AESNI' -print
+ OPT: -cpp-extra-args='-DUSE_AESNI' -print
-------------------------
*/
#ifdef __FRAMAC__
diff --git a/tests/syntax/local-init-const.i b/tests/syntax/local-init-const.i
index 1d79724df76..3d90f55d201 100644
--- a/tests/syntax/local-init-const.i
+++ b/tests/syntax/local-init-const.i
@@ -1,5 +1,6 @@
/*run.config
- OPT: -no-autoload-plugins -load-module eva,scope -eva -eva-verbose 0
+ PLUGIN: @EVA_PLUGINS@
+ OPT: -eva -eva-verbose 0
*/
unsigned id(unsigned x) { return x; }
diff --git a/tests/syntax/multiple_assigns.i b/tests/syntax/multiple_assigns.i
index d20a1dfcda4..d30757ea3ba 100644
--- a/tests/syntax/multiple_assigns.i
+++ b/tests/syntax/multiple_assigns.i
@@ -1,3 +1,7 @@
+/* run.config
+ EXIT: 1
+*/
+
int z;
/*@ assigns z, z;
diff --git a/tests/syntax/multiple_froms.i b/tests/syntax/multiple_froms.i
index 6a0a25687f9..ff8f1a77de1 100644
--- a/tests/syntax/multiple_froms.i
+++ b/tests/syntax/multiple_froms.i
@@ -1,3 +1,8 @@
+/* run.config
+ EXIT: 1
+*/
+
+
int a, b, c, d, e;
// Reminder: assigns are visited in reverse
diff --git a/tests/syntax/no-print-libc-reparse.c b/tests/syntax/no-print-libc-reparse.c
index bdb9005bf50..3bb87d76d19 100644
--- a/tests/syntax/no-print-libc-reparse.c
+++ b/tests/syntax/no-print-libc-reparse.c
@@ -1,11 +1,5 @@
/*run.config
-<<<<<<< HEAD
STDOPT: +"-no-print-libc -print -ocode ocode_@PTEST_NUMBER@_@PTEST_NAME@.c -then ocode_@PTEST_NUMBER@_@PTEST_NAME@.c"
-||||||| ac7807782d
- STDOPT: #"-no-print-libc -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.c -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.c"
-=======
- STDOPT: +"-no-print-libc -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.c -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.c"
->>>>>>> origin/master
*/
// tests that using -no-print-libc on a file with an enum produces output that
diff --git a/tests/syntax/offset.c b/tests/syntax/offset.c
index 39b1c35f8c4..271b4450362 100644
--- a/tests/syntax/offset.c
+++ b/tests/syntax/offset.c
@@ -1,5 +1,5 @@
/* run.config
-OPT: -machdep x86_32 -cpp-extra-args="-Ishare/libc" -print
+OPT: -cpp-extra-args="-Ishare/libc" -print
*/
#include "__fc_define_off_t.h"
diff --git a/tests/syntax/oracle/anon_enum_libc.res.oracle b/tests/syntax/oracle/anon_enum_libc.res.oracle
index 8334bd24f80..ebe1e0a3619 100644
--- a/tests/syntax/oracle/anon_enum_libc.res.oracle
+++ b/tests/syntax/oracle/anon_enum_libc.res.oracle
@@ -1,7 +1,7 @@
[kernel] Parsing anon_enum_libc.c (with preprocessing)
[kernel] Parsing ocode_0_anon_enum_libc.c (with preprocessing)
/* Generated by Frama-C */
-#include "tests/syntax/anon_enum_libc.h"
+#include "PTESTS_DIR/anon_enum_libc.h"
struct __anonstruct_s1_1 {
int x ;
float y ;
diff --git a/tests/syntax/oracle/cpp-command.0.res.oracle b/tests/syntax/oracle/cpp-command.0.res.oracle
index e3acce5e6e1..f9d70e8e442 100644
--- a/tests/syntax/oracle/cpp-command.0.res.oracle
+++ b/tests/syntax/oracle/cpp-command.0.res.oracle
@@ -1,10 +1,2 @@
-<<<<<<< HEAD
[kernel] Parsing cpp-command.c (with preprocessing)
[cpp-command.c cpp-command.c cpp-command.c cpp-command.c] [/tmp/FILE.i /tmp/FILE.i /tmp/FILE.i /tmp/FILE.i] [ -I LIBC -D__FRAMAC__ -D__FC_MACHDEP_X86_32 -dD -nostdinc -m32]
-||||||| ac7807782d
-[kernel] Parsing tests/syntax/cpp-command.c (with preprocessing)
-[cpp-command.c cpp-command.c cpp-command.c cpp-command.c] [/tmp/FILE.i /tmp/FILE.i /tmp/FILE.i /tmp/FILE.i] [ -I./share/libc -D__FRAMAC__ -D__FC_MACHDEP_X86_32 -dD -nostdinc -m32]
-=======
-[kernel] Parsing tests/syntax/cpp-command.c (with preprocessing)
-[cpp-command.c cpp-command.c cpp-command.c cpp-command.c] [TMPDIR/FILE.i TMPDIR/FILE.i TMPDIR/FILE.i TMPDIR/FILE.i] [ -I./share/libc -D__FRAMAC__ -D__FC_MACHDEP_X86_32 -dD -nostdinc]
->>>>>>> origin/master
diff --git a/tests/syntax/oracle/cpp-command.1.res.oracle b/tests/syntax/oracle/cpp-command.1.res.oracle
index 9bc18d10016..924d0947253 100644
--- a/tests/syntax/oracle/cpp-command.1.res.oracle
+++ b/tests/syntax/oracle/cpp-command.1.res.oracle
@@ -1,10 +1,2 @@
-<<<<<<< HEAD
[kernel] Parsing cpp-command.c (with preprocessing)
%1 = cpp-command.c %2 = /tmp/FILE.i %args = -I LIBC -D__FRAMAC__ -D__FC_MACHDEP_X86_32 -dD -nostdinc -m32
-||||||| ac7807782d
-[kernel] Parsing tests/syntax/cpp-command.c (with preprocessing)
-%1 = cpp-command.c %2 = /tmp/FILE.i %args = -I./share/libc -D__FRAMAC__ -D__FC_MACHDEP_X86_32 -dD -nostdinc -m32
-=======
-[kernel] Parsing tests/syntax/cpp-command.c (with preprocessing)
-%1 = cpp-command.c %2 = TMPDIR/FILE.i %args = -I./share/libc -D__FRAMAC__ -D__FC_MACHDEP_X86_32 -dD -nostdinc
->>>>>>> origin/master
diff --git a/tests/syntax/oracle/cpp-command.2.res.oracle b/tests/syntax/oracle/cpp-command.2.res.oracle
index a1d0fa4ee2a..692da95f912 100644
--- a/tests/syntax/oracle/cpp-command.2.res.oracle
+++ b/tests/syntax/oracle/cpp-command.2.res.oracle
@@ -1,10 +1,2 @@
-<<<<<<< HEAD
[kernel] Parsing cpp-command.c (with preprocessing)
-using \% has no effect : cpp-command.c'
-||||||| ac7807782d
-[kernel] Parsing tests/syntax/cpp-command.c (with preprocessing)
-using \% has no effect : cpp-command.c'
-=======
-[kernel] Parsing tests/syntax/cpp-command.c (with preprocessing)
-using \% has no effect : cpp-command.c'
->>>>>>> origin/master
+using \% has no effect : cpp-command.c'
\ No newline at end of file
diff --git a/tests/syntax/oracle/cpp-command.4.res.oracle b/tests/syntax/oracle/cpp-command.4.res.oracle
index 1556058e6b6..6ed0a35488b 100644
--- a/tests/syntax/oracle/cpp-command.4.res.oracle
+++ b/tests/syntax/oracle/cpp-command.4.res.oracle
@@ -1,8 +1,2 @@
[kernel] Preprocessing command:
-<<<<<<< HEAD
gcc -E -C -I LIBC -D__FRAMAC__ -D__FC_MACHDEP_X86_32 -dD -nostdinc -m32 './cpp-command.c' -o '/tmp/FILE.i'
-||||||| ac7807782d
- gcc -E -C -I. -I./share/libc -D__FRAMAC__ -D__FC_MACHDEP_X86_32 -dD -nostdinc -m32 'tests/syntax/cpp-command.c' -o '/tmp/FILE.i'
-=======
- gcc -E -C -I. -I./share/libc -D__FRAMAC__ -D__FC_MACHDEP_X86_32 -dD -nostdinc 'tests/syntax/cpp-command.c' -o 'TMPDIR/FILE.i'
->>>>>>> origin/master
diff --git a/tests/syntax/oracle/gnu-asm-aesni.res.oracle b/tests/syntax/oracle/gnu-asm-aesni.res.oracle
index c695cf73608..fbcb44028dd 100644
--- a/tests/syntax/oracle/gnu-asm-aesni.res.oracle
+++ b/tests/syntax/oracle/gnu-asm-aesni.res.oracle
@@ -161,7 +161,7 @@ void encrypt_aesni(void)
(unsigned char)0x8a,
(unsigned char)0x53};
memcpy((void *)(a),(void const *)(a_init),
- (unsigned int)64 * sizeof(unsigned char));
+ (unsigned long)64 * sizeof(unsigned char));
i = 0;
while (i < 14 + 1) {
j = 0;
diff --git a/tests/syntax/oracle/local-init-const.res.oracle b/tests/syntax/oracle/local-init-const.res.oracle
index 98bd497cc4f..541f4322295 100644
--- a/tests/syntax/oracle/local-init-const.res.oracle
+++ b/tests/syntax/oracle/local-init-const.res.oracle
@@ -1 +1 @@
-[kernel] Parsing tests/syntax/local-init-const.i (no preprocessing)
+[kernel] Parsing local-init-const.i (no preprocessing)
diff --git a/tests/syntax/oracle/multiple_assigns.res.oracle b/tests/syntax/oracle/multiple_assigns.res.oracle
index 0cda603d543..c297996d92a 100644
--- a/tests/syntax/oracle/multiple_assigns.res.oracle
+++ b/tests/syntax/oracle/multiple_assigns.res.oracle
@@ -1,4 +1,4 @@
-[kernel] Parsing tests/syntax/multiple_assigns.i (no preprocessing)
+[kernel] Parsing multiple_assigns.i (no preprocessing)
/* Generated by Frama-C */
int z;
/*@ assigns z;
diff --git a/tests/syntax/oracle/multiple_froms.res.oracle b/tests/syntax/oracle/multiple_froms.res.oracle
index b90f4dc55f6..782d8b3af9e 100644
--- a/tests/syntax/oracle/multiple_froms.res.oracle
+++ b/tests/syntax/oracle/multiple_froms.res.oracle
@@ -1,8 +1,8 @@
-[kernel] Parsing tests/syntax/multiple_froms.i (no preprocessing)
+[kernel] Parsing multiple_froms.i (no preprocessing)
[kernel:annot:multi-from] Warning:
- Drop 'b' \from at tests/syntax/multiple_froms.i:9 for more precise one at tests/syntax/multiple_froms.i:10
+ Drop 'b' \from at multiple_froms.i:14 for more precise one at multiple_froms.i:15
[kernel:annot:multi-from] Warning:
- Drop 'a' \from at tests/syntax/multiple_froms.i:7 for more precise one at tests/syntax/multiple_froms.i:6
+ Drop 'a' \from at multiple_froms.i:12 for more precise one at multiple_froms.i:11
/* Generated by Frama-C */
int a;
int b;
diff --git a/tests/syntax/oracle/offset.res.oracle b/tests/syntax/oracle/offset.res.oracle
index 4aebbc69c8d..bfdd8016e57 100644
--- a/tests/syntax/oracle/offset.res.oracle
+++ b/tests/syntax/oracle/offset.res.oracle
@@ -2,5 +2,5 @@
/* Generated by Frama-C */
#include "__fc_define_off_t.h"
off_t x = (long)0;
-off64_t y = (long long)0;
+off64_t y = (long)0;
diff --git a/tests/syntax/oracle/unroll_visit.res.oracle b/tests/syntax/oracle/unroll_visit.res.oracle
index 21a550e1a23..67c100b838f 100644
--- a/tests/syntax/oracle/unroll_visit.res.oracle
+++ b/tests/syntax/oracle/unroll_visit.res.oracle
@@ -4,16 +4,8 @@
[eva] Initial state computed
[eva:initial-state] Values of globals at initialization
-<<<<<<< HEAD
[eva] unroll_visit.i:10: assertion got status valid.
[eva] unroll_visit.i:8: starting to merge loop iterations
-||||||| ac7807782d
-[eva] tests/syntax/unroll_visit.i:8: assertion got status valid.
-[eva] tests/syntax/unroll_visit.i:6: starting to merge loop iterations
-=======
-[eva] tests/syntax/unroll_visit.i:9: assertion got status valid.
-[eva] tests/syntax/unroll_visit.i:7: starting to merge loop iterations
->>>>>>> origin/master
[eva] Recording results for main
[eva] done for function main
[eva] ====== VALUES COMPUTED ======
@@ -34,76 +26,26 @@
typedef char i8;
void main(void)
{
-<<<<<<< HEAD
- i8 i = (char)0;
- if (! ((int)i < 100)) goto unrolling_2_loop;
- i = (i8)((int)i - 1);
-||||||| ac7807782d
- int i = 0;
- if (! (i < 100)) goto unrolling_2_loop;
- i --;
-=======
i8 i = (char)0;
if (! ((int)i < 100)) goto unrolling_2_loop;
i = (char)((int)i - 1);
->>>>>>> origin/master
/*@ assert i < 100; */ ;
-<<<<<<< HEAD
- i = (i8)((int)i + 1);
- i = (i8)((int)i + 1);
-||||||| ac7807782d
- i ++;
- i ++;
-=======
i = (char)((int)i + 1);
i = (char)((int)i + 1);
->>>>>>> origin/master
unrolling_4_loop: ;
-<<<<<<< HEAD
- if (! ((int)i < 100)) goto unrolling_2_loop;
- i = (i8)((int)i - 1);
-||||||| ac7807782d
- if (! (i < 100)) goto unrolling_2_loop;
- i --;
-=======
if (! ((int)i < 100)) goto unrolling_2_loop;
i = (char)((int)i - 1);
->>>>>>> origin/master
/*@ assert i < 100; */ ;
-<<<<<<< HEAD
- i = (i8)((int)i + 1);
- i = (i8)((int)i + 1);
-||||||| ac7807782d
- i ++;
- i ++;
-=======
i = (char)((int)i + 1);
i = (char)((int)i + 1);
->>>>>>> origin/master
unrolling_3_loop: ;
/*@ loop pragma UNROLL 2;
loop pragma UNROLL "done", 2; */
-<<<<<<< HEAD
- while ((int)i < 100) {
- i = (i8)((int)i - 1);
-||||||| ac7807782d
- while (i < 100) {
- i --;
-=======
while ((int)i < 100) {
i = (char)((int)i - 1);
->>>>>>> origin/master
/*@ assert i < 100; */ ;
-<<<<<<< HEAD
- i = (i8)((int)i + 1);
- i = (i8)((int)i + 1);
-||||||| ac7807782d
- i ++;
- i ++;
-=======
i = (char)((int)i + 1);
i = (char)((int)i + 1);
->>>>>>> origin/master
}
unrolling_2_loop: ;
return;
diff --git a/tests/syntax/test_config b/tests/syntax/test_config
index f8c1acbc0d1..44df8c23bf4 100644
--- a/tests/syntax/test_config
+++ b/tests/syntax/test_config
@@ -1,5 +1,4 @@
COMMENT: this directory is meant to test exclusively the front-end
-<<<<<<< HEAD
COMMENT: (parser, type-checker, linker, syntactic transformations).
COMMENT: by default, no analysis is performed since only the varadic plugin is
COMMENT: used.
@@ -8,11 +7,4 @@ COMMENT: can be used into PLUGIN (resp. OPT) directives of specific test files.
PLUGIN: variadic
OPT: -print -machdep x86_32
-||||||| ac7807782d
-COMMENT: (parser, type-checker, linker, syntactic transformations)
-OPT: -print -journal-disable -check
-=======
-COMMENT: (parser, type-checker, linker, syntactic transformations)
-OPT: -print -journal-disable -check -machdep x86_32
->>>>>>> origin/master
FILEREG:.*\.\(c\|i\|ci\)$
diff --git a/tests/test_config b/tests/test_config
index 105f8bf82bb..9a493bd5e80 100644
--- a/tests/test_config
+++ b/tests/test_config
@@ -6,14 +6,6 @@ COMMENT: of used plug'ins.
MACRO: EVA_PLUGINS from inout eva scope variadic
MACRO: EVA_OPTIONS -eva-show-progress -eva-msg-key=-summary -eva-auto-loop-unroll 0
-<<<<<<< HEAD
MACRO: EVA_CONFIG @EVA_OPTIONS@ -machdep x86_32
PLUGIN: @EVA_PLUGINS@
OPT: -eva @EVA_CONFIG@ -out -input -deps
-||||||| ac7807782d
-MACRO: EVA_CONFIG @EVA_OPTIONS@ -no-autoload-plugins -load-module from,inout,eva,scope,variadic
-OPT: -eva @EVA_CONFIG@ -journal-disable -out -input -deps
-=======
-MACRO: EVA_CONFIG @EVA_OPTIONS@ -no-autoload-plugins -load-module from,inout,eva,scope,variadic -machdep x86_32
-OPT: -eva @EVA_CONFIG@ -journal-disable -out -input -deps
->>>>>>> origin/master
diff --git a/tests/test_config_apron b/tests/test_config_apron
index b6cd6c9977c..91f0ba7b07a 100644
--- a/tests/test_config_apron
+++ b/tests/test_config_apron
@@ -1,12 +1,6 @@
MACRO: EVA_PLUGINS from inout eva scope 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
-<<<<<<< HEAD
MACRO: EVA_CONFIG @EVA_OPTIONS@ -machdep x86_32
FILTER: diff %{dep:../oracle/@PTEST_ORACLE@}
PLUGIN: @EVA_PLUGINS@
-||||||| ac7807782d
-MACRO: EVA_CONFIG @EVA_OPTIONS@ -no-autoload-plugins -load-module from,inout,eva,scope,variadic
-=======
-MACRO: EVA_CONFIG @EVA_OPTIONS@ -no-autoload-plugins -load-module from,inout,eva,scope,variadic -machdep x86_32
->>>>>>> origin/master
OPT: -eva @EVA_CONFIG@ -journal-disable -out -input -deps
diff --git a/tests/test_config_bitwise b/tests/test_config_bitwise
index 85fe500c3ec..705f3d44db6 100644
--- a/tests/test_config_bitwise
+++ b/tests/test_config_bitwise
@@ -1,14 +1,6 @@
MACRO: EVA_PLUGINS from inout eva scope variadic
MACRO: EVA_OPTIONS -eva-show-progress -eva-msg-key=-summary -eva-auto-loop-unroll 0 -eva-domains bitwise
-<<<<<<< HEAD
MACRO: EVA_CONFIG @EVA_OPTIONS@ -machdep x86_32
FILTER: diff %{dep:../oracle/@PTEST_ORACLE@}
PLUGIN: @EVA_PLUGINS@
OPT: -eva @EVA_CONFIG@ -out -input -deps
-||||||| ac7807782d
-MACRO: EVA_CONFIG @EVA_OPTIONS@ -no-autoload-plugins -load-module from,inout,eva,scope,variadic
-OPT: -eva @EVA_CONFIG@ -journal-disable -out -input -deps
-=======
-MACRO: EVA_CONFIG @EVA_OPTIONS@ -no-autoload-plugins -load-module from,inout,eva,scope,variadic -machdep x86_32
-OPT: -eva @EVA_CONFIG@ -journal-disable -out -input -deps
->>>>>>> origin/master
diff --git a/tests/test_config_equalities b/tests/test_config_equalities
index da246875aa5..5efc24a16cd 100644
--- a/tests/test_config_equalities
+++ b/tests/test_config_equalities
@@ -1,12 +1,6 @@
MACRO: EVA_PLUGINS from inout eva scope variadic
MACRO: EVA_OPTIONS -eva-show-progress -eva-msg-key=-summary -eva-auto-loop-unroll 0 -eva-domains equality
-<<<<<<< HEAD
MACRO: EVA_CONFIG @EVA_OPTIONS@ -machdep x86_32
FILTER: diff %{dep:../oracle/@PTEST_ORACLE@}
PLUGIN: @EVA_PLUGINS@
-||||||| ac7807782d
-MACRO: EVA_CONFIG @EVA_OPTIONS@ -no-autoload-plugins -load-module from,inout,eva,scope,variadic
-=======
-MACRO: EVA_CONFIG @EVA_OPTIONS@ -no-autoload-plugins -load-module from,inout,eva,scope,variadic -machdep x86_32
->>>>>>> origin/master
OPT: -eva @EVA_CONFIG@ -journal-disable -out -input -deps
diff --git a/tests/test_config_gauges b/tests/test_config_gauges
index d6555ed3501..4e751c3d7d7 100644
--- a/tests/test_config_gauges
+++ b/tests/test_config_gauges
@@ -1,10 +1,4 @@
MACRO: EVA_PLUGINS from inout eva scope variadic
MACRO: EVA_OPTIONS -eva-show-progress -eva-msg-key=-summary -eva-auto-loop-unroll 0 -eva-domains gauges
-<<<<<<< HEAD
MACRO: EVA_CONFIG @EVA_OPTIONS@ -machdep x86_32
-||||||| ac7807782d
-MACRO: EVA_CONFIG @EVA_OPTIONS@ -no-autoload-plugins -load-module from,inout,eva,scope,variadic
-=======
-MACRO: EVA_CONFIG @EVA_OPTIONS@ -no-autoload-plugins -load-module from,inout,eva,scope,variadic -machdep x86_32
->>>>>>> origin/master
OPT: -eva @EVA_CONFIG@ -journal-disable -out -input -deps
diff --git a/tests/test_config_octagons b/tests/test_config_octagons
index 0fa6346dc81..4646bdc3865 100644
--- a/tests/test_config_octagons
+++ b/tests/test_config_octagons
@@ -1,12 +1,6 @@
MACRO: EVA_PLUGINS from inout eva scope variadic
MACRO: EVA_OPTIONS -eva-show-progress -eva-msg-key=-summary -eva-domains octagon
-<<<<<<< HEAD
MACRO: EVA_CONFIG @EVA_OPTIONS@ -machdep x86_32
FILTER: diff %{dep:../oracle/@PTEST_ORACLE@}
PLUGIN: @EVA_PLUGINS@
-||||||| ac7807782d
-MACRO: EVA_CONFIG @EVA_OPTIONS@ -no-autoload-plugins -load-module from,inout,eva,scope,variadic
-=======
-MACRO: EVA_CONFIG @EVA_OPTIONS@ -no-autoload-plugins -load-module from,inout,eva,scope,variadic -machdep x86_32
->>>>>>> origin/master
OPT: -eva @EVA_CONFIG@ -journal-disable -out -input -deps
diff --git a/tests/test_config_symblocs b/tests/test_config_symblocs
index bd6c9777089..edb58b80081 100644
--- a/tests/test_config_symblocs
+++ b/tests/test_config_symblocs
@@ -1,12 +1,6 @@
MACRO: EVA_PLUGINS from inout eva scope variadic
MACRO: EVA_OPTIONS -eva-show-progress -eva-msg-key=-summary -eva-auto-loop-unroll 0 -eva-domains symbolic-locations
-<<<<<<< HEAD
MACRO: EVA_CONFIG @EVA_OPTIONS@ -machdep x86_32
FILTER: diff %{dep:../oracle/@PTEST_ORACLE@}
PLUGIN: @EVA_PLUGINS@
-||||||| ac7807782d
-MACRO: EVA_CONFIG @EVA_OPTIONS@ -no-autoload-plugins -load-module from,inout,eva,scope,variadic
-=======
-MACRO: EVA_CONFIG @EVA_OPTIONS@ -no-autoload-plugins -load-module from,inout,eva,scope,variadic -machdep x86_32
->>>>>>> origin/master
OPT: -eva @EVA_CONFIG@ -journal-disable -out -input -deps
diff --git a/tests/value/align_char_array.c b/tests/value/align_char_array.c
index 9c99546fc8c..3162c9e3eb4 100644
--- a/tests/value/align_char_array.c
+++ b/tests/value/align_char_array.c
@@ -1,5 +1,5 @@
/* run.config*
- OPT: -eva @EVA_OPTIONS@ -cpp-extra-args="-DPTEST"
+ OPT: -eva @EVA_CONFIG@ -cpp-extra-args="-DPTEST"
*/
diff --git a/tests/value/array_initializer.i b/tests/value/array_initializer.i
index a4f0d427833..a1797a39721 100644
--- a/tests/value/array_initializer.i
+++ b/tests/value/array_initializer.i
@@ -1,5 +1,5 @@
/* run.config*
- OPT: -eva @EVA_OPTIONS@ -then -eva-initialization-padding-globals maybe
+ OPT: -eva @EVA_CONFIG@ -then -eva-initialization-padding-globals maybe
*/
int t[5] = { [2] = 3 };
diff --git a/tests/value/array_zero_length.i b/tests/value/array_zero_length.i
index 3e5b791a88f..a4f8efcb468 100644
--- a/tests/value/array_zero_length.i
+++ b/tests/value/array_zero_length.i
@@ -1,8 +1,8 @@
/* run.config*
- OPT: -eva @EVA_OPTIONS@ -machdep gcc_x86_32
- OPT: -eva @EVA_OPTIONS@ -lib-entry -machdep gcc_x86_32
+ OPT: -eva @EVA_CONFIG@ -machdep gcc_x86_32
+ OPT: -eva @EVA_CONFIG@ -lib-entry -machdep gcc_x86_32
EXIT: 1
- OPT: -eva @EVA_OPTIONS@ -lib-entry
+ OPT: -eva @EVA_CONFIG@ -lib-entry
*/
char T[];
char U[0];
diff --git a/tests/value/base_addr_offset_block_length.i b/tests/value/base_addr_offset_block_length.i
index 7e77e02d35e..75428ef7a28 100644
--- a/tests/value/base_addr_offset_block_length.i
+++ b/tests/value/base_addr_offset_block_length.i
@@ -1,5 +1,5 @@
/* run.config*
- OPT: -eva @EVA_OPTIONS@ -eva-context-width 3 -then -eva-slevel 3
+ OPT: -eva @EVA_CONFIG@ -eva-context-width 3 -then -eva-slevel 3
*/
diff --git a/tests/value/big_lib_entry.i b/tests/value/big_lib_entry.i
index c1c18288bc5..940b4d0bc6d 100644
--- a/tests/value/big_lib_entry.i
+++ b/tests/value/big_lib_entry.i
@@ -1,5 +1,5 @@
/* run.config*
- OPT: -eva @EVA_OPTIONS@ -lib-entry -eva-context-width 4 -eva-initialization-padding-globals no
+ OPT: -eva @EVA_CONFIG@ -lib-entry -eva-context-width 4 -eva-initialization-padding-globals no
*/
typedef struct {
diff --git a/tests/value/bitfield_longlong.c b/tests/value/bitfield_longlong.c
index 11b5b015288..7ee5041b3fd 100644
--- a/tests/value/bitfield_longlong.c
+++ b/tests/value/bitfield_longlong.c
@@ -1,5 +1,5 @@
/* run.config*
- OPT: -eva @EVA_OPTIONS@ -cpp-extra-args="-Dprintf=Frama_C_show_each"
+ OPT: -eva @EVA_CONFIG@ -cpp-extra-args="-Dprintf=Frama_C_show_each"
*/
struct X50 {
long long int z:50;
diff --git a/tests/value/bts1306.i b/tests/value/bts1306.i
index d9c701fe9ff..e188ea17e0d 100644
--- a/tests/value/bts1306.i
+++ b/tests/value/bts1306.i
@@ -1,5 +1,5 @@
/* run.config*
- OPT: -constfold -eva-slevel 0 -eva @EVA_OPTIONS@ -print -then -eva-slevel 10 -eva -print
+ 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 b534308a1b2..4bbe599b2e0 100644
--- a/tests/value/case_analysis.i
+++ b/tests/value/case_analysis.i
@@ -1,5 +1,5 @@
/* run.config*
- OPT: -eva @EVA_OPTIONS@ -eva-slevel 30 -float-normal
+ OPT: -eva @EVA_CONFIG@ -eva-slevel 30 -float-normal
*/
diff --git a/tests/value/cond_integer_cast_of_float.i b/tests/value/cond_integer_cast_of_float.i
index fc7b2dd18b0..8ad8d074e76 100644
--- a/tests/value/cond_integer_cast_of_float.i
+++ b/tests/value/cond_integer_cast_of_float.i
@@ -1,5 +1,5 @@
/* run.config*
- OPT: -eva @EVA_OPTIONS@ -eva-no-results -then -float-hex -main mainbis
+ OPT: -eva @EVA_CONFIG@ -eva-no-results -then -float-hex -main mainbis
*/
typedef double D;
typedef float F;
diff --git a/tests/value/const_typedef.i b/tests/value/const_typedef.i
index 2dd72202a6f..a672647be76 100644
--- a/tests/value/const_typedef.i
+++ b/tests/value/const_typedef.i
@@ -1,12 +1,6 @@
/* run.config*
-<<<<<<< HEAD
PLUGIN= inout eva
OPT: -machdep x86_32 -print -then -eva @EVA_CONFIG@ -lib-entry -no-print
-||||||| ac7807782d
- OPT: -no-autoload-plugins -load-module inout,eva -print -then -eva @EVA_CONFIG@ -lib-entry -no-print
-=======
- OPT: -machdep x86_32 -no-autoload-plugins -load-module inout,eva -print -then -eva @EVA_CONFIG@ -lib-entry -no-print
->>>>>>> origin/master
*/
typedef int INT[3][3];
diff --git a/tests/value/constarraystructlibentry.i b/tests/value/constarraystructlibentry.i
index f5b97e0452c..786e8c78d4c 100644
--- a/tests/value/constarraystructlibentry.i
+++ b/tests/value/constarraystructlibentry.i
@@ -1,5 +1,5 @@
/* run.config*
- OPT: -eva @EVA_OPTIONS@ -lib-entry -eva-initialization-padding-globals yes -then -eva-initialization-padding-globals no
+ 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 } ;
diff --git a/tests/value/context_free.i b/tests/value/context_free.i
index 05edb1ad3f3..ee63d582c4d 100644
--- a/tests/value/context_free.i
+++ b/tests/value/context_free.i
@@ -1,6 +1,6 @@
/* run.config*
- OPT: -eva @EVA_OPTIONS@ -lib-entry -main f -absolute-valid-range 0x200-0x199 -eva-msg-key initial-state
+ 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 9c26c61f853..ad68e909dc7 100644
--- a/tests/value/dead_inout.i
+++ b/tests/value/dead_inout.i
@@ -1,5 +1,5 @@
/* run.config*
- OPT: @EVA_OPTIONS@ -out -input -inout -inout -main main_all
+ 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
diff --git a/tests/value/div.i b/tests/value/div.i
index f59e2c5a3e4..a605df82521 100644
--- a/tests/value/div.i
+++ b/tests/value/div.i
@@ -1,14 +1,6 @@
/* run.config*
-<<<<<<< HEAD
STDOPT: #"-eva-remove-redundant-alarms"
- OPT: -machdep x86_32 -rte -then -eva @EVA_OPTIONS@
-||||||| ac7807782d
- STDOPT: #"-load-module scope -eva-remove-redundant-alarms"
- OPT: -no-autoload-plugins -load-module eva,inout -rte -then -eva @EVA_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@
->>>>>>> origin/master
+ OPT: -machdep x86_32 -rte -then -eva @EVA_CONFIG@
*/
int X,Y,Z1,Z2,T,U1,U2,V,W1,W2;
int a,b,d1,d2,d0,e;
diff --git a/tests/value/empty_base.c b/tests/value/empty_base.c
index 870994da2f4..a1e08e2b7e0 100644
--- a/tests/value/empty_base.c
+++ b/tests/value/empty_base.c
@@ -1,12 +1,6 @@
/* run.config*
-<<<<<<< HEAD
EXIT: 1
STDOPT: +"-machdep gcc_x86_32"
-||||||| ac7807782d
- STDOPT: #"-machdep gcc_x86_32"
-=======
- STDOPT: +"-machdep gcc_x86_32"
->>>>>>> origin/master
STDOPT:
*/
// the tests above must be done separately because both fail:
diff --git a/tests/value/empty_struct.c b/tests/value/empty_struct.c
index 64af6878098..0c35f9a3276 100644
--- a/tests/value/empty_struct.c
+++ b/tests/value/empty_struct.c
@@ -2,21 +2,13 @@
STDOPT: +" -machdep gcc_x86_32 -cpp-extra-args=-DP1 -then -lib-entry"
STDOPT: +" -machdep gcc_x86_32 -cpp-extra-args=-DP2 -lib-entry"
STDOPT: +" -machdep gcc_x86_32 -cpp-extra-args=-DP3 -lib-entry"
-<<<<<<< HEAD
-EXIT: 1
- STDOPT: +" -cpp-extra-args=-DP1 -lib-entry"
-EXIT: 0
- STDOPT: +" -cpp-extra-args=-DP1 -absolute-valid-range 0-1 -main main2"
-||||||| ac7807782d
- STDOPT: +" -cpp-extra-args=-DP1 -lib-entry"
- STDOPT: +" -cpp-extra-args=-DP1 -absolute-valid-range 0-1 -main main2"
-=======
STDOPT: +" -machdep gcc_x86_32 -cpp-extra-args=-DP1 -lib-entry"
STDOPT: +" -machdep gcc_x86_32 -cpp-extra-args=-DP1 -absolute-valid-range 0-1 -main main2"
->>>>>>> origin/master
- STDOPT: +" -cpp-extra-args=\"-DP1 -DP5\" -machdep gcc_x86_32 -absolute-valid-range 0-1 -main main3"
+ STDOPT: +" -cpp-extra-args=\"-DP1 -DP5\" -machdep gcc_x86_32 -absolute-valid-range 0-1 -main main3"
STDOPT: +" -machdep gcc_x86_32 -cpp-extra-args=-DP1 -main main4"
*/
+
+
// BTS 1416 and 1874
struct s {}; // empty structs only allowed in GCC/MSVC mode
struct s2 { int i1; struct s s; int i2; };
diff --git a/tests/value/fptr.i b/tests/value/fptr.i
index 96589f432f6..0dd5af57eac 100644
--- a/tests/value/fptr.i
+++ b/tests/value/fptr.i
@@ -1,7 +1,7 @@
/* run.config*
- OPT: -eva @EVA_OPTIONS@ -then -deps -out
- OPT: -eva @EVA_OPTIONS@ -main main_uninit -then -deps -out
+ 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 34555c8094b..8cc96e5cede 100644
--- a/tests/value/from_call.i
+++ b/tests/value/from_call.i
@@ -1,7 +1,7 @@
/* run.config*
- OPT: @EVA_OPTIONS@ -deps -show-indirect-deps
+ OPT: @EVA_CONFIG@ -deps -show-indirect-deps
PLUGIN: users @PLUGIN@
- OPT: -calldeps -eva @EVA_OPTIONS@ -users -then -input
+ OPT: -calldeps -eva @EVA_CONFIG@ -users -then -input
*/
int a,b,c,d;
int x,y,z,t;
diff --git a/tests/value/ilevel.i b/tests/value/ilevel.i
index 7211a7e64ec..1676fee1c9d 100644
--- a/tests/value/ilevel.i
+++ b/tests/value/ilevel.i
@@ -1,6 +1,6 @@
/* run.config*
PLUGIN: slicing sparecode @PLUGIN@
- OPT: -eva @EVA_OPTIONS@ -slice-return main -then-on "Slicing export" -eva -eva-ilevel 16 -eva-show-progress -then-on "default" -eva-ilevel 17 -then -eva-ilevel 48
+ 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;
diff --git a/tests/value/incorrect_reduce_expr.i b/tests/value/incorrect_reduce_expr.i
index 0dc6931d80b..2755dcfbdba 100644
--- a/tests/value/incorrect_reduce_expr.i
+++ b/tests/value/incorrect_reduce_expr.i
@@ -1,5 +1,5 @@
/* run.config*
- OPT: -eva @EVA_OPTIONS@ -absolute-valid-range 32-36
+ OPT: -eva @EVA_CONFIG@ -absolute-valid-range 32-36
*/
char t[5];
diff --git a/tests/value/inout.i b/tests/value/inout.i
index b0ce72c78b3..df82def628a 100644
--- a/tests/value/inout.i
+++ b/tests/value/inout.i
@@ -1,10 +1,10 @@
/* run.config*
- OPT: @EVA_OPTIONS@ -inout -deps -main inout_11_0
- OPT: @EVA_OPTIONS@ -inout -deps -main inout_11_3
- OPT: @EVA_OPTIONS@ -inout -deps -main never_terminate
- OPT: @EVA_OPTIONS@ -inout -deps -main may_not_terminate
- OPT: @EVA_OPTIONS@ -inout -deps -main call_may_not_terminate
+ 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 49654c1a2b0..46e82f096f1 100644
--- a/tests/value/inout_formals.i
+++ b/tests/value/inout_formals.i
@@ -1,5 +1,5 @@
/*run.config*
- OPT: @EVA_OPTIONS@ -inout -input-with-formals -inout-with-formals
+ OPT: @EVA_CONFIG@ -inout -input-with-formals -inout-with-formals
*/
int x, y;
diff --git a/tests/value/inout_proto.i b/tests/value/inout_proto.i
index b0c7f28d8f3..07e82502959 100644
--- a/tests/value/inout_proto.i
+++ b/tests/value/inout_proto.i
@@ -1,5 +1,5 @@
/*run.config*
- OPT: @EVA_OPTIONS@ -inout -input-with-formals -inout-with-formals -main main_main
+ OPT: @EVA_CONFIG@ -inout -input-with-formals -inout-with-formals -main main_main
*/
typedef unsigned char BYTE;
diff --git a/tests/value/limits.c b/tests/value/limits.c
index 8bc7852191c..e5d76638672 100644
--- a/tests/value/limits.c
+++ b/tests/value/limits.c
@@ -1,5 +1,5 @@
/* run.config*
- OPT: -eva @EVA_OPTIONS@ -warn-signed-overflow
+ OPT: -eva @EVA_CONFIG@ -warn-signed-overflow
*/
#include <limits.h>
diff --git a/tests/value/logic_ptr_cast.i b/tests/value/logic_ptr_cast.i
index 9e87c8cc14e..baa4f4cf1ea 100644
--- a/tests/value/logic_ptr_cast.i
+++ b/tests/value/logic_ptr_cast.i
@@ -1,5 +1,5 @@
/* run.config*
- OPT: -eva @EVA_OPTIONS@ -print -eva-no-results
+ OPT: -eva @EVA_CONFIG@ -print -eva-no-results
*/
int *p;
int t[90];
diff --git a/tests/value/loop_test.i b/tests/value/loop_test.i
index 7e6a55063e8..b9f6290fa22 100644
--- a/tests/value/loop_test.i
+++ b/tests/value/loop_test.i
@@ -1,6 +1,6 @@
/* run.config*
- OPT: -eva @EVA_OPTIONS@ -main test_onzes
- OPT: -eva @EVA_OPTIONS@ -main test_cent_onzes
+ OPT: -eva @EVA_CONFIG@ -main test_onzes
+ OPT: -eva @EVA_CONFIG@ -main test_cent_onzes
*/
diff --git a/tests/value/loop_wvar.i b/tests/value/loop_wvar.i
index b55afc2afb6..d755939e863 100644
--- a/tests/value/loop_wvar.i
+++ b/tests/value/loop_wvar.i
@@ -1,8 +1,8 @@
/* run.config*
- OPT: -no-annot -eva @EVA_OPTIONS@ -then -kernel-warn-key=annot-error=active -annot -eva
- OPT: -kernel-warn-key=annot-error=active -eva @EVA_OPTIONS@ -main main3
- OPT: -kernel-warn-key=annot-error=active -eva @EVA_OPTIONS@ -main main_err1
- OPT: -kernel-warn-key=annot-error=active -eva @EVA_OPTIONS@ -main main_err2
+ 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
*/
diff --git a/tests/value/loopinv.c b/tests/value/loopinv.c
index 37eeb43f954..26b947a064f 100644
--- a/tests/value/loopinv.c
+++ b/tests/value/loopinv.c
@@ -1,6 +1,6 @@
/* run.config*
PLUGIN: from,inout,eva,report
-OPT: @EVA_OPTIONS@ -eva-slevel-function main2:20 -pp-annot -eva -then -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; */
diff --git a/tests/value/machdep.c b/tests/value/machdep.c
index 1ccc83a0e4d..6cfbd131aaa 100644
--- a/tests/value/machdep.c
+++ b/tests/value/machdep.c
@@ -1,5 +1,5 @@
/* run.config*
- OPT: -eva @EVA_OPTIONS@ -cpp-extra-args="-DPTEST" -then -machdep x86_64 -then -machdep x86_16
+ OPT: -eva @EVA_CONFIG@ -cpp-extra-args="-DPTEST" -then -machdep x86_64 -then -machdep x86_16
*/
#ifndef PTEST
diff --git a/tests/value/nested_struct_init.i b/tests/value/nested_struct_init.i
index cca1c6ed9a0..23e7b2a84d8 100644
--- a/tests/value/nested_struct_init.i
+++ b/tests/value/nested_struct_init.i
@@ -1,5 +1,5 @@
/* run.config*
- OPT: -eva @EVA_OPTIONS@ -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
+ 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/backward_arith.res.oracle b/tests/value/oracle/backward_arith.res.oracle
index 90987a86f49..973ce42edbc 100644
--- a/tests/value/oracle/backward_arith.res.oracle
+++ b/tests/value/oracle/backward_arith.res.oracle
@@ -5,81 +5,45 @@
[eva:initial-state] Values of globals at initialization
nondet ∈ [--..--]
[eva] computing for function unsigned_neg <- main.
-<<<<<<< HEAD
- Called from backward_arith.i:31.
-[eva] backward_arith.i:12: Frama_C_show_each_ten: {10}
-[eva] backward_arith.i:14: Frama_C_show_each_not_ten: [0..4294967295]
-[eva] backward_arith.i:16:
-||||||| ac7807782d
- Called from tests/value/backward_arith.i:31.
-[eva] tests/value/backward_arith.i:12: Frama_C_show_each_ten: {10}
-[eva] tests/value/backward_arith.i:14:
- Frama_C_show_each_not_ten: [0..4294967295]
-[eva] tests/value/backward_arith.i:16:
-=======
- Called from tests/value/backward_arith.i:75.
-[eva] tests/value/backward_arith.i:13: Frama_C_show_each_ten: {10}
-[eva] tests/value/backward_arith.i:15:
- Frama_C_show_each_not_ten: [0..4294967295]
-[eva] tests/value/backward_arith.i:17:
->>>>>>> origin/master
+ Called from backward_arith.i:75.
+[eva] backward_arith.i:13: Frama_C_show_each_ten: {10}
+[eva] backward_arith.i:15: Frama_C_show_each_not_ten: [0..4294967295]
+[eva] backward_arith.i:17:
Frama_C_show_each_greater_than_ten_or_zero: [0..4294967295]
-<<<<<<< HEAD
-[eva] backward_arith.i:18: Frama_C_show_each_smaller_than_ten_but_zero: [1..10]
-[eva] backward_arith.i:20: Frama_C_show_each_minus_ten: {4294967286}
-[eva] backward_arith.i:22: Frama_C_show_each_not_minus_ten: [0..4294967295]
-[eva] backward_arith.i:24:
-||||||| ac7807782d
-[eva] tests/value/backward_arith.i:18:
- Frama_C_show_each_smaller_than_ten_but_zero: [1..10]
-[eva] tests/value/backward_arith.i:20: Frama_C_show_each_minus_ten: {4294967286}
-[eva] tests/value/backward_arith.i:22:
- Frama_C_show_each_not_minus_ten: [0..4294967295]
-[eva] tests/value/backward_arith.i:24:
-=======
-[eva] tests/value/backward_arith.i:19:
- Frama_C_show_each_smaller_than_ten_but_zero: [1..10]
-[eva] tests/value/backward_arith.i:21: Frama_C_show_each_minus_ten: {4294967286}
-[eva] tests/value/backward_arith.i:23:
- Frama_C_show_each_not_minus_ten: [0..4294967295]
-[eva] tests/value/backward_arith.i:25:
->>>>>>> origin/master
+[eva] backward_arith.i:19: Frama_C_show_each_smaller_than_ten_but_zero: [1..10]
+[eva] backward_arith.i:21: Frama_C_show_each_minus_ten: {4294967286}
+[eva] backward_arith.i:23: Frama_C_show_each_not_minus_ten: [0..4294967295]
+[eva] backward_arith.i:25:
Frama_C_show_each_greater_than_minus_ten_or_zero: [0..4294967295]
-<<<<<<< HEAD
-[eva] backward_arith.i:26:
-||||||| ac7807782d
-[eva] tests/value/backward_arith.i:26:
-=======
-[eva] tests/value/backward_arith.i:27:
->>>>>>> origin/master
+[eva] backward_arith.i:27:
Frama_C_show_each_smaller_than_minus_ten_but_zero: [1..4294967286]
[eva] Recording results for unsigned_neg
[eva] Done for function unsigned_neg
[eva] computing for function logical_operators <- main.
- Called from tests/value/backward_arith.i:76.
-[eva] tests/value/backward_arith.i:38:
+ Called from backward_arith.i:76.
+[eva] backward_arith.i:38:
Frama_C_show_each: {{ "0..10" }}, [0..10], {{ "0..20" }}, [0..20]
-[eva] tests/value/backward_arith.i:40:
+[eva] backward_arith.i:40:
Frama_C_show_each: {{ "top" }}, [0..4294967295], {{ "top" }}, [0..4294967295]
-[eva] tests/value/backward_arith.i:42:
+[eva] backward_arith.i:42:
Frama_C_show_each: {{ "0..9" }}, [0..9], {{ "0..9" }}, [0..9]
-[eva] tests/value/backward_arith.i:44:
+[eva] backward_arith.i:44:
Frama_C_show_each: {{ "0..9" }}, [0..9], {{ "10..max" }}, [10..4294967295]
-[eva] tests/value/backward_arith.i:48:
+[eva] backward_arith.i:48:
Frama_C_show_each: {{ "0..9" }}, [0..9], {{ "top" }}, [0..4294967295]
-[eva] tests/value/backward_arith.i:52:
+[eva] backward_arith.i:52:
Frama_C_show_each: {{ "0..9" }}, [0..9], {{ "0..9" }}, [0..9]
-[eva] tests/value/backward_arith.i:56:
+[eva] backward_arith.i:56:
Frama_C_show_each: {{ "top" }}, [0..4294967295], {{ "top" }}, [0..4294967295]
-[eva] tests/value/backward_arith.i:58:
+[eva] backward_arith.i:58:
Frama_C_show_each: {{ "0..10" }}, [0..10], {{ "0..20" }}, [0..20]
-[eva] tests/value/backward_arith.i:60:
+[eva] backward_arith.i:60:
Frama_C_show_each: {{ "0..9" }}, [0..9], {{ "11..max" }}, [11..4294967295]
-[eva] tests/value/backward_arith.i:62:
+[eva] backward_arith.i:62:
Frama_C_show_each: {{ "0..9" }}, [0..9], {{ "0..10" }}, [0..10]
-[eva] tests/value/backward_arith.i:64:
+[eva] backward_arith.i:64:
Frama_C_show_each: {{ "0..9" }}, [0..9], {{ "top" }}, [0..4294967295]
-[eva] tests/value/backward_arith.i:70:
+[eva] backward_arith.i:70:
Frama_C_show_each: {{ "0..9" }}, [0..9], {{ "0..9" }}, [0..9]
[eva] Recording results for logical_operators
[eva] Done for function logical_operators
diff --git a/tests/value/oracle/bool.res.oracle b/tests/value/oracle/bool.res.oracle
index bd0f602ff3a..f8c6df23506 100644
--- a/tests/value/oracle/bool.res.oracle
+++ b/tests/value/oracle/bool.res.oracle
@@ -5,117 +5,43 @@
[eva:initial-state] Values of globals at initialization
rand ∈ [--..--]
[eva] computing for function valid_bool <- main.
-<<<<<<< HEAD
- Called from bool.i:61.
+ Called from bool.i:71.
[eva] bool.i:12: Frama_C_show_each: {0}
[eva] bool.i:14: Frama_C_show_each: {1}
[eva] bool.i:16: Frama_C_show_each: {1}, {2}
[eva] bool.i:18: Frama_C_show_each: {1}
[eva] bool.i:20: Frama_C_show_each: {1}
-||||||| ac7807782d
- Called from tests/value/bool.i:61.
-[eva] tests/value/bool.i:12: Frama_C_show_each: {0}
-[eva] tests/value/bool.i:14: Frama_C_show_each: {1}
-[eva] tests/value/bool.i:16: Frama_C_show_each: {1}, {2}
-[eva] tests/value/bool.i:18: Frama_C_show_each: {1}
-[eva] tests/value/bool.i:20: Frama_C_show_each: {1}
-=======
- Called from tests/value/bool.i:71.
-[eva] tests/value/bool.i:12: Frama_C_show_each: {0}
-[eva] tests/value/bool.i:14: Frama_C_show_each: {1}
-[eva] tests/value/bool.i:16: Frama_C_show_each: {1}, {2}
-[eva] tests/value/bool.i:18: Frama_C_show_each: {1}
-[eva] tests/value/bool.i:20: Frama_C_show_each: {1}
-[eva] tests/value/bool.i:22: Frama_C_show_each: {1}
-[eva] tests/value/bool.i:24: Frama_C_show_each: {0}
-[eva] tests/value/bool.i:26: Frama_C_show_each: {1}
-[eva] tests/value/bool.i:28: Frama_C_show_each: {0}
-[eva] tests/value/bool.i:30: Frama_C_show_each: {1}
->>>>>>> origin/master
+[eva] bool.i:22: Frama_C_show_each: {1}
+[eva] bool.i:24: Frama_C_show_each: {0}
+[eva] bool.i:26: Frama_C_show_each: {1}
+[eva] bool.i:28: Frama_C_show_each: {0}
+[eva] bool.i:30: Frama_C_show_each: {1}
[eva] Recording results for valid_bool
[eva] Done for function valid_bool
[eva] computing for function invalid_bool <- main.
-<<<<<<< HEAD
- Called from bool.i:62.
-[eva:alarm] bool.i:33: Warning:
-||||||| ac7807782d
- Called from tests/value/bool.i:62.
-[eva:alarm] tests/value/bool.i:33: Warning:
-=======
- Called from tests/value/bool.i:72.
-[eva:alarm] tests/value/bool.i:43: Warning:
->>>>>>> origin/master
+ Called from bool.i:72.
+[eva:alarm] bool.i:43: Warning:
trap representation of a _Bool lvalue. assert ub.b ≡ 0 ∨ ub.b ≡ 1;
-<<<<<<< HEAD
-[eva] bool.i:36: Frama_C_show_each_zero: {0}
-[eva] bool.i:39: Frama_C_show_each_one: {1}
-[eva:alarm] bool.i:42: Warning:
- trap representation of a _Bool lvalue. assert ub.b ≡ 0 ∨ ub.b ≡ 1;
-[eva:alarm] bool.i:45: Warning:
- trap representation of a _Bool lvalue. assert ub.b ≡ 0 ∨ ub.b ≡ 1;
-[eva] bool.i:46: Frama_C_show_each_zero_or_one: {0; 1}
+[eva] bool.i:46: Frama_C_show_each_zero: {0}
[eva] bool.i:49: Frama_C_show_each_one: {1}
[eva:alarm] bool.i:52: Warning:
-||||||| ac7807782d
-[eva] tests/value/bool.i:36: Frama_C_show_each_zero: {0}
-[eva] tests/value/bool.i:39: Frama_C_show_each_one: {1}
-[eva:alarm] tests/value/bool.i:42: Warning:
- trap representation of a _Bool lvalue. assert ub.b ≡ 0 ∨ ub.b ≡ 1;
-[eva:alarm] tests/value/bool.i:45: Warning:
- trap representation of a _Bool lvalue. assert ub.b ≡ 0 ∨ ub.b ≡ 1;
-[eva] tests/value/bool.i:46: Frama_C_show_each_zero_or_one: {0; 1}
-[eva] tests/value/bool.i:49: Frama_C_show_each_one: {1}
-[eva:alarm] tests/value/bool.i:52: Warning:
-=======
-[eva] tests/value/bool.i:46: Frama_C_show_each_zero: {0}
-[eva] tests/value/bool.i:49: Frama_C_show_each_one: {1}
-[eva:alarm] tests/value/bool.i:52: Warning:
trap representation of a _Bool lvalue. assert ub.b ≡ 0 ∨ ub.b ≡ 1;
-[eva:alarm] tests/value/bool.i:55: Warning:
+[eva:alarm] bool.i:55: Warning:
trap representation of a _Bool lvalue. assert ub.b ≡ 0 ∨ ub.b ≡ 1;
-[eva] tests/value/bool.i:56: Frama_C_show_each_zero_or_one: {0; 1}
-[eva] tests/value/bool.i:59: Frama_C_show_each_one: {1}
-[eva:alarm] tests/value/bool.i:62: Warning:
->>>>>>> origin/master
+[eva] bool.i:56: Frama_C_show_each_zero_or_one: {0; 1}
+[eva] bool.i:59: Frama_C_show_each_one: {1}
+[eva:alarm] bool.i:62: Warning:
trap representation of a _Bool lvalue. assert b ≡ 0 ∨ b ≡ 1;
-<<<<<<< HEAD
-[eva:alarm] bool.i:56: Warning:
-||||||| ac7807782d
-[eva:alarm] tests/value/bool.i:56: Warning:
-=======
-[eva:alarm] tests/value/bool.i:66: Warning:
->>>>>>> origin/master
+[eva:alarm] bool.i:66: Warning:
trap representation of a _Bool lvalue. assert *p ≡ 0 ∨ *p ≡ 1;
-<<<<<<< HEAD
-[eva] bool.i:57: Frama_C_show_each_zero_or_one: {0; 1}
-||||||| ac7807782d
-[eva] tests/value/bool.i:57: Frama_C_show_each_zero_or_one: {0; 1}
-=======
-[eva] tests/value/bool.i:67: Frama_C_show_each_zero_or_one: {0; 1}
->>>>>>> origin/master
+[eva] bool.i:67: Frama_C_show_each_zero_or_one: {0; 1}
[eva] Recording results for invalid_bool
[eva] Done for function invalid_bool
[eva] Recording results for main
[eva] done for function main
-<<<<<<< HEAD
-[eva] bool.i:33: assertion 'Eva,bool_value' got final status invalid.
-[eva] bool.i:42: assertion 'Eva,bool_value' got final status invalid.
+[eva] bool.i:43: assertion 'Eva,bool_value' got final status invalid.
[eva] bool.i:52: assertion 'Eva,bool_value' got final status invalid.
-||||||| ac7807782d
-[eva] tests/value/bool.i:33:
- assertion 'Eva,bool_value' got final status invalid.
-[eva] tests/value/bool.i:42:
- assertion 'Eva,bool_value' got final status invalid.
-[eva] tests/value/bool.i:52:
- assertion 'Eva,bool_value' got final status invalid.
-=======
-[eva] tests/value/bool.i:43:
- assertion 'Eva,bool_value' got final status invalid.
-[eva] tests/value/bool.i:52:
- assertion 'Eva,bool_value' got final status invalid.
-[eva] tests/value/bool.i:62:
- assertion 'Eva,bool_value' got final status invalid.
->>>>>>> origin/master
+[eva] bool.i:62: assertion 'Eva,bool_value' got final status invalid.
[eva] ====== VALUES COMPUTED ======
[eva:final-states] Values at end of function invalid_bool:
ub{.b; .c; .s[bits 0 to 7]} ∈ {0; 1}
diff --git a/tests/value/oracle/empty_base.1.res.oracle b/tests/value/oracle/empty_base.1.res.oracle
index 23b3981f3a3..eec4d42edf6 100644
--- a/tests/value/oracle/empty_base.1.res.oracle
+++ b/tests/value/oracle/empty_base.1.res.oracle
@@ -1,15 +1,6 @@
-<<<<<<< HEAD
[kernel] Parsing empty_base.c (with preprocessing)
+[kernel] empty_base.c:13: User Error: empty structs only allowed for GCC/MSVC
[kernel] empty_base.c:47: User Error:
-||||||| ac7807782d
-[kernel] Parsing tests/value/empty_base.c (with preprocessing)
-[kernel] tests/value/empty_base.c:47: User Error:
-=======
-[kernel] Parsing tests/value/empty_base.c (with preprocessing)
-[kernel] tests/value/empty_base.c:12: User Error:
- empty structs only allowed for GCC/MSVC
-[kernel] tests/value/empty_base.c:47: User Error:
->>>>>>> origin/master
zero-length arrays only allowed for GCC/MSVC
[kernel] empty_base.c:49: User Error:
empty initializers only allowed for GCC/MSVC
diff --git a/tests/value/oracle/empty_struct.3.res.oracle b/tests/value/oracle/empty_struct.3.res.oracle
index daa9cdb1a92..24b7daa9c86 100644
--- a/tests/value/oracle/empty_struct.3.res.oracle
+++ b/tests/value/oracle/empty_struct.3.res.oracle
@@ -1,17 +1,6 @@
[kernel] Parsing empty_struct.c (with preprocessing)
[eva] Analyzing an incomplete application starting at main
[eva] Computing initial state
-<<<<<<< HEAD
-[eva] empty_struct.c:22: User Error:
- empty structs are unsupported (type 'struct s', location s)
- in C99 (only allowed as GCC/MSVC extension). Aborting.
-[kernel] Plug-in eva aborted: invalid user input.
-||||||| ac7807782d
-[eva] tests/value/empty_struct.c:22: User Error:
- empty structs are unsupported (type 'struct s', location s)
- in C99 (only allowed as GCC/MSVC extension). Aborting.
-[kernel] Plug-in eva aborted: invalid user input.
-=======
[eva] Initial state computed
[eva:initial-state] Values of globals at initialization
s2 ∈ [--..--]
@@ -32,4 +21,3 @@
p
[inout] Inputs for function main:
\nothing
->>>>>>> origin/master
diff --git a/tests/value/oracle/empty_struct2.res.oracle b/tests/value/oracle/empty_struct2.res.oracle
index 21d1ff04070..91690d40eae 100644
--- a/tests/value/oracle/empty_struct2.res.oracle
+++ b/tests/value/oracle/empty_struct2.res.oracle
@@ -5,131 +5,43 @@
[eva:initial-state] Values of globals at initialization
nondet ∈ [--..--]
pg ∈ {{ &global_empty }}
-<<<<<<< HEAD
-[eva] empty_struct2.c:44: assertion got status valid.
-[eva] empty_struct2.c:46: Frama_C_show_each_global_empty: ∅
-[eva] empty_struct2.c:47: Frama_C_show_each_e1: ∅
-[eva] empty_struct2.c:48: Call to builtin memcpy
-[eva] empty_struct2.c:48:
-||||||| ac7807782d
-[eva] tests/value/empty_struct2.c:44: assertion got status valid.
-[eva] tests/value/empty_struct2.c:46: Frama_C_show_each_global_empty: ∅
-[eva] tests/value/empty_struct2.c:47: Frama_C_show_each_e1: ∅
-[eva] tests/value/empty_struct2.c:48: Call to builtin memcpy
-[eva] tests/value/empty_struct2.c:48:
-=======
-[eva] tests/value/empty_struct2.c:48: assertion got status valid.
-[eva] tests/value/empty_struct2.c:50: Frama_C_show_each_global_empty: ∅
-[eva] tests/value/empty_struct2.c:51: Frama_C_show_each_e1: ∅
-[eva] tests/value/empty_struct2.c:52: Call to builtin memcpy
-[eva] tests/value/empty_struct2.c:52:
->>>>>>> origin/master
+[eva] empty_struct2.c:48: assertion got status valid.
+[eva] empty_struct2.c:50: Frama_C_show_each_global_empty: ∅
+[eva] empty_struct2.c:51: Frama_C_show_each_e1: ∅
+[eva] empty_struct2.c:52: Call to builtin memcpy
+[eva] empty_struct2.c:52:
function memcpy: precondition 'valid_dest' got status valid.
-<<<<<<< HEAD
-[eva] empty_struct2.c:48:
-||||||| ac7807782d
-[eva] tests/value/empty_struct2.c:48:
-=======
-[eva] tests/value/empty_struct2.c:52:
->>>>>>> origin/master
+[eva] empty_struct2.c:52:
function memcpy: precondition 'valid_src' got status valid.
-<<<<<<< HEAD
-[eva] empty_struct2.c:48:
-||||||| ac7807782d
-[eva] tests/value/empty_struct2.c:48:
-=======
-[eva] tests/value/empty_struct2.c:52:
->>>>>>> origin/master
+[eva] empty_struct2.c:52:
function memcpy: precondition 'separation' got status valid.
[eva] FRAMAC_SHARE/libc/string.h:98:
cannot evaluate ACSL term, unsupported ACSL construct: logic function memcmp
-<<<<<<< HEAD
-[eva] empty_struct2.c:53: Call to builtin memcpy
-[eva] empty_struct2.c:53:
-||||||| ac7807782d
-[eva] tests/value/empty_struct2.c:53: Call to builtin memcpy
-[eva] tests/value/empty_struct2.c:53:
-=======
-[eva] tests/value/empty_struct2.c:57: Call to builtin memcpy
-[eva] tests/value/empty_struct2.c:57:
->>>>>>> origin/master
+[eva] empty_struct2.c:57: Call to builtin memcpy
+[eva] empty_struct2.c:57:
function memcpy: precondition 'valid_dest' got status valid.
-<<<<<<< HEAD
-[eva] empty_struct2.c:53:
-||||||| ac7807782d
-[eva] tests/value/empty_struct2.c:53:
-=======
-[eva] tests/value/empty_struct2.c:57:
->>>>>>> origin/master
+[eva] empty_struct2.c:57:
function memcpy: precondition 'valid_src' got status valid.
-<<<<<<< HEAD
-[eva] empty_struct2.c:53:
-||||||| ac7807782d
-[eva] tests/value/empty_struct2.c:53:
-=======
-[eva] tests/value/empty_struct2.c:57:
->>>>>>> origin/master
+[eva] empty_struct2.c:57:
function memcpy: precondition 'separation' got status valid.
-<<<<<<< HEAD
-[eva] empty_struct2.c:54:
-||||||| ac7807782d
-[eva] tests/value/empty_struct2.c:54:
-=======
-[eva] tests/value/empty_struct2.c:58:
->>>>>>> origin/master
+[eva] empty_struct2.c:58:
Frama_C_show_each_c2: .a ∈ {42}
.b ∈ {77}
-<<<<<<< HEAD
-[eva] empty_struct2.c:55: Frama_C_show_each_c2_e: ∅
-||||||| ac7807782d
-[eva] tests/value/empty_struct2.c:55: Frama_C_show_each_c2_e: ∅
-=======
-[eva] tests/value/empty_struct2.c:59: Frama_C_show_each_c2_e: ∅
->>>>>>> origin/master
+[eva] empty_struct2.c:59: Frama_C_show_each_c2_e: ∅
[eva] computing for function f <- main.
-<<<<<<< HEAD
- Called from empty_struct2.c:56.
-||||||| ac7807782d
- Called from tests/value/empty_struct2.c:56.
-=======
- Called from tests/value/empty_struct2.c:60.
->>>>>>> origin/master
+ Called from empty_struct2.c:60.
[eva] Recording results for f
[eva] Done for function f
-<<<<<<< HEAD
-[eva] empty_struct2.c:58:
-||||||| ac7807782d
-[eva] tests/value/empty_struct2.c:58:
-=======
-[eva] tests/value/empty_struct2.c:62:
->>>>>>> origin/master
+[eva] empty_struct2.c:62:
Frama_C_show_each_res: .a ∈ {87}
.b ∈ {39}
-<<<<<<< HEAD
-[eva] empty_struct2.c:62: assertion got status valid.
-||||||| ac7807782d
-[eva] tests/value/empty_struct2.c:62: assertion got status valid.
-=======
-[eva] tests/value/empty_struct2.c:66: assertion got status valid.
->>>>>>> origin/master
+[eva] empty_struct2.c:66: assertion got status valid.
[eva] computing for function ret_empty <- main.
-<<<<<<< HEAD
- Called from empty_struct2.c:64.
-||||||| ac7807782d
- Called from tests/value/empty_struct2.c:64.
-=======
- Called from tests/value/empty_struct2.c:68.
->>>>>>> origin/master
+ Called from empty_struct2.c:68.
[eva] using specification for function ret_empty
[eva] Done for function ret_empty
[eva] computing for function ret_ptr_empty <- main.
-<<<<<<< HEAD
- Called from empty_struct2.c:65.
-||||||| ac7807782d
- Called from tests/value/empty_struct2.c:65.
-=======
- Called from tests/value/empty_struct2.c:69.
->>>>>>> origin/master
+ Called from empty_struct2.c:69.
[eva] using specification for function ret_ptr_empty
[eva] Done for function ret_ptr_empty
[eva] Recording results for main
diff --git a/tests/value/oracle/nonlin.res.oracle b/tests/value/oracle/nonlin.res.oracle
index c0d9b11adc2..9d5bdc6ef29 100644
--- a/tests/value/oracle/nonlin.res.oracle
+++ b/tests/value/oracle/nonlin.res.oracle
@@ -24,77 +24,27 @@
[31] ∈ {5}
[32..35] ∈ {0}
[eva] computing for function subdivide_integer <- main.
-<<<<<<< HEAD
- Called from nonlin.c:119.
-[eva:nonlin] nonlin.c:31: non-linear '((int)z + 675) * ((int)z + 675)', lv 'z'
-[eva:nonlin] nonlin.c:31: subdividing on z
-[eva:nonlin] nonlin.c:32:
-||||||| ac7807782d
- Called from tests/value/nonlin.c:119.
-[eva:nonlin] tests/value/nonlin.c:31:
- non-linear '((int)z + 675) * ((int)z + 675)', lv 'z'
-[eva:nonlin] tests/value/nonlin.c:31: subdividing on z
-[eva:nonlin] tests/value/nonlin.c:32:
-=======
- Called from tests/value/nonlin.c:125.
-[eva:nonlin] tests/value/nonlin.c:37:
- non-linear '((int)z + 675) * ((int)z + 675)', lv 'z'
-[eva:nonlin] tests/value/nonlin.c:37: subdividing on z
-[eva:nonlin] tests/value/nonlin.c:38:
->>>>>>> origin/master
+ Called from nonlin.c:125.
+[eva:nonlin] nonlin.c:37: non-linear '((int)z + 675) * ((int)z + 675)', lv 'z'
+[eva:nonlin] nonlin.c:37: subdividing on z
+[eva:nonlin] nonlin.c:38:
non-linear '((int)z + 17817) * ((int)z + 17817)', lv 'z'
-<<<<<<< HEAD
-[eva:nonlin] nonlin.c:32: subdividing on z
-[eva:alarm] nonlin.c:32: Warning:
-||||||| ac7807782d
-[eva:nonlin] tests/value/nonlin.c:32: subdividing on z
-[eva:alarm] tests/value/nonlin.c:32: Warning:
-=======
-[eva:nonlin] tests/value/nonlin.c:38: subdividing on z
-[eva:alarm] tests/value/nonlin.c:38: Warning:
->>>>>>> origin/master
+[eva:nonlin] nonlin.c:38: subdividing on z
+[eva:alarm] nonlin.c:38: Warning:
signed overflow.
assert (int)((int)z + 17817) * (int)((int)z + 17817) ≤ 2147483647;
-<<<<<<< HEAD
-[eva:nonlin] nonlin.c:39:
-||||||| ac7807782d
-[eva:nonlin] tests/value/nonlin.c:39:
-=======
-[eva:nonlin] tests/value/nonlin.c:45:
->>>>>>> origin/master
+[eva:nonlin] nonlin.c:45:
non-linear '(i2 + (long long)3) * (i2 + (long long)3)', lv 'i2'
-<<<<<<< HEAD
-[eva:nonlin] nonlin.c:39: non-linear 'i1 * i1', lv 'i1'
-[eva:nonlin] nonlin.c:39: subdividing on i2
-[eva:nonlin] nonlin.c:39: subdividing on i1
-[eva:alarm] nonlin.c:43: Warning: assertion got status unknown.
-[eva:nonlin] nonlin.c:44: non-linear '(int)idx * (int)idx', lv 'idx'
-[eva:nonlin] nonlin.c:44: subdividing on idx
-||||||| ac7807782d
-[eva:nonlin] tests/value/nonlin.c:39: non-linear 'i1 * i1', lv 'i1'
-[eva:nonlin] tests/value/nonlin.c:39: subdividing on i2
-[eva:nonlin] tests/value/nonlin.c:39: subdividing on i1
-[eva:alarm] tests/value/nonlin.c:43: Warning: assertion got status unknown.
-[eva:nonlin] tests/value/nonlin.c:44: non-linear '(int)idx * (int)idx', lv 'idx'
-[eva:nonlin] tests/value/nonlin.c:44: subdividing on idx
-=======
-[eva:nonlin] tests/value/nonlin.c:45: non-linear 'i1 * i1', lv 'i1'
-[eva:nonlin] tests/value/nonlin.c:45: subdividing on i2
-[eva:nonlin] tests/value/nonlin.c:45: subdividing on i1
-[eva:alarm] tests/value/nonlin.c:49: Warning: assertion got status unknown.
-[eva:nonlin] tests/value/nonlin.c:50: non-linear '(int)idx * (int)idx', lv 'idx'
-[eva:nonlin] tests/value/nonlin.c:50: subdividing on idx
->>>>>>> origin/master
+[eva:nonlin] nonlin.c:45: non-linear 'i1 * i1', lv 'i1'
+[eva:nonlin] nonlin.c:45: subdividing on i2
+[eva:nonlin] nonlin.c:45: subdividing on i1
+[eva:alarm] nonlin.c:49: Warning: assertion got status unknown.
+[eva:nonlin] nonlin.c:50: non-linear '(int)idx * (int)idx', lv 'idx'
+[eva:nonlin] nonlin.c:50: subdividing on idx
[eva] Recording results for subdivide_integer
[eva] Done for function subdivide_integer
[eva] computing for function subdivide_pointer <- main.
-<<<<<<< HEAD
- Called from nonlin.c:120.
-||||||| ac7807782d
- Called from tests/value/nonlin.c:120.
-=======
- Called from tests/value/nonlin.c:126.
->>>>>>> origin/master
+ Called from nonlin.c:126.
[eva] computing for function Frama_C_interval <- subdivide_pointer <- main.
Called from nonlin.c:12.
[eva] using specification for function Frama_C_interval
@@ -112,265 +62,97 @@
[eva:nonlin] nonlin.c:21: subdividing on i
[eva:alarm] nonlin.c:21: Warning:
out of bounds read. assert \valid_read((p + i) - i);
-<<<<<<< HEAD
-[eva:alarm] nonlin.c:23: Warning:
-||||||| ac7807782d
-[eva:alarm] tests/value/nonlin.c:23: Warning:
-=======
[eva] computing for function Frama_C_interval <- subdivide_pointer <- main.
- Called from tests/value/nonlin.c:26.
-[eva] tests/value/nonlin.c:26:
+ Called from nonlin.c:26.
+[eva] nonlin.c:26:
function Frama_C_interval: precondition 'order' got status valid.
[eva] Done for function Frama_C_interval
-[eva:nonlin] tests/value/nonlin.c:27: subdividing on i
-[eva:alarm] tests/value/nonlin.c:29: Warning:
->>>>>>> origin/master
+[eva:nonlin] nonlin.c:27: subdividing on i
+[eva:alarm] nonlin.c:29: Warning:
pointer downcast. assert (unsigned int)(&x) ≤ 2147483647;
-<<<<<<< HEAD
-[eva:alarm] nonlin.c:24: Warning:
-||||||| ac7807782d
-[eva:alarm] tests/value/nonlin.c:24: Warning:
-=======
-[eva:alarm] tests/value/nonlin.c:30: Warning:
->>>>>>> origin/master
+[eva:alarm] nonlin.c:30: Warning:
out of bounds read. assert \valid_read((p + i) - i);
[eva] Recording results for subdivide_pointer
[eva] Done for function subdivide_pointer
[eva] computing for function subdivide_several_variables <- main.
-<<<<<<< HEAD
- Called from nonlin.c:121.
-||||||| ac7807782d
- Called from tests/value/nonlin.c:121.
-=======
- Called from tests/value/nonlin.c:127.
->>>>>>> origin/master
+ Called from nonlin.c:127.
[eva] computing for function Frama_C_interval <- subdivide_several_variables <-
main.
-<<<<<<< HEAD
- Called from nonlin.c:51.
-[eva] nonlin.c:51:
-||||||| ac7807782d
- Called from tests/value/nonlin.c:51.
-[eva] tests/value/nonlin.c:51:
-=======
- Called from tests/value/nonlin.c:57.
-[eva] tests/value/nonlin.c:57:
->>>>>>> origin/master
+ Called from nonlin.c:57.
+[eva] nonlin.c:57:
function Frama_C_interval: precondition 'order' got status valid.
[eva] Done for function Frama_C_interval
[eva] computing for function Frama_C_interval <- subdivide_several_variables <-
main.
-<<<<<<< HEAD
- Called from nonlin.c:52.
-[eva] nonlin.c:52:
-||||||| ac7807782d
- Called from tests/value/nonlin.c:52.
-[eva] tests/value/nonlin.c:52:
-=======
- Called from tests/value/nonlin.c:58.
-[eva] tests/value/nonlin.c:58:
->>>>>>> origin/master
+ Called from nonlin.c:58.
+[eva] nonlin.c:58:
function Frama_C_interval: precondition 'order' got status valid.
[eva] Done for function Frama_C_interval
[eva] computing for function Frama_C_interval <- subdivide_several_variables <-
main.
-<<<<<<< HEAD
- Called from nonlin.c:53.
-[eva] nonlin.c:53:
-||||||| ac7807782d
- Called from tests/value/nonlin.c:53.
-[eva] tests/value/nonlin.c:53:
-=======
- Called from tests/value/nonlin.c:59.
-[eva] tests/value/nonlin.c:59:
->>>>>>> origin/master
+ Called from nonlin.c:59.
+[eva] nonlin.c:59:
function Frama_C_interval: precondition 'order' got status valid.
[eva] Done for function Frama_C_interval
[eva] computing for function Frama_C_interval <- subdivide_several_variables <-
main.
-<<<<<<< HEAD
- Called from nonlin.c:54.
-[eva] nonlin.c:54:
-||||||| ac7807782d
- Called from tests/value/nonlin.c:54.
-[eva] tests/value/nonlin.c:54:
-=======
- Called from tests/value/nonlin.c:60.
-[eva] tests/value/nonlin.c:60:
->>>>>>> origin/master
+ Called from nonlin.c:60.
+[eva] nonlin.c:60:
function Frama_C_interval: precondition 'order' got status valid.
[eva] Done for function Frama_C_interval
-<<<<<<< HEAD
-[eva:nonlin] nonlin.c:56: non-linear 'x * x', lv 'x'
-[eva:nonlin] nonlin.c:56: non-linear 'y * y', lv 'y'
-[eva:nonlin] nonlin.c:56: subdividing on x
-[eva:nonlin] nonlin.c:56: subdividing on y
-[eva:nonlin] nonlin.c:60: non-linear 'x * x', lv 'x'
-[eva:nonlin] nonlin.c:60: non-linear '((x * x) * y) * y', lv 'y'
-[eva:nonlin] nonlin.c:60: subdividing on x
-[eva:nonlin] nonlin.c:60: subdividing on y
-[eva:nonlin] nonlin.c:62: non-linear 'x * y - y * x', lv 'y, x'
-[eva:nonlin] nonlin.c:62: subdividing on x, y
-[eva:nonlin] nonlin.c:65: non-linear '(x * x - (2 * x) * y) + y * y', lv 'y, x'
-[eva:nonlin] nonlin.c:65: subdividing on x, y
-[eva:nonlin] nonlin.c:66: non-linear '(x * x + y * y) - (2 * x) * y', lv 'y, x'
-[eva:nonlin] nonlin.c:66: subdividing on x, y
-[eva:nonlin] nonlin.c:68: non-linear '(z * x + x * y) + y * z', lv 'z, y, x'
-[eva:nonlin] nonlin.c:68: non-linear 'w * w', lv 'w'
-[eva:nonlin] nonlin.c:68: subdividing on x, y, z
-[eva:nonlin] nonlin.c:68: subdividing on w
-||||||| ac7807782d
-[eva:nonlin] tests/value/nonlin.c:56: non-linear 'x * x', lv 'x'
-[eva:nonlin] tests/value/nonlin.c:56: non-linear 'y * y', lv 'y'
-[eva:nonlin] tests/value/nonlin.c:56: subdividing on x
-[eva:nonlin] tests/value/nonlin.c:56: subdividing on y
-[eva:nonlin] tests/value/nonlin.c:60: non-linear 'x * x', lv 'x'
-[eva:nonlin] tests/value/nonlin.c:60: non-linear '((x * x) * y) * y', lv 'y'
-[eva:nonlin] tests/value/nonlin.c:60: subdividing on x
-[eva:nonlin] tests/value/nonlin.c:60: subdividing on y
-[eva:nonlin] tests/value/nonlin.c:62: non-linear 'x * y - y * x', lv 'y, x'
-[eva:nonlin] tests/value/nonlin.c:62: subdividing on x, y
-[eva:nonlin] tests/value/nonlin.c:65:
- non-linear '(x * x - (2 * x) * y) + y * y', lv 'y, x'
-[eva:nonlin] tests/value/nonlin.c:65: subdividing on x, y
-[eva:nonlin] tests/value/nonlin.c:66:
- non-linear '(x * x + y * y) - (2 * x) * y', lv 'y, x'
-[eva:nonlin] tests/value/nonlin.c:66: subdividing on x, y
-[eva:nonlin] tests/value/nonlin.c:68:
- non-linear '(z * x + x * y) + y * z', lv 'z, y, x'
-[eva:nonlin] tests/value/nonlin.c:68: non-linear 'w * w', lv 'w'
-[eva:nonlin] tests/value/nonlin.c:68: subdividing on x, y, z
-[eva:nonlin] tests/value/nonlin.c:68: subdividing on w
-=======
-[eva:nonlin] tests/value/nonlin.c:62: non-linear 'x * x', lv 'x'
-[eva:nonlin] tests/value/nonlin.c:62: non-linear 'y * y', lv 'y'
-[eva:nonlin] tests/value/nonlin.c:62: subdividing on x
-[eva:nonlin] tests/value/nonlin.c:62: subdividing on y
-[eva:nonlin] tests/value/nonlin.c:66: non-linear 'x * x', lv 'x'
-[eva:nonlin] tests/value/nonlin.c:66: non-linear '((x * x) * y) * y', lv 'y'
-[eva:nonlin] tests/value/nonlin.c:66: subdividing on x
-[eva:nonlin] tests/value/nonlin.c:66: subdividing on y
-[eva:nonlin] tests/value/nonlin.c:68: non-linear 'x * y - y * x', lv 'y, x'
-[eva:nonlin] tests/value/nonlin.c:68: subdividing on x, y
-[eva:nonlin] tests/value/nonlin.c:71:
- non-linear '(x * x - (2 * x) * y) + y * y', lv 'y, x'
-[eva:nonlin] tests/value/nonlin.c:71: subdividing on x, y
-[eva:nonlin] tests/value/nonlin.c:72:
- non-linear '(x * x + y * y) - (2 * x) * y', lv 'y, x'
-[eva:nonlin] tests/value/nonlin.c:72: subdividing on x, y
-[eva:nonlin] tests/value/nonlin.c:74:
- non-linear '(z * x + x * y) + y * z', lv 'z, y, x'
-[eva:nonlin] tests/value/nonlin.c:74: non-linear 'w * w', lv 'w'
-[eva:nonlin] tests/value/nonlin.c:74: subdividing on x, y, z
-[eva:nonlin] tests/value/nonlin.c:74: subdividing on w
->>>>>>> origin/master
+[eva:nonlin] nonlin.c:62: non-linear 'x * x', lv 'x'
+[eva:nonlin] nonlin.c:62: non-linear 'y * y', lv 'y'
+[eva:nonlin] nonlin.c:62: subdividing on x
+[eva:nonlin] nonlin.c:62: subdividing on y
+[eva:nonlin] nonlin.c:66: non-linear 'x * x', lv 'x'
+[eva:nonlin] nonlin.c:66: non-linear '((x * x) * y) * y', lv 'y'
+[eva:nonlin] nonlin.c:66: subdividing on x
+[eva:nonlin] nonlin.c:66: subdividing on y
+[eva:nonlin] nonlin.c:68: non-linear 'x * y - y * x', lv 'y, x'
+[eva:nonlin] nonlin.c:68: subdividing on x, y
+[eva:nonlin] nonlin.c:71: non-linear '(x * x - (2 * x) * y) + y * y', lv 'y, x'
+[eva:nonlin] nonlin.c:71: subdividing on x, y
+[eva:nonlin] nonlin.c:72: non-linear '(x * x + y * y) - (2 * x) * y', lv 'y, x'
+[eva:nonlin] nonlin.c:72: subdividing on x, y
+[eva:nonlin] nonlin.c:74: non-linear '(z * x + x * y) + y * z', lv 'z, y, x'
+[eva:nonlin] nonlin.c:74: non-linear 'w * w', lv 'w'
+[eva:nonlin] nonlin.c:74: subdividing on x, y, z
+[eva:nonlin] nonlin.c:74: subdividing on w
[eva] Recording results for subdivide_several_variables
[eva] Done for function subdivide_several_variables
[eva] computing for function subdivide_table <- main.
-<<<<<<< HEAD
- Called from nonlin.c:122.
-[eva] nonlin.c:87: loop invariant got status valid.
-[eva] nonlin.c:88: starting to merge loop iterations
-[eva:nonlin] nonlin.c:89: non-linear '(4 + ((x >> 2) * 3 << 2)) + x % 4', lv 'x'
-[eva:nonlin] nonlin.c:89: subdividing on x
-||||||| ac7807782d
- Called from tests/value/nonlin.c:122.
-[eva] tests/value/nonlin.c:87: loop invariant got status valid.
-[eva] tests/value/nonlin.c:88: starting to merge loop iterations
-[eva:nonlin] tests/value/nonlin.c:89:
- non-linear '(4 + ((x >> 2) * 3 << 2)) + x % 4', lv 'x'
-[eva:nonlin] tests/value/nonlin.c:89: subdividing on x
-=======
- Called from tests/value/nonlin.c:128.
-[eva] tests/value/nonlin.c:93: loop invariant got status valid.
-[eva] tests/value/nonlin.c:94: starting to merge loop iterations
-[eva:nonlin] tests/value/nonlin.c:95:
- non-linear '(4 + ((x >> 2) * 3 << 2)) + x % 4', lv 'x'
-[eva:nonlin] tests/value/nonlin.c:95: subdividing on x
->>>>>>> origin/master
+ Called from nonlin.c:128.
+[eva] nonlin.c:93: loop invariant got status valid.
+[eva] nonlin.c:94: starting to merge loop iterations
+[eva:nonlin] nonlin.c:95: non-linear '(4 + ((x >> 2) * 3 << 2)) + x % 4', lv 'x'
+[eva:nonlin] nonlin.c:95: subdividing on x
[eva] Recording results for subdivide_table
[eva] Done for function subdivide_table
[eva] computing for function subdivide_reduced_value <- main.
-<<<<<<< HEAD
- Called from nonlin.c:123.
-[eva:nonlin] nonlin.c:101: non-linear 't1[i] - t2[i]', lv 'i'
-[eva:nonlin] nonlin.c:101: subdividing on i
-[eva:alarm] nonlin.c:101: Warning:
-||||||| ac7807782d
- Called from tests/value/nonlin.c:123.
-[eva:nonlin] tests/value/nonlin.c:101: non-linear 't1[i] - t2[i]', lv 'i'
-[eva:nonlin] tests/value/nonlin.c:101: subdividing on i
-[eva:alarm] tests/value/nonlin.c:101: Warning:
-=======
- Called from tests/value/nonlin.c:129.
-[eva:nonlin] tests/value/nonlin.c:107: non-linear 't1[i] - t2[i]', lv 'i'
-[eva:nonlin] tests/value/nonlin.c:107: subdividing on i
-[eva:alarm] tests/value/nonlin.c:107: Warning:
->>>>>>> origin/master
+ Called from nonlin.c:129.
+[eva:nonlin] nonlin.c:107: non-linear 't1[i] - t2[i]', lv 'i'
+[eva:nonlin] nonlin.c:107: subdividing on i
+[eva:alarm] nonlin.c:107: Warning:
accessing out of bounds index. assert 0 ≤ i;
-<<<<<<< HEAD
-[eva:alarm] nonlin.c:101: Warning: accessing out of bounds index. assert i < 2;
-||||||| ac7807782d
-[eva:alarm] tests/value/nonlin.c:101: Warning:
- accessing out of bounds index. assert i < 2;
-=======
-[eva:alarm] tests/value/nonlin.c:107: Warning:
- accessing out of bounds index. assert i < 2;
->>>>>>> origin/master
+[eva:alarm] nonlin.c:107: Warning: accessing out of bounds index. assert i < 2;
[eva] Recording results for subdivide_reduced_value
[eva] Done for function subdivide_reduced_value
[eva] computing for function local_subdivide <- main.
-<<<<<<< HEAD
- Called from nonlin.c:124.
-||||||| ac7807782d
- Called from tests/value/nonlin.c:124.
-=======
- Called from tests/value/nonlin.c:130.
->>>>>>> origin/master
+ Called from nonlin.c:130.
[eva] computing for function Frama_C_interval <- local_subdivide <- main.
-<<<<<<< HEAD
- Called from nonlin.c:107.
-[eva] nonlin.c:107:
-||||||| ac7807782d
- Called from tests/value/nonlin.c:107.
-[eva] tests/value/nonlin.c:107:
-=======
- Called from tests/value/nonlin.c:113.
-[eva] tests/value/nonlin.c:113:
->>>>>>> origin/master
+ Called from nonlin.c:113.
+[eva] nonlin.c:113:
function Frama_C_interval: precondition 'order' got status valid.
[eva] Done for function Frama_C_interval
[eva] computing for function Frama_C_interval <- local_subdivide <- main.
-<<<<<<< HEAD
- Called from nonlin.c:108.
-[eva] nonlin.c:108:
-||||||| ac7807782d
- Called from tests/value/nonlin.c:108.
-[eva] tests/value/nonlin.c:108:
-=======
- Called from tests/value/nonlin.c:114.
-[eva] tests/value/nonlin.c:114:
->>>>>>> origin/master
+ Called from nonlin.c:114.
+[eva] nonlin.c:114:
function Frama_C_interval: precondition 'order' got status valid.
[eva] Done for function Frama_C_interval
-<<<<<<< HEAD
-[eva:nonlin] nonlin.c:112: non-linear '(x * x - (2 * x) * y) + y * y', lv 'y, x'
-[eva:nonlin] nonlin.c:112: subdividing on x, y
-[eva:nonlin] nonlin.c:113: subdividing on x, y
-[eva:nonlin] nonlin.c:115: subdividing on x, y
-||||||| ac7807782d
-[eva:nonlin] tests/value/nonlin.c:112:
- non-linear '(x * x - (2 * x) * y) + y * y', lv 'y, x'
-[eva:nonlin] tests/value/nonlin.c:112: subdividing on x, y
-[eva:nonlin] tests/value/nonlin.c:113: subdividing on x, y
-[eva:nonlin] tests/value/nonlin.c:115: subdividing on x, y
-=======
-[eva:nonlin] tests/value/nonlin.c:118:
- non-linear '(x * x - (2 * x) * y) + y * y', lv 'y, x'
-[eva:nonlin] tests/value/nonlin.c:118: subdividing on x, y
-[eva:nonlin] tests/value/nonlin.c:119: subdividing on x, y
-[eva:nonlin] tests/value/nonlin.c:121: subdividing on x, y
->>>>>>> origin/master
+[eva:nonlin] nonlin.c:118: non-linear '(x * x - (2 * x) * y) + y * y', lv 'y, x'
+[eva:nonlin] nonlin.c:118: subdividing on x, y
+[eva:nonlin] nonlin.c:119: subdividing on x, y
+[eva:nonlin] nonlin.c:121: subdividing on x, y
[eva] Recording results for local_subdivide
[eva] Done for function local_subdivide
[eva] Recording results for main
diff --git a/tests/value/oracle/widen_non_constant.res.oracle b/tests/value/oracle/widen_non_constant.res.oracle
index b12e4384e4f..431083ac8a1 100644
--- a/tests/value/oracle/widen_non_constant.res.oracle
+++ b/tests/value/oracle/widen_non_constant.res.oracle
@@ -10,8 +10,7 @@
t[0..19] ∈ {0}
u[0..39] ∈ {0}
[eva] computing for function main1 <- main.
-<<<<<<< HEAD
- Called from widen_non_constant.i:84.
+ Called from widen_non_constant.i:97.
[eva] widen_non_constant.i:11: Frama_C_show_each_out: {0}
[eva] widen_non_constant.i:13: Frama_C_show_each_in: {0}, {1}
[eva] widen_non_constant.i:12: starting to merge loop iterations
@@ -25,46 +24,10 @@
[eva] widen_non_constant.i:13: Frama_C_show_each_in: {0; 1; 2}, [1..23]
[eva] widen_non_constant.i:11: Frama_C_show_each_out: [0..22]
[eva] widen_non_constant.i:13: Frama_C_show_each_in: [0..22], [1..23]
-||||||| ac7807782d
- Called from tests/value/widen_non_constant.i:84.
-[eva] tests/value/widen_non_constant.i:11: Frama_C_show_each_out: {0}
-[eva] tests/value/widen_non_constant.i:13: Frama_C_show_each_in: {0}, {1}
-[eva] tests/value/widen_non_constant.i:12: starting to merge loop iterations
-[eva] tests/value/widen_non_constant.i:13: Frama_C_show_each_in: {0}, {1; 2}
-[eva] tests/value/widen_non_constant.i:13: Frama_C_show_each_in: {0}, {1; 2; 3}
-[eva] tests/value/widen_non_constant.i:13: Frama_C_show_each_in: {0}, [1..23]
-[eva] tests/value/widen_non_constant.i:10: starting to merge loop iterations
-[eva] tests/value/widen_non_constant.i:11: Frama_C_show_each_out: {0; 1}
-[eva] tests/value/widen_non_constant.i:13: Frama_C_show_each_in: {0; 1}, [1..23]
-[eva] tests/value/widen_non_constant.i:11: Frama_C_show_each_out: {0; 1; 2}
-[eva] tests/value/widen_non_constant.i:13:
- Frama_C_show_each_in: {0; 1; 2}, [1..23]
-[eva] tests/value/widen_non_constant.i:11: Frama_C_show_each_out: [0..22]
-[eva] tests/value/widen_non_constant.i:13:
- Frama_C_show_each_in: [0..22], [1..23]
-=======
- Called from tests/value/widen_non_constant.i:97.
-[eva] tests/value/widen_non_constant.i:11: Frama_C_show_each_out: {0}
-[eva] tests/value/widen_non_constant.i:13: Frama_C_show_each_in: {0}, {1}
-[eva] tests/value/widen_non_constant.i:12: starting to merge loop iterations
-[eva] tests/value/widen_non_constant.i:13: Frama_C_show_each_in: {0}, {1; 2}
-[eva] tests/value/widen_non_constant.i:13: Frama_C_show_each_in: {0}, {1; 2; 3}
-[eva] tests/value/widen_non_constant.i:13: Frama_C_show_each_in: {0}, [1..23]
-[eva] tests/value/widen_non_constant.i:10: starting to merge loop iterations
-[eva] tests/value/widen_non_constant.i:11: Frama_C_show_each_out: {0; 1}
-[eva] tests/value/widen_non_constant.i:13: Frama_C_show_each_in: {0; 1}, [1..23]
-[eva] tests/value/widen_non_constant.i:11: Frama_C_show_each_out: {0; 1; 2}
-[eva] tests/value/widen_non_constant.i:13:
- Frama_C_show_each_in: {0; 1; 2}, [1..23]
-[eva] tests/value/widen_non_constant.i:11: Frama_C_show_each_out: [0..22]
-[eva] tests/value/widen_non_constant.i:13:
- Frama_C_show_each_in: [0..22], [1..23]
->>>>>>> origin/master
[eva] Recording results for main1
[eva] Done for function main1
[eva] computing for function main2 <- main.
-<<<<<<< HEAD
- Called from widen_non_constant.i:85.
+ Called from widen_non_constant.i:98.
[eva] widen_non_constant.i:27: Frama_C_show_each_out: {0}
[eva] widen_non_constant.i:29: Frama_C_show_each_in: {0}, {1}
[eva] widen_non_constant.i:28: starting to merge loop iterations
@@ -78,46 +41,10 @@
[eva] widen_non_constant.i:29: Frama_C_show_each_in: {0; 1; 2}, [1..23]
[eva] widen_non_constant.i:27: Frama_C_show_each_out: [0..22]
[eva] widen_non_constant.i:29: Frama_C_show_each_in: [0..22], [1..23]
-||||||| ac7807782d
- Called from tests/value/widen_non_constant.i:85.
-[eva] tests/value/widen_non_constant.i:27: Frama_C_show_each_out: {0}
-[eva] tests/value/widen_non_constant.i:29: Frama_C_show_each_in: {0}, {1}
-[eva] tests/value/widen_non_constant.i:28: starting to merge loop iterations
-[eva] tests/value/widen_non_constant.i:29: Frama_C_show_each_in: {0}, {1; 2}
-[eva] tests/value/widen_non_constant.i:29: Frama_C_show_each_in: {0}, {1; 2; 3}
-[eva] tests/value/widen_non_constant.i:29: Frama_C_show_each_in: {0}, [1..23]
-[eva] tests/value/widen_non_constant.i:26: starting to merge loop iterations
-[eva] tests/value/widen_non_constant.i:27: Frama_C_show_each_out: {0; 1}
-[eva] tests/value/widen_non_constant.i:29: Frama_C_show_each_in: {0; 1}, [1..23]
-[eva] tests/value/widen_non_constant.i:27: Frama_C_show_each_out: {0; 1; 2}
-[eva] tests/value/widen_non_constant.i:29:
- Frama_C_show_each_in: {0; 1; 2}, [1..23]
-[eva] tests/value/widen_non_constant.i:27: Frama_C_show_each_out: [0..22]
-[eva] tests/value/widen_non_constant.i:29:
- Frama_C_show_each_in: [0..22], [1..23]
-=======
- Called from tests/value/widen_non_constant.i:98.
-[eva] tests/value/widen_non_constant.i:27: Frama_C_show_each_out: {0}
-[eva] tests/value/widen_non_constant.i:29: Frama_C_show_each_in: {0}, {1}
-[eva] tests/value/widen_non_constant.i:28: starting to merge loop iterations
-[eva] tests/value/widen_non_constant.i:29: Frama_C_show_each_in: {0}, {1; 2}
-[eva] tests/value/widen_non_constant.i:29: Frama_C_show_each_in: {0}, {1; 2; 3}
-[eva] tests/value/widen_non_constant.i:29: Frama_C_show_each_in: {0}, [1..23]
-[eva] tests/value/widen_non_constant.i:26: starting to merge loop iterations
-[eva] tests/value/widen_non_constant.i:27: Frama_C_show_each_out: {0; 1}
-[eva] tests/value/widen_non_constant.i:29: Frama_C_show_each_in: {0; 1}, [1..23]
-[eva] tests/value/widen_non_constant.i:27: Frama_C_show_each_out: {0; 1; 2}
-[eva] tests/value/widen_non_constant.i:29:
- Frama_C_show_each_in: {0; 1; 2}, [1..23]
-[eva] tests/value/widen_non_constant.i:27: Frama_C_show_each_out: [0..22]
-[eva] tests/value/widen_non_constant.i:29:
- Frama_C_show_each_in: [0..22], [1..23]
->>>>>>> origin/master
[eva] Recording results for main2
[eva] Done for function main2
[eva] computing for function main3 <- main.
-<<<<<<< HEAD
- Called from widen_non_constant.i:86.
+ Called from widen_non_constant.i:99.
[eva] widen_non_constant.i:46: Frama_C_show_each_out: {0}
[eva] widen_non_constant.i:48: Frama_C_show_each_in: {0}, {1}
[eva] widen_non_constant.i:47: starting to merge loop iterations
@@ -131,72 +58,21 @@
[eva] widen_non_constant.i:48: Frama_C_show_each_in: {0; 1; 2}, [1..23]
[eva] widen_non_constant.i:46: Frama_C_show_each_out: [0..22]
[eva] widen_non_constant.i:48: Frama_C_show_each_in: [0..22], [1..23]
-||||||| ac7807782d
- Called from tests/value/widen_non_constant.i:86.
-[eva] tests/value/widen_non_constant.i:46: Frama_C_show_each_out: {0}
-[eva] tests/value/widen_non_constant.i:48: Frama_C_show_each_in: {0}, {1}
-[eva] tests/value/widen_non_constant.i:47: starting to merge loop iterations
-[eva] tests/value/widen_non_constant.i:48: Frama_C_show_each_in: {0}, {1; 2}
-[eva] tests/value/widen_non_constant.i:48: Frama_C_show_each_in: {0}, {1; 2; 3}
-[eva] tests/value/widen_non_constant.i:48: Frama_C_show_each_in: {0}, [1..23]
-[eva] tests/value/widen_non_constant.i:45: starting to merge loop iterations
-[eva] tests/value/widen_non_constant.i:46: Frama_C_show_each_out: {0; 1}
-[eva] tests/value/widen_non_constant.i:48: Frama_C_show_each_in: {0; 1}, [1..23]
-[eva] tests/value/widen_non_constant.i:46: Frama_C_show_each_out: {0; 1; 2}
-[eva] tests/value/widen_non_constant.i:48:
- Frama_C_show_each_in: {0; 1; 2}, [1..23]
-[eva] tests/value/widen_non_constant.i:46: Frama_C_show_each_out: [0..22]
-[eva] tests/value/widen_non_constant.i:48:
- Frama_C_show_each_in: [0..22], [1..23]
-=======
- Called from tests/value/widen_non_constant.i:99.
-[eva] tests/value/widen_non_constant.i:46: Frama_C_show_each_out: {0}
-[eva] tests/value/widen_non_constant.i:48: Frama_C_show_each_in: {0}, {1}
-[eva] tests/value/widen_non_constant.i:47: starting to merge loop iterations
-[eva] tests/value/widen_non_constant.i:48: Frama_C_show_each_in: {0}, {1; 2}
-[eva] tests/value/widen_non_constant.i:48: Frama_C_show_each_in: {0}, {1; 2; 3}
-[eva] tests/value/widen_non_constant.i:48: Frama_C_show_each_in: {0}, [1..23]
-[eva] tests/value/widen_non_constant.i:45: starting to merge loop iterations
-[eva] tests/value/widen_non_constant.i:46: Frama_C_show_each_out: {0; 1}
-[eva] tests/value/widen_non_constant.i:48: Frama_C_show_each_in: {0; 1}, [1..23]
-[eva] tests/value/widen_non_constant.i:46: Frama_C_show_each_out: {0; 1; 2}
-[eva] tests/value/widen_non_constant.i:48:
- Frama_C_show_each_in: {0; 1; 2}, [1..23]
-[eva] tests/value/widen_non_constant.i:46: Frama_C_show_each_out: [0..22]
-[eva] tests/value/widen_non_constant.i:48:
- Frama_C_show_each_in: [0..22], [1..23]
->>>>>>> origin/master
[eva] Recording results for main3
[eva] Done for function main3
[eva] computing for function main4 <- main.
-<<<<<<< HEAD
- Called from widen_non_constant.i:87.
+ Called from widen_non_constant.i:100.
[eva] widen_non_constant.i:63: starting to merge loop iterations
[eva] widen_non_constant.i:69: starting to merge loop iterations
[eva] widen_non_constant.i:72: Frama_C_show_each: {43}
[eva] widen_non_constant.i:75: starting to merge loop iterations
[eva] widen_non_constant.i:78:
-||||||| ac7807782d
- Called from tests/value/widen_non_constant.i:87.
-[eva] tests/value/widen_non_constant.i:63: starting to merge loop iterations
-[eva] tests/value/widen_non_constant.i:69: starting to merge loop iterations
-[eva] tests/value/widen_non_constant.i:72: Frama_C_show_each: {43}
-[eva] tests/value/widen_non_constant.i:75: starting to merge loop iterations
-[eva] tests/value/widen_non_constant.i:78:
-=======
- Called from tests/value/widen_non_constant.i:100.
-[eva] tests/value/widen_non_constant.i:63: starting to merge loop iterations
-[eva] tests/value/widen_non_constant.i:69: starting to merge loop iterations
-[eva] tests/value/widen_non_constant.i:72: Frama_C_show_each: {43}
-[eva] tests/value/widen_non_constant.i:75: starting to merge loop iterations
-[eva] tests/value/widen_non_constant.i:78:
->>>>>>> origin/master
Frama_C_show_each: {35; 36; 37; 38; 39; 40; 41; 42}
[eva] Recording results for main4
[eva] Done for function main4
[eva] computing for function main5 <- main.
- Called from tests/value/widen_non_constant.i:101.
-[eva] tests/value/widen_non_constant.i:90: starting to merge loop iterations
+ Called from widen_non_constant.i:101.
+[eva] widen_non_constant.i:90: starting to merge loop iterations
[eva] Recording results for main5
[eva] Done for function main5
[eva] Recording results for main
diff --git a/tests/value/origin.i b/tests/value/origin.i
index c8f05ef9243..e06761b459f 100644
--- a/tests/value/origin.i
+++ b/tests/value/origin.i
@@ -1,7 +1,7 @@
/* run.config*
- OPT: @EVA_OPTIONS@ -eva -eva-warn-copy-indeterminate=-origin_misalign_2,-main -main main -then -out -deps
- OPT: @EVA_OPTIONS@ -eva -eva-warn-copy-indeterminate=-origin_misalign_2,-origin -main origin -then -out -deps
+ 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/postcond_leaf.c b/tests/value/postcond_leaf.c
index 05ebbb2c0ff..3b4ac3194da 100644
--- a/tests/value/postcond_leaf.c
+++ b/tests/value/postcond_leaf.c
@@ -1,6 +1,6 @@
/* run.config*
PLUGIN: eva,inout,report
-OPT: @EVA_OPTIONS@ -eva-no-show-progress -eva -eva-use-spec g1,g2,g3 -then -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:
diff --git a/tests/value/precond.c b/tests/value/precond.c
index c9ad8bf7c41..6aaba80295e 100644
--- a/tests/value/precond.c
+++ b/tests/value/precond.c
@@ -1,6 +1,6 @@
/* run.config*
PLUGIN: from,inout,eva,report
- OPT: -lib-entry -eva @EVA_OPTIONS@ -then -report -report-print-properties -then -report-no-specialized
+ OPT: -lib-entry -eva @EVA_CONFIG@ -then -report -report-print-properties -then -report-no-specialized
*/
int x;
diff --git a/tests/value/precond2.c b/tests/value/precond2.c
index 4df5ae310d2..a1ec1be488e 100644
--- a/tests/value/precond2.c
+++ b/tests/value/precond2.c
@@ -1,15 +1,7 @@
/* run.config*
-<<<<<<< HEAD
PLUGIN: @PLUGIN@ report
- OPT: -machdep x86_32 -rte -then -eva @EVA_OPTIONS@ -then -report -report-print-properties
- OPT: -machdep x86_32 -eva @EVA_OPTIONS@ -then -rte -then -report -report-print-properties
-||||||| ac7807782d
- OPT: -no-autoload-plugins -load-module from,inout,eva,report,rtegen -rte -then -eva @EVA_CONFIG@ -then -report -report-print-properties
- OPT: -no-autoload-plugins -load-module from,inout,eva,report,rtegen -eva @EVA_CONFIG@ -then -rte -then -report -report-print-properties
-=======
- 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
->>>>>>> origin/master
+ OPT: -machdep x86_32 -rte -then -eva @EVA_CONFIG@ -then -report -report-print-properties
+ OPT: -machdep x86_32 -eva @EVA_CONFIG@ -then -rte -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 0ba49d137fe..53fa86131c5 100644
--- a/tests/value/protomain.i
+++ b/tests/value/protomain.i
@@ -1,4 +1,4 @@
/* run.config*
- OPT: -eva @EVA_OPTIONS@
+ OPT: -eva @EVA_CONFIG@
*/
int main(int c, char **);
diff --git a/tests/value/recol.c b/tests/value/recol.c
index 8144fef6857..ace7479c625 100644
--- a/tests/value/recol.c
+++ b/tests/value/recol.c
@@ -1,6 +1,6 @@
/* run.config*
- OPT: -eva @EVA_OPTIONS@ -eva-slevel 100 -cpp-extra-args="-DPTEST " -no-warn-signed-overflow
- OPT: -eva @EVA_OPTIONS@ -eva-slevel 100 -cpp-extra-args="-DPTEST " -machdep ppc_32 -no-warn-signed-overflow
+ 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
diff --git a/tests/value/recursion.i b/tests/value/recursion.i
index 26b6f59fe20..a54b9703d4e 100644
--- a/tests/value/recursion.i
+++ b/tests/value/recursion.i
@@ -1,7 +1,7 @@
/*run.config*
EXIT: 1
- OPT: -lib-entry -main main -eva @EVA_OPTIONS@
- OPT: -lib-entry -main main -eva @EVA_OPTIONS@ -eva-ignore-recursive-calls
+ OPT: -lib-entry -main main -eva @EVA_CONFIG@
+ OPT: -lib-entry -main main -eva @EVA_CONFIG@ -eva-ignore-recursive-calls
*/
int G;
int ff() {
diff --git a/tests/value/recursion2.i b/tests/value/recursion2.i
index 4d0361b3609..dd3a75161c5 100644
--- a/tests/value/recursion2.i
+++ b/tests/value/recursion2.i
@@ -1,5 +1,5 @@
/*run.config*
- OPT: -eva @EVA_OPTIONS@ -then -input -out -inout
+ OPT: -eva @EVA_CONFIG@ -then -input -out -inout
*/
int x, y;
diff --git a/tests/value/redundant_alarms.c b/tests/value/redundant_alarms.c
index ad157c747f7..56c24a7649e 100644
--- a/tests/value/redundant_alarms.c
+++ b/tests/value/redundant_alarms.c
@@ -1,6 +1,6 @@
/* run.config*
PLUGIN: @EVA_PLUGINS@ slicing sparecode
- OPT: @EVA_OPTIONS@ -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
+ 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;
diff --git a/tests/value/replace_by_show_each.c b/tests/value/replace_by_show_each.c
index c949642ecb5..b9dfdc475ca 100644
--- a/tests/value/replace_by_show_each.c
+++ b/tests/value/replace_by_show_each.c
@@ -1,5 +1,5 @@
/* run.config*
- OPT: -eva @EVA_OPTIONS@ -inout -calldeps
+ OPT: -eva @EVA_CONFIG@ -inout -calldeps
*/
#define show_each_1 Frama_C_show_each_1
diff --git a/tests/value/sign_of_bitfiled_int.c b/tests/value/sign_of_bitfiled_int.c
index 4dd8195437f..9bf9cc90d87 100644
--- a/tests/value/sign_of_bitfiled_int.c
+++ b/tests/value/sign_of_bitfiled_int.c
@@ -1,6 +1,6 @@
/* run.config*
- OPT: -eva @EVA_OPTIONS@ -cpp-extra-args="-DPTEST"
- OPT: -machdep ppc_32 -eva @EVA_OPTIONS@ -cpp-extra-args="-DPTEST"
+ OPT: -eva @EVA_CONFIG@ -cpp-extra-args="-DPTEST"
+ OPT: -machdep ppc_32 -eva @EVA_CONFIG@ -cpp-extra-args="-DPTEST"
*/
diff --git a/tests/value/simplify_cfg.i b/tests/value/simplify_cfg.i
index e44a1801aad..cb69eab8342 100644
--- a/tests/value/simplify_cfg.i
+++ b/tests/value/simplify_cfg.i
@@ -1,6 +1,6 @@
/* run.config*
- OPT: -simplify-cfg -keep-switch -eva @EVA_OPTIONS@
- OPT: -simplify-cfg -eva @EVA_OPTIONS@
+ OPT: -simplify-cfg -keep-switch -eva @EVA_CONFIG@
+ OPT: -simplify-cfg -eva @EVA_CONFIG@
*/
int main(int x, int y) {
diff --git a/tests/value/ulongvslonglong.i b/tests/value/ulongvslonglong.i
index 71aa7efbba4..c1169138a30 100644
--- a/tests/value/ulongvslonglong.i
+++ b/tests/value/ulongvslonglong.i
@@ -1,6 +1,6 @@
/* run.config*
- OPT: -eva @EVA_OPTIONS@ -machdep x86_64
- OPT: -eva @EVA_OPTIONS@
+ OPT: -eva @EVA_CONFIG@ -machdep x86_64
+ OPT: -eva @EVA_CONFIG@
*/
int x;
diff --git a/tests/value/uninit_callstack.i b/tests/value/uninit_callstack.i
index 3c89afcb065..8a9396b3dae 100644
--- a/tests/value/uninit_callstack.i
+++ b/tests/value/uninit_callstack.i
@@ -1,5 +1,5 @@
/* run.config*
- OPT: -eva @EVA_OPTIONS@ -eva-no-show-progress -eva-print-callstacks -eva-no-results
+ OPT: -eva @EVA_CONFIG@ -eva-no-show-progress -eva-print-callstacks -eva-no-results
*/
int *p, x;
diff --git a/tests/value/unknown_sizeof.i b/tests/value/unknown_sizeof.i
index 65b882e54ac..38f1f696870 100644
--- a/tests/value/unknown_sizeof.i
+++ b/tests/value/unknown_sizeof.i
@@ -1,7 +1,7 @@
/* run.config*
EXIT: 1
- OPT: -eva @EVA_OPTIONS@ -main main1
- OPT: -eva @EVA_OPTIONS@ -main main2
+ OPT: -eva @EVA_CONFIG@ -main main1
+ OPT: -eva @EVA_CONFIG@ -main main2
*/
struct s;
diff --git a/tests/value/use_spec.i b/tests/value/use_spec.i
index b451db3ec05..31507fa899b 100644
--- a/tests/value/use_spec.i
+++ b/tests/value/use_spec.i
@@ -1,7 +1,7 @@
/* run.config*
EXIT: 1
- OPT: -eva-use-spec f,h -eva @EVA_OPTIONS@ -inout -calldeps
- OPT: -eva-use-spec f,h -eva @EVA_OPTIONS@ -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 b7a930b1620..a96527231b4 100644
--- a/tests/value/volatile2.i
+++ b/tests/value/volatile2.i
@@ -1,5 +1,5 @@
/* run.config*
- OPT: -print -eva @EVA_OPTIONS@ -machdep x86_16
+ OPT: -print -eva @EVA_CONFIG@ -machdep x86_16
*/
diff --git a/tests/value/widen_overflow.i b/tests/value/widen_overflow.i
index cf992f46df9..b116ee48ccc 100644
--- a/tests/value/widen_overflow.i
+++ b/tests/value/widen_overflow.i
@@ -1,5 +1,5 @@
/* run.config*
- OPT: -eva @EVA_OPTIONS@
+ OPT: -eva @EVA_CONFIG@
*/
int main() {
--
GitLab