diff --git a/tests/builtins/diff_apron b/tests/builtins/diff_apron
deleted file mode 100644
index 70280ccca2e510f2efb64c181f50cc4a9d5bea21..0000000000000000000000000000000000000000
--- a/tests/builtins/diff_apron
+++ /dev/null
@@ -1,292 +0,0 @@
-<<<<<<< HEAD
-diff oracle/Longinit_sequencer.res.oracle oracle_apron/Longinit_sequencer.res.oracle
-59,62c59,78
-< [eva] long_init.c:29: Reusing old results for call to subanalyze
-< [eva] long_init.c:29: Reusing old results for call to subanalyze
-< [eva] long_init.c:29: Reusing old results for call to subanalyze
-< [eva] long_init.c:29: Reusing old results for call to subanalyze
----
-> [eva] computing for function subanalyze <- analyze <- init_inner <- init_outer <- 
->                           main.
->   Called from long_init.c:29.
-> [eva] Recording results for subanalyze
-> [eva] Done for function subanalyze
-> [eva] computing for function subanalyze <- analyze <- init_inner <- init_outer <- 
->                           main.
->   Called from long_init.c:29.
-> [eva] Recording results for subanalyze
-> [eva] Done for function subanalyze
-> [eva] computing for function subanalyze <- analyze <- init_inner <- init_outer <- 
->                           main.
->   Called from long_init.c:29.
-> [eva] Recording results for subanalyze
-> [eva] Done for function subanalyze
-> [eva] computing for function subanalyze <- analyze <- init_inner <- init_outer <- 
->                           main.
->   Called from long_init.c:29.
-> [eva] Recording results for subanalyze
-> [eva] Done for function subanalyze
-148,149c164,211
-< [eva] long_init.c:93: Reusing old results for call to analyze
-< [eva] long_init.c:94: Reusing old results for call to analyze
----
-> [eva] computing for function analyze <- main.
->   Called from long_init.c:93.
-> [eva] computing for function subanalyze <- analyze <- main.
->   Called from long_init.c:29.
-> [eva] Recording results for subanalyze
-> [eva] Done for function subanalyze
-> [eva] computing for function subanalyze <- analyze <- main.
->   Called from long_init.c:29.
-> [eva] Recording results for subanalyze
-> [eva] Done for function subanalyze
-> [eva] computing for function subanalyze <- analyze <- main.
->   Called from long_init.c:29.
-> [eva] Recording results for subanalyze
-> [eva] Done for function subanalyze
-> [eva] computing for function subanalyze <- analyze <- main.
->   Called from long_init.c:29.
-> [eva] Recording results for subanalyze
-> [eva] Done for function subanalyze
-> [eva] computing for function subanalyze <- analyze <- main.
->   Called from long_init.c:29.
-> [eva] Recording results for subanalyze
-> [eva] Done for function subanalyze
-> [eva] Recording results for analyze
-> [eva] Done for function analyze
-> [eva] computing for function analyze <- main.
->   Called from long_init.c:94.
-> [eva] computing for function subanalyze <- analyze <- main.
->   Called from long_init.c:29.
-> [eva] Recording results for subanalyze
-> [eva] Done for function subanalyze
-> [eva] computing for function subanalyze <- analyze <- main.
->   Called from long_init.c:29.
-> [eva] Recording results for subanalyze
-> [eva] Done for function subanalyze
-> [eva] computing for function subanalyze <- analyze <- main.
->   Called from long_init.c:29.
-> [eva] Recording results for subanalyze
-> [eva] Done for function subanalyze
-> [eva] computing for function subanalyze <- analyze <- main.
->   Called from long_init.c:29.
-> [eva] Recording results for subanalyze
-> [eva] Done for function subanalyze
-> [eva] computing for function subanalyze <- analyze <- main.
->   Called from long_init.c:29.
-> [eva] Recording results for subanalyze
-> [eva] Done for function subanalyze
-> [eva] Recording results for analyze
-> [eva] Done for function analyze
-320c382
-<   result/Longinit_sequencer.sav
----
->   result_apron/Longinit_sequencer.sav
-411,414c473,488
-< [eva] long_init2.c:29: Reusing old results for call to subanalyze
-< [eva] long_init2.c:29: Reusing old results for call to subanalyze
-< [eva] long_init2.c:29: Reusing old results for call to subanalyze
-< [eva] long_init2.c:29: Reusing old results for call to subanalyze
----
-> [eva] computing for function subanalyze <- analyze <- main.
->   Called from long_init2.c:29.
-> [eva] Recording results for subanalyze
-> [eva] Done for function subanalyze
-> [eva] computing for function subanalyze <- analyze <- main.
->   Called from long_init2.c:29.
-> [eva] Recording results for subanalyze
-> [eva] Done for function subanalyze
-> [eva] computing for function subanalyze <- analyze <- main.
->   Called from long_init2.c:29.
-> [eva] Recording results for subanalyze
-> [eva] Done for function subanalyze
-> [eva] computing for function subanalyze <- analyze <- main.
->   Called from long_init2.c:29.
-> [eva] Recording results for subanalyze
-> [eva] Done for function subanalyze
-556c630
-<   result/Longinit_sequencer.sav
----
->   result_apron/Longinit_sequencer.sav
-643,646c717,732
-< [eva] long_init3.c:29: Reusing old results for call to subanalyze
-< [eva] long_init3.c:29: Reusing old results for call to subanalyze
-< [eva] long_init3.c:29: Reusing old results for call to subanalyze
-< [eva] long_init3.c:29: Reusing old results for call to subanalyze
----
-> [eva] computing for function subanalyze <- analyze <- main.
->   Called from long_init3.c:29.
-> [eva] Recording results for subanalyze
-> [eva] Done for function subanalyze
-> [eva] computing for function subanalyze <- analyze <- main.
->   Called from long_init3.c:29.
-> [eva] Recording results for subanalyze
-> [eva] Done for function subanalyze
-> [eva] computing for function subanalyze <- analyze <- main.
->   Called from long_init3.c:29.
-> [eva] Recording results for subanalyze
-> [eva] Done for function subanalyze
-> [eva] computing for function subanalyze <- analyze <- main.
->   Called from long_init3.c:29.
-> [eva] Recording results for subanalyze
-> [eva] Done for function subanalyze
-diff oracle/allocated.0.res.oracle oracle_apron/allocated.0.res.oracle
-||||||| ac7807782d
-diff tests/builtins/oracle/Longinit_sequencer.res.oracle tests/builtins/oracle_apron/Longinit_sequencer.res.oracle
-59,62c59,78
-< [eva] tests/builtins/long_init.c:29: Reusing old results for call to subanalyze
-< [eva] tests/builtins/long_init.c:29: Reusing old results for call to subanalyze
-< [eva] tests/builtins/long_init.c:29: Reusing old results for call to subanalyze
-< [eva] tests/builtins/long_init.c:29: Reusing old results for call to subanalyze
----
-> [eva] computing for function subanalyze <- analyze <- init_inner <- init_outer <- 
->                           main.
->   Called from tests/builtins/long_init.c:29.
-> [eva] Recording results for subanalyze
-> [eva] Done for function subanalyze
-> [eva] computing for function subanalyze <- analyze <- init_inner <- init_outer <- 
->                           main.
->   Called from tests/builtins/long_init.c:29.
-> [eva] Recording results for subanalyze
-> [eva] Done for function subanalyze
-> [eva] computing for function subanalyze <- analyze <- init_inner <- init_outer <- 
->                           main.
->   Called from tests/builtins/long_init.c:29.
-> [eva] Recording results for subanalyze
-> [eva] Done for function subanalyze
-> [eva] computing for function subanalyze <- analyze <- init_inner <- init_outer <- 
->                           main.
->   Called from tests/builtins/long_init.c:29.
-> [eva] Recording results for subanalyze
-> [eva] Done for function subanalyze
-148,149c164,211
-< [eva] tests/builtins/long_init.c:93: Reusing old results for call to analyze
-< [eva] tests/builtins/long_init.c:94: Reusing old results for call to analyze
----
-> [eva] computing for function analyze <- main.
->   Called from tests/builtins/long_init.c:93.
-> [eva] computing for function subanalyze <- analyze <- main.
->   Called from tests/builtins/long_init.c:29.
-> [eva] Recording results for subanalyze
-> [eva] Done for function subanalyze
-> [eva] computing for function subanalyze <- analyze <- main.
->   Called from tests/builtins/long_init.c:29.
-> [eva] Recording results for subanalyze
-> [eva] Done for function subanalyze
-> [eva] computing for function subanalyze <- analyze <- main.
->   Called from tests/builtins/long_init.c:29.
-> [eva] Recording results for subanalyze
-> [eva] Done for function subanalyze
-> [eva] computing for function subanalyze <- analyze <- main.
->   Called from tests/builtins/long_init.c:29.
-> [eva] Recording results for subanalyze
-> [eva] Done for function subanalyze
-> [eva] computing for function subanalyze <- analyze <- main.
->   Called from tests/builtins/long_init.c:29.
-> [eva] Recording results for subanalyze
-> [eva] Done for function subanalyze
-> [eva] Recording results for analyze
-> [eva] Done for function analyze
-> [eva] computing for function analyze <- main.
->   Called from tests/builtins/long_init.c:94.
-> [eva] computing for function subanalyze <- analyze <- main.
->   Called from tests/builtins/long_init.c:29.
-> [eva] Recording results for subanalyze
-> [eva] Done for function subanalyze
-> [eva] computing for function subanalyze <- analyze <- main.
->   Called from tests/builtins/long_init.c:29.
-> [eva] Recording results for subanalyze
-> [eva] Done for function subanalyze
-> [eva] computing for function subanalyze <- analyze <- main.
->   Called from tests/builtins/long_init.c:29.
-> [eva] Recording results for subanalyze
-> [eva] Done for function subanalyze
-> [eva] computing for function subanalyze <- analyze <- main.
->   Called from tests/builtins/long_init.c:29.
-> [eva] Recording results for subanalyze
-> [eva] Done for function subanalyze
-> [eva] computing for function subanalyze <- analyze <- main.
->   Called from tests/builtins/long_init.c:29.
-> [eva] Recording results for subanalyze
-> [eva] Done for function subanalyze
-> [eva] Recording results for analyze
-> [eva] Done for function analyze
-320c382
-<   tests/builtins/result/Longinit_sequencer.sav
----
->   tests/builtins/result_apron/Longinit_sequencer.sav
-411,414c473,488
-< [eva] tests/builtins/long_init2.c:29: Reusing old results for call to subanalyze
-< [eva] tests/builtins/long_init2.c:29: Reusing old results for call to subanalyze
-< [eva] tests/builtins/long_init2.c:29: Reusing old results for call to subanalyze
-< [eva] tests/builtins/long_init2.c:29: Reusing old results for call to subanalyze
----
-> [eva] computing for function subanalyze <- analyze <- main.
->   Called from tests/builtins/long_init2.c:29.
-> [eva] Recording results for subanalyze
-> [eva] Done for function subanalyze
-> [eva] computing for function subanalyze <- analyze <- main.
->   Called from tests/builtins/long_init2.c:29.
-> [eva] Recording results for subanalyze
-> [eva] Done for function subanalyze
-> [eva] computing for function subanalyze <- analyze <- main.
->   Called from tests/builtins/long_init2.c:29.
-> [eva] Recording results for subanalyze
-> [eva] Done for function subanalyze
-> [eva] computing for function subanalyze <- analyze <- main.
->   Called from tests/builtins/long_init2.c:29.
-> [eva] Recording results for subanalyze
-> [eva] Done for function subanalyze
-556c630
-<   tests/builtins/result/Longinit_sequencer.sav
----
->   tests/builtins/result_apron/Longinit_sequencer.sav
-643,646c717,732
-< [eva] tests/builtins/long_init3.c:29: Reusing old results for call to subanalyze
-< [eva] tests/builtins/long_init3.c:29: Reusing old results for call to subanalyze
-< [eva] tests/builtins/long_init3.c:29: Reusing old results for call to subanalyze
-< [eva] tests/builtins/long_init3.c:29: Reusing old results for call to subanalyze
----
-> [eva] computing for function subanalyze <- analyze <- main.
->   Called from tests/builtins/long_init3.c:29.
-> [eva] Recording results for subanalyze
-> [eva] Done for function subanalyze
-> [eva] computing for function subanalyze <- analyze <- main.
->   Called from tests/builtins/long_init3.c:29.
-> [eva] Recording results for subanalyze
-> [eva] Done for function subanalyze
-> [eva] computing for function subanalyze <- analyze <- main.
->   Called from tests/builtins/long_init3.c:29.
-> [eva] Recording results for subanalyze
-> [eva] Done for function subanalyze
-> [eva] computing for function subanalyze <- analyze <- main.
->   Called from tests/builtins/long_init3.c:29.
-> [eva] Recording results for subanalyze
-> [eva] Done for function subanalyze
-diff tests/builtins/oracle/allocated.0.res.oracle tests/builtins/oracle_apron/allocated.0.res.oracle
-=======
-diff tests/builtins/oracle/allocated.0.res.oracle tests/builtins/oracle_apron/allocated.0.res.oracle
->>>>>>> origin/master
-260a261,263
-> [eva] allocated.c:127: Call to builtin __fc_vla_alloc
-> [eva:malloc] allocated.c:127: 
->   resizing variable `__malloc_main_l127' (0..31/319) to fit 0..63/319
-273c276
-<   j ∈ [1..2147483647]
----
->   j ∈ [1..10]
-diff oracle/memexec-malloc.res.oracle oracle_apron/memexec-malloc.res.oracle
-16c16,19
-< [eva] memexec-malloc.c:25: Reusing old results for call to f
----
-> [eva] computing for function f <- main.
->   Called from memexec-malloc.c:25.
-> [eva] Recording results for f
-> [eva] Done for function f
-20c23,26
-< [eva] memexec-malloc.c:29: Reusing old results for call to f
----
-> [eva] computing for function f <- main.
->   Called from memexec-malloc.c:29.
-> [eva] Recording results for f
-> [eva] Done for function f
diff --git a/tests/builtins/diff_bitwise b/tests/builtins/diff_bitwise
deleted file mode 100644
index 1d0599adc64b3db9143879fa543f8c48fb51d18f..0000000000000000000000000000000000000000
--- a/tests/builtins/diff_bitwise
+++ /dev/null
@@ -1,313 +0,0 @@
-<<<<<<< HEAD
-diff oracle/Longinit_sequencer.res.oracle oracle_bitwise/Longinit_sequencer.res.oracle
-320c320
-<   result/Longinit_sequencer.sav
----
->   result_bitwise/Longinit_sequencer.sav
-556c556
-<   result/Longinit_sequencer.sav
----
->   result_bitwise/Longinit_sequencer.sav
-diff oracle/allocated.0.res.oracle oracle_bitwise/allocated.0.res.oracle
-||||||| ac7807782d
-diff tests/builtins/oracle/Longinit_sequencer.res.oracle tests/builtins/oracle_bitwise/Longinit_sequencer.res.oracle
-320c320
-<   tests/builtins/result/Longinit_sequencer.sav
----
->   tests/builtins/result_bitwise/Longinit_sequencer.sav
-556c556
-<   tests/builtins/result/Longinit_sequencer.sav
----
->   tests/builtins/result_bitwise/Longinit_sequencer.sav
-diff tests/builtins/oracle/allocated.0.res.oracle tests/builtins/oracle_bitwise/allocated.0.res.oracle
-=======
-diff tests/builtins/oracle/allocated.0.res.oracle tests/builtins/oracle_bitwise/allocated.0.res.oracle
->>>>>>> origin/master
-260a261,263
-> [eva] allocated.c:127: Call to builtin __fc_vla_alloc
-> [eva:malloc] allocated.c:127: 
->   resizing variable `__malloc_main_l127' (0..31/319) to fit 0..63/319
-diff oracle/allocated.1.res.oracle oracle_bitwise/allocated.1.res.oracle
-171a172,173
-> [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_7
-188a191,193
->   strong free on bases: {__malloc_main_l82_7}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
-203a209,211
->   strong free on bases: {__malloc_main_l82_7}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
-218a227,229
->   strong free on bases: {__malloc_main_l82_7}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
-232,233c243,245
-< [eva] allocated.c:82: Call to builtin malloc
-< [eva] allocated.c:82: allocating variable __malloc_main_l82_7
----
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_7}
-279a292,305
-> [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_31
-> [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_32
-> [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_33
-> [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_34
-> [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_35
-> [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_36
-> [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_37
-285,286d310
-<   Trace partitioning superposing up to 300 states
-< [eva] allocated.c:84: 
-289a314,334
->   strong free on bases: {__malloc_main_l82_37}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_36}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_35}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_34}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_33}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_32}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_31}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
-359c404,422
-<   strong free on bases: {__malloc_main_l82_7}
----
->   strong free on bases: {__malloc_main_l82_37}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_36}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_35}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_34}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_33}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_32}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_31}
-431c494,512
-<   strong free on bases: {__malloc_main_l82_7}
----
->   strong free on bases: {__malloc_main_l82_37}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_36}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_35}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_34}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_33}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_32}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_31}
-503c584,602
-<   strong free on bases: {__malloc_main_l82_7}
----
->   strong free on bases: {__malloc_main_l82_37}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_36}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_35}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_34}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_33}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_32}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_31}
-575c674,692
-<   strong free on bases: {__malloc_main_l82_7}
----
->   strong free on bases: {__malloc_main_l82_37}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_36}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_35}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_34}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_33}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_32}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_31}
-647c764,782
-<   strong free on bases: {__malloc_main_l82_7}
----
->   strong free on bases: {__malloc_main_l82_37}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_36}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_35}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_34}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_33}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_32}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_31}
-719c854,872
-<   strong free on bases: {__malloc_main_l82_7}
----
->   strong free on bases: {__malloc_main_l82_37}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_36}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_35}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_34}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_33}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_32}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_31}
-791c944,962
-<   strong free on bases: {__malloc_main_l82_7}
----
->   strong free on bases: {__malloc_main_l82_37}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_36}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_35}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_34}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_33}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_32}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_31}
-861,863c1032,1033
-< [eva] allocated.c:87: Call to builtin free
-< [eva:malloc] allocated.c:87: 
-<   strong free on bases: {__malloc_main_l82_7}
----
-> [eva] allocated.c:81: 
->   Trace partitioning superposing up to 500 states
-1001,1003c1171,1172
-<   __malloc_main_l82_7[0] ∈ {21} or UNINITIALIZED
-<                      [1] ∈ {24} or UNINITIALIZED
-<                      [2] ∈ {27} or UNINITIALIZED
----
->   __malloc_main_l82_7[0] ∈ {14} or UNINITIALIZED
->                      [1] ∈ {17} or UNINITIALIZED
-1072a1242,1262
->   __malloc_main_l82_31[0] ∈ {21} or UNINITIALIZED
->                       [1] ∈ {24} or UNINITIALIZED
->                       [2] ∈ {27} or UNINITIALIZED
->   __malloc_main_l82_32[0] ∈ {21} or UNINITIALIZED
->                       [1] ∈ {24} or UNINITIALIZED
->                       [2] ∈ {27} or UNINITIALIZED
->   __malloc_main_l82_33[0] ∈ {21} or UNINITIALIZED
->                       [1] ∈ {24} or UNINITIALIZED
->                       [2] ∈ {27} or UNINITIALIZED
->   __malloc_main_l82_34[0] ∈ {21} or UNINITIALIZED
->                       [1] ∈ {24} or UNINITIALIZED
->                       [2] ∈ {27} or UNINITIALIZED
->   __malloc_main_l82_35[0] ∈ {21} or UNINITIALIZED
->                       [1] ∈ {24} or UNINITIALIZED
->                       [2] ∈ {27} or UNINITIALIZED
->   __malloc_main_l82_36[0] ∈ {21} or UNINITIALIZED
->                       [1] ∈ {24} or UNINITIALIZED
->                       [2] ∈ {27} or UNINITIALIZED
->   __malloc_main_l82_37[0] ∈ {21} or UNINITIALIZED
->                       [1] ∈ {24} or UNINITIALIZED
->                       [2] ∈ {27} or UNINITIALIZED
-1116c1306
-<   __malloc_main_l82_7[0..2] FROM __fc_heap_status; nondet (and SELF)
----
->   __malloc_main_l82_7[0..1] FROM __fc_heap_status; nondet (and SELF)
-1139a1330,1336
->   __malloc_main_l82_31[0..2] FROM __fc_heap_status; nondet (and SELF)
->   __malloc_main_l82_32[0..2] FROM __fc_heap_status; nondet (and SELF)
->   __malloc_main_l82_33[0..2] FROM __fc_heap_status; nondet (and SELF)
->   __malloc_main_l82_34[0..2] FROM __fc_heap_status; nondet (and SELF)
->   __malloc_main_l82_35[0..2] FROM __fc_heap_status; nondet (and SELF)
->   __malloc_main_l82_36[0..2] FROM __fc_heap_status; nondet (and SELF)
->   __malloc_main_l82_37[0..2] FROM __fc_heap_status; nondet (and SELF)
-1163c1360
-<     __malloc_main_l82_6[0..1]; __malloc_main_l82_7[0..2];
----
->     __malloc_main_l82_6[0..1]; __malloc_main_l82_7[0..1];
-1175,1176c1372,1377
-<     __malloc_main_l82_30[0..2]; __malloc_main_l97[0]; __malloc_main_l114[0..3];
-<     __malloc_main_l127; __malloc_main_l127_0[0..1]; __malloc_main_l127_1[0..2];
----
->     __malloc_main_l82_30[0..2]; __malloc_main_l82_31[0..2];
->     __malloc_main_l82_32[0..2]; __malloc_main_l82_33[0..2];
->     __malloc_main_l82_34[0..2]; __malloc_main_l82_35[0..2];
->     __malloc_main_l82_36[0..2]; __malloc_main_l82_37[0..2];
->     __malloc_main_l97[0]; __malloc_main_l114[0..3]; __malloc_main_l127;
->     __malloc_main_l127_0[0..1]; __malloc_main_l127_1[0..2];
-diff oracle/malloc-optimistic.res.oracle oracle_bitwise/malloc-optimistic.res.oracle
-1945a1946,1948
-> [eva] malloc-optimistic.c:90: Call to builtin malloc
-> [eva:malloc] malloc-optimistic.c:90: 
->   resizing variable `__malloc_main7_l90' (0..31/3231) to fit 0..511/3231
diff --git a/tests/builtins/diff_equalities b/tests/builtins/diff_equalities
deleted file mode 100644
index 05e100d6a0038c446e4844ed7790a7f570699a8a..0000000000000000000000000000000000000000
--- a/tests/builtins/diff_equalities
+++ /dev/null
@@ -1,604 +0,0 @@
-<<<<<<< HEAD
-diff oracle/Longinit_sequencer.res.oracle oracle_equalities/Longinit_sequencer.res.oracle
-320c320
-<   result/Longinit_sequencer.sav
----
->   result_equalities/Longinit_sequencer.sav
-556c556
-<   result/Longinit_sequencer.sav
----
->   result_equalities/Longinit_sequencer.sav
-diff oracle/alloc_weak.res.oracle oracle_equalities/alloc_weak.res.oracle
-||||||| ac7807782d
-diff tests/builtins/oracle/Longinit_sequencer.res.oracle tests/builtins/oracle_equalities/Longinit_sequencer.res.oracle
-320c320
-<   tests/builtins/result/Longinit_sequencer.sav
----
->   tests/builtins/result_equalities/Longinit_sequencer.sav
-556c556
-<   tests/builtins/result/Longinit_sequencer.sav
----
->   tests/builtins/result_equalities/Longinit_sequencer.sav
-diff tests/builtins/oracle/alloc_weak.res.oracle tests/builtins/oracle_equalities/alloc_weak.res.oracle
-=======
-diff tests/builtins/oracle/alloc_weak.res.oracle tests/builtins/oracle_equalities/alloc_weak.res.oracle
->>>>>>> origin/master
-36,37d35
-< [eva:alarm] alloc_weak.c:30: Warning: 
-<   accessing uninitialized left-value. assert \initialized(p);
-912c910
-<   r ∈ [--..--]
----
->   r ∈ {42}
-diff oracle/allocated.1.res.oracle oracle_equalities/allocated.1.res.oracle
-171a172,173
-> [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_7
-188a191,193
->   strong free on bases: {__malloc_main_l82_7}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
-203a209,211
->   strong free on bases: {__malloc_main_l82_7}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
-218a227,229
->   strong free on bases: {__malloc_main_l82_7}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
-232,233c243,245
-< [eva] allocated.c:82: Call to builtin malloc
-< [eva] allocated.c:82: allocating variable __malloc_main_l82_7
----
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_7}
-279a292,305
-> [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_31
-> [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_32
-> [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_33
-> [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_34
-> [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_35
-> [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_36
-> [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_37
-285,286d310
-<   Trace partitioning superposing up to 300 states
-< [eva] allocated.c:84: 
-289a314,334
->   strong free on bases: {__malloc_main_l82_37}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_36}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_35}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_34}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_33}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_32}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_31}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
-359c404,422
-<   strong free on bases: {__malloc_main_l82_7}
----
->   strong free on bases: {__malloc_main_l82_37}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_36}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_35}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_34}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_33}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_32}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_31}
-431c494,512
-<   strong free on bases: {__malloc_main_l82_7}
----
->   strong free on bases: {__malloc_main_l82_37}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_36}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_35}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_34}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_33}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_32}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_31}
-503c584,602
-<   strong free on bases: {__malloc_main_l82_7}
----
->   strong free on bases: {__malloc_main_l82_37}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_36}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_35}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_34}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_33}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_32}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_31}
-575c674,692
-<   strong free on bases: {__malloc_main_l82_7}
----
->   strong free on bases: {__malloc_main_l82_37}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_36}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_35}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_34}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_33}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_32}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_31}
-647c764,782
-<   strong free on bases: {__malloc_main_l82_7}
----
->   strong free on bases: {__malloc_main_l82_37}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_36}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_35}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_34}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_33}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_32}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_31}
-719c854,872
-<   strong free on bases: {__malloc_main_l82_7}
----
->   strong free on bases: {__malloc_main_l82_37}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_36}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_35}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_34}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_33}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_32}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_31}
-791c944,962
-<   strong free on bases: {__malloc_main_l82_7}
----
->   strong free on bases: {__malloc_main_l82_37}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_36}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_35}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_34}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_33}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_32}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_31}
-861,863c1032,1033
-< [eva] allocated.c:87: Call to builtin free
-< [eva:malloc] allocated.c:87: 
-<   strong free on bases: {__malloc_main_l82_7}
----
-> [eva] allocated.c:81: 
->   Trace partitioning superposing up to 500 states
-1001,1003c1171,1172
-<   __malloc_main_l82_7[0] ∈ {21} or UNINITIALIZED
-<                      [1] ∈ {24} or UNINITIALIZED
-<                      [2] ∈ {27} or UNINITIALIZED
----
->   __malloc_main_l82_7[0] ∈ {14} or UNINITIALIZED
->                      [1] ∈ {17} or UNINITIALIZED
-1072a1242,1262
->   __malloc_main_l82_31[0] ∈ {21} or UNINITIALIZED
->                       [1] ∈ {24} or UNINITIALIZED
->                       [2] ∈ {27} or UNINITIALIZED
->   __malloc_main_l82_32[0] ∈ {21} or UNINITIALIZED
->                       [1] ∈ {24} or UNINITIALIZED
->                       [2] ∈ {27} or UNINITIALIZED
->   __malloc_main_l82_33[0] ∈ {21} or UNINITIALIZED
->                       [1] ∈ {24} or UNINITIALIZED
->                       [2] ∈ {27} or UNINITIALIZED
->   __malloc_main_l82_34[0] ∈ {21} or UNINITIALIZED
->                       [1] ∈ {24} or UNINITIALIZED
->                       [2] ∈ {27} or UNINITIALIZED
->   __malloc_main_l82_35[0] ∈ {21} or UNINITIALIZED
->                       [1] ∈ {24} or UNINITIALIZED
->                       [2] ∈ {27} or UNINITIALIZED
->   __malloc_main_l82_36[0] ∈ {21} or UNINITIALIZED
->                       [1] ∈ {24} or UNINITIALIZED
->                       [2] ∈ {27} or UNINITIALIZED
->   __malloc_main_l82_37[0] ∈ {21} or UNINITIALIZED
->                       [1] ∈ {24} or UNINITIALIZED
->                       [2] ∈ {27} or UNINITIALIZED
-1116c1306
-<   __malloc_main_l82_7[0..2] FROM __fc_heap_status; nondet (and SELF)
----
->   __malloc_main_l82_7[0..1] FROM __fc_heap_status; nondet (and SELF)
-1139a1330,1336
->   __malloc_main_l82_31[0..2] FROM __fc_heap_status; nondet (and SELF)
->   __malloc_main_l82_32[0..2] FROM __fc_heap_status; nondet (and SELF)
->   __malloc_main_l82_33[0..2] FROM __fc_heap_status; nondet (and SELF)
->   __malloc_main_l82_34[0..2] FROM __fc_heap_status; nondet (and SELF)
->   __malloc_main_l82_35[0..2] FROM __fc_heap_status; nondet (and SELF)
->   __malloc_main_l82_36[0..2] FROM __fc_heap_status; nondet (and SELF)
->   __malloc_main_l82_37[0..2] FROM __fc_heap_status; nondet (and SELF)
-1163c1360
-<     __malloc_main_l82_6[0..1]; __malloc_main_l82_7[0..2];
----
->     __malloc_main_l82_6[0..1]; __malloc_main_l82_7[0..1];
-1175,1176c1372,1377
-<     __malloc_main_l82_30[0..2]; __malloc_main_l97[0]; __malloc_main_l114[0..3];
-<     __malloc_main_l127; __malloc_main_l127_0[0..1]; __malloc_main_l127_1[0..2];
----
->     __malloc_main_l82_30[0..2]; __malloc_main_l82_31[0..2];
->     __malloc_main_l82_32[0..2]; __malloc_main_l82_33[0..2];
->     __malloc_main_l82_34[0..2]; __malloc_main_l82_35[0..2];
->     __malloc_main_l82_36[0..2]; __malloc_main_l82_37[0..2];
->     __malloc_main_l97[0]; __malloc_main_l114[0..3]; __malloc_main_l127;
->     __malloc_main_l127_0[0..1]; __malloc_main_l127_1[0..2];
-diff oracle/imprecise.res.oracle oracle_equalities/imprecise.res.oracle
-104a105,106
-> [kernel] imprecise.c:51: 
->   imprecise size for variable v3 (abstract type 'struct u')
-229a232,233
-> [kernel] imprecise.c:111: 
->   more than 200(300) elements to enumerate. Approximating.
-238a243,244
-> [kernel] imprecise.c:114: 
->   more than 200(300) elements to enumerate. Approximating.
-242,245d247
-< [kernel] imprecise.c:111: 
-<   more than 200(300) elements to enumerate. Approximating.
-< [kernel] imprecise.c:114: 
-<   more than 200(300) elements to enumerate. Approximating.
-diff oracle/linked_list.1.res.oracle oracle_equalities/linked_list.1.res.oracle
-477a478,479
-> [kernel] linked_list.c:19: 
->   more than 100(128) elements to enumerate. Approximating.
-530a533,534
-> [kernel] linked_list.c:43: 
->   more than 100(128) elements to enumerate. Approximating.
-532a537,538
-> [kernel] linked_list.c:44: 
->   more than 100(128) elements to enumerate. Approximating.
-628,631d633
-< [kernel] linked_list.c:43: 
-<   more than 100(128) elements to enumerate. Approximating.
-< [kernel] linked_list.c:44: 
-<   more than 100(128) elements to enumerate. Approximating.
-diff oracle/malloc-optimistic.res.oracle oracle_equalities/malloc-optimistic.res.oracle
-524,525d523
-< [eva:alarm] malloc-optimistic.c:79: Warning: 
-<   accessing uninitialized left-value. assert \initialized(p + i);
-533c531
-<   k ∈ {-2; -1}
----
->   k ∈ {-1}
-569c567
-<   k ∈ {-1; 0}
----
->   k ∈ {0}
-607c605
-<   k ∈ {0; 1}
----
->   k ∈ {1}
-647c645
-<   k ∈ {1; 2}
----
->   k ∈ {2}
-689c687
-<   k ∈ {2; 3}
----
->   k ∈ {3}
-733c731
-<   k ∈ {3; 4}
----
->   k ∈ {4}
-779c777
-<   k ∈ {4; 5}
----
->   k ∈ {5}
-827c825
-<   k ∈ {5; 6}
----
->   k ∈ {6}
-877c875
-<   k ∈ {6; 7}
----
->   k ∈ {7}
-1826,1827d1823
-< [eva:alarm] malloc-optimistic.c:92: Warning: 
-<   accessing uninitialized left-value. assert \initialized(p + i);
-2018,2019d2013
-< [eva:alarm] malloc-optimistic.c:105: Warning: 
-<   accessing uninitialized left-value. assert \initialized(p + i);
-2027c2021
-<   k ∈ {-2; -1}
----
->   k ∈ {-1}
-2085c2079
-<   k ∈ {-1; 0}
----
->   k ∈ {0}
-2145c2139
-<   k ∈ {0; 1}
----
->   k ∈ {1}
-2207c2201
-<   k ∈ {1; 2}
----
->   k ∈ {2}
-2271c2265
-<   k ∈ {2; 3}
----
->   k ∈ {3}
-2337c2331
-<   k ∈ {3; 4}
----
->   k ∈ {4}
-2405c2399
-<   k ∈ {4; 5}
----
->   k ∈ {5}
-2475c2469
-<   k ∈ {5; 6}
----
->   k ∈ {6}
-2547c2541
-<   k ∈ {6; 7}
----
->   k ∈ {7}
-2621c2615
-<   k ∈ {7; 8}
----
->   k ∈ {8}
-2697c2691
-<   k ∈ {8; 9}
----
->   k ∈ {9}
-2775c2769
-<   k ∈ {9; 10}
----
->   k ∈ {10}
-2855c2849
-<   k ∈ {10; 11}
----
->   k ∈ {11}
-2937c2931
-<   k ∈ {11; 12}
----
->   k ∈ {12}
-3018c3012
-<   k ∈ {12; 13}
----
->   k ∈ {13}
-3064c3058
-<   k ∈ {12; 13; 14}
----
->   k ∈ {13; 14}
-3109c3103
-<   k ∈ {12; 13; 14; 15}
----
->   k ∈ {13; 14; 15}
-3154c3148
-<   k ∈ [12..97]
----
->   k ∈ [13..97]
-3211c3205
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: {-20; 1}
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {1}
-3219c3213
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: {-20; 1; 2}
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {2}
-3227c3221
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: {-20; 1; 2; 3}
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {3}
-3235,3236c3229
-< [eva] malloc-optimistic.c:122: 
-<   Frama_C_show_each: {-20; 1; 2; 3; 4}
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {4}
-3244,3245c3237
-< [eva] malloc-optimistic.c:122: 
-<   Frama_C_show_each: {-20; 1; 2; 3; 4; 5}
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {5}
-3253,3254c3245
-< [eva] malloc-optimistic.c:122: 
-<   Frama_C_show_each: {-20; 1; 2; 3; 4; 5; 6}
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {6}
-3262,3263c3253
-< [eva] malloc-optimistic.c:122: 
-<   Frama_C_show_each: {-20; 1; 2; 3; 4; 5; 6; 7}
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {7}
-3271c3261
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..8]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {8}
-3279c3269
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..9]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {9}
-3287c3277
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..10]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {10}
-3295c3285
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..11]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {11}
-3303c3293
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..12]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {12}
-3311c3301
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..13]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {13}
-3319c3309
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..14]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {14}
-3327c3317
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..15]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {15}
-3335c3325
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..16]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {16}
-3343c3333
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..17]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {17}
-3351c3341
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..18]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {18}
-3359c3349
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..19]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {19}
-3367c3357
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..20]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {20}
-3375c3365
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..21]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {21}
-3383c3373
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..22]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {22}
-3391c3381
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..23]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {23}
-3399c3389
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..24]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {24}
-3407c3397
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..25]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {25}
-3415c3405
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..26]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {26}
-3423c3413
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..27]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {27}
-3431c3421
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..28]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {28}
-3439c3429
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..29]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {29}
-3447c3437
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..30]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {30}
-3456c3446
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..31]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {30; 31}
-3464c3454
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..32]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {30; 31; 32}
-3472c3462
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..99]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: [30..99]
-diff oracle/write-const.res.oracle oracle_equalities/write-const.res.oracle
-84c84
-<   tmp ∈ {{ &a ; &b }}
----
->   tmp ∈ {{ &b }}
-107c107
-<   tmp ∈ {{ &a ; &b }}
----
->   tmp ∈ {{ &b }}
diff --git a/tests/builtins/diff_octagons b/tests/builtins/diff_octagons
deleted file mode 100644
index 797a12def3f992a2027197cc25c8fe88e65462e9..0000000000000000000000000000000000000000
--- a/tests/builtins/diff_octagons
+++ /dev/null
@@ -1,341 +0,0 @@
-<<<<<<< HEAD
-diff oracle/Longinit_sequencer.res.oracle oracle_octagons/Longinit_sequencer.res.oracle
-320c320
-<   result/Longinit_sequencer.sav
----
->   result_octagons/Longinit_sequencer.sav
-556c556
-<   result/Longinit_sequencer.sav
----
->   result_octagons/Longinit_sequencer.sav
-diff oracle/allocated.0.res.oracle oracle_octagons/allocated.0.res.oracle
-||||||| ac7807782d
-diff tests/builtins/oracle/Longinit_sequencer.res.oracle tests/builtins/oracle_octagons/Longinit_sequencer.res.oracle
-320c320
-<   tests/builtins/result/Longinit_sequencer.sav
----
->   tests/builtins/result_octagons/Longinit_sequencer.sav
-556c556
-<   tests/builtins/result/Longinit_sequencer.sav
----
->   tests/builtins/result_octagons/Longinit_sequencer.sav
-diff tests/builtins/oracle/allocated.0.res.oracle tests/builtins/oracle_octagons/allocated.0.res.oracle
-=======
-diff tests/builtins/oracle/allocated.0.res.oracle tests/builtins/oracle_octagons/allocated.0.res.oracle
->>>>>>> origin/master
-273c273
-<   j ∈ [1..2147483647]
----
->   j ∈ {10}
-diff oracle/allocated.1.res.oracle oracle_octagons/allocated.1.res.oracle
-171a172,173
-> [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_7
-188a191,193
->   strong free on bases: {__malloc_main_l82_7}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
-203a209,211
->   strong free on bases: {__malloc_main_l82_7}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
-218a227,229
->   strong free on bases: {__malloc_main_l82_7}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
-232,233c243,245
-< [eva] allocated.c:82: Call to builtin malloc
-< [eva] allocated.c:82: allocating variable __malloc_main_l82_7
----
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_7}
-279a292,305
-> [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_31
-> [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_32
-> [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_33
-> [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_34
-> [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_35
-> [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_36
-> [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_37
-285,286d310
-<   Trace partitioning superposing up to 300 states
-< [eva] allocated.c:84: 
-289a314,334
->   strong free on bases: {__malloc_main_l82_37}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_36}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_35}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_34}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_33}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_32}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_31}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
-359c404,422
-<   strong free on bases: {__malloc_main_l82_7}
----
->   strong free on bases: {__malloc_main_l82_37}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_36}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_35}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_34}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_33}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_32}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_31}
-431c494,512
-<   strong free on bases: {__malloc_main_l82_7}
----
->   strong free on bases: {__malloc_main_l82_37}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_36}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_35}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_34}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_33}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_32}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_31}
-503c584,602
-<   strong free on bases: {__malloc_main_l82_7}
----
->   strong free on bases: {__malloc_main_l82_37}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_36}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_35}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_34}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_33}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_32}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_31}
-575c674,692
-<   strong free on bases: {__malloc_main_l82_7}
----
->   strong free on bases: {__malloc_main_l82_37}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_36}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_35}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_34}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_33}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_32}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_31}
-647c764,782
-<   strong free on bases: {__malloc_main_l82_7}
----
->   strong free on bases: {__malloc_main_l82_37}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_36}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_35}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_34}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_33}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_32}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_31}
-719c854,872
-<   strong free on bases: {__malloc_main_l82_7}
----
->   strong free on bases: {__malloc_main_l82_37}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_36}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_35}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_34}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_33}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_32}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_31}
-791c944,962
-<   strong free on bases: {__malloc_main_l82_7}
----
->   strong free on bases: {__malloc_main_l82_37}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_36}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_35}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_34}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_33}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_32}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: 
->   strong free on bases: {__malloc_main_l82_31}
-861,863c1032,1033
-< [eva] allocated.c:87: Call to builtin free
-< [eva:malloc] allocated.c:87: 
-<   strong free on bases: {__malloc_main_l82_7}
----
-> [eva] allocated.c:81: 
->   Trace partitioning superposing up to 500 states
-1001,1003c1171,1172
-<   __malloc_main_l82_7[0] ∈ {21} or UNINITIALIZED
-<                      [1] ∈ {24} or UNINITIALIZED
-<                      [2] ∈ {27} or UNINITIALIZED
----
->   __malloc_main_l82_7[0] ∈ {14} or UNINITIALIZED
->                      [1] ∈ {17} or UNINITIALIZED
-1072a1242,1262
->   __malloc_main_l82_31[0] ∈ {21} or UNINITIALIZED
->                       [1] ∈ {24} or UNINITIALIZED
->                       [2] ∈ {27} or UNINITIALIZED
->   __malloc_main_l82_32[0] ∈ {21} or UNINITIALIZED
->                       [1] ∈ {24} or UNINITIALIZED
->                       [2] ∈ {27} or UNINITIALIZED
->   __malloc_main_l82_33[0] ∈ {21} or UNINITIALIZED
->                       [1] ∈ {24} or UNINITIALIZED
->                       [2] ∈ {27} or UNINITIALIZED
->   __malloc_main_l82_34[0] ∈ {21} or UNINITIALIZED
->                       [1] ∈ {24} or UNINITIALIZED
->                       [2] ∈ {27} or UNINITIALIZED
->   __malloc_main_l82_35[0] ∈ {21} or UNINITIALIZED
->                       [1] ∈ {24} or UNINITIALIZED
->                       [2] ∈ {27} or UNINITIALIZED
->   __malloc_main_l82_36[0] ∈ {21} or UNINITIALIZED
->                       [1] ∈ {24} or UNINITIALIZED
->                       [2] ∈ {27} or UNINITIALIZED
->   __malloc_main_l82_37[0] ∈ {21} or UNINITIALIZED
->                       [1] ∈ {24} or UNINITIALIZED
->                       [2] ∈ {27} or UNINITIALIZED
-1116c1306
-<   __malloc_main_l82_7[0..2] FROM __fc_heap_status; nondet (and SELF)
----
->   __malloc_main_l82_7[0..1] FROM __fc_heap_status; nondet (and SELF)
-1139a1330,1336
->   __malloc_main_l82_31[0..2] FROM __fc_heap_status; nondet (and SELF)
->   __malloc_main_l82_32[0..2] FROM __fc_heap_status; nondet (and SELF)
->   __malloc_main_l82_33[0..2] FROM __fc_heap_status; nondet (and SELF)
->   __malloc_main_l82_34[0..2] FROM __fc_heap_status; nondet (and SELF)
->   __malloc_main_l82_35[0..2] FROM __fc_heap_status; nondet (and SELF)
->   __malloc_main_l82_36[0..2] FROM __fc_heap_status; nondet (and SELF)
->   __malloc_main_l82_37[0..2] FROM __fc_heap_status; nondet (and SELF)
-1163c1360
-<     __malloc_main_l82_6[0..1]; __malloc_main_l82_7[0..2];
----
->     __malloc_main_l82_6[0..1]; __malloc_main_l82_7[0..1];
-1175,1176c1372,1377
-<     __malloc_main_l82_30[0..2]; __malloc_main_l97[0]; __malloc_main_l114[0..3];
-<     __malloc_main_l127; __malloc_main_l127_0[0..1]; __malloc_main_l127_1[0..2];
----
->     __malloc_main_l82_30[0..2]; __malloc_main_l82_31[0..2];
->     __malloc_main_l82_32[0..2]; __malloc_main_l82_33[0..2];
->     __malloc_main_l82_34[0..2]; __malloc_main_l82_35[0..2];
->     __malloc_main_l82_36[0..2]; __malloc_main_l82_37[0..2];
->     __malloc_main_l97[0]; __malloc_main_l114[0..3]; __malloc_main_l127;
->     __malloc_main_l127_0[0..1]; __malloc_main_l127_1[0..2];
-diff oracle/imprecise.res.oracle oracle_octagons/imprecise.res.oracle
-229a230,231
-> [kernel] imprecise.c:111: 
->   more than 200(300) elements to enumerate. Approximating.
-238a241,242
-> [kernel] imprecise.c:114: 
->   more than 200(300) elements to enumerate. Approximating.
-242,245d245
-< [kernel] imprecise.c:111: 
-<   more than 200(300) elements to enumerate. Approximating.
-< [kernel] imprecise.c:114: 
-<   more than 200(300) elements to enumerate. Approximating.
-diff oracle/linked_list.1.res.oracle oracle_octagons/linked_list.1.res.oracle
-530a531,532
-> [kernel] linked_list.c:43: 
->   more than 100(128) elements to enumerate. Approximating.
-532a535,536
-> [kernel] linked_list.c:44: 
->   more than 100(128) elements to enumerate. Approximating.
-628,631d631
-< [kernel] linked_list.c:43: 
-<   more than 100(128) elements to enumerate. Approximating.
-< [kernel] linked_list.c:44: 
-<   more than 100(128) elements to enumerate. Approximating.
-diff oracle/malloc-optimistic.res.oracle oracle_octagons/malloc-optimistic.res.oracle
-3520c3520
-<   i ∈ [14..100]
----
->   i ∈ {98; 99; 100}
-3524c3524
-<   i ∈ [14..100]
----
->   i ∈ {98; 99; 100}
diff --git a/tests/builtins/diff_symblocs b/tests/builtins/diff_symblocs
deleted file mode 100644
index 4772c73639e671638807abb79ba117f466d7a225..0000000000000000000000000000000000000000
--- a/tests/builtins/diff_symblocs
+++ /dev/null
@@ -1,310 +0,0 @@
-<<<<<<< HEAD
-diff oracle/Longinit_sequencer.res.oracle oracle_symblocs/Longinit_sequencer.res.oracle
-320c320
-<   result/Longinit_sequencer.sav
----
->   result_symblocs/Longinit_sequencer.sav
-556c556
-<   result/Longinit_sequencer.sav
----
->   result_symblocs/Longinit_sequencer.sav
-diff oracle/alloc_weak.res.oracle oracle_symblocs/alloc_weak.res.oracle
-||||||| ac7807782d
-diff tests/builtins/oracle/Longinit_sequencer.res.oracle tests/builtins/oracle_symblocs/Longinit_sequencer.res.oracle
-320c320
-<   tests/builtins/result/Longinit_sequencer.sav
----
->   tests/builtins/result_symblocs/Longinit_sequencer.sav
-556c556
-<   tests/builtins/result/Longinit_sequencer.sav
----
->   tests/builtins/result_symblocs/Longinit_sequencer.sav
-diff tests/builtins/oracle/alloc_weak.res.oracle tests/builtins/oracle_symblocs/alloc_weak.res.oracle
-=======
-diff tests/builtins/oracle/alloc_weak.res.oracle tests/builtins/oracle_symblocs/alloc_weak.res.oracle
->>>>>>> origin/master
-36,37d35
-< [eva:alarm] alloc_weak.c:30: Warning: 
-<   accessing uninitialized left-value. assert \initialized(p);
-912c910
-<   r ∈ [--..--]
----
->   r ∈ {42}
-diff oracle/imprecise.res.oracle oracle_symblocs/imprecise.res.oracle
-229a230,231
-> [kernel] imprecise.c:111: 
->   more than 200(300) elements to enumerate. Approximating.
-238a241,242
-> [kernel] imprecise.c:114: 
->   more than 200(300) elements to enumerate. Approximating.
-242,245d245
-< [kernel] imprecise.c:111: 
-<   more than 200(300) elements to enumerate. Approximating.
-< [kernel] imprecise.c:114: 
-<   more than 200(300) elements to enumerate. Approximating.
-diff oracle/linked_list.1.res.oracle oracle_symblocs/linked_list.1.res.oracle
-530a531,532
-> [kernel] linked_list.c:43: 
->   more than 100(128) elements to enumerate. Approximating.
-532a535,536
-> [kernel] linked_list.c:44: 
->   more than 100(128) elements to enumerate. Approximating.
-628,631d631
-< [kernel] linked_list.c:43: 
-<   more than 100(128) elements to enumerate. Approximating.
-< [kernel] linked_list.c:44: 
-<   more than 100(128) elements to enumerate. Approximating.
-diff oracle/malloc-optimistic.res.oracle oracle_symblocs/malloc-optimistic.res.oracle
-524,525d523
-< [eva:alarm] malloc-optimistic.c:79: Warning: 
-<   accessing uninitialized left-value. assert \initialized(p + i);
-533c531
-<   k ∈ {-2; -1}
----
->   k ∈ {-1}
-569c567
-<   k ∈ {-1; 0}
----
->   k ∈ {0}
-607c605
-<   k ∈ {0; 1}
----
->   k ∈ {1}
-647c645
-<   k ∈ {1; 2}
----
->   k ∈ {2}
-689c687
-<   k ∈ {2; 3}
----
->   k ∈ {3}
-733c731
-<   k ∈ {3; 4}
----
->   k ∈ {4}
-779c777
-<   k ∈ {4; 5}
----
->   k ∈ {5}
-827c825
-<   k ∈ {5; 6}
----
->   k ∈ {6}
-877c875
-<   k ∈ {6; 7}
----
->   k ∈ {7}
-1826,1827d1823
-< [eva:alarm] malloc-optimistic.c:92: Warning: 
-<   accessing uninitialized left-value. assert \initialized(p + i);
-2018,2019d2013
-< [eva:alarm] malloc-optimistic.c:105: Warning: 
-<   accessing uninitialized left-value. assert \initialized(p + i);
-2027c2021
-<   k ∈ {-2; -1}
----
->   k ∈ {-1}
-2085c2079
-<   k ∈ {-1; 0}
----
->   k ∈ {0}
-2145c2139
-<   k ∈ {0; 1}
----
->   k ∈ {1}
-2207c2201
-<   k ∈ {1; 2}
----
->   k ∈ {2}
-2271c2265
-<   k ∈ {2; 3}
----
->   k ∈ {3}
-2337c2331
-<   k ∈ {3; 4}
----
->   k ∈ {4}
-2405c2399
-<   k ∈ {4; 5}
----
->   k ∈ {5}
-2475c2469
-<   k ∈ {5; 6}
----
->   k ∈ {6}
-2547c2541
-<   k ∈ {6; 7}
----
->   k ∈ {7}
-2621c2615
-<   k ∈ {7; 8}
----
->   k ∈ {8}
-2697c2691
-<   k ∈ {8; 9}
----
->   k ∈ {9}
-2775c2769
-<   k ∈ {9; 10}
----
->   k ∈ {10}
-2855c2849
-<   k ∈ {10; 11}
----
->   k ∈ {11}
-2937c2931
-<   k ∈ {11; 12}
----
->   k ∈ {12}
-3018c3012
-<   k ∈ {12; 13}
----
->   k ∈ {13}
-3064c3058
-<   k ∈ {12; 13; 14}
----
->   k ∈ {13; 14}
-3109c3103
-<   k ∈ {12; 13; 14; 15}
----
->   k ∈ {13; 14; 15}
-3154c3148
-<   k ∈ [12..97]
----
->   k ∈ [13..97]
-3211c3205
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: {-20; 1}
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {1}
-3219c3213
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: {-20; 1; 2}
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {2}
-3227c3221
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: {-20; 1; 2; 3}
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {3}
-3235,3236c3229
-< [eva] malloc-optimistic.c:122: 
-<   Frama_C_show_each: {-20; 1; 2; 3; 4}
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {4}
-3244,3245c3237
-< [eva] malloc-optimistic.c:122: 
-<   Frama_C_show_each: {-20; 1; 2; 3; 4; 5}
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {5}
-3253,3254c3245
-< [eva] malloc-optimistic.c:122: 
-<   Frama_C_show_each: {-20; 1; 2; 3; 4; 5; 6}
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {6}
-3262,3263c3253
-< [eva] malloc-optimistic.c:122: 
-<   Frama_C_show_each: {-20; 1; 2; 3; 4; 5; 6; 7}
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {7}
-3271c3261
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..8]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {8}
-3279c3269
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..9]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {9}
-3287c3277
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..10]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {10}
-3295c3285
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..11]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {11}
-3303c3293
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..12]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {12}
-3311c3301
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..13]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {13}
-3319c3309
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..14]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {14}
-3327c3317
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..15]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {15}
-3335c3325
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..16]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {16}
-3343c3333
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..17]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {17}
-3351c3341
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..18]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {18}
-3359c3349
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..19]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {19}
-3367c3357
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..20]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {20}
-3375c3365
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..21]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {21}
-3383c3373
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..22]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {22}
-3391c3381
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..23]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {23}
-3399c3389
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..24]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {24}
-3407c3397
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..25]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {25}
-3415c3405
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..26]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {26}
-3423c3413
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..27]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {27}
-3431c3421
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..28]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {28}
-3439c3429
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..29]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {29}
-3447c3437
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..30]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {30}
-3456c3446
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..31]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {30; 31}
-3464c3454
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..32]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {30; 31; 32}
-3472c3462
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..99]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: [30..99]
diff --git a/tests/builtins/malloc-deps.c b/tests/builtins/malloc-deps.c
index 29f258d52bb00ac6cfe776db7fe0d4ed4a27b9c9..1bb43e5021c1eb4b3d88ff639219613a9f099871 100644
--- a/tests/builtins/malloc-deps.c
+++ b/tests/builtins/malloc-deps.c
@@ -1,5 +1,5 @@
 /* run.config*
-   OPT: -eva @EVA_OPTIONS@ -deps -calldeps -inout -eva-slevel 5 -eva-msg-key malloc
+   OPT: -eva @EVA_CONFIG@ -deps -calldeps -inout -eva-slevel 5 -eva-msg-key malloc
 */
 #include <stdlib.h>
 
diff --git a/tests/builtins/malloc-size-zero.c b/tests/builtins/malloc-size-zero.c
index 21cb95cfe5ce572faf9ddabdf5f2034d2582a329..0ff4c5e749f9ed70eb450993db8dcad2226ca561 100644
--- a/tests/builtins/malloc-size-zero.c
+++ b/tests/builtins/malloc-size-zero.c
@@ -1,6 +1,6 @@
 /* run.config*
-   OPT: -eva @EVA_OPTIONS@ -eva-mlevel 3
-   OPT: -eva @EVA_OPTIONS@ -eva-alloc-functions my_calloc
+   OPT: -eva @EVA_CONFIG@ -eva-mlevel 3
+   OPT: -eva @EVA_CONFIG@ -eva-alloc-functions my_calloc
 */
 
 #include <stdlib.h>
diff --git a/tests/builtins/malloc_bug_tr.c b/tests/builtins/malloc_bug_tr.c
index c933ffe4af59ab848316ce4c7675f672d551dfc0..98b3d323d6dc902fd725994595d35f248190f46b 100644
--- a/tests/builtins/malloc_bug_tr.c
+++ b/tests/builtins/malloc_bug_tr.c
@@ -1,5 +1,5 @@
 /* run.config*
-   OPT: -eva @EVA_OPTIONS@
+   OPT: -eva @EVA_CONFIG@
 */
 
 #include <stdlib.h>
diff --git a/tests/builtins/malloc_memexec.c b/tests/builtins/malloc_memexec.c
index e02637be2be686bd338daf09baeb7eb77ae033a9..cac60b4be3121fe0fe79ea701fee95860d0420a3 100644
--- a/tests/builtins/malloc_memexec.c
+++ b/tests/builtins/malloc_memexec.c
@@ -1,5 +1,5 @@
 /* run.config*
-   OPT: -eva @EVA_OPTIONS@ -eva-memexec -deps -inout -eva-mlevel 0
+   OPT: -eva @EVA_CONFIG@ -eva-memexec -deps -inout -eva-mlevel 0
 */
 #include <stdlib.h>
 
diff --git a/tests/builtins/malloc_multiple.c b/tests/builtins/malloc_multiple.c
index 337e6b4abfd0ade9566f8b3f0a2a83173ef70094..81e2a9cc9f717679e7e98ff2047b2c5360f23bdc 100644
--- a/tests/builtins/malloc_multiple.c
+++ b/tests/builtins/malloc_multiple.c
@@ -1,5 +1,5 @@
 /* run.config*
-   OPT: -eva @EVA_OPTIONS@ -eva-slevel 50 -eva-mlevel 5
+   OPT: -eva @EVA_CONFIG@ -eva-slevel 50 -eva-mlevel 5
 */
 #include<stdlib.h>
 #define MAX 10
diff --git a/tests/builtins/oracle/Longinit_sequencer.res.oracle b/tests/builtins/oracle/Longinit_sequencer.res.oracle
deleted file mode 100644
index e2ab5e2221a5abefe15142d12203c5d0b1a7b752..0000000000000000000000000000000000000000
--- a/tests/builtins/oracle/Longinit_sequencer.res.oracle
+++ /dev/null
@@ -1,4 +0,0 @@
-[kernel] Parsing Longinit_sequencer.i (no preprocessing)
-[kernel] User Error: source file 'long_init.c' does not exist
-[kernel] Frama-C aborted: invalid user input.
-[test-long-init] Keeping temp file result/Longinit_sequencer.sav
diff --git a/tests/builtins/oracle_equalities/alloc_weak.res.oracle b/tests/builtins/oracle_equalities/alloc_weak.res.oracle
deleted file mode 100644
index b4c9111452e03f530c8ecf2275b5072c8055c757..0000000000000000000000000000000000000000
--- a/tests/builtins/oracle_equalities/alloc_weak.res.oracle
+++ /dev/null
@@ -1,7 +0,0 @@
-34,35d33
-< [eva:alarm] alloc_weak.c:30: Warning: 
-<   accessing uninitialized left-value. assert \initialized(p);
-901c899
-<   r ∈ [--..--]
----
->   r ∈ {42}
diff --git a/tests/builtins/oracle_equalities/allocated.1.res.oracle b/tests/builtins/oracle_equalities/allocated.1.res.oracle
deleted file mode 100644
index 07f6b70bfde49280d8694fcf62a4517fa2e177d6..0000000000000000000000000000000000000000
--- a/tests/builtins/oracle_equalities/allocated.1.res.oracle
+++ /dev/null
@@ -1,222 +0,0 @@
-135a136,137
-> [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_7
-146a149,150
-> [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_7}
-> [eva] allocated.c:87: Call to builtin free
-156a161,162
-> [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_7}
-> [eva] allocated.c:87: Call to builtin free
-166a173,174
-> [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_7}
-> [eva] allocated.c:87: Call to builtin free
-176,177c184,185
-< [eva] allocated.c:82: Call to builtin malloc
-< [eva] allocated.c:82: allocating variable __malloc_main_l82_7
----
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_7}
-223a232,245
-> [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_31
-> [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_32
-> [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_33
-> [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_34
-> [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_35
-> [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_36
-> [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_37
-226d247
-< [eva] allocated.c:84: Trace partitioning superposing up to 300 states
-228a250,263
-> [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_37}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_36}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_35}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_34}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_33}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_32}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_31}
-> [eva] allocated.c:87: Call to builtin free
-275c310,322
-< [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_7}
----
-> [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_37}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_36}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_35}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_34}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_33}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_32}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_31}
-323c370,382
-< [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_7}
----
-> [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_37}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_36}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_35}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_34}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_33}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_32}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_31}
-371c430,442
-< [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_7}
----
-> [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_37}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_36}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_35}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_34}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_33}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_32}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_31}
-419c490,502
-< [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_7}
----
-> [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_37}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_36}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_35}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_34}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_33}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_32}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_31}
-467c550,562
-< [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_7}
----
-> [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_37}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_36}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_35}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_34}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_33}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_32}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_31}
-515c610,622
-< [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_7}
----
-> [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_37}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_36}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_35}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_34}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_33}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_32}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_31}
-563c670,682
-< [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_7}
----
-> [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_37}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_36}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_35}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_34}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_33}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_32}
-> [eva] allocated.c:87: Call to builtin free
-> [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_31}
-610,611c729
-< [eva] allocated.c:87: Call to builtin free
-< [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_7}
----
-> [eva] allocated.c:81: Trace partitioning superposing up to 500 states
-721,723c839,840
-<   __malloc_main_l82_7[0] ∈ {21} or UNINITIALIZED
-<                      [1] ∈ {24} or UNINITIALIZED
-<                      [2] ∈ {27} or UNINITIALIZED
----
->   __malloc_main_l82_7[0] ∈ {14} or UNINITIALIZED
->                      [1] ∈ {17} or UNINITIALIZED
-792a910,930
->   __malloc_main_l82_31[0] ∈ {21} or UNINITIALIZED
->                       [1] ∈ {24} or UNINITIALIZED
->                       [2] ∈ {27} or UNINITIALIZED
->   __malloc_main_l82_32[0] ∈ {21} or UNINITIALIZED
->                       [1] ∈ {24} or UNINITIALIZED
->                       [2] ∈ {27} or UNINITIALIZED
->   __malloc_main_l82_33[0] ∈ {21} or UNINITIALIZED
->                       [1] ∈ {24} or UNINITIALIZED
->                       [2] ∈ {27} or UNINITIALIZED
->   __malloc_main_l82_34[0] ∈ {21} or UNINITIALIZED
->                       [1] ∈ {24} or UNINITIALIZED
->                       [2] ∈ {27} or UNINITIALIZED
->   __malloc_main_l82_35[0] ∈ {21} or UNINITIALIZED
->                       [1] ∈ {24} or UNINITIALIZED
->                       [2] ∈ {27} or UNINITIALIZED
->   __malloc_main_l82_36[0] ∈ {21} or UNINITIALIZED
->                       [1] ∈ {24} or UNINITIALIZED
->                       [2] ∈ {27} or UNINITIALIZED
->   __malloc_main_l82_37[0] ∈ {21} or UNINITIALIZED
->                       [1] ∈ {24} or UNINITIALIZED
->                       [2] ∈ {27} or UNINITIALIZED
-836c974
-<   __malloc_main_l82_7[0..2] FROM __fc_heap_status; nondet (and SELF)
----
->   __malloc_main_l82_7[0..1] FROM __fc_heap_status; nondet (and SELF)
-859a998,1004
->   __malloc_main_l82_31[0..2] FROM __fc_heap_status; nondet (and SELF)
->   __malloc_main_l82_32[0..2] FROM __fc_heap_status; nondet (and SELF)
->   __malloc_main_l82_33[0..2] FROM __fc_heap_status; nondet (and SELF)
->   __malloc_main_l82_34[0..2] FROM __fc_heap_status; nondet (and SELF)
->   __malloc_main_l82_35[0..2] FROM __fc_heap_status; nondet (and SELF)
->   __malloc_main_l82_36[0..2] FROM __fc_heap_status; nondet (and SELF)
->   __malloc_main_l82_37[0..2] FROM __fc_heap_status; nondet (and SELF)
-883c1028
-<     __malloc_main_l82_6[0..1]; __malloc_main_l82_7[0..2];
----
->     __malloc_main_l82_6[0..1]; __malloc_main_l82_7[0..1];
-895,896c1040,1045
-<     __malloc_main_l82_30[0..2]; __malloc_main_l97[0]; __malloc_main_l114[0..3];
-<     __malloc_main_l127; __malloc_main_l127_0[0..1]; __malloc_main_l127_1[0..2];
----
->     __malloc_main_l82_30[0..2]; __malloc_main_l82_31[0..2];
->     __malloc_main_l82_32[0..2]; __malloc_main_l82_33[0..2];
->     __malloc_main_l82_34[0..2]; __malloc_main_l82_35[0..2];
->     __malloc_main_l82_36[0..2]; __malloc_main_l82_37[0..2];
->     __malloc_main_l97[0]; __malloc_main_l114[0..3]; __malloc_main_l127;
->     __malloc_main_l127_0[0..1]; __malloc_main_l127_1[0..2];
diff --git a/tests/builtins/oracle_equalities/imprecise.res.oracle b/tests/builtins/oracle_equalities/imprecise.res.oracle
deleted file mode 100644
index 1671979a21da9093f750711b69ddf89ae1266418..0000000000000000000000000000000000000000
--- a/tests/builtins/oracle_equalities/imprecise.res.oracle
+++ /dev/null
@@ -1,14 +0,0 @@
-99a100,101
-> [kernel] imprecise.c:51: 
->   imprecise size for variable v3 (abstract type 'struct u')
-220a223,224
-> [kernel] imprecise.c:111: 
->   more than 200(300) elements to enumerate. Approximating.
-229,232d232
-< [eva:alarm] imprecise.c:116: Warning: assertion got status unknown.
-< [eva] Recording results for many_writes
-< [kernel] imprecise.c:111: 
-<   more than 200(300) elements to enumerate. Approximating.
-234a235,236
-> [eva:alarm] imprecise.c:116: Warning: assertion got status unknown.
-> [eva] Recording results for many_writes
diff --git a/tests/builtins/oracle_equalities/linked_list.1.res.oracle b/tests/builtins/oracle_equalities/linked_list.1.res.oracle
deleted file mode 100644
index 86101f25dec3a00a48f14d1dac51c9930cdf9f7c..0000000000000000000000000000000000000000
--- a/tests/builtins/oracle_equalities/linked_list.1.res.oracle
+++ /dev/null
@@ -1,23 +0,0 @@
-477a478,479
-> [kernel] linked_list.c:19: 
->   more than 100(127) elements to enumerate. Approximating.
-530a533,534
-> [kernel] linked_list.c:43: 
->   more than 100(127) elements to enumerate. Approximating.
-532a537,538
-> [kernel] linked_list.c:44: 
->   more than 100(127) elements to enumerate. Approximating.
-658a665,666
-> [kernel] linked_list.c:19: 
->   more than 100(128) elements to enumerate. Approximating.
-702a711,712
-> [kernel] linked_list.c:43: 
->   more than 100(128) elements to enumerate. Approximating.
-704a715,716
-> [kernel] linked_list.c:44: 
->   more than 100(128) elements to enumerate. Approximating.
-799,802d810
-< [kernel] linked_list.c:43: 
-<   more than 100(128) elements to enumerate. Approximating.
-< [kernel] linked_list.c:44: 
-<   more than 100(128) elements to enumerate. Approximating.
diff --git a/tests/builtins/oracle_equalities/malloc-optimistic.res.oracle b/tests/builtins/oracle_equalities/malloc-optimistic.res.oracle
deleted file mode 100644
index e2b025a8698a2d0152d7d8b490bffd1e6631af14..0000000000000000000000000000000000000000
--- a/tests/builtins/oracle_equalities/malloc-optimistic.res.oracle
+++ /dev/null
@@ -1,249 +0,0 @@
-495,496d494
-< [eva:alarm] malloc-optimistic.c:79: Warning: 
-<   accessing uninitialized left-value. assert \initialized(p + i);
-504c502
-<   k ∈ {-2; -1}
----
->   k ∈ {-1}
-539c537
-<   k ∈ {-1; 0}
----
->   k ∈ {0}
-576c574
-<   k ∈ {0; 1}
----
->   k ∈ {1}
-615c613
-<   k ∈ {1; 2}
----
->   k ∈ {2}
-656c654
-<   k ∈ {2; 3}
----
->   k ∈ {3}
-699c697
-<   k ∈ {3; 4}
----
->   k ∈ {4}
-744c742
-<   k ∈ {4; 5}
----
->   k ∈ {5}
-791c789
-<   k ∈ {5; 6}
----
->   k ∈ {6}
-840c838
-<   k ∈ {6; 7}
----
->   k ∈ {7}
-1757,1758d1754
-< [eva:alarm] malloc-optimistic.c:92: Warning: 
-<   accessing uninitialized left-value. assert \initialized(p + i);
-1944,1945d1939
-< [eva:alarm] malloc-optimistic.c:105: Warning: 
-<   accessing uninitialized left-value. assert \initialized(p + i);
-1953c1947
-<   k ∈ {-2; -1}
----
->   k ∈ {-1}
-2011c2005
-<   k ∈ {-1; 0}
----
->   k ∈ {0}
-2071c2065
-<   k ∈ {0; 1}
----
->   k ∈ {1}
-2133c2127
-<   k ∈ {1; 2}
----
->   k ∈ {2}
-2197c2191
-<   k ∈ {2; 3}
----
->   k ∈ {3}
-2263c2257
-<   k ∈ {3; 4}
----
->   k ∈ {4}
-2331c2325
-<   k ∈ {4; 5}
----
->   k ∈ {5}
-2401c2395
-<   k ∈ {5; 6}
----
->   k ∈ {6}
-2473c2467
-<   k ∈ {6; 7}
----
->   k ∈ {7}
-2547c2541
-<   k ∈ {7; 8}
----
->   k ∈ {8}
-2623c2617
-<   k ∈ {8; 9}
----
->   k ∈ {9}
-2701c2695
-<   k ∈ {9; 10}
----
->   k ∈ {10}
-2781c2775
-<   k ∈ {10; 11}
----
->   k ∈ {11}
-2863c2857
-<   k ∈ {11; 12}
----
->   k ∈ {12}
-2944c2938
-<   k ∈ {12; 13}
----
->   k ∈ {13}
-2990c2984
-<   k ∈ {12; 13; 14}
----
->   k ∈ {13; 14}
-3035c3029
-<   k ∈ {12; 13; 14; 15}
----
->   k ∈ {13; 14; 15}
-3080c3074
-<   k ∈ [12..97]
----
->   k ∈ [13..97]
-3136c3130
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: {-20; 1}
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {1}
-3144c3138
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: {-20; 1; 2}
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {2}
-3152c3146
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: {-20; 1; 2; 3}
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {3}
-3160c3154
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: {-20; 1; 2; 3; 4}
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {4}
-3168c3162
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: {-20; 1; 2; 3; 4; 5}
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {5}
-3176c3170
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: {-20; 1; 2; 3; 4; 5; 6}
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {6}
-3184c3178
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: {-20; 1; 2; 3; 4; 5; 6; 7}
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {7}
-3192c3186
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..8]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {8}
-3200c3194
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..9]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {9}
-3208c3202
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..10]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {10}
-3216c3210
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..11]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {11}
-3224c3218
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..12]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {12}
-3232c3226
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..13]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {13}
-3240c3234
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..14]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {14}
-3248c3242
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..15]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {15}
-3256c3250
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..16]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {16}
-3264c3258
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..17]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {17}
-3272c3266
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..18]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {18}
-3280c3274
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..19]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {19}
-3288c3282
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..20]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {20}
-3296c3290
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..21]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {21}
-3304c3298
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..22]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {22}
-3312c3306
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..23]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {23}
-3320c3314
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..24]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {24}
-3328c3322
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..25]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {25}
-3336c3330
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..26]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {26}
-3344c3338
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..27]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {27}
-3352c3346
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..28]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {28}
-3360c3354
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..29]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {29}
-3368c3362
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..30]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {30}
-3377c3371
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..31]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {30; 31}
-3385c3379
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..32]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: {30; 31; 32}
-3393c3387
-< [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..99]
----
-> [eva] malloc-optimistic.c:122: Frama_C_show_each: [30..99]
diff --git a/tests/builtins/oracle_equalities/write-const.res.oracle b/tests/builtins/oracle_equalities/write-const.res.oracle
deleted file mode 100644
index bb9121f7eafe722a4a7ceb59a1ebd71bc45c5ac4..0000000000000000000000000000000000000000
--- a/tests/builtins/oracle_equalities/write-const.res.oracle
+++ /dev/null
@@ -1,8 +0,0 @@
-83c83
-<   tmp ∈ {{ &a ; &b }}
----
->   tmp ∈ {{ &b }}
-105c105
-<   tmp ∈ {{ &a ; &b }}
----
->   tmp ∈ {{ &b }}
diff --git a/tests/builtins/oracle_gauges/realloc.res.oracle b/tests/builtins/oracle_gauges/realloc.res.oracle
index 0739856c02a2ea5919c9db4867ca30cf10e5b23f..069f27f2969eb952d52bc91776532e1161094d10 100644
--- a/tests/builtins/oracle_gauges/realloc.res.oracle
+++ b/tests/builtins/oracle_gauges/realloc.res.oracle
@@ -1,123 +1,9 @@
-<<<<<<<< HEAD:tests/builtins/oracle_gauges/realloc.res.oracle
 627a628,964
 > [eva] realloc.c:152: Call to builtin realloc
-|||||||| 754e522ceb:tests/builtins/diff_gauges
-diff tests/builtins/oracle/linked_list.0.res.oracle tests/builtins/oracle_gauges/linked_list.0.res.oracle
-1122a1123,1128
-> [eva] computing for function printf_va_1 <- main.
->   Called from tests/builtins/linked_list.c:51.
-> [eva] Done for function printf_va_1
-> [eva] computing for function printf_va_1 <- main.
->   Called from tests/builtins/linked_list.c:51.
-> [eva] Done for function printf_va_1
-diff tests/builtins/oracle/linked_list.1.res.oracle tests/builtins/oracle_gauges/linked_list.1.res.oracle
-626a627,632
-> [eva] computing for function printf_va_1 <- main.
->   Called from tests/builtins/linked_list.c:51.
-> [eva] Done for function printf_va_1
-> [eva] computing for function printf_va_1 <- main.
->   Called from tests/builtins/linked_list.c:51.
-> [eva] Done for function printf_va_1
-diff tests/builtins/oracle/malloc-size-zero.1.res.oracle tests/builtins/oracle_gauges/malloc-size-zero.1.res.oracle
-31a32,41
-> [eva] computing for function my_calloc <- main.
->   Called from tests/builtins/malloc-size-zero.c:29.
-> [eva] tests/builtins/malloc-size-zero.c:10: Call to builtin malloc
-> [eva] Recording results for my_calloc
-> [eva] Done for function my_calloc
-> [eva] computing for function my_calloc <- main.
->   Called from tests/builtins/malloc-size-zero.c:29.
-> [eva] tests/builtins/malloc-size-zero.c:10: Call to builtin malloc
-> [eva] Recording results for my_calloc
-> [eva] Done for function my_calloc
-diff tests/builtins/oracle/memcpy.res.oracle tests/builtins/oracle_gauges/memcpy.res.oracle
-176a177,178
-> [eva] tests/builtins/memcpy.c:96: Call to builtin memcpy
-> [eva] tests/builtins/memcpy.c:96: Call to builtin memcpy
-457a460
-> [eva] tests/builtins/memcpy.c:230: starting to merge loop iterations
-diff tests/builtins/oracle/realloc.res.oracle tests/builtins/oracle_gauges/realloc.res.oracle
-677a678,1026
-> [eva] tests/builtins/realloc.c:152: Call to builtin realloc
-========
-<<<<<<< HEAD
-diff oracle/Longinit_sequencer.res.oracle oracle_gauges/Longinit_sequencer.res.oracle
-320c320
-<   result/Longinit_sequencer.sav
----
->   result_gauges/Longinit_sequencer.sav
-556c556
-<   result/Longinit_sequencer.sav
----
->   result_gauges/Longinit_sequencer.sav
-diff oracle/linked_list.0.res.oracle oracle_gauges/linked_list.0.res.oracle
-||||||| ac7807782d
-diff tests/builtins/oracle/Longinit_sequencer.res.oracle tests/builtins/oracle_gauges/Longinit_sequencer.res.oracle
-320c320
-<   tests/builtins/result/Longinit_sequencer.sav
----
->   tests/builtins/result_gauges/Longinit_sequencer.sav
-556c556
-<   tests/builtins/result/Longinit_sequencer.sav
----
->   tests/builtins/result_gauges/Longinit_sequencer.sav
-diff tests/builtins/oracle/linked_list.0.res.oracle tests/builtins/oracle_gauges/linked_list.0.res.oracle
-=======
-diff tests/builtins/oracle/linked_list.0.res.oracle tests/builtins/oracle_gauges/linked_list.0.res.oracle
->>>>>>> origin/master
-1122a1123,1128
-> [eva] computing for function printf_va_1 <- main.
->   Called from linked_list.c:51.
-> [eva] Done for function printf_va_1
-> [eva] computing for function printf_va_1 <- main.
->   Called from linked_list.c:51.
-> [eva] Done for function printf_va_1
-diff oracle/linked_list.1.res.oracle oracle_gauges/linked_list.1.res.oracle
-626a627,632
-> [eva] computing for function printf_va_1 <- main.
->   Called from linked_list.c:51.
-> [eva] Done for function printf_va_1
-> [eva] computing for function printf_va_1 <- main.
->   Called from linked_list.c:51.
-> [eva] Done for function printf_va_1
-diff oracle/malloc-size-zero.1.res.oracle oracle_gauges/malloc-size-zero.1.res.oracle
-31a32,41
-> [eva] computing for function my_calloc <- main.
->   Called from malloc-size-zero.c:29.
-> [eva] malloc-size-zero.c:10: Call to builtin malloc
-> [eva] Recording results for my_calloc
-> [eva] Done for function my_calloc
-> [eva] computing for function my_calloc <- main.
->   Called from malloc-size-zero.c:29.
-> [eva] malloc-size-zero.c:10: Call to builtin malloc
-> [eva] Recording results for my_calloc
-> [eva] Done for function my_calloc
-diff oracle/memcpy.res.oracle oracle_gauges/memcpy.res.oracle
-176a177,178
-> [eva] memcpy.c:96: Call to builtin memcpy
-> [eva] memcpy.c:96: Call to builtin memcpy
-457a460
-> [eva] memcpy.c:230: starting to merge loop iterations
-diff oracle/realloc.res.oracle oracle_gauges/realloc.res.oracle
-677a678,1026
-> [eva] realloc.c:152: Call to builtin realloc
->>>>>>>> origin/master:tests/builtins/diff_gauges
 > [eva:malloc] bases_to_realloc: {__realloc_w_main10_l152}
-<<<<<<<< HEAD:tests/builtins/oracle_gauges/realloc.res.oracle
 > [eva:malloc] realloc.c:152: weak free on bases: {__realloc_w_main10_l152}
 > [eva] realloc.c:154: Frama_C_show_each_main10: {4}
 > [eva] realloc.c:155: 
-|||||||| 754e522ceb:tests/builtins/diff_gauges
-> [eva:malloc] tests/builtins/realloc.c:152: 
->   weak free on bases: {__realloc_w_main10_l152}
-> [eva] tests/builtins/realloc.c:154: Frama_C_show_each_main10: {4}
-> [eva] tests/builtins/realloc.c:155: 
-========
-> [eva:malloc] realloc.c:152: 
->   weak free on bases: {__realloc_w_main10_l152}
-> [eva] realloc.c:154: Frama_C_show_each_main10: {4}
-> [eva] realloc.c:155: 
->>>>>>>> origin/master:tests/builtins/diff_gauges
 >   Frama_C_dump_each:
 >   # cvalue:
 >   __fc_heap_status ∈ [--..--]
@@ -143,21 +29,9 @@ diff oracle/realloc.res.oracle oracle_gauges/realloc.res.oracle
 >   ==END OF DUMP==
 > [eva] realloc.c:152: Call to builtin realloc
 > [eva:malloc] bases_to_realloc: {__realloc_w_main10_l152}
-<<<<<<<< HEAD:tests/builtins/oracle_gauges/realloc.res.oracle
 > [eva:malloc] realloc.c:152: weak free on bases: {__realloc_w_main10_l152}
 > [eva] realloc.c:154: Frama_C_show_each_main10: {4}
 > [eva] realloc.c:155: 
-|||||||| 754e522ceb:tests/builtins/diff_gauges
-> [eva:malloc] tests/builtins/realloc.c:152: 
->   weak free on bases: {__realloc_w_main10_l152}
-> [eva] tests/builtins/realloc.c:154: Frama_C_show_each_main10: {4}
-> [eva] tests/builtins/realloc.c:155: 
-========
-> [eva:malloc] realloc.c:152: 
->   weak free on bases: {__realloc_w_main10_l152}
-> [eva] realloc.c:154: Frama_C_show_each_main10: {4}
-> [eva] realloc.c:155: 
->>>>>>>> origin/master:tests/builtins/diff_gauges
 >   Frama_C_dump_each:
 >   # cvalue:
 >   __fc_heap_status ∈ [--..--]
@@ -183,21 +57,9 @@ diff oracle/realloc.res.oracle oracle_gauges/realloc.res.oracle
 >   ==END OF DUMP==
 > [eva] realloc.c:152: Call to builtin realloc
 > [eva:malloc] bases_to_realloc: {__realloc_w_main10_l152}
-<<<<<<<< HEAD:tests/builtins/oracle_gauges/realloc.res.oracle
 > [eva:malloc] realloc.c:152: weak free on bases: {__realloc_w_main10_l152}
 > [eva] realloc.c:154: Frama_C_show_each_main10: {4}
 > [eva] realloc.c:155: 
-|||||||| 754e522ceb:tests/builtins/diff_gauges
-> [eva:malloc] tests/builtins/realloc.c:152: 
->   weak free on bases: {__realloc_w_main10_l152}
-> [eva] tests/builtins/realloc.c:154: Frama_C_show_each_main10: {4}
-> [eva] tests/builtins/realloc.c:155: 
-========
-> [eva:malloc] realloc.c:152: 
->   weak free on bases: {__realloc_w_main10_l152}
-> [eva] realloc.c:154: Frama_C_show_each_main10: {4}
-> [eva] realloc.c:155: 
->>>>>>>> origin/master:tests/builtins/diff_gauges
 >   Frama_C_dump_each:
 >   # cvalue:
 >   __fc_heap_status ∈ [--..--]
@@ -223,21 +85,9 @@ diff oracle/realloc.res.oracle oracle_gauges/realloc.res.oracle
 >   ==END OF DUMP==
 > [eva] realloc.c:152: Call to builtin realloc
 > [eva:malloc] bases_to_realloc: {__realloc_w_main10_l152}
-<<<<<<<< HEAD:tests/builtins/oracle_gauges/realloc.res.oracle
 > [eva:malloc] realloc.c:152: weak free on bases: {__realloc_w_main10_l152}
 > [eva] realloc.c:154: Frama_C_show_each_main10: {4}
 > [eva] realloc.c:155: 
-|||||||| 754e522ceb:tests/builtins/diff_gauges
-> [eva:malloc] tests/builtins/realloc.c:152: 
->   weak free on bases: {__realloc_w_main10_l152}
-> [eva] tests/builtins/realloc.c:154: Frama_C_show_each_main10: {4}
-> [eva] tests/builtins/realloc.c:155: 
-========
-> [eva:malloc] realloc.c:152: 
->   weak free on bases: {__realloc_w_main10_l152}
-> [eva] realloc.c:154: Frama_C_show_each_main10: {4}
-> [eva] realloc.c:155: 
->>>>>>>> origin/master:tests/builtins/diff_gauges
 >   Frama_C_dump_each:
 >   # cvalue:
 >   __fc_heap_status ∈ [--..--]
@@ -263,21 +113,9 @@ diff oracle/realloc.res.oracle oracle_gauges/realloc.res.oracle
 >   ==END OF DUMP==
 > [eva] realloc.c:152: Call to builtin realloc
 > [eva:malloc] bases_to_realloc: {__realloc_w_main10_l152}
-<<<<<<<< HEAD:tests/builtins/oracle_gauges/realloc.res.oracle
 > [eva:malloc] realloc.c:152: weak free on bases: {__realloc_w_main10_l152}
 > [eva] realloc.c:154: Frama_C_show_each_main10: {4}
 > [eva] realloc.c:155: 
-|||||||| 754e522ceb:tests/builtins/diff_gauges
-> [eva:malloc] tests/builtins/realloc.c:152: 
->   weak free on bases: {__realloc_w_main10_l152}
-> [eva] tests/builtins/realloc.c:154: Frama_C_show_each_main10: {4}
-> [eva] tests/builtins/realloc.c:155: 
-========
-> [eva:malloc] realloc.c:152: 
->   weak free on bases: {__realloc_w_main10_l152}
-> [eva] realloc.c:154: Frama_C_show_each_main10: {4}
-> [eva] realloc.c:155: 
->>>>>>>> origin/master:tests/builtins/diff_gauges
 >   Frama_C_dump_each:
 >   # cvalue:
 >   __fc_heap_status ∈ [--..--]
@@ -303,21 +141,9 @@ diff oracle/realloc.res.oracle oracle_gauges/realloc.res.oracle
 >   ==END OF DUMP==
 > [eva] realloc.c:152: Call to builtin realloc
 > [eva:malloc] bases_to_realloc: {__realloc_w_main10_l152}
-<<<<<<<< HEAD:tests/builtins/oracle_gauges/realloc.res.oracle
 > [eva:malloc] realloc.c:152: weak free on bases: {__realloc_w_main10_l152}
 > [eva] realloc.c:154: Frama_C_show_each_main10: {4}
 > [eva] realloc.c:155: 
-|||||||| 754e522ceb:tests/builtins/diff_gauges
-> [eva:malloc] tests/builtins/realloc.c:152: 
->   weak free on bases: {__realloc_w_main10_l152}
-> [eva] tests/builtins/realloc.c:154: Frama_C_show_each_main10: {4}
-> [eva] tests/builtins/realloc.c:155: 
-========
-> [eva:malloc] realloc.c:152: 
->   weak free on bases: {__realloc_w_main10_l152}
-> [eva] realloc.c:154: Frama_C_show_each_main10: {4}
-> [eva] realloc.c:155: 
->>>>>>>> origin/master:tests/builtins/diff_gauges
 >   Frama_C_dump_each:
 >   # cvalue:
 >   __fc_heap_status ∈ [--..--]
@@ -343,21 +169,9 @@ diff oracle/realloc.res.oracle oracle_gauges/realloc.res.oracle
 >   ==END OF DUMP==
 > [eva] realloc.c:152: Call to builtin realloc
 > [eva:malloc] bases_to_realloc: {__realloc_w_main10_l152}
-<<<<<<<< HEAD:tests/builtins/oracle_gauges/realloc.res.oracle
 > [eva:malloc] realloc.c:152: weak free on bases: {__realloc_w_main10_l152}
 > [eva] realloc.c:154: Frama_C_show_each_main10: {4}
 > [eva] realloc.c:155: 
-|||||||| 754e522ceb:tests/builtins/diff_gauges
-> [eva:malloc] tests/builtins/realloc.c:152: 
->   weak free on bases: {__realloc_w_main10_l152}
-> [eva] tests/builtins/realloc.c:154: Frama_C_show_each_main10: {4}
-> [eva] tests/builtins/realloc.c:155: 
-========
-> [eva:malloc] realloc.c:152: 
->   weak free on bases: {__realloc_w_main10_l152}
-> [eva] realloc.c:154: Frama_C_show_each_main10: {4}
-> [eva] realloc.c:155: 
->>>>>>>> origin/master:tests/builtins/diff_gauges
 >   Frama_C_dump_each:
 >   # cvalue:
 >   __fc_heap_status ∈ [--..--]
@@ -383,21 +197,9 @@ diff oracle/realloc.res.oracle oracle_gauges/realloc.res.oracle
 >   ==END OF DUMP==
 > [eva] realloc.c:152: Call to builtin realloc
 > [eva:malloc] bases_to_realloc: {__realloc_w_main10_l152}
-<<<<<<<< HEAD:tests/builtins/oracle_gauges/realloc.res.oracle
 > [eva:malloc] realloc.c:152: weak free on bases: {__realloc_w_main10_l152}
 > [eva] realloc.c:154: Frama_C_show_each_main10: {4}
 > [eva] realloc.c:155: 
-|||||||| 754e522ceb:tests/builtins/diff_gauges
-> [eva:malloc] tests/builtins/realloc.c:152: 
->   weak free on bases: {__realloc_w_main10_l152}
-> [eva] tests/builtins/realloc.c:154: Frama_C_show_each_main10: {4}
-> [eva] tests/builtins/realloc.c:155: 
-========
-> [eva:malloc] realloc.c:152: 
->   weak free on bases: {__realloc_w_main10_l152}
-> [eva] realloc.c:154: Frama_C_show_each_main10: {4}
-> [eva] realloc.c:155: 
->>>>>>>> origin/master:tests/builtins/diff_gauges
 >   Frama_C_dump_each:
 >   # cvalue:
 >   __fc_heap_status ∈ [--..--]
@@ -423,21 +225,9 @@ diff oracle/realloc.res.oracle oracle_gauges/realloc.res.oracle
 >   ==END OF DUMP==
 > [eva] realloc.c:152: Call to builtin realloc
 > [eva:malloc] bases_to_realloc: {__realloc_w_main10_l152}
-<<<<<<<< HEAD:tests/builtins/oracle_gauges/realloc.res.oracle
 > [eva:malloc] realloc.c:152: weak free on bases: {__realloc_w_main10_l152}
 > [eva] realloc.c:154: Frama_C_show_each_main10: {4}
 > [eva] realloc.c:155: 
-|||||||| 754e522ceb:tests/builtins/diff_gauges
-> [eva:malloc] tests/builtins/realloc.c:152: 
->   weak free on bases: {__realloc_w_main10_l152}
-> [eva] tests/builtins/realloc.c:154: Frama_C_show_each_main10: {4}
-> [eva] tests/builtins/realloc.c:155: 
-========
-> [eva:malloc] realloc.c:152: 
->   weak free on bases: {__realloc_w_main10_l152}
-> [eva] realloc.c:154: Frama_C_show_each_main10: {4}
-> [eva] realloc.c:155: 
->>>>>>>> origin/master:tests/builtins/diff_gauges
 >   Frama_C_dump_each:
 >   # cvalue:
 >   __fc_heap_status ∈ [--..--]
@@ -464,21 +254,9 @@ diff oracle/realloc.res.oracle oracle_gauges/realloc.res.oracle
 > [eva] realloc.c:150: starting to merge loop iterations
 > [eva] realloc.c:152: Call to builtin realloc
 > [eva:malloc] bases_to_realloc: {__realloc_w_main10_l152}
-<<<<<<<< HEAD:tests/builtins/oracle_gauges/realloc.res.oracle
 > [eva:malloc] realloc.c:152: weak free on bases: {__realloc_w_main10_l152}
 > [eva] realloc.c:154: Frama_C_show_each_main10: {4}
 > [eva] realloc.c:155: 
-|||||||| 754e522ceb:tests/builtins/diff_gauges
-> [eva:malloc] tests/builtins/realloc.c:152: 
->   weak free on bases: {__realloc_w_main10_l152}
-> [eva] tests/builtins/realloc.c:154: Frama_C_show_each_main10: {4}
-> [eva] tests/builtins/realloc.c:155: 
-========
-> [eva:malloc] realloc.c:152: 
->   weak free on bases: {__realloc_w_main10_l152}
-> [eva] realloc.c:154: Frama_C_show_each_main10: {4}
-> [eva] realloc.c:155: 
->>>>>>>> origin/master:tests/builtins/diff_gauges
 >   Frama_C_dump_each:
 >   # cvalue:
 >   __fc_heap_status ∈ [--..--]
@@ -504,21 +282,9 @@ diff oracle/realloc.res.oracle oracle_gauges/realloc.res.oracle
 >   ==END OF DUMP==
 > [eva] realloc.c:152: Call to builtin realloc
 > [eva:malloc] bases_to_realloc: {__realloc_w_main10_l152}
-<<<<<<<< HEAD:tests/builtins/oracle_gauges/realloc.res.oracle
 > [eva:malloc] realloc.c:152: weak free on bases: {__realloc_w_main10_l152}
 > [eva] realloc.c:154: Frama_C_show_each_main10: {4}
 > [eva] realloc.c:155: 
-|||||||| 754e522ceb:tests/builtins/diff_gauges
-> [eva:malloc] tests/builtins/realloc.c:152: 
->   weak free on bases: {__realloc_w_main10_l152}
-> [eva] tests/builtins/realloc.c:154: Frama_C_show_each_main10: {4}
-> [eva] tests/builtins/realloc.c:155: 
-========
-> [eva:malloc] realloc.c:152: 
->   weak free on bases: {__realloc_w_main10_l152}
-> [eva] realloc.c:154: Frama_C_show_each_main10: {4}
-> [eva] realloc.c:155: 
->>>>>>>> origin/master:tests/builtins/diff_gauges
 >   Frama_C_dump_each:
 >   # cvalue:
 >   __fc_heap_status ∈ [--..--]
@@ -544,21 +310,9 @@ diff oracle/realloc.res.oracle oracle_gauges/realloc.res.oracle
 >   ==END OF DUMP==
 > [eva] realloc.c:152: Call to builtin realloc
 > [eva:malloc] bases_to_realloc: {__realloc_w_main10_l152}
-<<<<<<<< HEAD:tests/builtins/oracle_gauges/realloc.res.oracle
 > [eva:malloc] realloc.c:152: weak free on bases: {__realloc_w_main10_l152}
 > [eva] realloc.c:154: Frama_C_show_each_main10: {4}
 > [eva] realloc.c:155: 
-|||||||| 754e522ceb:tests/builtins/diff_gauges
-> [eva:malloc] tests/builtins/realloc.c:152: 
->   weak free on bases: {__realloc_w_main10_l152}
-> [eva] tests/builtins/realloc.c:154: Frama_C_show_each_main10: {4}
-> [eva] tests/builtins/realloc.c:155: 
-========
-> [eva:malloc] realloc.c:152: 
->   weak free on bases: {__realloc_w_main10_l152}
-> [eva] realloc.c:154: Frama_C_show_each_main10: {4}
-> [eva] realloc.c:155: 
->>>>>>>> origin/master:tests/builtins/diff_gauges
 >   Frama_C_dump_each:
 >   # cvalue:
 >   __fc_heap_status ∈ [--..--]
diff --git a/tests/cil/Change_formals.ml b/tests/cil/Change_formals.ml
index b3d74892a22f649625c5754913a78c594e63deb9..3ed509cbbe9a90d0a789d62f77eacd24e0df3140 100644
--- a/tests/cil/Change_formals.ml
+++ b/tests/cil/Change_formals.ml
@@ -92,6 +92,6 @@ let () = Db.Main.extend main
 
 (*
 Local Variables:
-compile-command: "make -C ../.. Change_formals.cmo"
+compile-command: "make -C ../.. tests/misc/Change_formals.cmo"
 End:
 *)
diff --git a/tests/cil/bts892.i b/tests/cil/bts892.i
index 493733c896a6f8f29ed439bfb4f2ee7f286f150a..a4a656fc9af4cb1e935ddf18a0d208f5f0520534 100644
--- a/tests/cil/bts892.i
+++ b/tests/cil/bts892.i
@@ -6,8 +6,10 @@
 
 int tab[16];
 
-void* main(void){
+void* main(void)
+{
   int i;
+
   static const int* t[] = {
     &tab[1],
     &tab[3],
diff --git a/tests/cil/test_config b/tests/cil/test_config
index 10fe0f1baf22285230dbed5e40589798a95c78c7..1c55c7641562e385f36fc0b618e7b9636e517854 100644
--- a/tests/cil/test_config
+++ b/tests/cil/test_config
@@ -1,8 +1 @@
-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@)
-COMMENT: can be used into PLUGIN (resp. OPT) directives of specific test files.
-COMMENT: no changes of the @PTEST_DEFAULT_OPTIONS@.
-
-PLUGIN:
-OPT: -print
+OPT:-print
diff --git a/tests/compliance/check-json.i b/tests/compliance/check-json.i
index 99a889344abf1496eaf7701a4e17589f3d3611cf..b4c5e6c33fc7f804398a3320873a02c67a4440cc 100644
--- a/tests/compliance/check-json.i
+++ b/tests/compliance/check-json.i
@@ -5,5 +5,4 @@
   EXECNOW: LOG json_@PTEST_NAME@_2.txt python3 -m json.tool < @SHARE@/glibc_functions.json | head -n 2 > @PTEST_RESULT@/json_@PTEST_NAME@_2.txt 2> @DEV_NULL@
   EXECNOW: LOG json_@PTEST_NAME@_3.txt python3 -m json.tool < @SHARE@/nonstandard_identifiers.json | head -n 2 > @PTEST_RESULT@/json_@PTEST_NAME@_3.txt 2> @DEV_NULL@
   EXECNOW: LOG json_@PTEST_NAME@_4.txt python3 -m json.tool < @SHARE@/posix_identifiers.json | head -n 2 > @PTEST_RESULT@/json_@PTEST_NAME@_4.txt 2> @DEV_NULL@
-  EXECNOW: LOG json_@PTEST_NAME@_5.txt python3 @PTEST_DIR@/sanity-checks.py @SHARE@ > @PTEST_RESULT@/json_@PTEST_NAME@_5.txt 2> @DEV_NULL@
 */
diff --git a/tests/constant_propagation/oracle/const_propagate.0.res.oracle b/tests/constant_propagation/oracle/const_propagate.0.res.oracle
index 72a698cc3999064713e38b479d33ae68636600ae..db357d9854128a8478c40bb11cd1c3c131b85360 100644
--- a/tests/constant_propagation/oracle/const_propagate.0.res.oracle
+++ b/tests/constant_propagation/oracle/const_propagate.0.res.oracle
@@ -128,107 +128,6 @@
   p ∈ {{ &x }}
   q ∈ {{ &x ; &y }}
   yy ∈ {7}
-[from] Computing for function add3
-[from] Done for function add3
-[from] Computing for function init
-[from] Done for function init
-[from] Computing for function test_float_double
-[from] Done for function test_float_double
-[from] Computing for function test_ptr
-[from] Done for function test_ptr
-[from] Computing for function test_struct
-[from] Done for function test_struct
-[from] Computing for function test_struct_ptr
-[from] Done for function test_struct_ptr
-[from] Computing for function test_tab
-[from] Done for function test_tab
-[from] Computing for function test_ull
-[from] Done for function test_ull
-[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 add3:
-  \result FROM v1; v2; v3
-[from] Function init:
-  x FROM v
-  y FROM \nothing
-  z FROM v
-  \result FROM \nothing
-[from] Function test_float_double:
-  f1 FROM f0
-  f2 FROM f0
-  f3 FROM f0
-  d1 FROM d0
-  d2 FROM d0
-  d3 FROM d0
-[from] Function test_ptr:
-  x FROM v
-  \result FROM \nothing
-[from] Function test_struct:
-  s1 FROM \nothing
-  s2 FROM \nothing
-[from] Function test_struct_ptr:
-  \result FROM \nothing
-[from] Function test_tab:
-  TAB[1] FROM TAB[2]; s1.b; s2.b
-     [4..5] FROM v
-  s2.b FROM s2.b
-[from] Function test_ull:
-  ull FROM ull
-[from] Function main:
-  x FROM \nothing
-  y FROM \nothing
-  z FROM a
-  TAB[1] FROM TAB[2]
-     [4..5] FROM \nothing
-  s1 FROM \nothing
-  s2 FROM \nothing
-  ull FROM ull
-  f1 FROM f0
-  f2 FROM f0
-  f3 FROM f0
-  d1 FROM d0
-  d2 FROM d0
-  d3 FROM d0
-[from] ====== END OF DEPENDENCIES ======
-[inout] Out (internal) for function add3:
-    __retres
-[inout] Inputs for function add3:
-    \nothing
-[inout] Out (internal) for function init:
-    x; y; z; zero; sept; z1
-[inout] Inputs for function init:
-    x; y; z
-[inout] Out (internal) for function test_float_double:
-    f1; f2; f3; d1; d2; d3
-[inout] Inputs for function test_float_double:
-    f0; f1; f2; d0; d1; d2
-[inout] Out (internal) for function test_ptr:
-    x; p; s; decal; __retres
-[inout] Inputs for function test_ptr:
-    \nothing
-[inout] Out (internal) for function test_struct:
-    s1; s2; s
-[inout] Inputs for function test_struct:
-    s1.a
-[inout] Out (internal) for function test_struct_ptr:
-    q; __retres
-[inout] Inputs for function test_struct_ptr:
-    \nothing
-[inout] Out (internal) for function test_tab:
-    TAB{[1]; [4..5]}; s2.b; r; q; decal
-[inout] Inputs for function test_tab:
-    TAB[2]; s1.b; s2.b
-[inout] Out (internal) for function test_ull:
-    ull
-[inout] Inputs for function test_ull:
-    ull
-[inout] Out (internal) for function main:
-    x; y; z; TAB{[1]; [4..5]}; s1; s2; ull; f1; f2; f3; d1; d2; d3; b; 
-    p; q; tmp_1; yy
-[inout] Inputs for function main:
-    x; y; z; TAB[2]; s1; s2.b; ull; f0; f1; f2; d0; d1; d2
 [scf] beginning constant propagation
 /* Generated by Frama-C */
 struct st {
@@ -358,3 +257,104 @@ void main(int a)
 
 
 [scf] constant propagation done
+[from] Computing for function add3
+[from] Done for function add3
+[from] Computing for function init
+[from] Done for function init
+[from] Computing for function test_float_double
+[from] Done for function test_float_double
+[from] Computing for function test_ptr
+[from] Done for function test_ptr
+[from] Computing for function test_struct
+[from] Done for function test_struct
+[from] Computing for function test_struct_ptr
+[from] Done for function test_struct_ptr
+[from] Computing for function test_tab
+[from] Done for function test_tab
+[from] Computing for function test_ull
+[from] Done for function test_ull
+[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 add3:
+  \result FROM v1; v2; v3
+[from] Function init:
+  x FROM v
+  y FROM \nothing
+  z FROM v
+  \result FROM \nothing
+[from] Function test_float_double:
+  f1 FROM f0
+  f2 FROM f0
+  f3 FROM f0
+  d1 FROM d0
+  d2 FROM d0
+  d3 FROM d0
+[from] Function test_ptr:
+  x FROM v
+  \result FROM \nothing
+[from] Function test_struct:
+  s1 FROM \nothing
+  s2 FROM \nothing
+[from] Function test_struct_ptr:
+  \result FROM \nothing
+[from] Function test_tab:
+  TAB[1] FROM TAB[2]; s1.b; s2.b
+     [4..5] FROM v
+  s2.b FROM s2.b
+[from] Function test_ull:
+  ull FROM ull
+[from] Function main:
+  x FROM \nothing
+  y FROM \nothing
+  z FROM a
+  TAB[1] FROM TAB[2]
+     [4..5] FROM \nothing
+  s1 FROM \nothing
+  s2 FROM \nothing
+  ull FROM ull
+  f1 FROM f0
+  f2 FROM f0
+  f3 FROM f0
+  d1 FROM d0
+  d2 FROM d0
+  d3 FROM d0
+[from] ====== END OF DEPENDENCIES ======
+[inout] Out (internal) for function add3:
+    __retres
+[inout] Inputs for function add3:
+    \nothing
+[inout] Out (internal) for function init:
+    x; y; z; zero; sept; z1
+[inout] Inputs for function init:
+    x; y; z
+[inout] Out (internal) for function test_float_double:
+    f1; f2; f3; d1; d2; d3
+[inout] Inputs for function test_float_double:
+    f0; f1; f2; d0; d1; d2
+[inout] Out (internal) for function test_ptr:
+    x; p; s; decal; __retres
+[inout] Inputs for function test_ptr:
+    \nothing
+[inout] Out (internal) for function test_struct:
+    s1; s2; s
+[inout] Inputs for function test_struct:
+    s1.a
+[inout] Out (internal) for function test_struct_ptr:
+    q; __retres
+[inout] Inputs for function test_struct_ptr:
+    \nothing
+[inout] Out (internal) for function test_tab:
+    TAB{[1]; [4..5]}; s2.b; r; q; decal
+[inout] Inputs for function test_tab:
+    TAB[2]; s1.b; s2.b
+[inout] Out (internal) for function test_ull:
+    ull
+[inout] Inputs for function test_ull:
+    ull
+[inout] Out (internal) for function main:
+    x; y; z; TAB{[1]; [4..5]}; s1; s2; ull; f1; f2; f3; d1; d2; d3; b; 
+    p; q; tmp_1; yy
+[inout] Inputs for function main:
+    x; y; z; TAB[2]; s1; s2.b; ull; f0; f1; f2; d0; d1; d2
diff --git a/tests/dynamic/oracle/dynamic.res.oracle b/tests/dynamic/oracle/dynamic.1.res.oracle
similarity index 100%
rename from tests/dynamic/oracle/dynamic.res.oracle
rename to tests/dynamic/oracle/dynamic.1.res.oracle
diff --git a/tests/float/alarms.i b/tests/float/alarms.i
index 64f4fc7965336f23ea777a9ec24034e5aff4aaf3..8d60a075054d3ed035311ea24ecb62b5f24405c9 100644
--- a/tests/float/alarms.i
+++ b/tests/float/alarms.i
@@ -1,7 +1,7 @@
 /* run.config*
-   OPT: -eva @EVA_OPTIONS@ -warn-special-float non-finite
-   OPT: -eva @EVA_OPTIONS@ -warn-special-float nan
-   OPT: -eva @EVA_OPTIONS@ -warn-special-float none
+   OPT: -eva @EVA_CONFIG@ -warn-special-float non-finite
+   OPT: -eva @EVA_CONFIG@ -warn-special-float nan
+   OPT: -eva @EVA_CONFIG@ -warn-special-float none
 */
 
 union { long long l ; float f ; double d ; } u1, u2;
diff --git a/tests/float/builtins.c b/tests/float/builtins.c
index 102f1eff06839adc153e524164b9c1b71d2ab2a2..1b2d53069a31c06abd0b437c3a1b388ed79672e0 100644
--- a/tests/float/builtins.c
+++ b/tests/float/builtins.c
@@ -1,5 +1,5 @@
 /* run.config*
-   OPT: -eva @EVA_OPTIONS@ -then -main main_log_exp
+   OPT: -eva @EVA_CONFIG@ -then -main main_log_exp
 */
 
 #include <__fc_builtin.h>
diff --git a/tests/float/diff_apron b/tests/float/diff_apron
deleted file mode 100644
index dbbc7f7b4c150a7650e9f8db6b769b41f1c8a592..0000000000000000000000000000000000000000
--- a/tests/float/diff_apron
+++ /dev/null
@@ -1,6 +0,0 @@
-Only in oracle: absorb.res.oracle
-Only in oracle: absorb_sav.err
-Only in oracle: absorb_sav.res
-Only in oracle: absorb_sav2.err
-Only in oracle: absorb_sav2.res
-Only in oracle: fval_test.res.oracle
diff --git a/tests/float/diff_bitwise b/tests/float/diff_bitwise
deleted file mode 100644
index dbbc7f7b4c150a7650e9f8db6b769b41f1c8a592..0000000000000000000000000000000000000000
--- a/tests/float/diff_bitwise
+++ /dev/null
@@ -1,6 +0,0 @@
-Only in oracle: absorb.res.oracle
-Only in oracle: absorb_sav.err
-Only in oracle: absorb_sav.res
-Only in oracle: absorb_sav2.err
-Only in oracle: absorb_sav2.res
-Only in oracle: fval_test.res.oracle
diff --git a/tests/float/diff_equalities b/tests/float/diff_equalities
deleted file mode 100644
index 10f3f10ccff82b7a82dffbd688706c79cd4c93ad..0000000000000000000000000000000000000000
--- a/tests/float/diff_equalities
+++ /dev/null
@@ -1,44 +0,0 @@
-Only in oracle: absorb.res.oracle
-Only in oracle: absorb_sav.err
-Only in oracle: absorb_sav.res
-Only in oracle: absorb_sav2.err
-Only in oracle: absorb_sav2.res
-diff oracle/alarms.0.res.oracle oracle_equalities/alarms.0.res.oracle
-141,143c141,142
-<   u1{.l[bits 0 to 31]; .f; .d[bits 0 to 31]} ∈
-<     [-3.40282346639e+38 .. 3.40282346639e+38]
-<     {.l[bits 32 to 63]; .f[bits 32 to 63]; .d[bits 32 to 63]} ∈ [--..--]
----
->   u1{.l; .f[bits 0 to 63]; .d} ∈
->     [-9223372036854775808..9218868437227405311]
-diff oracle/alarms.1.res.oracle oracle_equalities/alarms.1.res.oracle
-126,127c126,127
-<   u1{.l[bits 0 to 31]; .f; .d[bits 0 to 31]} ∈ [-inf .. inf]
-<     {.l[bits 32 to 63]; .f[bits 32 to 63]; .d[bits 32 to 63]} ∈ [--..--]
----
->   u1{.l; .f[bits 0 to 63]; .d} ∈
->     [-9223372036854775808..9218868437227405312]
-diff oracle/cond.res.oracle oracle_equalities/cond.res.oracle
-45,46c45,46
-<   dz ∈ [0x1.0000000000001p0 .. 0x1.4000000000000p3]
-<   dt ∈ [-0x1.4000000000000p3 .. 0x1.fffffffffffffp-1]
----
->   dz ∈ [0x1.0000020000000p0 .. 0x1.4000000000000p3]
->   dt ∈ [-0x1.4000000000000p3 .. 0x1.fffffe0000000p-1]
-Only in oracle: fval_test.res.oracle
-diff oracle/nonlin.1.res.oracle oracle_equalities/nonlin.1.res.oracle
-61a62
-> [eva:nonlin] nonlin.c:44: subdividing on a
-diff oracle/nonlin.2.res.oracle oracle_equalities/nonlin.2.res.oracle
-61a62
-> [eva:nonlin] nonlin.c:44: subdividing on a
-diff oracle/nonlin.4.res.oracle oracle_equalities/nonlin.4.res.oracle
-61a62
-> [eva:nonlin] nonlin.c:44: subdividing on a
-diff oracle/nonlin.5.res.oracle oracle_equalities/nonlin.5.res.oracle
-61a62
-> [eva:nonlin] nonlin.c:44: subdividing on a
-diff oracle/parse.res.oracle oracle_equalities/parse.res.oracle
-22a23,24
-> [eva] parse.i:37: Warning: 
->   cannot parse floating-point constant, returning imprecise result
diff --git a/tests/float/diff_gauges b/tests/float/diff_gauges
deleted file mode 100644
index dbbc7f7b4c150a7650e9f8db6b769b41f1c8a592..0000000000000000000000000000000000000000
--- a/tests/float/diff_gauges
+++ /dev/null
@@ -1,6 +0,0 @@
-Only in oracle: absorb.res.oracle
-Only in oracle: absorb_sav.err
-Only in oracle: absorb_sav.res
-Only in oracle: absorb_sav2.err
-Only in oracle: absorb_sav2.res
-Only in oracle: fval_test.res.oracle
diff --git a/tests/float/diff_octagons b/tests/float/diff_octagons
deleted file mode 100644
index 952723958037d65a41eb0ba68debd5256aa1c839..0000000000000000000000000000000000000000
--- a/tests/float/diff_octagons
+++ /dev/null
@@ -1,30 +0,0 @@
-Only in oracle: absorb.res.oracle
-Only in oracle: absorb_sav.err
-Only in oracle: absorb_sav.res
-Only in oracle: absorb_sav2.err
-Only in oracle: absorb_sav2.res
-Only in oracle: fval_test.res.oracle
-diff oracle/nonlin.1.res.oracle oracle_octagons/nonlin.1.res.oracle
-283a284,285
-> [eva:nonlin] nonlin.c:113: non-linear 'f + f', lv 'f'
-> [eva:nonlin] nonlin.c:113: subdividing on f
-287d288
-< [eva:nonlin] nonlin.c:113: subdividing on f
-diff oracle/nonlin.2.res.oracle oracle_octagons/nonlin.2.res.oracle
-263a264,265
-> [eva:nonlin] nonlin.c:113: non-linear 'f + f', lv 'f'
-> [eva:nonlin] nonlin.c:113: subdividing on f
-267d268
-< [eva:nonlin] nonlin.c:113: subdividing on f
-diff oracle/nonlin.4.res.oracle oracle_octagons/nonlin.4.res.oracle
-283a284,285
-> [eva:nonlin] nonlin.c:113: non-linear 'f + f', lv 'f'
-> [eva:nonlin] nonlin.c:113: subdividing on f
-287d288
-< [eva:nonlin] nonlin.c:113: subdividing on f
-diff oracle/nonlin.5.res.oracle oracle_octagons/nonlin.5.res.oracle
-263a264,265
-> [eva:nonlin] nonlin.c:113: non-linear 'f + f', lv 'f'
-> [eva:nonlin] nonlin.c:113: subdividing on f
-267d268
-< [eva:nonlin] nonlin.c:113: subdividing on f
diff --git a/tests/float/diff_symblocs b/tests/float/diff_symblocs
deleted file mode 100644
index dbbc7f7b4c150a7650e9f8db6b769b41f1c8a592..0000000000000000000000000000000000000000
--- a/tests/float/diff_symblocs
+++ /dev/null
@@ -1,6 +0,0 @@
-Only in oracle: absorb.res.oracle
-Only in oracle: absorb_sav.err
-Only in oracle: absorb_sav.res
-Only in oracle: absorb_sav2.err
-Only in oracle: absorb_sav2.res
-Only in oracle: fval_test.res.oracle
diff --git a/tests/float/extract_bits.i b/tests/float/extract_bits.i
index 552bd39549d0f7eba2d4b50a668ba74837787c2b..083727447193a64d526f1560c853c0a34b6c084e 100644
--- a/tests/float/extract_bits.i
+++ b/tests/float/extract_bits.i
@@ -1,6 +1,6 @@
 /* run.config*
-  OPT: -eva @EVA_OPTIONS@ -eva-slevel 10 -big-ints-hex 0 -machdep ppc_32 -float-normal -warn-decimal-float all
-  OPT: -eva @EVA_OPTIONS@ -eva-slevel 10 -big-ints-hex 0 -machdep x86_32 -float-normal -warn-decimal-float all
+  OPT: -eva @EVA_CONFIG@ -eva-slevel 10 -big-ints-hex 0 -machdep ppc_32 -float-normal -warn-decimal-float all
+  OPT: -eva @EVA_CONFIG@ -eva-slevel 10 -big-ints-hex 0 -machdep x86_32 -float-normal -warn-decimal-float all
 */
 
 float f = 3.14;
diff --git a/tests/float/oracle/absorb_sav.err b/tests/float/oracle/absorb_sav.err
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/float/oracle/absorb_sav2.err b/tests/float/oracle/absorb_sav2.err
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/float/oracle_equalities/alarms.0.res.oracle b/tests/float/oracle_equalities/alarms.0.res.oracle
deleted file mode 100644
index c0293cdd68b29be5e867b6afaa1bccb8c09fcc49..0000000000000000000000000000000000000000
--- a/tests/float/oracle_equalities/alarms.0.res.oracle
+++ /dev/null
@@ -1,7 +0,0 @@
-137,139c137,138
-<   u1{.l[bits 0 to 31]; .f; .d[bits 0 to 31]} ∈
-<     [-3.40282346639e+38 .. 3.40282346639e+38]
-<     {.l[bits 32 to 63]; .f[bits 32 to 63]; .d[bits 32 to 63]} ∈ [--..--]
----
->   u1{.l; .f[bits 0 to 63]; .d} ∈
->     [-9223372036854775808..9218868437227405311]
diff --git a/tests/float/oracle_equalities/alarms.1.res.oracle b/tests/float/oracle_equalities/alarms.1.res.oracle
deleted file mode 100644
index 1ab35c18d93d2826bb86fc25efd9510bf94f38f1..0000000000000000000000000000000000000000
--- a/tests/float/oracle_equalities/alarms.1.res.oracle
+++ /dev/null
@@ -1,6 +0,0 @@
-120,121c120,121
-<   u1{.l[bits 0 to 31]; .f; .d[bits 0 to 31]} ∈ [-inf .. inf]
-<     {.l[bits 32 to 63]; .f[bits 32 to 63]; .d[bits 32 to 63]} ∈ [--..--]
----
->   u1{.l; .f[bits 0 to 63]; .d} ∈
->     [-9223372036854775808..9218868437227405312]
diff --git a/tests/float/oracle_equalities/cond.res.oracle b/tests/float/oracle_equalities/cond.res.oracle
deleted file mode 100644
index 4cd8c3819bdb64f63d5e9a5ad88e1e7fa18fadeb..0000000000000000000000000000000000000000
--- a/tests/float/oracle_equalities/cond.res.oracle
+++ /dev/null
@@ -1,6 +0,0 @@
-45,46c45,46
-<   dz ∈ [0x1.0000000000001p0 .. 0x1.4000000000000p3]
-<   dt ∈ [-0x1.4000000000000p3 .. 0x1.fffffffffffffp-1]
----
->   dz ∈ [0x1.0000020000000p0 .. 0x1.4000000000000p3]
->   dt ∈ [-0x1.4000000000000p3 .. 0x1.fffffe0000000p-1]
diff --git a/tests/float/oracle_equalities/const3.1.res.oracle b/tests/float/oracle_equalities/const3.1.res.oracle
deleted file mode 100644
index 412af6075b5e836804b4f3c7685e52ef6d66ba06..0000000000000000000000000000000000000000
--- a/tests/float/oracle_equalities/const3.1.res.oracle
+++ /dev/null
@@ -1,4 +0,0 @@
-23c23
-<   d1 ∈ [0x1.16c2000000000p-133 .. 0x1.16c3000000000p-133]
----
->   d1 ∈ {0x1.16c2000000000p-133}
diff --git a/tests/float/oracle_equalities/dr.2.res.oracle b/tests/float/oracle_equalities/dr.2.res.oracle
deleted file mode 100644
index 127ccb152a5fd3259b17916e95ab1062bad13e11..0000000000000000000000000000000000000000
--- a/tests/float/oracle_equalities/dr.2.res.oracle
+++ /dev/null
@@ -1,8 +0,0 @@
-25c25
-< [eva] dr.i:26: Frama_C_show_each: {0; 1}, {0; 1}
----
-> [eva] dr.i:26: Frama_C_show_each: {1}, {0; 1}
-30c30
-<   e1 ∈ {0; 1}
----
->   e1 ∈ {1}
diff --git a/tests/float/oracle_equalities/nonlin.1.res.oracle b/tests/float/oracle_equalities/nonlin.1.res.oracle
deleted file mode 100644
index 219fb5edaa60ceb558e2ae210ac981f0d144e48a..0000000000000000000000000000000000000000
--- a/tests/float/oracle_equalities/nonlin.1.res.oracle
+++ /dev/null
@@ -1,2 +0,0 @@
-61a62
-> [eva:nonlin] nonlin.c:44: subdividing on a
diff --git a/tests/float/oracle_equalities/nonlin.2.res.oracle b/tests/float/oracle_equalities/nonlin.2.res.oracle
deleted file mode 100644
index 219fb5edaa60ceb558e2ae210ac981f0d144e48a..0000000000000000000000000000000000000000
--- a/tests/float/oracle_equalities/nonlin.2.res.oracle
+++ /dev/null
@@ -1,2 +0,0 @@
-61a62
-> [eva:nonlin] nonlin.c:44: subdividing on a
diff --git a/tests/float/oracle_equalities/nonlin.4.res.oracle b/tests/float/oracle_equalities/nonlin.4.res.oracle
deleted file mode 100644
index 219fb5edaa60ceb558e2ae210ac981f0d144e48a..0000000000000000000000000000000000000000
--- a/tests/float/oracle_equalities/nonlin.4.res.oracle
+++ /dev/null
@@ -1,2 +0,0 @@
-61a62
-> [eva:nonlin] nonlin.c:44: subdividing on a
diff --git a/tests/float/oracle_equalities/nonlin.5.res.oracle b/tests/float/oracle_equalities/nonlin.5.res.oracle
deleted file mode 100644
index 219fb5edaa60ceb558e2ae210ac981f0d144e48a..0000000000000000000000000000000000000000
--- a/tests/float/oracle_equalities/nonlin.5.res.oracle
+++ /dev/null
@@ -1,2 +0,0 @@
-61a62
-> [eva:nonlin] nonlin.c:44: subdividing on a
diff --git a/tests/float/oracle_equalities/parse.res.oracle b/tests/float/oracle_equalities/parse.res.oracle
deleted file mode 100644
index 0580f18a6bd3f0525765567c6c1c4b3cb14cd140..0000000000000000000000000000000000000000
--- a/tests/float/oracle_equalities/parse.res.oracle
+++ /dev/null
@@ -1,3 +0,0 @@
-21a22,23
-> [eva] parse.i:37: Warning: 
->   cannot parse floating-point constant, returning imprecise result
diff --git a/tests/float/special_floats.c b/tests/float/special_floats.c
index bba0f5b339e9909cd5d9d84c65934acd25af13a1..732c2cc3e5814adf905a8ddf711e7188b5749e9b 100644
--- a/tests/float/special_floats.c
+++ b/tests/float/special_floats.c
@@ -1,5 +1,5 @@
 /* run.config*
-   OPT: -eva @EVA_OPTIONS@ -warn-special-float none
+   OPT: -eva @EVA_CONFIG@ -warn-special-float none
 */
 
 /* Tests on special float values NaN and infinites. */
diff --git a/tests/idct/diff_equalities b/tests/idct/diff_equalities
deleted file mode 100644
index 1f18aa221f219efd625ea59f350cddd5a4b0f2db..0000000000000000000000000000000000000000
--- a/tests/idct/diff_equalities
+++ /dev/null
@@ -1,136 +0,0 @@
-diff oracle/ieee_1180_1990.res.oracle oracle_equalities/ieee_1180_1990.res.oracle
-356a357,358
-> [eva:signed-overflow] ieee_1180_1990.c:219: Warning: 
->   2's complement assumed for overflow
-360a363,364
-> [eva:signed-overflow] ieee_1180_1990.c:220: Warning: 
->   2's complement assumed for overflow
-366,367d369
-< [eva:signed-overflow] ieee_1180_1990.c:219: Warning: 
-<   2's complement assumed for overflow
-392a395,396
-> [eva:signed-overflow] ieee_1180_1990.c:243: Warning: 
->   2's complement assumed for overflow
-396a401,402
-> [eva:signed-overflow] ieee_1180_1990.c:244: Warning: 
->   2's complement assumed for overflow
-402,403d407
-< [eva:signed-overflow] ieee_1180_1990.c:243: Warning: 
-<   2's complement assumed for overflow
-424a429,436
-> [eva] ieee_1180_1990.c:85: 
->   Reusing old results for call to IEEE_1180_1990_rand
-> [eva] ieee_1180_1990.c:85: 
->   Reusing old results for call to IEEE_1180_1990_rand
-> [eva] ieee_1180_1990.c:85: 
->   Reusing old results for call to IEEE_1180_1990_rand
-> [eva] ieee_1180_1990.c:85: 
->   Reusing old results for call to IEEE_1180_1990_rand
-437a450,451
-> [eva:signed-overflow] ieee_1180_1990.c:265: Warning: 
->   2's complement assumed for overflow
-441a456,457
-> [eva:signed-overflow] ieee_1180_1990.c:266: Warning: 
->   2's complement assumed for overflow
-447,448d462
-< [eva:signed-overflow] ieee_1180_1990.c:265: Warning: 
-<   2's complement assumed for overflow
-466a481,482
-> [eva:signed-overflow] ieee_1180_1990.c:289: Warning: 
->   2's complement assumed for overflow
-470a487,488
-> [eva:signed-overflow] ieee_1180_1990.c:290: Warning: 
->   2's complement assumed for overflow
-476,477d493
-< [eva:signed-overflow] ieee_1180_1990.c:289: Warning: 
-<   2's complement assumed for overflow
-498a515,522
-> [eva] ieee_1180_1990.c:85: 
->   Reusing old results for call to IEEE_1180_1990_rand
-> [eva] ieee_1180_1990.c:85: 
->   Reusing old results for call to IEEE_1180_1990_rand
-> [eva] ieee_1180_1990.c:85: 
->   Reusing old results for call to IEEE_1180_1990_rand
-> [eva] ieee_1180_1990.c:85: 
->   Reusing old results for call to IEEE_1180_1990_rand
-511a536,537
-> [eva:signed-overflow] ieee_1180_1990.c:311: Warning: 
->   2's complement assumed for overflow
-515a542,543
-> [eva:signed-overflow] ieee_1180_1990.c:312: Warning: 
->   2's complement assumed for overflow
-521,522d548
-< [eva:signed-overflow] ieee_1180_1990.c:311: Warning: 
-<   2's complement assumed for overflow
-540a567,568
-> [eva:signed-overflow] ieee_1180_1990.c:335: Warning: 
->   2's complement assumed for overflow
-544a573,574
-> [eva:signed-overflow] ieee_1180_1990.c:336: Warning: 
->   2's complement assumed for overflow
-550,551d579
-< [eva:signed-overflow] ieee_1180_1990.c:335: Warning: 
-<   2's complement assumed for overflow
-571a600,607
-> [eva] ieee_1180_1990.c:85: 
->   Reusing old results for call to IEEE_1180_1990_rand
-> [eva] ieee_1180_1990.c:85: 
->   Reusing old results for call to IEEE_1180_1990_rand
-> [eva] ieee_1180_1990.c:85: 
->   Reusing old results for call to IEEE_1180_1990_rand
-> [eva] ieee_1180_1990.c:85: 
->   Reusing old results for call to IEEE_1180_1990_rand
-579a616,633
-> [eva] ieee_1180_1990.c:100: 
->   Call to builtin Frama_C_sqrt for function sqrt
-> [eva] ieee_1180_1990.c:101: 
->   Call to builtin Frama_C_cos for function cos
-> [eva] ieee_1180_1990.c:100: 
->   Call to builtin Frama_C_sqrt for function sqrt
-> [eva] ieee_1180_1990.c:101: 
->   Call to builtin Frama_C_cos for function cos
-> [eva] ieee_1180_1990.c:100: 
->   Call to builtin Frama_C_sqrt for function sqrt
-> [eva] ieee_1180_1990.c:101: 
->   Call to builtin Frama_C_cos for function cos
-> [eva] ieee_1180_1990.c:100: 
->   Call to builtin Frama_C_sqrt for function sqrt
-> [eva] ieee_1180_1990.c:101: 
->   Call to builtin Frama_C_cos for function cos
-> [eva] ieee_1180_1990.c:100: 
->   Call to builtin Frama_C_sqrt for function sqrt
-581a636,637
-> [eva] ieee_1180_1990.c:100: 
->   Call to builtin Frama_C_sqrt for function sqrt
-583a640,641
-> [eva] ieee_1180_1990.c:100: 
->   Call to builtin Frama_C_sqrt for function sqrt
-605a664,677
-> [eva] ieee_1180_1990.c:140: 
->   Call to builtin Frama_C_sqrt for function sqrt
-> [eva] ieee_1180_1990.c:141: 
->   Call to builtin Frama_C_cos for function cos
-> [eva] ieee_1180_1990.c:140: 
->   Call to builtin Frama_C_sqrt for function sqrt
-> [eva] ieee_1180_1990.c:141: 
->   Call to builtin Frama_C_cos for function cos
-> [eva] ieee_1180_1990.c:140: 
->   Call to builtin Frama_C_sqrt for function sqrt
-> [eva] ieee_1180_1990.c:141: 
->   Call to builtin Frama_C_cos for function cos
-> [eva] ieee_1180_1990.c:140: 
->   Call to builtin Frama_C_sqrt for function sqrt
-607a680,681
-> [eva] ieee_1180_1990.c:140: 
->   Call to builtin Frama_C_sqrt for function sqrt
-609a684,689
-> [eva] ieee_1180_1990.c:140: 
->   Call to builtin Frama_C_sqrt for function sqrt
-> [eva] ieee_1180_1990.c:141: 
->   Call to builtin Frama_C_cos for function cos
-> [eva] ieee_1180_1990.c:140: 
->   Call to builtin Frama_C_sqrt for function sqrt
-980c1060
-<     by the Eva analyzer:      0 errors   42 warnings
----
->     by the Eva analyzer:      0 errors   48 warnings
diff --git a/tests/idct/diff_gauges b/tests/idct/diff_gauges
deleted file mode 100644
index e56a9e4b3b761465bea4a9c2fc5ad75845e12ba6..0000000000000000000000000000000000000000
--- a/tests/idct/diff_gauges
+++ /dev/null
@@ -1,7 +0,0 @@
-diff oracle/ieee_1180_1990.res.oracle oracle_gauges/ieee_1180_1990.res.oracle
-579a580,581
-> [eva] ieee_1180_1990.c:100: 
->   Call to builtin Frama_C_sqrt for function sqrt
-605a608,609
-> [eva] ieee_1180_1990.c:140: 
->   Call to builtin Frama_C_sqrt for function sqrt
diff --git a/tests/idct/diff_octagons b/tests/idct/diff_octagons
deleted file mode 100644
index 24654a12305a4218c5d0648314ed3b251e489a72..0000000000000000000000000000000000000000
--- a/tests/idct/diff_octagons
+++ /dev/null
@@ -1,78 +0,0 @@
-diff oracle/ieee_1180_1990.res.oracle oracle_octagons/ieee_1180_1990.res.oracle
-424a425,432
-> [eva] ieee_1180_1990.c:85: 
->   Reusing old results for call to IEEE_1180_1990_rand
-> [eva] ieee_1180_1990.c:85: 
->   Reusing old results for call to IEEE_1180_1990_rand
-> [eva] ieee_1180_1990.c:85: 
->   Reusing old results for call to IEEE_1180_1990_rand
-> [eva] ieee_1180_1990.c:85: 
->   Reusing old results for call to IEEE_1180_1990_rand
-498a507,514
-> [eva] ieee_1180_1990.c:85: 
->   Reusing old results for call to IEEE_1180_1990_rand
-> [eva] ieee_1180_1990.c:85: 
->   Reusing old results for call to IEEE_1180_1990_rand
-> [eva] ieee_1180_1990.c:85: 
->   Reusing old results for call to IEEE_1180_1990_rand
-> [eva] ieee_1180_1990.c:85: 
->   Reusing old results for call to IEEE_1180_1990_rand
-571a588,595
-> [eva] ieee_1180_1990.c:85: 
->   Reusing old results for call to IEEE_1180_1990_rand
-> [eva] ieee_1180_1990.c:85: 
->   Reusing old results for call to IEEE_1180_1990_rand
-> [eva] ieee_1180_1990.c:85: 
->   Reusing old results for call to IEEE_1180_1990_rand
-> [eva] ieee_1180_1990.c:85: 
->   Reusing old results for call to IEEE_1180_1990_rand
-579a604,617
-> [eva] ieee_1180_1990.c:100: 
->   Call to builtin Frama_C_sqrt for function sqrt
-> [eva] ieee_1180_1990.c:101: 
->   Call to builtin Frama_C_cos for function cos
-> [eva] ieee_1180_1990.c:100: 
->   Call to builtin Frama_C_sqrt for function sqrt
-> [eva] ieee_1180_1990.c:101: 
->   Call to builtin Frama_C_cos for function cos
-> [eva] ieee_1180_1990.c:100: 
->   Call to builtin Frama_C_sqrt for function sqrt
-> [eva] ieee_1180_1990.c:101: 
->   Call to builtin Frama_C_cos for function cos
-> [eva] ieee_1180_1990.c:100: 
->   Call to builtin Frama_C_sqrt for function sqrt
-581a620,621
-> [eva] ieee_1180_1990.c:100: 
->   Call to builtin Frama_C_sqrt for function sqrt
-583a624,629
-> [eva] ieee_1180_1990.c:100: 
->   Call to builtin Frama_C_sqrt for function sqrt
-> [eva] ieee_1180_1990.c:101: 
->   Call to builtin Frama_C_cos for function cos
-> [eva] ieee_1180_1990.c:100: 
->   Call to builtin Frama_C_sqrt for function sqrt
-605a652,661
-> [eva] ieee_1180_1990.c:140: 
->   Call to builtin Frama_C_sqrt for function sqrt
-> [eva] ieee_1180_1990.c:141: 
->   Call to builtin Frama_C_cos for function cos
-> [eva] ieee_1180_1990.c:140: 
->   Call to builtin Frama_C_sqrt for function sqrt
-> [eva] ieee_1180_1990.c:141: 
->   Call to builtin Frama_C_cos for function cos
-> [eva] ieee_1180_1990.c:140: 
->   Call to builtin Frama_C_sqrt for function sqrt
-607a664,665
-> [eva] ieee_1180_1990.c:140: 
->   Call to builtin Frama_C_sqrt for function sqrt
-609a668,677
-> [eva] ieee_1180_1990.c:140: 
->   Call to builtin Frama_C_sqrt for function sqrt
-> [eva] ieee_1180_1990.c:141: 
->   Call to builtin Frama_C_cos for function cos
-> [eva] ieee_1180_1990.c:140: 
->   Call to builtin Frama_C_sqrt for function sqrt
-> [eva] ieee_1180_1990.c:141: 
->   Call to builtin Frama_C_cos for function cos
-> [eva] ieee_1180_1990.c:140: 
->   Call to builtin Frama_C_sqrt for function sqrt
diff --git a/tests/idct/oracle_equalities/ieee_1180_1990.res.oracle b/tests/idct/oracle_equalities/ieee_1180_1990.res.oracle
deleted file mode 100644
index 12ecac9ae6750f82c8cf5c0e4bbffb30add61432..0000000000000000000000000000000000000000
--- a/tests/idct/oracle_equalities/ieee_1180_1990.res.oracle
+++ /dev/null
@@ -1,101 +0,0 @@
-297a298,299
-> [eva:signed-overflow] ieee_1180_1990.c:219: Warning: 
->   2's complement assumed for overflow
-301a304,305
-> [eva:signed-overflow] ieee_1180_1990.c:220: Warning: 
->   2's complement assumed for overflow
-307,308d310
-< [eva:signed-overflow] ieee_1180_1990.c:219: Warning: 
-<   2's complement assumed for overflow
-333a336,337
-> [eva:signed-overflow] ieee_1180_1990.c:243: Warning: 
->   2's complement assumed for overflow
-337a342,343
-> [eva:signed-overflow] ieee_1180_1990.c:244: Warning: 
->   2's complement assumed for overflow
-343,344d348
-< [eva:signed-overflow] ieee_1180_1990.c:243: Warning: 
-<   2's complement assumed for overflow
-359a364,367
-> [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
-> [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
-> [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
-> [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
-370a379,380
-> [eva:signed-overflow] ieee_1180_1990.c:265: Warning: 
->   2's complement assumed for overflow
-374a385,386
-> [eva:signed-overflow] ieee_1180_1990.c:266: Warning: 
->   2's complement assumed for overflow
-380,381d391
-< [eva:signed-overflow] ieee_1180_1990.c:265: Warning: 
-<   2's complement assumed for overflow
-397a408,409
-> [eva:signed-overflow] ieee_1180_1990.c:289: Warning: 
->   2's complement assumed for overflow
-401a414,415
-> [eva:signed-overflow] ieee_1180_1990.c:290: Warning: 
->   2's complement assumed for overflow
-407,408d420
-< [eva:signed-overflow] ieee_1180_1990.c:289: Warning: 
-<   2's complement assumed for overflow
-423a436,439
-> [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
-> [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
-> [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
-> [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
-434a451,452
-> [eva:signed-overflow] ieee_1180_1990.c:311: Warning: 
->   2's complement assumed for overflow
-438a457,458
-> [eva:signed-overflow] ieee_1180_1990.c:312: Warning: 
->   2's complement assumed for overflow
-444,445d463
-< [eva:signed-overflow] ieee_1180_1990.c:311: Warning: 
-<   2's complement assumed for overflow
-461a480,481
-> [eva:signed-overflow] ieee_1180_1990.c:335: Warning: 
->   2's complement assumed for overflow
-465a486,487
-> [eva:signed-overflow] ieee_1180_1990.c:336: Warning: 
->   2's complement assumed for overflow
-471,472d492
-< [eva:signed-overflow] ieee_1180_1990.c:335: Warning: 
-<   2's complement assumed for overflow
-485a506,509
-> [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
-> [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
-> [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
-> [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
-491a516
-> [eva] ieee_1180_1990.c:100: Call to builtin Frama_C_sqrt for function sqrt
-492a518,520
-> [eva] ieee_1180_1990.c:100: Call to builtin Frama_C_sqrt for function sqrt
-> [eva] ieee_1180_1990.c:101: Call to builtin Frama_C_cos for function cos
-> [eva] ieee_1180_1990.c:100: Call to builtin Frama_C_sqrt for function sqrt
-493a522,528
-> [eva] ieee_1180_1990.c:100: Call to builtin Frama_C_sqrt for function sqrt
-> [eva] ieee_1180_1990.c:101: Call to builtin Frama_C_cos for function cos
-> [eva] ieee_1180_1990.c:100: Call to builtin Frama_C_sqrt for function sqrt
-> [eva] ieee_1180_1990.c:101: Call to builtin Frama_C_cos for function cos
-> [eva] ieee_1180_1990.c:100: Call to builtin Frama_C_sqrt for function sqrt
-> [eva] ieee_1180_1990.c:101: Call to builtin Frama_C_cos for function cos
-> [eva] ieee_1180_1990.c:100: Call to builtin Frama_C_sqrt for function sqrt
-506a542
-> [eva] ieee_1180_1990.c:140: Call to builtin Frama_C_sqrt for function sqrt
-507a544
-> [eva] ieee_1180_1990.c:140: Call to builtin Frama_C_sqrt for function sqrt
-508a546,554
-> [eva] ieee_1180_1990.c:140: Call to builtin Frama_C_sqrt for function sqrt
-> [eva] ieee_1180_1990.c:141: Call to builtin Frama_C_cos for function cos
-> [eva] ieee_1180_1990.c:140: Call to builtin Frama_C_sqrt for function sqrt
-> [eva] ieee_1180_1990.c:141: Call to builtin Frama_C_cos for function cos
-> [eva] ieee_1180_1990.c:140: Call to builtin Frama_C_sqrt for function sqrt
-> [eva] ieee_1180_1990.c:141: Call to builtin Frama_C_cos for function cos
-> [eva] ieee_1180_1990.c:140: Call to builtin Frama_C_sqrt for function sqrt
-> [eva] ieee_1180_1990.c:141: Call to builtin Frama_C_cos for function cos
-> [eva] ieee_1180_1990.c:140: Call to builtin Frama_C_sqrt for function sqrt
-770c816
-<     by the Eva analyzer:      0 errors   42 warnings
----
->     by the Eva analyzer:      0 errors   48 warnings
diff --git a/tests/jcdb/jcdb.c b/tests/jcdb/jcdb.c
index 120899cdbfe123223beb07e677fd1f3cc97f2935..aafa9112dc0f1d77975668df0e71979441836727 100644
--- a/tests/jcdb/jcdb.c
+++ b/tests/jcdb/jcdb.c
@@ -1,20 +1,4 @@
 /* run.config
-<<<<<<< HEAD
-COMMENT: dependency to FRAMA-C share directory is implicit
-DEPS: jcdb2.c with_arguments.json compile_commands.json file_without_main.c
-  OPT: -json-compilation-database ./ -print
-  OPT: jcdb2.c -json-compilation-database with_arguments.json -print
-MODULE: @PTEST_NAME@
-  OPT: -json-compilation-database with_arguments.json
-MODULE:
-  EXECNOW: LOG list_files.res LOG list_files.err @FRAMAC_SHARE@/analysis-scripts/list_files.py %{dep:compile_commands_working.json} > list_files.res 2> list_files.err
-||||||| 754e522ceb
-EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
-OPT: -json-compilation-database @PTEST_DIR@ -print
-OPT: @PTEST_DIR@/jcdb2.c -json-compilation-database @PTEST_DIR@/with_arguments.json -print
-OPT: -json-compilation-database @PTEST_DIR@/with_arguments.json -no-autoload-plugins -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
-EXECNOW: LOG list_files.res LOG list_files.err share/analysis-scripts/list_files.py @PTEST_DIR@/compile_commands_working.json > @PTEST_DIR@/result/list_files.res 2> @PTEST_DIR@/result/list_files.err
-=======
  DEPS: compile_commands.json
  COMMENT: parsing option are defined in the default json file "compile_commands.json"
    OPT: -json-compilation-database @PTEST_DIR@ -print
@@ -24,15 +8,8 @@ EXECNOW: LOG list_files.res LOG list_files.err share/analysis-scripts/list_files
    OPT: -json-compilation-database %{dep:@PTEST_DIR@/with_arguments.json}
  MODULE:
    EXECNOW: LOG list_files.res LOG list_files.err %{bin:frama-c-script} list-files %{dep:@PTEST_DIR@/compile_commands_working.json} > @PTEST_RESULT@/list_files.res 2> @PTEST_RESULT@/list_files.err
->>>>>>> origin/master
 */
-<<<<<<< HEAD
 
-
-||||||| 754e522ceb
-=======
-
->>>>>>> origin/master
 #include <stdio.h>
 
 #ifdef TOUNDEF
diff --git a/tests/jcdb/oracle/list_files.err b/tests/jcdb/oracle/list_files.err
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/journal/intra.ml b/tests/journal/intra.ml
index eca295d9ae6b0c28cc261de43f4277c1d5e690b6..7785c391999cf580cd9d92645b63f9a34d0f93b3 100644
--- a/tests/journal/intra.ml
+++ b/tests/journal/intra.ml
@@ -1 +1 @@
-let () = Db.Main.extend (fun _ -> ignore (Sparecode.Register.get ~select_annot:true ~select_slice_pragma:true))
+let () = Db.Main.extend (fun _ -> ignore (Sparecode.Register.get true true))
diff --git a/tests/journal/oracle/control2_sav.err b/tests/journal/oracle/control2_sav.err
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/libc/check_parsing_individual_headers.ml b/tests/libc/check_parsing_individual_headers.ml
index a86210d3f5f6ea3251604cf071a1b2ef9dcec399..29066eb45e43d60b1375d4df389d319f1be5124d 100644
--- a/tests/libc/check_parsing_individual_headers.ml
+++ b/tests/libc/check_parsing_individual_headers.ml
@@ -8,7 +8,7 @@ let is_header f = Str.string_match header_re f 0
 
 (* Files which are *not* supposed to be parsed *)
 let blacklist () =
-  let libc = (Filename.concat Fc_config.datadir "libc") in
+  let libc = (Filename.concat (Sys.getenv "FRAMAC_SHARE") "libc") in
   List.map (fun f ->
       Datatype.Filepath.of_string (Filename.concat libc f))
     ["tgmath.h"; "complex.h"; "__fc_machdep_linux_shared.h"]
@@ -42,4 +42,4 @@ let collect_headers libc_dir =
     ) all_headers
 
 let () =
-  Db.Main.apply (collect_headers (Filename.concat Fc_config.datadir "libc"))
+  Db.Main.apply (collect_headers (Filename.concat (Sys.getenv "FRAMAC_SHARE") "libc"))
diff --git a/tests/libc/oracle/math_h.res.oracle b/tests/libc/oracle/math_h.res.oracle
deleted file mode 100644
index e6809f6bf5f5d46f2a1faa0b299456919853bd0e..0000000000000000000000000000000000000000
--- a/tests/libc/oracle/math_h.res.oracle
+++ /dev/null
@@ -1,316 +0,0 @@
-[kernel] Parsing math_h.c (with preprocessing)
-[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
-[eva] Computing initial state
-[eva] Initial state computed
-[eva:initial-state] Values of globals at initialization
-  pi ∈ {3.14159265359}
-  half_pi ∈ {1.57079632679}
-  e ∈ {2.71828182846}
-  top ∈ [--..--]
-  f_pi ∈ {3.14159274101}
-  f_half_pi ∈ {1.57079637051}
-  f_e ∈ {2.71828174591}
-  f_top ∈ [--..--]
-  ld_pi ∈ [3.14159265359 .. 3.14159265359]
-  ld_half_pi ∈ [1.57079632679 .. 1.57079632679]
-  ld_e ∈ {2.71828182846}
-  ld_top ∈ [--..--]
-  zero ∈ {0}
-  minus_zero ∈ {-0.}
-  one ∈ {1.}
-  minus_one ∈ {-1.}
-  large ∈ {1e+38}
-  huge_val ∈ {inf}
-  huge_valf ∈ {inf}
-  huge_vall ∈ {inf}
-  infinity ∈ {inf}
-  fp_ilogb0 ∈ {-2147483648.}
-  fp_ilogbnan ∈ {-2147483648.}
-[eva] math_h.c:45: Call to builtin atan
-[eva] math_h.c:45: function atan: precondition 'finite_arg' got status valid.
-[eva] math_h.c:45: Call to builtin atan
-[eva] math_h.c:45: function atan: precondition 'finite_arg' got status valid.
-[eva] math_h.c:45: Call to builtin atan
-[eva] math_h.c:45: function atan: precondition 'finite_arg' got status valid.
-[eva] math_h.c:45: Call to builtin atan
-[eva] math_h.c:45: function atan: precondition 'finite_arg' got status valid.
-[eva] math_h.c:45: Call to builtin atan
-[eva] math_h.c:45: function atan: precondition 'finite_arg' got status valid.
-[eva] math_h.c:45: Call to builtin atan
-[eva] math_h.c:45: function atan: precondition 'finite_arg' got status valid.
-[eva] math_h.c:45: Call to builtin atan
-[eva] math_h.c:45: function atan: precondition 'finite_arg' got status valid.
-[eva] math_h.c:45: Call to builtin atan
-[eva] math_h.c:45: function atan: precondition 'finite_arg' got status valid.
-[eva] math_h.c:45: Call to builtin atan
-[eva:alarm] math_h.c:45: Warning: 
-  function atan: precondition 'finite_arg' got status unknown.
-[eva] math_h.c:46: Call to builtin atanf
-[eva] math_h.c:46: function atanf: precondition 'finite_arg' got status valid.
-[eva] math_h.c:46: Call to builtin atanf
-[eva] math_h.c:46: function atanf: precondition 'finite_arg' got status valid.
-[eva] math_h.c:46: Call to builtin atanf
-[eva] math_h.c:46: function atanf: precondition 'finite_arg' got status valid.
-[eva] math_h.c:46: Call to builtin atanf
-[eva] math_h.c:46: function atanf: precondition 'finite_arg' got status valid.
-[eva] math_h.c:46: Call to builtin atanf
-[eva] math_h.c:46: function atanf: precondition 'finite_arg' got status valid.
-[eva] math_h.c:46: Call to builtin atanf
-[eva] math_h.c:46: function atanf: precondition 'finite_arg' got status valid.
-[eva] math_h.c:46: Call to builtin atanf
-[eva] math_h.c:46: function atanf: precondition 'finite_arg' got status valid.
-[eva] math_h.c:46: Call to builtin atanf
-[eva] math_h.c:46: function atanf: precondition 'finite_arg' got status valid.
-[eva] math_h.c:46: Call to builtin atanf
-[eva:alarm] math_h.c:46: Warning: 
-  function atanf: precondition 'finite_arg' got status unknown.
-[eva] computing for function atanl <- main.
-  Called from math_h.c:47.
-[eva] using specification for function atanl
-[eva] math_h.c:47: function atanl: precondition 'finite_arg' got status valid.
-[eva] Done for function atanl
-[eva] computing for function atanl <- main.
-  Called from math_h.c:47.
-[eva] math_h.c:47: function atanl: precondition 'finite_arg' got status valid.
-[eva] Done for function atanl
-[eva] computing for function atanl <- main.
-  Called from math_h.c:47.
-[eva] math_h.c:47: function atanl: precondition 'finite_arg' got status valid.
-[eva] Done for function atanl
-[eva] computing for function atanl <- main.
-  Called from math_h.c:47.
-[eva] math_h.c:47: function atanl: precondition 'finite_arg' got status valid.
-[eva] Done for function atanl
-[eva] computing for function atanl <- main.
-  Called from math_h.c:47.
-[eva] math_h.c:47: function atanl: precondition 'finite_arg' got status valid.
-[eva] Done for function atanl
-[eva] computing for function atanl <- main.
-  Called from math_h.c:47.
-[eva] math_h.c:47: function atanl: precondition 'finite_arg' got status valid.
-[eva] Done for function atanl
-[eva] computing for function atanl <- main.
-  Called from math_h.c:47.
-[eva] math_h.c:47: function atanl: precondition 'finite_arg' got status valid.
-[eva] Done for function atanl
-[eva] computing for function atanl <- main.
-  Called from math_h.c:47.
-[eva] math_h.c:47: function atanl: precondition 'finite_arg' got status valid.
-[eva] Done for function atanl
-[eva] computing for function atanl <- main.
-  Called from math_h.c:47.
-[eva:alarm] math_h.c:47: Warning: 
-  function atanl: precondition 'finite_arg' got status unknown.
-[eva] Done for function atanl
-[eva] computing for function fabs <- main.
-  Called from math_h.c:48.
-[eva] using specification for function fabs
-[eva] math_h.c:48: function fabs: precondition 'finite_arg' got status valid.
-[eva] Done for function fabs
-[eva] computing for function fabs <- main.
-  Called from math_h.c:48.
-[eva] math_h.c:48: function fabs: precondition 'finite_arg' got status valid.
-[eva] Done for function fabs
-[eva] computing for function fabs <- main.
-  Called from math_h.c:48.
-[eva] math_h.c:48: function fabs: precondition 'finite_arg' got status valid.
-[eva] Done for function fabs
-[eva] computing for function fabs <- main.
-  Called from math_h.c:48.
-[eva] math_h.c:48: function fabs: precondition 'finite_arg' got status valid.
-[eva] Done for function fabs
-[eva] computing for function fabs <- main.
-  Called from math_h.c:48.
-[eva] math_h.c:48: function fabs: precondition 'finite_arg' got status valid.
-[eva] Done for function fabs
-[eva] computing for function fabs <- main.
-  Called from math_h.c:48.
-[eva] math_h.c:48: function fabs: precondition 'finite_arg' got status valid.
-[eva] Done for function fabs
-[eva] computing for function fabs <- main.
-  Called from math_h.c:48.
-[eva] math_h.c:48: function fabs: precondition 'finite_arg' got status valid.
-[eva] Done for function fabs
-[eva] computing for function fabs <- main.
-  Called from math_h.c:48.
-[eva] math_h.c:48: function fabs: precondition 'finite_arg' got status valid.
-[eva] Done for function fabs
-[eva] computing for function fabs <- main.
-  Called from math_h.c:48.
-[eva:alarm] math_h.c:48: Warning: 
-  function fabs: precondition 'finite_arg' got status unknown.
-[eva] Done for function fabs
-[eva] computing for function fabsf <- main.
-  Called from math_h.c:49.
-[eva] using specification for function fabsf
-[eva] math_h.c:49: function fabsf: precondition 'finite_arg' got status valid.
-[eva] Done for function fabsf
-[eva] computing for function fabsf <- main.
-  Called from math_h.c:49.
-[eva] math_h.c:49: function fabsf: precondition 'finite_arg' got status valid.
-[eva] Done for function fabsf
-[eva] computing for function fabsf <- main.
-  Called from math_h.c:49.
-[eva] math_h.c:49: function fabsf: precondition 'finite_arg' got status valid.
-[eva] Done for function fabsf
-[eva] computing for function fabsf <- main.
-  Called from math_h.c:49.
-[eva] math_h.c:49: function fabsf: precondition 'finite_arg' got status valid.
-[eva] Done for function fabsf
-[eva] computing for function fabsf <- main.
-  Called from math_h.c:49.
-[eva] math_h.c:49: function fabsf: precondition 'finite_arg' got status valid.
-[eva] Done for function fabsf
-[eva] computing for function fabsf <- main.
-  Called from math_h.c:49.
-[eva] math_h.c:49: function fabsf: precondition 'finite_arg' got status valid.
-[eva] Done for function fabsf
-[eva] computing for function fabsf <- main.
-  Called from math_h.c:49.
-[eva] math_h.c:49: function fabsf: precondition 'finite_arg' got status valid.
-[eva] Done for function fabsf
-[eva] computing for function fabsf <- main.
-  Called from math_h.c:49.
-[eva] math_h.c:49: function fabsf: precondition 'finite_arg' got status valid.
-[eva] Done for function fabsf
-[eva] computing for function fabsf <- main.
-  Called from math_h.c:49.
-[eva:alarm] math_h.c:49: Warning: 
-  function fabsf: precondition 'finite_arg' got status unknown.
-[eva] Done for function fabsf
-[eva] computing for function fabsl <- main.
-  Called from math_h.c:50.
-[eva] using specification for function fabsl
-[eva] math_h.c:50: function fabsl: precondition 'finite_arg' got status valid.
-[eva] Done for function fabsl
-[eva] computing for function fabsl <- main.
-  Called from math_h.c:50.
-[eva] math_h.c:50: function fabsl: precondition 'finite_arg' got status valid.
-[eva] Done for function fabsl
-[eva] computing for function fabsl <- main.
-  Called from math_h.c:50.
-[eva] math_h.c:50: function fabsl: precondition 'finite_arg' got status valid.
-[eva] Done for function fabsl
-[eva] computing for function fabsl <- main.
-  Called from math_h.c:50.
-[eva] math_h.c:50: function fabsl: precondition 'finite_arg' got status valid.
-[eva] Done for function fabsl
-[eva] computing for function fabsl <- main.
-  Called from math_h.c:50.
-[eva] math_h.c:50: function fabsl: precondition 'finite_arg' got status valid.
-[eva] Done for function fabsl
-[eva] computing for function fabsl <- main.
-  Called from math_h.c:50.
-[eva] math_h.c:50: function fabsl: precondition 'finite_arg' got status valid.
-[eva] Done for function fabsl
-[eva] computing for function fabsl <- main.
-  Called from math_h.c:50.
-[eva] math_h.c:50: function fabsl: precondition 'finite_arg' got status valid.
-[eva] Done for function fabsl
-[eva] computing for function fabsl <- main.
-  Called from math_h.c:50.
-[eva] math_h.c:50: function fabsl: precondition 'finite_arg' got status valid.
-[eva] Done for function fabsl
-[eva] computing for function fabsl <- main.
-  Called from math_h.c:50.
-[eva:alarm] math_h.c:50: Warning: 
-  function fabsl: precondition 'finite_arg' got status unknown.
-[eva] Done for function fabsl
-[eva] computing for function __finite <- main.
-  Called from math_h.c:54.
-[eva] using specification for function __finite
-[eva] Done for function __finite
-[eva] math_h.c:55: assertion got status valid.
-[eva] computing for function __finite <- main.
-  Called from math_h.c:56.
-[eva] Done for function __finite
-[eva] computing for function __finite <- main.
-  Called from math_h.c:56.
-[eva] Done for function __finite
-[eva] math_h.c:57: assertion got status valid.
-[eva] computing for function __finitef <- main.
-  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 math_h.c:58.
-[eva] Done for function __finitef
-[eva] math_h.c:59: assertion got status valid.
-[eva] computing for function __finite <- main.
-  Called from math_h.c:60.
-[eva] Done for function __finite
-[eva] computing for function __finite <- main.
-  Called from math_h.c:60.
-[eva] Done for function __finite
-[eva] math_h.c:61: assertion got status valid.
-[eva] computing for function __finitef <- main.
-  Called from math_h.c:62.
-[eva] Done for function __finitef
-[eva] math_h.c:63: assertion got status valid.
-[eva] computing for function __finitef <- main.
-  Called from math_h.c:64.
-[eva] Done for function __finitef
-[eva] math_h.c:65: assertion got status valid.
-[eva] Recording results for main
-[eva] done for function main
-[eva] ====== VALUES COMPUTED ======
-[eva:final-states] Values at end of function main:
-  atan_pi ∈ {1.26262725568}
-  atan_half_pi ∈ {1.00388482185}
-  atan_e ∈ {1.21828290502}
-  atan_zero ∈ {0}
-  atan_minus_zero ∈ {-0.}
-  atan_one ∈ {0.785398163397}
-  atan_minus_one ∈ {-0.785398163397}
-  atan_large ∈ {1.57079632679}
-  atan_top ∈ [-1.57079632679 .. 1.57079632679] ∪ {NaN}
-  atanf_f_pi ∈ {1.262627}
-  atanf_f_half_pi ∈ {1.003884}
-  atanf_f_e ∈ {1.218282}
-  atanf_zero ∈ {0}
-  atanf_minus_zero ∈ {-0.}
-  atanf_one ∈ {0.785398}
-  atanf_minus_one ∈ {-0.785398}
-  atanf_large ∈ {1.570796}
-  atanf_f_top ∈ [-1.570796 .. 1.570796] ∪ {NaN}
-  atanl_ld_pi ∈ [-inf .. inf]
-  atanl_ld_half_pi ∈ [-inf .. inf]
-  atanl_ld_e ∈ [-inf .. inf]
-  atanl_zero ∈ [-inf .. inf]
-  atanl_minus_zero ∈ [-inf .. inf]
-  atanl_one ∈ [-inf .. inf]
-  atanl_minus_one ∈ [-inf .. inf]
-  atanl_large ∈ [-inf .. inf]
-  atanl_ld_top ∈ [-inf .. inf]
-  fabs_pi ∈ {3.14159265359}
-  fabs_half_pi ∈ {1.57079632679}
-  fabs_e ∈ {2.71828182846}
-  fabs_zero ∈ [-0. .. 0.]
-  fabs_minus_zero ∈ [-0. .. 0.]
-  fabs_one ∈ {1.}
-  fabs_minus_one ∈ {1.}
-  fabs_large ∈ {1e+38}
-  fabs_top ∈ [-0. .. 1.79769313486e+308]
-  fabsf_f_pi ∈ {3.14159274101}
-  fabsf_f_half_pi ∈ {1.57079637051}
-  fabsf_f_e ∈ {2.71828174591}
-  fabsf_zero ∈ [-0. .. 0.]
-  fabsf_minus_zero ∈ [-0. .. 0.]
-  fabsf_one ∈ {1.}
-  fabsf_minus_one ∈ {1.}
-  fabsf_large ∈ {9.99999968029e+37}
-  fabsf_f_top ∈ [-0. .. 3.40282346639e+38]
-  fabsl_ld_pi ∈ [-inf .. inf]
-  fabsl_ld_half_pi ∈ [-inf .. inf]
-  fabsl_ld_e ∈ [-inf .. inf]
-  fabsl_zero ∈ [-inf .. inf]
-  fabsl_minus_zero ∈ [-inf .. inf]
-  fabsl_one ∈ [-inf .. inf]
-  fabsl_minus_one ∈ [-inf .. inf]
-  fabsl_large ∈ [-inf .. inf]
-  fabsl_ld_top ∈ [-inf .. inf]
-  r ∈ {0}
-  __retres ∈ {0}
diff --git a/tests/libc/test_config_gcc b/tests/libc/test_config_gcc
index 5d4fa62882f9ee17ba2aee3fd5d6c6c9190775f7..9457f1caac4ef56a181a35b8d4e772c67fe15f4e 100644
--- a/tests/libc/test_config_gcc
+++ b/tests/libc/test_config_gcc
@@ -1,4 +1,4 @@
 COMMENT: This test config is not run by default. It allows a simple test to the tests,
 COMMENT: by compiling the file and running it.
-CMD: ./compile_and_run.sh
+CMD: ./tests/libc/compile_and_run.sh
 OPT:
diff --git a/tests/metrics/used-files.i b/tests/metrics/used-files.i
index 7d2aa312537cd0061ec71f935694592fbef7205b..dee7f1945c2e8bf0642c26f0123b55da13483f14 100644
--- a/tests/metrics/used-files.i
+++ b/tests/metrics/used-files.i
@@ -1,8 +1,8 @@
 /* run.config
- EXIT: 1
-   OPT: -metrics-used-files @PTEST_NAME@1.i @PTEST_NAME@2.i @PTEST_NAME@3.i @PTEST_NAME@4.i @PTEST_NAME@5.i @PTEST_NAME@6.i @PTEST_NAME@7.i @PTEST_NAME@8.i @PTEST_NAME@9.c @PTEST_NAME@1.h @PTEST_NAME@2.h
-   OPT: -metrics-used-files -main g @PTEST_NAME@1.i @PTEST_NAME@2.i @PTEST_NAME@3.i @PTEST_NAME@4.i @PTEST_NAME@5.i @PTEST_NAME@6.i @PTEST_NAME@7.i @PTEST_NAME@8.i @PTEST_NAME@9.c @PTEST_NAME@1.h @PTEST_NAME@2.h
+   OPT: -metrics-used-files @PTEST_DIR@/@PTEST_NAME@1.i @PTEST_DIR@/@PTEST_NAME@2.i @PTEST_DIR@/@PTEST_NAME@3.i @PTEST_DIR@/@PTEST_NAME@4.i @PTEST_DIR@/@PTEST_NAME@5.i @PTEST_DIR@/@PTEST_NAME@6.i @PTEST_DIR@/@PTEST_NAME@7.i @PTEST_DIR@/@PTEST_NAME@8.i @PTEST_DIR@/@PTEST_NAME@9.c @PTEST_DIR@/@PTEST_NAME@1.h @PTEST_DIR@/@PTEST_NAME@2.h
+   OPT: -metrics-used-files -main g @PTEST_DIR@/@PTEST_NAME@1.i @PTEST_DIR@/@PTEST_NAME@2.i @PTEST_DIR@/@PTEST_NAME@3.i @PTEST_DIR@/@PTEST_NAME@4.i @PTEST_DIR@/@PTEST_NAME@5.i @PTEST_DIR@/@PTEST_NAME@6.i @PTEST_DIR@/@PTEST_NAME@7.i @PTEST_DIR@/@PTEST_NAME@8.i @PTEST_DIR@/@PTEST_NAME@9.c @PTEST_DIR@/@PTEST_NAME@1.h @PTEST_DIR@/@PTEST_NAME@2.h
 */
+
 int h(void);
 
 extern int glob;
diff --git a/tests/misc/array_size_specifier_unification.i b/tests/misc/array_size_specifier_unification.i
index b22dbee0a55bdbdd4aa0741a980ab9240c9724df..97b90a4a11980ed20830c12168308e6b001aff28 100644
--- a/tests/misc/array_size_specifier_unification.i
+++ b/tests/misc/array_size_specifier_unification.i
@@ -1,5 +1,5 @@
 /* run.config
-   OPT: -print
+   OPT: -print -check
 */
 
 extern int t[3U];
diff --git a/tests/misc/bts0451.i b/tests/misc/bts0451.i
index ae4a84402a08c2c9ba91967acd6466f2682a87bf..4ba9f9768c54c472c2c59c31e045094ca301cdf9 100644
--- a/tests/misc/bts0451.i
+++ b/tests/misc/bts0451.i
@@ -6,6 +6,7 @@
 
 /* small test cases to verify that break is accepted in while and switch */
 int f () {
+
   while (1) {
     if (0) {
       while (1) break;
diff --git a/tests/misc/__fc_machdep_custom.h b/tests/misc/custom_machdep/__fc_machdep_custom.h
similarity index 100%
rename from tests/misc/__fc_machdep_custom.h
rename to tests/misc/custom_machdep/__fc_machdep_custom.h
diff --git a/tests/misc/oracle/log-file-feedback.txt b/tests/misc/oracle/log-file-feedback.txt
index 3d8d72d5ab7255d99edae584cd058ab0f3e2dbeb..941d344dc0af8f47c2ec0f194933b87cdb04c53a 100644
--- a/tests/misc/oracle/log-file-feedback.txt
+++ b/tests/misc/oracle/log-file-feedback.txt
@@ -1,15 +1,15 @@
-[kernel] Parsing log-file.i (no preprocessing)
+[kernel] Parsing tests/misc/log-file.i (no preprocessing)
 [eva] Analyzing a complete application starting at main
 [eva] Computing initial state
 [eva] Initial state computed
 [eva] computing for function f <- main.
-Called from log-file.i:20.
+Called from tests/misc/log-file.i:20.
 [eva] using specification for function f
 [eva] Done for function f
 [eva] computing for function g <- main.
-Called from log-file.i:21.
+Called from tests/misc/log-file.i:21.
 [eva] using specification for function g
 [eva] Done for function g
-log-file.i:22:[eva] starting to merge loop iterations
+tests/misc/log-file.i:22:[eva] starting to merge loop iterations
 [eva] Recording results for main
 [eva] done for function main
diff --git a/tests/misc/oracle/log-file-kernel-warnings.txt b/tests/misc/oracle/log-file-kernel-warnings.txt
index a670c8a54008a0ffde8066c0943feed6918deb55..4e35b1c74cec91a3ba4e36c94232ff1ccbbf3e6e 100644
--- a/tests/misc/oracle/log-file-kernel-warnings.txt
+++ b/tests/misc/oracle/log-file-kernel-warnings.txt
@@ -1 +1 @@
-log-file.i:20:[kernel:annot:missing-spec] warning: Neither code nor specification for function f, generating default assigns from the prototype
+tests/misc/log-file.i:20:[kernel:annot:missing-spec] warning: Neither code nor specification for function f, generating default assigns from the prototype
diff --git a/tests/misc/oracle/log-file-value-all.txt b/tests/misc/oracle/log-file-value-all.txt
index 9fc40734a809654691a7caaf3cda993080071e64..c19d8ff15faac9301d00a3f1878c008f2c7ef9fe 100644
--- a/tests/misc/oracle/log-file-value-all.txt
+++ b/tests/misc/oracle/log-file-value-all.txt
@@ -2,15 +2,15 @@
 [eva] Computing initial state
 [eva] Initial state computed
 [eva] computing for function f <- main.
-Called from log-file.i:20.
+Called from tests/misc/log-file.i:20.
 [eva] using specification for function f
 [eva] Done for function f
 [eva] computing for function g <- main.
-Called from log-file.i:21.
+Called from tests/misc/log-file.i:21.
 [eva] using specification for function g
-log-file.i:17:[eva] warning: no 'assigns \result \from ...' clause specified for function g
+tests/misc/log-file.i:17:[eva] warning: no 'assigns \result \from ...' clause specified for function g
 [eva] Done for function g
-log-file.i:22:[eva] starting to merge loop iterations
+tests/misc/log-file.i:22:[eva] starting to merge loop iterations
 [eva] Recording results for main
 [eva] done for function main
 [eva] ====== VALUES COMPUTED ======
diff --git a/tests/misc/oracle/log-file-value-default.txt b/tests/misc/oracle/log-file-value-default.txt
index 39a8339523f5432535f3f79d3738d56a7a7b5a3e..93553049c30efa17102275ef8c4b8187d04efeea 100644
--- a/tests/misc/oracle/log-file-value-default.txt
+++ b/tests/misc/oracle/log-file-value-default.txt
@@ -1,2 +1,2 @@
-log-file.i:17:[eva] warning: no 'assigns \result \from ...' clause specified for function g
+tests/misc/log-file.i:17:[eva] warning: no 'assigns \result \from ...' clause specified for function g
 [eva] ====== VALUES COMPUTED ======
diff --git a/tests/misc/oracle/log-file.0.res.oracle b/tests/misc/oracle/log-file.0.res.oracle
deleted file mode 100644
index e7d4b91d22fb199483beb544258b789c1802804c..0000000000000000000000000000000000000000
--- a/tests/misc/oracle/log-file.0.res.oracle
+++ /dev/null
@@ -1,44 +0,0 @@
-[kernel] Parsing log-file.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] computing for function f <- main.
-  Called from log-file.i:20.
-[kernel:annot:missing-spec] log-file.i:20: Warning: 
-  Neither code nor specification for function f, generating default assigns from the prototype
-[eva] using specification for function f
-[eva] Done for function f
-[eva] computing for function g <- main.
-  Called from log-file.i:21.
-[eva] using specification for function g
-[eva] log-file.i:17: Warning: 
-  no 'assigns \result \from ...' clause specified for function g
-[eva] Done for function g
-[eva] log-file.i:22: starting to merge loop iterations
-[eva] Recording results for main
-[eva] done for function main
-[eva] ====== VALUES COMPUTED ======
-[eva:final-states] Values at end of function main:
-  r ∈ [--..--]
-  __retres ∈ {0}
-[from] Computing for function main
-[from] Computing for function f <-main
-[from] Done for function f
-[from] Computing for function g <-main
-[from] Done for function g
-[from] Done for function main
-[from] ====== DEPENDENCIES COMPUTED ======
-  These dependencies hold at termination for the executions that terminate:
-[from] Function f:
-  \result FROM \nothing
-[from] Function g:
-  \result FROM ANYTHING(origin:Unknown)
-[from] Function main:
-  \result FROM \nothing
-[from] ====== END OF DEPENDENCIES ======
-[inout] Out (internal) for function main:
-    r; i; __retres
-[inout] Inputs for function main:
-    \nothing
diff --git a/tests/misc/oracle/log-file.1.res.oracle b/tests/misc/oracle/log-file.1.res.oracle
deleted file mode 100644
index 834a21040cc44e5e49f3fdb108a6877a5f08cde1..0000000000000000000000000000000000000000
--- a/tests/misc/oracle/log-file.1.res.oracle
+++ /dev/null
@@ -1,8 +0,0 @@
-[kernel] Parsing log-file.i (no preprocessing)
-[kernel:foo-category] result with dkey
-[kernel] result
-[kernel:foo-category] feedback with dkey
-[kernel] feedback
-[kernel:foo-category] debug (level 0) with dkey
-[kernel] debug (level 0)
-[kernel] Warning: warning
diff --git a/tests/misc/oracle/log_selfrec.res.oracle b/tests/misc/oracle/log_selfrec.res.oracle
index befe7bc2d0fa5c1653ace7344098c437ca313627..a6950e931a0ec56f8a87657fbc4d32fd71e54c8d 100644
--- a/tests/misc/oracle/log_selfrec.res.oracle
+++ b/tests/misc/oracle/log_selfrec.res.oracle
@@ -1,5 +1,5 @@
 [report] Monitoring events
 [kernel] User Error: option `-foobar' is unknown.
-  use `frama-c -help' for more information.
+  use `bin/toplevel.opt -help' for more information.
 [report] User Error: Invalid action ("JAZZ")
 [kernel] Plug-in report aborted: invalid user input.
diff --git a/tests/misc/oracle/my_visitor_sav.err b/tests/misc/oracle/my_visitor_sav.err
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/misc/oracle/plugin-log-all.txt b/tests/misc/oracle/plugin-log-all.txt
index f5efe13d2c9583d7cc798feaaea5763ca454c567..336371940a03087a0ea145f8eaa0b2d531f0e91e 100644
--- a/tests/misc/oracle/plugin-log-all.txt
+++ b/tests/misc/oracle/plugin-log-all.txt
@@ -1,4 +1,4 @@
-[kernel] Parsing log-file.i (no preprocessing)
+[kernel] Parsing tests/misc/log-file.i (no preprocessing)
 [kernel:foo-category] result with dkey
 [kernel] result
 [kernel:foo-category] feedback with dkey
diff --git a/tests/pdg/README b/tests/pdg/README
index ab59481809169197ebfb28f2f16f09362195b45f..cc030bd0c34258348bcbbd0e71d8a08e252f0042 100644
--- a/tests/pdg/README
+++ b/tests/pdg/README
@@ -1,62 +1,62 @@
 This file present the tests in ppc/test/pdg that deal with the
 Program Dependence Graph computation.
 
-** dpds_intra.c
+** tests/pdg/dpds_intra.c
    many small tests for the PDG.
    The function "test_ctrl_dpd_multiple" is a case where some
    PDG nodes should have more than one control dependencies,
    but it cannot be tested because the value analysis doesn't work on that case.
 
-** simple_call.c
+** tests/pdg/simple_call.c
    tests for the PDG of function calls.
 
-** calls_and_implicits.c
+** tests/pdg/calls_and_implicits.c
    test the PDG for dependencies between global variables in calls.
    Check if inputs and outputs are not mixed up.
 
-** calls_and_struct.c
+** tests/pdg/calls_and_struct.c
    test the PDG for dependencies with structures.
    In the function 'asgn_struct' we see that the precision could be better.
 
-** decl_dpds.c
+** tests/pdg/decl_dpds.c
    test the PDG with pointers and global variables.
 
-** globals.c
+** tests/pdg/globals.c
    Some tests to have more information about value analysis results.
    Some of the results seem strange...
 
-** inter_alias2.c
+** tests/pdg/inter_alias2.c
    Test the PDG with pointers.
    Show that the alias analysis merge the contexts and the precison problem.
 
-** inter_alias.c
+** tests/pdg/inter_alias.c
    Test the PDG with pointers.
 
-** multiple_calls.c
+** tests/pdg/multiple_calls.c
    Test the PDG for call through function pointer.
 
-** no_body.c
+** tests/pdg/no_body.c
    Test the PDG for call to a function that has no body.
    It is strange that the result of the function doesn't depend on the inputs,
    but it is the behaviour of the whole tool.
 
-** pb_infinite_loop.c
+** tests/pdg/pb_infinite_loop.c
    Infinite loop => no post-dominator computation (not defined in this case).
    Not-Implemented-Yet !
    We should over-approximate the control dependencies in the loop
    so that every statement depend on every test.
 
-** variadic.c
+** tests/pdg/variadic.c
    Test a call to a function with a variable number of arguments.
    The PDG of the variadic function is not computed -> TOP.
 
-** dyn_dpds.c + dyn_dpds.ml
+** tests/pdg/dyn_dpds.c + tests/pdg/dyn_dpds.ml
    Test for the dynamic dependencies.
 
-** call.c
+** tests/pdg/call.c
    A very simple example to generate graph for the documentation.
 
-** doc_dot.c
+** tests/pdg/doc_dot.c
    A very simple example to show the different kinds of nodes and link
    in a .dot file (also for the documentation).
 
diff --git a/tests/pdg/dpds_intra.c b/tests/pdg/dpds_intra.c
index a21a84046e666ea28274178fc22978315dd12023..aac87fd2a4b37ef62171783f69bac333b30ad5c0 100644
--- a/tests/pdg/dpds_intra.c
+++ b/tests/pdg/dpds_intra.c
@@ -11,8 +11,8 @@
    STDOPT: +"-fct-pdg main"
    STDOPT: +"-fct-pdg multiple_global_inputs"
 */
-/* bin/toplevel.opt -deps -main g dpds_intra.c */
-/* bin/toplevel.opt -fct-pdg test_goto_simple dpds_intra.c -pdg-dot */
+/* bin/toplevel.opt -deps -main g tests/slicing/dpds_intra.c */
+/* bin/toplevel.opt -fct-pdg test_goto_simple tests/slicing/dpds_intra.c -pdg-dot */
 
 extern int G;
 
@@ -81,7 +81,7 @@ int test_goto_else (void) {
 }
 
 /* ne passe pas l'analyse de valeur (bouclage)
-./bin/toplevel.opt  -eva -main test_ctrl_dpd_multiple dpds_intra.c
+./bin/toplevel.opt  -eva -main test_ctrl_dpd_multiple tests/slicing/dpds_intra.c
  * cf. mail Pascal Re: loop_pragma UNROLL_LOOP du 09.05.2006 15:03 */
 int test_ctrl_dpd_multiple (void) {
   int x = 0;
diff --git a/tests/pdg/no_body.c b/tests/pdg/no_body.c
index 680ccddbd56ed2e62d5f5c6ad8821a8bec9c1da6..363cf12008dc10349e9c3b54bbc092e56edb4edb 100644
--- a/tests/pdg/no_body.c
+++ b/tests/pdg/no_body.c
@@ -3,8 +3,8 @@
 *    STDOPT: +"-fct-pdg main -inout "
 */
 /*
- * ledit bin/toplevel.top  no_body.c -fct-pdg main
- * #use "select.ml";;
+ * ledit bin/toplevel.top  tests/slicing/no_body.c -fct-pdg main
+ * #use "tests/slicing/select.ml";;
  * test "loop" (select_data "G");;
 */
 
diff --git a/tests/pdg/oracle/calls_and_implicits.res.oracle b/tests/pdg/oracle/calls_and_implicits.res.oracle
index 87f2d3d975262cb0176e2a5b01395127f260d3f1..10f54cf5c3ad2ff1f334c2704ed77d2cc27517b4 100644
--- a/tests/pdg/oracle/calls_and_implicits.res.oracle
+++ b/tests/pdg/oracle/calls_and_implicits.res.oracle
@@ -24,6 +24,34 @@
 [eva] Done for function swap
 [eva] Recording results for main
 [eva] done for function main
+[inout] InOut (internal) for function f:
+  Operational inputs:
+    G
+  Operational inputs on termination:
+    G
+  Sure outputs:
+    G; __retres
+[inout] InOut (internal) for function f2:
+  Operational inputs:
+    G
+  Operational inputs on termination:
+    G
+  Sure outputs:
+    G2; __retres
+[inout] InOut (internal) for function swap:
+  Operational inputs:
+    G; G2
+  Operational inputs on termination:
+    G; G2
+  Sure outputs:
+    G; G2; tmp
+[inout] InOut (internal) for function main:
+  Operational inputs:
+    \nothing
+  Operational inputs on termination:
+    \nothing
+  Sure outputs:
+    t{[0]; [2]}; G; G2; __retres
 [pdg] computing for function main
 [from] Computing for function f
 [from] Done for function f
@@ -88,31 +116,3 @@
    -[--d]-> 17
  {n19}: OutRet
    -[--d]-> 18
-[inout] InOut (internal) for function f:
-  Operational inputs:
-    G
-  Operational inputs on termination:
-    G
-  Sure outputs:
-    G; __retres
-[inout] InOut (internal) for function f2:
-  Operational inputs:
-    G
-  Operational inputs on termination:
-    G
-  Sure outputs:
-    G2; __retres
-[inout] InOut (internal) for function swap:
-  Operational inputs:
-    G; G2
-  Operational inputs on termination:
-    G; G2
-  Sure outputs:
-    G; G2; tmp
-[inout] InOut (internal) for function main:
-  Operational inputs:
-    \nothing
-  Operational inputs on termination:
-    \nothing
-  Sure outputs:
-    t{[0]; [2]}; G; G2; __retres
diff --git a/tests/pdg/oracle/calls_and_struct.res.oracle b/tests/pdg/oracle/calls_and_struct.res.oracle
index 526c9e463d43acca9bbe96e90c057ddb609ecf68..fc445a1698d69559d776adc53d56097c4e91a336 100644
--- a/tests/pdg/oracle/calls_and_struct.res.oracle
+++ b/tests/pdg/oracle/calls_and_struct.res.oracle
@@ -38,6 +38,39 @@
   C FROM \nothing
   \result FROM S
 [from] ====== END OF DEPENDENCIES ======
+[inout] Out (internal) for function asgn_struct:
+    s; __retres
+[inout] Inputs for function asgn_struct:
+    S
+[inout] InOut (internal) for function asgn_struct:
+  Operational inputs:
+    S
+  Operational inputs on termination:
+    S
+  Sure outputs:
+    s; __retres
+[inout] Out (internal) for function f:
+    S.a; A; __retres
+[inout] Inputs for function f:
+    S.b; A
+[inout] InOut (internal) for function f:
+  Operational inputs:
+    S.b; A; s{.a; .b}
+  Operational inputs on termination:
+    S.b; A; s{.a; .b}
+  Sure outputs:
+    S.a; A; __retres
+[inout] Out (internal) for function main:
+    S.a; A; B; C; a; tmp_0
+[inout] Inputs for function main:
+    S; A
+[inout] InOut (internal) for function main:
+  Operational inputs:
+    S
+  Operational inputs on termination:
+    S
+  Sure outputs:
+    S.a; A; B; C; a; tmp_0
 [pdg] computing for function asgn_struct
 [pdg] done for function asgn_struct
 [pdg] computing for function f
@@ -140,36 +173,3 @@
    -[--d]-> 33
  {n35}: In(S.b)
  {n36}: In(S)
-[inout] Out (internal) for function asgn_struct:
-    s; __retres
-[inout] Inputs for function asgn_struct:
-    S
-[inout] InOut (internal) for function asgn_struct:
-  Operational inputs:
-    S
-  Operational inputs on termination:
-    S
-  Sure outputs:
-    s; __retres
-[inout] Out (internal) for function f:
-    S.a; A; __retres
-[inout] Inputs for function f:
-    S.b; A
-[inout] InOut (internal) for function f:
-  Operational inputs:
-    S.b; A; s{.a; .b}
-  Operational inputs on termination:
-    S.b; A; s{.a; .b}
-  Sure outputs:
-    S.a; A; __retres
-[inout] Out (internal) for function main:
-    S.a; A; B; C; a; tmp_0
-[inout] Inputs for function main:
-    S; A
-[inout] InOut (internal) for function main:
-  Operational inputs:
-    S
-  Operational inputs on termination:
-    S
-  Sure outputs:
-    S.a; A; B; C; a; tmp_0
diff --git a/tests/pdg/oracle/const.res.oracle b/tests/pdg/oracle/const.res.oracle
index d7ec59e3ebb5391ff694e1ce9d883b50811ea956..413996203daf25491d890d9cd5d879966b2ae89f 100644
--- a/tests/pdg/oracle/const.res.oracle
+++ b/tests/pdg/oracle/const.res.oracle
@@ -67,6 +67,18 @@
   G3.M2 FROM G1.M2; G4; G5
   \result FROM \nothing
 [from] ====== END OF CALLWISE DEPENDENCIES ======
+[inout] Out (internal) for function F1:
+    G3.M2
+[inout] Inputs for function F1:
+    G2.M2; G5
+[inout] Out (internal) for function F2:
+    G1.M1; V1
+[inout] Inputs for function F2:
+    G4
+[inout] Out (internal) for function main:
+    G1.M1; G2; G3.M2; V2
+[inout] Inputs for function main:
+    G1; G2.M2; G4; G5
 [pdg] computing for function F1
 [pdg] done for function F1
 [pdg] computing for function F2
@@ -154,15 +166,3 @@
  {n30}: In(G5)
  {n31}: In(G1.M2)
  {n32}: In(G4)
-[inout] Out (internal) for function F1:
-    G3.M2
-[inout] Inputs for function F1:
-    G2.M2; G5
-[inout] Out (internal) for function F2:
-    G1.M1; V1
-[inout] Inputs for function F2:
-    G4
-[inout] Out (internal) for function main:
-    G1.M1; G2; G3.M2; V2
-[inout] Inputs for function main:
-    G1; G2.M2; G4; G5
diff --git a/tests/pdg/oracle/inter_alias.res.oracle b/tests/pdg/oracle/inter_alias.res.oracle
index c7a1e2a74c654c24c78839c8fc74731578e802c4..620028a428cd176366b69346684739a2cc2f8eaa 100644
--- a/tests/pdg/oracle/inter_alias.res.oracle
+++ b/tests/pdg/oracle/inter_alias.res.oracle
@@ -39,6 +39,14 @@
 [from] entry point:
   \result FROM G
 [from] ====== END OF CALLWISE DEPENDENCIES ======
+[inout] Out (internal) for function f1:
+    a; b; __retres
+[inout] Inputs for function f1:
+    G; a; b
+[inout] Out (internal) for function main:
+    a; b; __retres
+[inout] Inputs for function main:
+    G
 [pdg] computing for function f1
 [pdg] done for function f1
 [pdg] computing for function main
@@ -138,11 +146,3 @@
  {n30}: OutRet
    -[--d]-> 29
  {n31}: In(G)
-[inout] Out (internal) for function f1:
-    a; b; __retres
-[inout] Inputs for function f1:
-    G; a; b
-[inout] Out (internal) for function main:
-    a; b; __retres
-[inout] Inputs for function main:
-    G
diff --git a/tests/pdg/oracle/multiple_calls.0.res.oracle b/tests/pdg/oracle/multiple_calls.0.res.oracle
index dc147d4a67be0d3802582b30e3fdd1d11287c106..56904ff1011d3d68851e341fcd1382f781d32d56 100644
--- a/tests/pdg/oracle/multiple_calls.0.res.oracle
+++ b/tests/pdg/oracle/multiple_calls.0.res.oracle
@@ -47,6 +47,27 @@
   G4 FROM c; d (and SELF)
   \result FROM G1; G2; c; d
 [from] ====== END OF DEPENDENCIES ======
+[inout] InOut (internal) for function fct1:
+  Operational inputs:
+    x; y; z
+  Operational inputs on termination:
+    x; y; z
+  Sure outputs:
+    G1; G3; G4
+[inout] InOut (internal) for function fct2:
+  Operational inputs:
+    x; y; z
+  Operational inputs on termination:
+    x; y; z
+  Sure outputs:
+    G2; G3
+[inout] InOut (internal) for function appel_ptr_fct:
+  Operational inputs:
+    G1; G2; c; d
+  Operational inputs on termination:
+    G1; G2; c; d
+  Sure outputs:
+    G3; a; b; pf; tmp; x; tmp_0; __retres
 [pdg] computing for function appel_ptr_fct
 [pdg] done for function appel_ptr_fct
 [pdg] PDG for appel_ptr_fct
@@ -157,24 +178,3 @@
    -[--d]-> 30
  {n32}: In(G1)
  {n33}: In(G2)
-[inout] InOut (internal) for function fct1:
-  Operational inputs:
-    x; y; z
-  Operational inputs on termination:
-    x; y; z
-  Sure outputs:
-    G1; G3; G4
-[inout] InOut (internal) for function fct2:
-  Operational inputs:
-    x; y; z
-  Operational inputs on termination:
-    x; y; z
-  Sure outputs:
-    G2; G3
-[inout] InOut (internal) for function appel_ptr_fct:
-  Operational inputs:
-    G1; G2; c; d
-  Operational inputs on termination:
-    G1; G2; c; d
-  Sure outputs:
-    G3; a; b; pf; tmp; x; tmp_0; __retres
diff --git a/tests/pdg/oracle/multiple_calls.1.res.oracle b/tests/pdg/oracle/multiple_calls.1.res.oracle
index 851299dabf4ce6df96aac24c7e0f0ca6d36ce548..b5c8435972d9f3a1bbd0f6c0339369a75a82a8f9 100644
--- a/tests/pdg/oracle/multiple_calls.1.res.oracle
+++ b/tests/pdg/oracle/multiple_calls.1.res.oracle
@@ -41,6 +41,27 @@
   G4 FROM c; a; b
   \result FROM c; a; b
 [from] ====== END OF DEPENDENCIES ======
+[inout] InOut (internal) for function fct1:
+  Operational inputs:
+    x; y; z
+  Operational inputs on termination:
+    x; y; z
+  Sure outputs:
+    G1; G3; G4
+[inout] InOut (internal) for function fct2:
+  Operational inputs:
+    x; y; z
+  Operational inputs on termination:
+    x; y; z
+  Sure outputs:
+    G2; G3
+[inout] InOut (internal) for function appel_ptr_fct_bis:
+  Operational inputs:
+    c; a; b; d
+  Operational inputs on termination:
+    c; a; b; d
+  Sure outputs:
+    G3; G4; pf; tmp
 [pdg] computing for function appel_ptr_fct_bis
 [pdg] done for function appel_ptr_fct_bis
 [pdg] PDG for appel_ptr_fct_bis
@@ -130,24 +151,3 @@
    -[--d]-> 23
  {n26}: OutRet
    -[--d]-> 25
-[inout] InOut (internal) for function fct1:
-  Operational inputs:
-    x; y; z
-  Operational inputs on termination:
-    x; y; z
-  Sure outputs:
-    G1; G3; G4
-[inout] InOut (internal) for function fct2:
-  Operational inputs:
-    x; y; z
-  Operational inputs on termination:
-    x; y; z
-  Sure outputs:
-    G2; G3
-[inout] InOut (internal) for function appel_ptr_fct_bis:
-  Operational inputs:
-    c; a; b; d
-  Operational inputs on termination:
-    c; a; b; d
-  Sure outputs:
-    G3; G4; pf; tmp
diff --git a/tests/pdg/oracle/no_body.res.oracle b/tests/pdg/oracle/no_body.res.oracle
index 4be1aaea9d6d0e9c8cb5510b05a1006d8cdd4116..cbceb964eb12fbaa49587302d2283bfe7f6e3654 100644
--- a/tests/pdg/oracle/no_body.res.oracle
+++ b/tests/pdg/oracle/no_body.res.oracle
@@ -31,6 +31,20 @@
 [eva] Done for function loop
 [eva] Recording results for main
 [eva] done for function main
+[inout] InOut (internal) for function loop:
+  Operational inputs:
+    G; x
+  Operational inputs on termination:
+    G; x
+  Sure outputs:
+    tmp
+[inout] InOut (internal) for function main:
+  Operational inputs:
+    \nothing
+  Operational inputs on termination:
+    \nothing
+  Sure outputs:
+    G; x
 [pdg] computing for function main
 [from] Computing for function f
 [from] Done for function f
@@ -68,17 +82,3 @@
    -[--d]-> 8
  {n10}: return;
    -[-c-]-> 1
-[inout] InOut (internal) for function loop:
-  Operational inputs:
-    G; x
-  Operational inputs on termination:
-    G; x
-  Sure outputs:
-    tmp
-[inout] InOut (internal) for function main:
-  Operational inputs:
-    \nothing
-  Operational inputs on termination:
-    \nothing
-  Sure outputs:
-    G; x
diff --git a/tests/pdg/oracle/sets.res.oracle b/tests/pdg/oracle/sets.res.oracle
index 9b3e71719db2c54e88dbea980b858d79543e793b..8dacaaeda875abfdc54c572fa40243d14be8e589 100644
--- a/tests/pdg/oracle/sets.res.oracle
+++ b/tests/pdg/oracle/sets.res.oracle
@@ -12,6 +12,13 @@
 [eva:alarm] sets.c:15: Warning: signed overflow. assert b + y ≤ 2147483647;
 [eva] Recording results for f
 [eva] done for function f
+[inout] InOut (internal) for function f:
+  Operational inputs:
+    a
+  Operational inputs on termination:
+    a
+  Sure outputs:
+    b; c; x; y; z; t
 [pdg] computing for function f
 [pdg] done for function f
 [pdg] ====== PDG GRAPH COMPUTED ======
@@ -55,13 +62,6 @@
    -[-c-]-> 1
  {n14}: return;
    -[-c-]-> 1
-[inout] InOut (internal) for function f:
-  Operational inputs:
-    a
-  Operational inputs on termination:
-    a
-  Sure outputs:
-    b; c; x; y; z; t
 [kernel] Test [all_uses] stmt1
 [kernel] {n9}: x = z;
 [kernel] {n7}: z = y;
diff --git a/tests/pdg/oracle/top_pdg_input.res.oracle b/tests/pdg/oracle/top_pdg_input.res.oracle
index dad838a19caa71097af4c106076ce6ed6612a728..72f904673274a5504962f083902fd9626ec5e46a 100644
--- a/tests/pdg/oracle/top_pdg_input.res.oracle
+++ b/tests/pdg/oracle/top_pdg_input.res.oracle
@@ -129,6 +129,26 @@ Cannot filter: dumping raw memory (including unchanged variables)
   FROMTOP
   \result FROM ANYTHING(origin:Unknown)
 [from] ====== END OF DEPENDENCIES ======
+[inout] Out (internal) for function no_results:
+    __retres
+[inout] Inputs for function no_results:
+    \nothing
+[inout] Out (internal) for function f1:
+    ANYTHING(origin:Unknown)
+[inout] Inputs for function f1:
+    nondet; tab[1]; G
+[inout] Out (internal) for function f2:
+    ANYTHING(origin:Unknown)
+[inout] Inputs for function f2:
+    nondet; S
+[inout] Out (internal) for function strlen:
+    q; k
+[inout] Inputs for function strlen:
+    S_0_S_p_str[0..1]
+[inout] Out (internal) for function main:
+    ANYTHING(origin:Unknown)
+[inout] Inputs for function main:
+    nondet; tab[1]; S; G; S_p_str[0]; S_0_S_p_str[0..1]
 [pdg] computing for function no_results
 [pdg] Top for function no_results
 [pdg] computing for function f1
@@ -210,26 +230,6 @@ Cannot filter: dumping raw memory (including unchanged variables)
  {n33}: In(S_0_S_p_str[0..1])
 [pdg] PDG for main
  Top PDG
-[inout] Out (internal) for function no_results:
-    __retres
-[inout] Inputs for function no_results:
-    \nothing
-[inout] Out (internal) for function f1:
-    ANYTHING(origin:Unknown)
-[inout] Inputs for function f1:
-    nondet; tab[1]; G
-[inout] Out (internal) for function f2:
-    ANYTHING(origin:Unknown)
-[inout] Inputs for function f2:
-    nondet; S
-[inout] Out (internal) for function strlen:
-    q; k
-[inout] Inputs for function strlen:
-    S_0_S_p_str[0..1]
-[inout] Out (internal) for function main:
-    ANYTHING(origin:Unknown)
-[inout] Inputs for function main:
-    nondet; tab[1]; S; G; S_p_str[0]; S_0_S_p_str[0..1]
 [eva] Analyzing a complete application starting at main_asm
 [eva] Computing initial state
 [eva] Initial state computed
@@ -268,6 +268,18 @@ Cannot filter: dumping raw memory (including unchanged variables)
   FROMTOP
   \result FROM ANYTHING(origin:Unknown)
 [from] ====== END OF DEPENDENCIES ======
+[inout] Out (internal) for function fun_asm:
+    __retres
+[inout] Inputs for function fun_asm:
+    \nothing
+[inout] Out (internal) for function main_asm:
+    j; tmp
+[inout] Inputs for function main_asm:
+    \nothing
+[inout] Out (internal) for function no_results:
+    __retres
+[inout] Inputs for function no_results:
+    \nothing
 [pdg] computing for function fun_asm
 [pdg] top_pdg_input.c:45: Warning: Ignoring inline assembly code
 [pdg] done for function fun_asm
@@ -323,15 +335,3 @@ Cannot filter: dumping raw memory (including unchanged variables)
    -[--d]-> 62
 [pdg] PDG for no_results
  Top PDG
-[inout] Out (internal) for function fun_asm:
-    __retres
-[inout] Inputs for function fun_asm:
-    \nothing
-[inout] Out (internal) for function main_asm:
-    j; tmp
-[inout] Inputs for function main_asm:
-    \nothing
-[inout] Out (internal) for function no_results:
-    __retres
-[inout] Inputs for function no_results:
-    \nothing
diff --git a/tests/pretty_printing/ghost_parameters.c b/tests/pretty_printing/ghost_parameters.c
index 74638a96fb581e66a991860176031eef13da9b3d..27dc37fa59a03fe51d987bf0bccb84162ec451b0 100644
--- a/tests/pretty_printing/ghost_parameters.c
+++ b/tests/pretty_printing/ghost_parameters.c
@@ -1,8 +1,8 @@
 /* run.config
-  PLUGIN:
   STDOPT: +"-kernel-warn-key ghost:bad-use=inactive"
 */
 // Note: we deactivate ghost:bad-use to check that pretty-printing ghost well
+
 void decl_function_void_no_ghost(void);
 void def_function_void_no_ghost(void) {}
 void decl_function_void_ghost(void) /*@ ghost (int y) */;
diff --git a/tests/pretty_printing/parenthesis.c b/tests/pretty_printing/parenthesis.c
index 9e25bb53be7de6a9479b8354104ce4346c47b27a..fc923fe3d2751e03d3f539ff7c0bac58f5295a8f 100644
--- a/tests/pretty_printing/parenthesis.c
+++ b/tests/pretty_printing/parenthesis.c
@@ -1,5 +1,5 @@
 /* run.config
-   OPT: @PTEST_FILE@ -print
+   OPT: -print
  */
 
 /*@
diff --git a/tests/saveload/oracle/basic_sav.1.err b/tests/saveload/oracle/basic_sav.1.err
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/saveload/oracle/basic_sav.err b/tests/saveload/oracle/basic_sav.err
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/saveload/oracle/bool_sav.err b/tests/saveload/oracle/bool_sav.err
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/saveload/oracle/deps.2.res.oracle b/tests/saveload/oracle/deps.2.res.oracle
index 21b9554423da6c5174779fe69f4cc594e87fc5de..86d7a2aa4ea6852ffe77c514b82169f16a040c6d 100644
--- a/tests/saveload/oracle/deps.2.res.oracle
+++ b/tests/saveload/oracle/deps.2.res.oracle
@@ -1 +1 @@
-[kernel] Parsing deps.i (no preprocessing)
+[kernel] Warning: 2 states in saved file ignored. They are invalid in this Frama-C configuration.
diff --git a/tests/saveload/oracle/deps_sav.err b/tests/saveload/oracle/deps_sav.err
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/saveload/oracle/isset_sav.err b/tests/saveload/oracle/isset_sav.err
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/saveload/oracle/multi_project_sav.err b/tests/saveload/oracle/multi_project_sav.err
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/saveload/oracle/segfault_datatypes_sav.err b/tests/saveload/oracle/segfault_datatypes_sav.err
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/saveload/oracle/sparecode_sav.err b/tests/saveload/oracle/sparecode_sav.err
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/saveload/oracle/status_sav.err b/tests/saveload/oracle/status_sav.err
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/scope/zones.ml b/tests/scope/zones.ml
index 740c9d49e6a16860d27a5a5dcbb48b1fbfbecb83..19d3afc121119fb4bfbd343f526d57b9b91b33ec 100644
--- a/tests/scope/zones.ml
+++ b/tests/scope/zones.ml
@@ -1,5 +1,5 @@
 (* when using toplevel.top :
-bin/topleval.top -eva zones.c
+bin/topleval.top -eva tests/scope/zones.c
 #directory "cil/src";;
 *)
 
diff --git a/tests/slicing/README b/tests/slicing/README
index f7a71a0977e1630a22531aa24b9382c2691c05db..47ee0df1fc9a8b784d4128621a8dbe315b1bd21d 100644
--- a/tests/slicing/README
+++ b/tests/slicing/README
@@ -1,54 +1,54 @@
 This file present the tests in ppc/tests/slicing.
 For the Program Dependence Graph tests, see  ppc/tests/pdg.
 
-** simple_intra_slice.c & simple_intra_slice.ml
+** tests/slicing/simple_intra_slice.c & tests/slicing/simple_intra_slice.ml
    First slicing test. Still use internal functions of the Slicing module
    to test internal features (select with a statement number for instance).
    Many small tests for intra-procedural slicing.
 
-** select_by_annot.c & select_by_annot.ml
+** tests/slicing/select_by_annot.c & tests/slicing/select_by_annot.ml
    At first, there were no internal means to build a location for a data at a
    given program point, so test the slicing on a data using annotation in the
    source code.
 
-** libSelect.ml
+** tests/slicing/libSelect.ml
    Library used in other tests to have higher level functions.
    Also includes a try to have a 'load_source_file' function in order to be
    able to change the project without exiting the tool, but it doesn't work
    at the moment because of CIL problems.
 
-** select_simple.c & select_simple.ml
+** tests/slicing/select_simple.c & tests/slicing/select_simple.ml
    Same source code than simple_intra_slice.c but test it with a user
    point of view using Select module (above) functions.
 
-** switch.c & switch.ml
+** tests/slicing/switch.c & tests/slicing/switch.ml
    One very small test on a switch. Should do more...
 
-** ex_spec_interproc.c & ex_spec_interproc.ml
+** tests/slicing/ex_spec_interproc.c & tests/slicing/ex_spec_interproc.ml
    Example given by Patrick for the specification of the inter-procedural
    slicing. Test the example using different slicing modes.
    See the documentation for more information.
 
-** horwitz.c & horwitz.ml
+** tests/slicing/horwitz.c & tests/slicing/horwitz.ml
    Example from a paper of Horwitz about inter-procedural slicing.
    Check if we have the same result than her with her System Dependence Graph.
 
-** adpcm.c & adpcm.ml
-   source code from adpcm.c. To have a bigger example...
+** tests/slicing/adpcm.c & tests/slicing/adpcm.ml
+   source code from tests/test/adpcm.c. To have a bigger example...
 
-** ptr_fct.c
+** tests/slicing/ptr_fct.c
    Example given by Patrick for the specification/documentation 
    of Db.Slicing.Project.is_directly_called_internal.
 
-** sizeof.c
+** tests/slicing/sizeof.c
    Example given by Patrick.
    Tests the slicing 
    different slicing modes with and without propagation to the callers.
    This is done using options of the command line:
    -slice-print, -slicing-return.
 
-** select_return.c
-** select_return_bis.c
+** tests/slicing/select_return.c
+** tests/slicing/select_return_bis.c
    Example given by Patrick for the specification of the inter-procedural
    slicing including the propagation to the callers. Tests the example using
    different slicing modes with and without propagation to the callers.
@@ -57,37 +57,37 @@ For the Program Dependence Graph tests, see  ppc/tests/pdg.
    with/without -slice-callers.
    Some tests for -slice-value have been added.
 
-** select_call.c
+** tests/slicing/select_call.c
    Example given by Julien for the specification of property analysis about
    data confidentiality. Test -slice-calls option.
 
-** mark_all_slices.c
+** tests/slicing/mark_all_slices.c
    tests for the newly created (04/2007) persistant selection.
 
-** min_call.c
-   the source code is included from select_return.c,
+** tests/slicing/min_call.c
+   the source code is included from tests/slicing/select_return.c,
    but le .ml command file is to test the propagation to the callers. 
    It use the new (04/2007) [select_min_call]
    function that can be used to select a call to be visible without choosing 
    the version of the function to call.
 
-** libAnim.ml
+** tests/slicing/libAnim.ml
    Useful functions to view graphically the building process of a slicing
    project.
 
-** anim.ml
-   Small example to see how to use libAnim.ml
+** tests/slicing/anim.ml
+   Small example to see how to use tests/slicing/libAnim.ml
    (see the header lines to launch it)
 
-** merge.c
+** tests/slicing/merge.c
    Basic test for merging slices (to be enhance...)
 
-** variadic.c
-   Same source file than variadic.c (#include).
+** tests/slicing/variadic.c
+   Same source file than tests/pdg/variadic.c (#include).
    Slicing variadic functions and calls to variadic functions.
 
-** unravel-flavors.c
-** unravel-point.c
-** unravel-variance.c
+** tests/slicing/unravel-flavors.c
+** tests/slicing/unravel-point.c
+** tests/slicing/unravel-variance.c
    Small example derived from examples given for UNRAVEL slicing tool.
 
diff --git a/tests/slicing/adpcm.ml b/tests/slicing/adpcm.ml
index c183f46de28d2a291bf37763f48ad43da8994c61..0da186815d051e27681f0ed1f6c4cacb639bcdbb 100644
--- a/tests/slicing/adpcm.ml
+++ b/tests/slicing/adpcm.ml
@@ -1,6 +1,6 @@
 (*
-ledit bin/toplevel.top  -no-annot -deps -slicing_level 2 adpcm.c
-#use "select.ml";;
+ledit bin/toplevel.top  -no-annot -deps -slicing_level 2 tests/slicing/adpcm.c
+#use "tests/slicing/select.ml";;
 *)
 
 include LibSelect;;
@@ -8,7 +8,7 @@ include LibSelect;;
 (* Kernel.slicing_level := 2;;  = MinimizeNbCalls *)
 
 (*
-let resname = "adpcm.sliced" in
+let resname = "tests/slicing/adpcm.sliced" in
 ignore (test "uppol2" ~do_prop_to_callers:true ~resname (select_retres));;
 *)
 let () =
diff --git a/tests/slicing/anim.ml b/tests/slicing/anim.ml
index 3065ed0987873028a29d43616ce026d2d32fe4aa..845f8405af0070998708af054255c0d803f8ef9d 100644
--- a/tests/slicing/anim.ml
+++ b/tests/slicing/anim.ml
@@ -2,9 +2,9 @@
 * Small example to view graphically the building process of a slicing project.
 * To try it, use the following commands :
 
-  make anim.byte; \
-  anim.byte -deps -lib-entry -main g -slicing-level 3 -slice-callers \
-                          select_return_bis.c
+  make tests/slicing/anim.byte; \
+  tests/slicing/anim.byte -deps -lib-entry -main g -slicing-level 3 -slice-callers \
+                          tests/slicing/select_return_bis.c
 *)
 
 (*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*)
diff --git a/tests/slicing/ex_spec_interproc.ml b/tests/slicing/ex_spec_interproc.ml
index 617018e357eee224b8651c36cc00bf9c3d2d38b5..a97a0bbebbd542fce41da037a0f1dd13105e4f30 100644
--- a/tests/slicing/ex_spec_interproc.ml
+++ b/tests/slicing/ex_spec_interproc.ml
@@ -1,7 +1,7 @@
-(* ledit bin/toplevel.top -deps ex_spec_interproc.c
-  #use "select.ml";;
+(* ledit bin/toplevel.top -deps tests/slicing/ex_spec_interproc.c
+  #use "tests/slicing/select.ml";;
 ou
-  #use "ex_spec_interproc.ml";;
+  #use "tests/slicing/ex_spec_interproc.ml";;
 
 *)
 
diff --git a/tests/slicing/horwitz.ml b/tests/slicing/horwitz.ml
index 0c5dafe351cbb2ed123ec85ec14051c7923cfbf9..f897fa15e85842c275955a33c927714f609adda0 100644
--- a/tests/slicing/horwitz.ml
+++ b/tests/slicing/horwitz.ml
@@ -1,8 +1,8 @@
 (* 
-ledit bin/toplevel.top  -deps horwitz.c
-#use "select.ml";;
+ledit bin/toplevel.top  -deps tests/slicing/horwitz.c
+#use "tests/slicing/select.ml";;
 
-horwitz.byte -deps horwitz.c
+tests/slicing/horwitz.byte -deps tests/slicing/horwitz.c
 * *)
 
 include LibSelect;;
diff --git a/tests/slicing/libAnim.ml b/tests/slicing/libAnim.ml
index 49bb7d1c724356ef00d48303a006701a562d8f98..a71ec650781bd5f599018550b7da38dc79315fe3 100644
--- a/tests/slicing/libAnim.ml
+++ b/tests/slicing/libAnim.ml
@@ -1,5 +1,5 @@
 (* Some useful function to use the graphical representation of a slicing
-* project. (see anim.ml for a test) *)
+* project. (see tests/slicing/anim.ml for a test) *)
 (*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*)
 
 let use_dot =
diff --git a/tests/slicing/libSelect.ml b/tests/slicing/libSelect.ml
index 58bd424a2c74e3819c66375a868dd20c2ab64c2a..41e55de6abc57f04b210f23b7547f49fa38d0821 100644
--- a/tests/slicing/libSelect.ml
+++ b/tests/slicing/libSelect.ml
@@ -1,6 +1,6 @@
 (* To use this in interactive mode :
 
-#use "select.ml";;
+#use "tests/slicing/select.ml";;
 *)
 
 exception Break
diff --git a/tests/slicing/mark_all_slices.ml b/tests/slicing/mark_all_slices.ml
index 8151c44f51081fa234c974233860d6331a9d8d56..0f0ca762df66af1c6f065329b1d14fb81aca0cb7 100644
--- a/tests/slicing/mark_all_slices.ml
+++ b/tests/slicing/mark_all_slices.ml
@@ -1,7 +1,7 @@
-(* ledit bin/toplevel.top -deps mark_all_slices.c
-  #use "select.ml";;
+(* ledit bin/toplevel.top -deps tests/slicing/mark_all_slices.c
+  #use "tests/slicing/select.ml";;
 ou
-  #use "mark_all_slices.ml";;
+  #use "tests/slicing/mark_all_slices.ml";;
 
 *)
 
diff --git a/tests/slicing/merge.ml b/tests/slicing/merge.ml
index ba164dac9d1b34cf6fefc294161a3addaec3a506..3b12cf6728f01660e87da29ada7c4c7a0e434f1f 100644
--- a/tests/slicing/merge.ml
+++ b/tests/slicing/merge.ml
@@ -2,9 +2,9 @@
 * Small example to test function merge_slices.
 * To try it, use the following commands :
 
-  make merge.byte; \
-  merge.byte -deps -lib-entry g -slicing-level 3 \
-                          merge.c
+  make tests/slicing/merge.byte; \
+  tests/slicing/merge.byte -deps -lib-entry g -slicing-level 3 \
+                          tests/slicing/merge.c
 *)
 
 (*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*)
diff --git a/tests/slicing/min_call.ml b/tests/slicing/min_call.ml
index 7005c27ff916d2b295e87dc3b845a5fa84fc865c..de1b11726f2ce2c0f84dcaa1a34a626845603e33 100644
--- a/tests/slicing/min_call.ml
+++ b/tests/slicing/min_call.ml
@@ -1,5 +1,5 @@
 (* ledit -h jnl bin/toplevel.top -deps  -lib-entry g -slice-callers \
-                                 min_call.c
+                                 tests/slicing/min_call.c
 
 *)
 
diff --git a/tests/slicing/oracle/bts336.3.res.oracle b/tests/slicing/oracle/bts336.3.res.oracle
index e5747bf075409abbc7e822901ac8b4276355f8c1..3ec5777dbbc97d199debd99753f3d97d3ca14a83 100644
--- a/tests/slicing/oracle/bts336.3.res.oracle
+++ b/tests/slicing/oracle/bts336.3.res.oracle
@@ -37,6 +37,20 @@
 [from] entry point:
   \result FROM \nothing
 [from] ====== END OF CALLWISE DEPENDENCIES ======
+[inout] InOut (internal) for function f3:
+  Operational inputs:
+    p; a; b; c
+  Operational inputs on termination:
+    p; a; b; c
+  Sure outputs:
+    \nothing
+[inout] InOut (internal) for function main3:
+  Operational inputs:
+    \nothing
+  Operational inputs on termination:
+    \nothing
+  Sure outputs:
+    a; b; c
 [slicing] slicing requests in progress...
 [slicing] initializing slicing ...
 [slicing] interpreting slicing requests from the command line...
@@ -54,20 +68,6 @@
 [slicing] applying 0 actions...
 [sparecode] remove unused global declarations from project 'Slicing export tmp'
 [sparecode] removed unused global declarations in new project 'Slicing export'
-[inout] InOut (internal) for function f3:
-  Operational inputs:
-    p; a; b; c
-  Operational inputs on termination:
-    p; a; b; c
-  Sure outputs:
-    \nothing
-[inout] InOut (internal) for function main3:
-  Operational inputs:
-    \nothing
-  Operational inputs on termination:
-    \nothing
-  Sure outputs:
-    a; b; c
 /* Generated by Frama-C */
 void f3_slice_1(int *p)
 {
diff --git a/tests/slicing/select_by_annot.ml b/tests/slicing/select_by_annot.ml
index cd5c0fe25ebb0e136b44223790c0f0a7c8f0d986..75508ce846022c06b09834bfe61bff5c0713672c 100644
--- a/tests/slicing/select_by_annot.ml
+++ b/tests/slicing/select_by_annot.ml
@@ -1,5 +1,5 @@
-(* ledit bin/toplevel.top -deps select_by_annot.c \
-   < select_by_annot.ml
+(* ledit bin/toplevel.top -deps tests/slicing/select_by_annot.c \
+   < tests/slicing/select_by_annot.ml
 *)
 
 
diff --git a/tests/slicing/select_simple.ml b/tests/slicing/select_simple.ml
index 65fcaf7bdcbb2ca7ec3b0ebce22858013ff78e21..3aa0403891373879e2f3a05719f72ac00fd4c239 100644
--- a/tests/slicing/select_simple.ml
+++ b/tests/slicing/select_simple.ml
@@ -1,4 +1,4 @@
-(* ledit bin/toplevel.top -deps simple_intra_slice.c
+(* ledit bin/toplevel.top -deps tests/slicing/simple_intra_slice.c
 * *)
 
 include LibSelect ;;
diff --git a/tests/slicing/simple_intra_slice.ml b/tests/slicing/simple_intra_slice.ml
index 3163f42e28d822b3aea96c95f748729175c41db0..3746bbdf37d28c52eab3315d0c74485117b40a63 100644
--- a/tests/slicing/simple_intra_slice.ml
+++ b/tests/slicing/simple_intra_slice.ml
@@ -1,5 +1,5 @@
-(* ledit bin/toplevel.top -deps simple_intra_slice.c \
-  < simple_intra_slice.ml
+(* ledit bin/toplevel.top -deps tests/slicing/simple_intra_slice.c \
+  < tests/slicing/simple_intra_slice.ml
 *)
 
 
diff --git a/tests/slicing/slice_no_body.ml b/tests/slicing/slice_no_body.ml
index c9dfad9a18995d2f372506674cf8f30718297054..8bbcde8573d6d3d4821df039f2bfcfc92795c5a7 100644
--- a/tests/slicing/slice_no_body.ml
+++ b/tests/slicing/slice_no_body.ml
@@ -1,5 +1,5 @@
-(* ledit bin/toplevel.top -deps slice_no_body.c
-  #use "select.ml";;
+(* ledit bin/toplevel.top -deps tests/slicing/slice_no_body.c
+  #use "tests/slicing/select.ml";;
 *)
 
 include LibSelect;;
diff --git a/tests/slicing/switch.ml b/tests/slicing/switch.ml
index 69318e2ccdb915b8f061162976fabb438220bfe9..bff182f72adf37a9450c052fc63812e540b44896 100644
--- a/tests/slicing/switch.ml
+++ b/tests/slicing/switch.ml
@@ -1,4 +1,4 @@
-(* ledit bin/toplevel.top -deps switch.c
+(* ledit bin/toplevel.top -deps tests/slicing/switch.c
 * *)
 
 include LibSelect ;;
diff --git a/tests/slicing/tests.sh b/tests/slicing/tests.sh
index e4755af949086a31ad26a05bd2cba306e4ce9af6..6403be07e2936e57b62cbddd0fecf52e69901a61 100755
--- a/tests/slicing/tests.sh
+++ b/tests/slicing/tests.sh
@@ -2,13 +2,13 @@
 
 BASE=$1
 
-EXE_FILE=$BASE.byte
-RES_FILE=result/$BASE.res.log
-ERR_FILE=result/$BASE.err.log
+EXE_FILE=tests/slicing/$BASE.byte
+RES_FILE=tests/slicing/result/$BASE.res.log
+ERR_FILE=tests/slicing/result/$BASE.err.log
 
 make -s $EXE_FILE
 
-CMD="$EXE_FILE -deps $BASE.c"
+CMD="$EXE_FILE -deps tests/slicing/$BASE.c"
 
 echo "$CMD"
 #echo "RES = $RES_FILE"
diff --git a/tests/spec/anon_arg_1.i b/tests/spec/anon_arg_1.i
index 8b3247502d18822a39c46f5ee739fb8775e6f0fa..386a5754268f9a275ca042e2abdc5be54111c67f 100644
--- a/tests/spec/anon_arg_1.i
+++ b/tests/spec/anon_arg_1.i
@@ -1,5 +1,5 @@
 /* run.config*
-   STDOPT: #"%{dep:anon_arg_2.i}"
+DONTRUN: main test in anon_arg_2.i
 */
 
 int f(int*, int);
diff --git a/tests/spec/anon_arg_2.i b/tests/spec/anon_arg_2.i
index 9abe30d35b31a5c7262bee2293d7f5a65bf16ca8..9e3ef0cb8d077d0db7b384d04bbb470a969ddda2 100644
--- a/tests/spec/anon_arg_2.i
+++ b/tests/spec/anon_arg_2.i
@@ -1,5 +1,5 @@
 /* run.config*
-   STDOPT: #"%{dep:anon_arg_1.i}"
+STDOPT: #"@PTEST_DIR@/anon_arg_1.i @PTEST_FILE@"
 */
 
 /*@ requires \valid(p);
diff --git a/tests/spec/oracle/anon_arg_1.res.oracle b/tests/spec/oracle/anon_arg_1.res.oracle
deleted file mode 100644
index 4dac36af6cc13f92514ec30a789f66e576079ef8..0000000000000000000000000000000000000000
--- a/tests/spec/oracle/anon_arg_1.res.oracle
+++ /dev/null
@@ -1,19 +0,0 @@
-[kernel] Parsing anon_arg_1.i (no preprocessing)
-[kernel] Parsing anon_arg_2.i (no preprocessing)
-[kernel] anon_arg_1.i:7: Warning: found two contracts. Merging them
-/* Generated by Frama-C */
-/*@ requires \valid(p);
-    ensures \result ≡ \old(x) ∧ *\old(p) ≡ \old(x);
-    assigns *p;
-    assigns *p \from x;
- */
-int f(int *p, int x);
-
-/*@ requires \valid(p);
-    ensures \result ≡ \old(x);
-    ensures *\old(p) ≡ \result;
-    assigns *p;
- */
-int g(int *p, int x);
-
-
diff --git a/tests/spec/oracle/array_typedef.res.oracle b/tests/spec/oracle/array_typedef.res.oracle
index 17188f40b4ca3d7365849e12808e4d6def5452f0..dc4596be3beeff4fba933ccb48ded95f387059e5 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 ip[4])
 {
-  unsigned int i = (unsigned int)(sizeof(int [4]) / sizeof(int));
+  unsigned int i = sizeof(int [4]) / sizeof(int);
   *(ip + 0) = 192;
   *(ip + 1) = 100;
   *(ip + 2) = 200;
diff --git a/tests/spec/test_config b/tests/spec/test_config
index 3451196c9530eca938c5827b1e4e89ed5d208693..6f16db895cb99190e93d744819de7c21e7358ebe 100644
--- a/tests/spec/test_config
+++ b/tests/spec/test_config
@@ -1,10 +1,5 @@
-COMMENT: for now, this directory mainly tests the annotations syntax.
+COMMENT: for now, this directory mainly tests the annotations syntax,
+COMMENT: no analysis is performed.
 COMMENT: we continue on annotation errors, as this allows to put
 COMMENT: various variations of the same test in one file.
-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@)
-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
+OPT: -pp-annot -print -journal-disable -kernel-warn-key=annot-error=active -check -machdep x86_32
diff --git a/tests/syntax/aggressive_merging_1.i b/tests/syntax/aggressive_merging_1.i
index ace8a3820e4b96eb6a92968f52328e378054de93..78f7123911b96029ba8f65fb1f55b78808c3cf65 100644
--- a/tests/syntax/aggressive_merging_1.i
+++ b/tests/syntax/aggressive_merging_1.i
@@ -1,5 +1,5 @@
 /* run.config
-   STDOPT: +"%{dep:aggressive_merging_2.i} -aggressive-merging"
+   STDOPT: +"@PTEST_DIR@/aggressive_merging_2.i -aggressive-merging"
 */
 static inline void f(void) {
   return;
diff --git a/tests/syntax/anon_enum_libc.c b/tests/syntax/anon_enum_libc.c
index 7935ec8d02d33fbd18c2fde7f371fbd9c5af5eca..55a1a952097df987ce611d8a2d446e7de9815e28 100644
--- a/tests/syntax/anon_enum_libc.c
+++ b/tests/syntax/anon_enum_libc.c
@@ -1,14 +1,6 @@
 /* run.config
-<<<<<<< HEAD
-DEPS: anon_enum_libc.h
-OPT: -cpp-extra-args="-I ." -ocode ocode_@PTEST_NUMBER@_@PTEST_NAME@.c -print -then -ocode="" ocode_@PTEST_NUMBER@_@PTEST_NAME@.c -print
-||||||| 754e522ceb
-
-OPT: -cpp-extra-args="-I @PTEST_DIR@" -ocode @PTEST_DIR@/result/@PTEST_NAME@.c -print -then -ocode="" @PTEST_DIR@/result/@PTEST_NAME@.c -print
-=======
  DEPS: anon_enum_libc.h
    OPT: -cpp-extra-args="-I @PTEST_DIR@" -ocode @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.c -print -then -ocode="" @PTEST_RESULT@/ocode_@PTEST_NUMBER@_@PTEST_NAME@.c -print
->>>>>>> origin/master
 */
 struct { int x; float y; } s1;
 enum { BLA=4, BLI=12 };
diff --git a/tests/syntax/bad_return_bts_599.i b/tests/syntax/bad_return_bts_599.i
index 0306283d85e7d51baf78513fb457add2faf010a4..9ccba084dc28c5ffad18f5fc9271e085d78a2637 100644
--- a/tests/syntax/bad_return_bts_599.i
+++ b/tests/syntax/bad_return_bts_599.i
@@ -12,6 +12,7 @@ int BadReturn2(int* p) {
   return;
 }
 
+
 int main() {
   int i = 3;
   BadReturn2(&i);
diff --git a/tests/syntax/bts0442.i b/tests/syntax/bts0442.i
index b90fc6386e0d27b42bf305efd8e00146adf371e6..6a0681975ea63f797833df107ca4810471a274a2 100644
--- a/tests/syntax/bts0442.i
+++ b/tests/syntax/bts0442.i
@@ -1,10 +1,4 @@
 /* run.config
-<<<<<<< HEAD
-STDOPT: +"%{dep:bts0442-2.i}"
-||||||| 754e522ceb
-STDOPT: +"tests/syntax/bts0442-2.i"
-=======
 STDOPT: +"@PTEST_DIR@/bts0442-2.i"
->>>>>>> origin/master
 */
 enum E { E1=1, E2=2} ve2=E2;
diff --git a/tests/syntax/bts0519.c b/tests/syntax/bts0519.c
index 8b7f870c14b9d368467c1e5bd624d256a3025a46..41a8ff2c7bbca2cf5a34cd9f1f58f2b574f0c04c 100644
--- a/tests/syntax/bts0519.c
+++ b/tests/syntax/bts0519.c
@@ -5,6 +5,7 @@
  */
 
 int t[4];
+
 #ifdef ERR
 int q[static 3];
 #endif
diff --git a/tests/syntax/cert_msc_38.c b/tests/syntax/cert_msc_38.c
index e9554c6c19133dfe83c679244a98f1cfc94f53e3..ad9f60245808fff6c5f62bb12d0641e44e962a7b 100644
--- a/tests/syntax/cert_msc_38.c
+++ b/tests/syntax/cert_msc_38.c
@@ -1,24 +1,4 @@
 /* run.config
-<<<<<<< HEAD
- EXIT: 1
-   STDOPT: +"-cpp-extra-args='-DTEST_ASSERT'"
-   STDOPT  : +"-cpp-extra-args='-DTEST_ERRNO'"
-   STDOPT: +"-cpp-extra-args='-DTEST_MATHERRHANDLING'"
-   STDOPT: +"-cpp-extra-args='-DTEST_VASTART'"
-   STDOPT: +"-cpp-extra-args='-DTEST_VACOPY'"
-   STDOPT: +"-cpp-extra-args='-DTEST_VAARG'"
-   STDOPT: +"-cpp-extra-args='-DTEST_VAEND'"
-   STDOPT: +"-cpp-extra-args='-DTEST_SETJMP'"
-||||||| 754e522ceb
-STDOPT: +"-cpp-extra-args='-DTEST_ASSERT'"
-STDOPT: +"-cpp-extra-args='-DTEST_ERRNO'"
-STDOPT: +"-cpp-extra-args='-DTEST_MATHERRHANDLING'"
-STDOPT: +"-cpp-extra-args='-DTEST_VASTART'"
-STDOPT: +"-cpp-extra-args='-DTEST_VACOPY'"
-STDOPT: +"-cpp-extra-args='-DTEST_VAARG'"
-STDOPT: +"-cpp-extra-args='-DTEST_VAEND'"
-STDOPT: +"-cpp-extra-args='-DTEST_SETJMP'"
-=======
  EXIT: 1
   STDOPT: +"-cpp-extra-args='-DTEST_ASSERT'"
   STDOPT: +"-cpp-extra-args='-DTEST_ERRNO'"
@@ -28,13 +8,13 @@ STDOPT: +"-cpp-extra-args='-DTEST_SETJMP'"
   STDOPT: +"-cpp-extra-args='-DTEST_VAARG'"
   STDOPT: +"-cpp-extra-args='-DTEST_VAEND'"
   STDOPT: +"-cpp-extra-args='-DTEST_SETJMP'"
->>>>>>> origin/master
 */
 #include <assert.h>
 #include <stdarg.h>
 #include <setjmp.h>
 
 #ifdef TEST_ASSERT
+
 typedef void (*handler_type)(int);
 
 void execute_handler(handler_type handler, int value) {
diff --git a/tests/syntax/copy_logic.i b/tests/syntax/copy_logic.i
index 93ae17abe30bb5fbc1d21fda925affb802eb5d2b..fee16b6120468fa4170798dc4290114348c9ee3d 100644
--- a/tests/syntax/copy_logic.i
+++ b/tests/syntax/copy_logic.i
@@ -1,10 +1,5 @@
 /* run.config
-<<<<<<< HEAD
-   PLUGIN: @EVA_PLUGINS@
-||||||| 754e522ceb
-=======
 PLUGIN: eva,scope
->>>>>>> origin/master
    STDOPT: +"-copy" +"-eva"
  */
 /*@ predicate p(int x); */
@@ -12,6 +7,7 @@ PLUGIN: eva,scope
 /*@ logic int f (int y); */
 /*@ logic integer g (int x) = x + 42; */
 
+
 /*@ frees x; */
 void f(int *x);
 
diff --git a/tests/syntax/copy_visitor.i b/tests/syntax/copy_visitor.i
index fe08ddb8a2bdcaaa0d21de95af978b89d77fea3f..d2d4bdb124e786dd2ee04327d9803b86b6c3dbe7 100644
--- a/tests/syntax/copy_visitor.i
+++ b/tests/syntax/copy_visitor.i
@@ -1,13 +1,6 @@
 /* run.config
-<<<<<<< HEAD
-   PLUGIN: @EVA_PLUGINS@
-   STDOPT: +"-copy -eva @EVA_OPTIONS@"
-||||||| 754e522ceb
-   STDOPT: +"-copy -eva @EVA_CONFIG@"
-=======
 PLUGIN: eva,scope
    STDOPT: +"-copy -eva @EVA_CONFIG@"
->>>>>>> origin/master
  */
 struct S {
   int a;
diff --git a/tests/syntax/dune b/tests/syntax/dune
deleted file mode 100644
index be1dbc8b5c23135914372b97a49453e00aff0996..0000000000000000000000000000000000000000
--- a/tests/syntax/dune
+++ /dev/null
@@ -1,3 +0,0 @@
-(rule
- (action (with-stdout-to framac_share_path (run frama-c -print-share-path)))
-)
diff --git a/tests/syntax/enum1.c b/tests/syntax/enum1.c
index 49410a3ddcd5b10ee2d5925119c07eb9f7d14ba5..1e851c556fdd00c4c2644a20f650ab46525da5d7 100644
--- a/tests/syntax/enum1.c
+++ b/tests/syntax/enum1.c
@@ -1,13 +1,6 @@
 /* run.config
-<<<<<<< HEAD
-   DEPS: enum.h
-   STDOPT: +"%{dep:enum2.c}"
-||||||| 754e522ceb
-   STDOPT: +"tests/syntax/enum2.c"
-=======
  DEPS: enum.h
    STDOPT: +"%{dep:@PTEST_DIR@/enum2.c}"
->>>>>>> origin/master
 */
 
 
diff --git a/tests/syntax/extern_init.i b/tests/syntax/extern_init.i
index 2ca27aaf632cbb188da65553e710a8e73f8ec2ef..37a97faef54b721dcfc5c135e34f9c294e4c7235 100644
--- a/tests/syntax/extern_init.i
+++ b/tests/syntax/extern_init.i
@@ -1,16 +1,7 @@
 /* run.config
-<<<<<<< HEAD
-   PLUGIN: @EVA_PLUGINS@
-   OPT: %{dep:@PTEST_NAME@_1.i} %{dep:@PTEST_NAME@_2.i} -eva @EVA_OPTIONS@
-   OPT: %{dep:@PTEST_NAME@_2.i} %{dep:@PTEST_NAME@_1.i} -eva @EVA_OPTIONS@
-||||||| 754e522ceb
-OPT: @PTEST_DIR@/@PTEST_NAME@_1.i @PTEST_DIR@/@PTEST_NAME@_2.i -eva @EVA_CONFIG@
-OPT: @PTEST_DIR@/@PTEST_NAME@_2.i @PTEST_DIR@/@PTEST_NAME@_1.i -eva @EVA_CONFIG@
-=======
 PLUGIN: eva,scope
 OPT: @PTEST_DIR@/@PTEST_NAME@_1.i @PTEST_DIR@/@PTEST_NAME@_2.i -eva @EVA_CONFIG@
 OPT: @PTEST_DIR@/@PTEST_NAME@_2.i @PTEST_DIR@/@PTEST_NAME@_1.i -eva @EVA_CONFIG@
->>>>>>> origin/master
 */
 
 extern int a[] ;
diff --git a/tests/syntax/fam.i b/tests/syntax/fam.i
index b07e8e8c7178f470665a52708903edbe26c9358d..c7239abee35c9bf1ec8290756d59550555d78307 100644
--- a/tests/syntax/fam.i
+++ b/tests/syntax/fam.i
@@ -6,12 +6,14 @@
 
 // Tests related to flexible array members
 
-struct { // FAM declaration OK
+// FAM declaration OK
+struct {
   int len;
   char a[];
 } fam;
 
-struct {// static FAM initialization not allowed (unsupported GCC extension)
+// static FAM initialization not allowed (unsupported GCC extension)
+struct {
   int len;
   char a[];
 } fam2 = {1, {1, 2, 3, 4, 5, 6}};
diff --git a/tests/syntax/flexible_array_member_invalid5.i b/tests/syntax/flexible_array_member_invalid5.i
index 1dc4c1843384f5f2bd6c51bfa9c56dfd77834dea..35dbe5c3064ecbaa0312c532641dab5c25148b19 100644
--- a/tests/syntax/flexible_array_member_invalid5.i
+++ b/tests/syntax/flexible_array_member_invalid5.i
@@ -5,7 +5,6 @@
 
 
 // In C99, flexible array members cannot be nested inside other structs
-
 typedef struct {
   int a;
   char data[];
diff --git "a/tests/syntax/foo\".c" "b/tests/syntax/foo\".c"
index 51ab7db036515eb4dff56be6116636cdf2137280..5933f9603a0e136d34c0680af6714d936839eaa5 100644
--- "a/tests/syntax/foo\".c"
+++ "b/tests/syntax/foo\".c"
@@ -1,6 +1,3 @@
-/* run.config*
-DONTRUN:
-*/
 #include "assert.h"
 
 int test = 1;
diff --git a/tests/syntax/forloophook.i b/tests/syntax/forloophook.i
index 6d5faf508d1947df5e1ddc330e5c551106e8eb0a..918fadf7579d70cc8ad34bbc1f60f0007ea9d5ac 100644
--- a/tests/syntax/forloophook.i
+++ b/tests/syntax/forloophook.i
@@ -1,14 +1,6 @@
 /* run.config
-<<<<<<< HEAD
-   MODULE: @PTEST_NAME@
-   STDOPT: +"-no-print"
-||||||| 754e522ceb
-   EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
-   OPT: -no-autoload-plugins -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
-=======
  MODULE: @PTEST_NAME@
    OPT: -no-autoload-plugins
->>>>>>> origin/master
 */
 void f() {
   for (int i=0; i< 10; i++);
diff --git a/tests/syntax/formals_decl_leak.i b/tests/syntax/formals_decl_leak.i
index 39672170f660fa0370fe9ef3da978b4e3a983b40..0b767a1328585f2b970022d3318315d8d381ec7d 100644
--- a/tests/syntax/formals_decl_leak.i
+++ b/tests/syntax/formals_decl_leak.i
@@ -1,14 +1,6 @@
 /* run.config
-<<<<<<< HEAD
-MODULE: @PTEST_NAME@
-STDOPT: +"%{dep:@PTEST_NAME@_1.i}"
-||||||| 754e522ceb
-EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
-OPT: -print -no-autoload-plugins -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs @PTEST_DIR@/@PTEST_NAME@_1.i
-=======
  MODULE: @PTEST_NAME@
    OPT: -print -no-autoload-plugins @PTEST_DIR@/@PTEST_NAME@_1.i
->>>>>>> origin/master
 */
 
 void f(int x);
diff --git a/tests/syntax/formals_decl_leak_1.i b/tests/syntax/formals_decl_leak_1.i
index 0a9ec253d9b9072d25cdcdfde2f0936e1ac3525d..3fb93c23877dd2b9fe2e7e83eecb6be9ad947bad 100644
--- a/tests/syntax/formals_decl_leak_1.i
+++ b/tests/syntax/formals_decl_leak_1.i
@@ -1,11 +1,5 @@
 /* run.config
-<<<<<<< HEAD
-DONTRUN: main test is located in formals_decl_leak.i
-||||||| 754e522ceb
-DONTRUN: main test is located in tests/syntax/formals_decl_leak.i
-=======
 DONTRUN: main test is located in @PTEST_DIR@/formals_decl_leak.i
->>>>>>> origin/master
 */
 
 void f(int y);
diff --git a/tests/syntax/gcc_builtins.c b/tests/syntax/gcc_builtins.c
index fcfaba7f615ecec0d0bbdaa6b299ee5e1904e519..db5d0e38bdd1c27bea62b457f061eacbdb2c3211 100644
--- a/tests/syntax/gcc_builtins.c
+++ b/tests/syntax/gcc_builtins.c
@@ -2,15 +2,7 @@
   PLUGIN: variadic
    STDOPT: +"-machdep gcc_x86_32"
  */
-<<<<<<< HEAD
-
-#include "stdint.h"
-||||||| 754e522ceb
-
-#include "share/libc/stdint.h"
-=======
 #include "stdint.h"
->>>>>>> origin/master
 
 #define likely(x)  __builtin_expect((x),1)
 #define unlikely(x)  __builtin_expect((x),0)
diff --git a/tests/syntax/ghost_cv_parsing_errors.c b/tests/syntax/ghost_cv_parsing_errors.c
index 7e1c57415c9b6f85fb309395c1fe835d1bffd2d9..08ecf3c1bc55182919c315baf9de600eb8af743b 100644
--- a/tests/syntax/ghost_cv_parsing_errors.c
+++ b/tests/syntax/ghost_cv_parsing_errors.c
@@ -6,6 +6,7 @@
 */
 
 // All of this should be refused
+
 #ifdef IN_TYPE
 
 struct S {
diff --git a/tests/syntax/ghost_cv_var_decl.c b/tests/syntax/ghost_cv_var_decl.c
index 87be85217892b9408b61f1e66bb28bce2fc76557..c407d427b9c4feaaa9c790338a47b8aa8f7da522 100644
--- a/tests/syntax/ghost_cv_var_decl.c
+++ b/tests/syntax/ghost_cv_var_decl.c
@@ -6,8 +6,8 @@
    OPT:
 */
 
-/* When there is no comment, the code should be allowed */
 
+/* When there is no comment, the code should be allowed */
 void f_ints(){
   int ng ;
 
diff --git a/tests/syntax/ghost_parameters.c b/tests/syntax/ghost_parameters.c
index db0ea6a87aab505160cbdaf19fcfeaca6fdc2f59..db9dce1ccf5d5c0cef88ace49215b5aaef7bfdfc 100644
--- a/tests/syntax/ghost_parameters.c
+++ b/tests/syntax/ghost_parameters.c
@@ -16,8 +16,11 @@
    STDOPT: +" -cpp-extra-args=-DVOID_EMPTY_GHOST_PARAMETER_LIST"
    STDOPT: +" -cpp-extra-args=-DVOID_GHOST_PARAMETER"
 */
+
 #ifdef ARGS_NOT_VOID
+
 void function(int a, int b) /*@ ghost (int c, int d) */{
+
 }
 
 void caller(void){
diff --git a/tests/syntax/gnu-asm-aesni.c b/tests/syntax/gnu-asm-aesni.c
index 57f21d3dc98c7b9c984f0e4f43bd4eba384026c1..1e2b0f7f4526aa2e71a85d9f31114959b086f0dc 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: -cpp-extra-args='-DUSE_AESNI' -print
+   OPT: -machdep x86_32 -cpp-extra-args='-DUSE_AESNI' -print
    -------------------------
 */
 #ifdef __FRAMAC__
diff --git a/tests/syntax/inconsistent_decl.c b/tests/syntax/inconsistent_decl.c
index 1237add48932ca8f4e513491d1271bf2ce2eb76c..43fe38e5c0edbbdd94b658b77acac715fe4809a2 100644
--- a/tests/syntax/inconsistent_decl.c
+++ b/tests/syntax/inconsistent_decl.c
@@ -1,17 +1,9 @@
 /* run.config
-<<<<<<< HEAD
-EXIT: 1
-  STDOPT: +"%{dep:inconsistent_decl_2.i}"
-  STDOPT: +"%{dep:inconsistent_decl_2.i}"+"-cpp-extra-args='-DWITH_PROTO'"
-||||||| 754e522ceb
-STDOPT: +"tests/syntax/inconsistent_decl_2.i"
-STDOPT: +"tests/syntax/inconsistent_decl_2.i"+"-cpp-extra-args='-DWITH_PROTO'"
-=======
 EXIT: 1
   STDOPT: +"@PTEST_DIR@/inconsistent_decl_2.i"
   STDOPT: +"@PTEST_DIR@/inconsistent_decl_2.i"+"-cpp-extra-args='-DWITH_PROTO'"
->>>>>>> origin/master
 */
+
 #ifdef WITH_PROTO
 int f();
 #endif
diff --git a/tests/syntax/inconsistent_decl_2.i b/tests/syntax/inconsistent_decl_2.i
index 1170256b61a14fe8ea60580df062902d97926f7c..2452dc7cebee5a83a3db1bcd198f8b165ed4d67d 100644
--- a/tests/syntax/inconsistent_decl_2.i
+++ b/tests/syntax/inconsistent_decl_2.i
@@ -1,11 +1,5 @@
 /* run.config
-<<<<<<< HEAD
-DONTRUN: main test is at inconsistent_decl.c
-||||||| 754e522ceb
-DONTRUN: main test is at tests/syntax/inconsistent_decl.c
-=======
 DONTRUN: main test is at @PTEST_DIR@/inconsistent_decl.c
->>>>>>> origin/master
 */
 
 int f(double x);
diff --git a/tests/syntax/inline_calls.i b/tests/syntax/inline_calls.i
index 740bbe34fecd1f6f5fe74bd3efef0e1b62ca721e..4cf6b9c05992ba6000408bbe11dde27f4ad4bda0 100644
--- a/tests/syntax/inline_calls.i
+++ b/tests/syntax/inline_calls.i
@@ -1,10 +1,5 @@
 /* run.config
-<<<<<<< HEAD
-   PLUGIN: @EVA_PLUGINS@
-||||||| 754e522ceb
-=======
 PLUGIN: eva,scope
->>>>>>> origin/master
    STDOPT: +"-inline-calls @all -kernel-msg-key printer:attrs"
    STDOPT: +"-inline-calls @inline"
    STDOPT: +"-inline-calls @inline -remove-inlined @inline"
diff --git a/tests/syntax/inline_def_1.i b/tests/syntax/inline_def_1.i
index aaab1cf1b4ee9877710eaff76e3c5a682d170ed7..d9f3bf03143273afe0a6337fb774e07af82cbbae 100644
--- a/tests/syntax/inline_def_1.i
+++ b/tests/syntax/inline_def_1.i
@@ -1,5 +1,5 @@
 /* run.config
-STDOPT: +"%{dep:inline_def_2.i}"
+STDOPT: +"@PTEST_DIR@/inline_def_2.i"
 */
 
 // inline definition can be used in this translation unit, but does not
diff --git a/tests/syntax/inline_def_bad_1.i b/tests/syntax/inline_def_bad_1.i
index 7d32fc00ea810473f45021f5051457d2e81f6b88..03ee6e12cddb2a8e9cbd14ff5ee1021567f27176 100644
--- a/tests/syntax/inline_def_bad_1.i
+++ b/tests/syntax/inline_def_bad_1.i
@@ -1,5 +1,5 @@
 /* run.config
-STDOPT: +"%{dep:inline_def_bad_2.i}"
+STDOPT: +"@PTEST_DIR@/inline_def_bad_2.i"
 */
 
 extern inline f() { return 1; }
diff --git a/tests/syntax/local-init-const.i b/tests/syntax/local-init-const.i
index a3cce7253ee8f8eb45a95f1840d654e75376e0b5..09793138d4693239a17072a39327874320e9e4ff 100644
--- a/tests/syntax/local-init-const.i
+++ b/tests/syntax/local-init-const.i
@@ -1,13 +1,6 @@
 /*run.config
-<<<<<<< HEAD
-  PLUGIN: @EVA_PLUGINS@
-  OPT: -eva -eva-verbose 0
-||||||| 754e522ceb
-  OPT: -no-autoload-plugins -load-module eva,scope -eva -eva-verbose 0
-=======
 PLUGIN: eva,scope
   OPT: -eva -eva-verbose 0
->>>>>>> origin/master
  */
 
 unsigned id(unsigned x) { return x; }
diff --git a/tests/syntax/loop-case-switch-for-unroll.c b/tests/syntax/loop-case-switch-for-unroll.c
index dea4f3c909c5deee2c11f7469e759e621d8abbae..3052cb9f5529fa6a77d6763f81aaee4673598cbd 100644
--- a/tests/syntax/loop-case-switch-for-unroll.c
+++ b/tests/syntax/loop-case-switch-for-unroll.c
@@ -1,10 +1,5 @@
 /* run.config
-<<<<<<< HEAD
-   PLUGIN: @EVA_PLUGINS@
-||||||| 754e522ceb
-=======
 PLUGIN: eva,scope
->>>>>>> origin/master
    STDOPT: +"-eva-slevel 100 -eva"
    STDOPT: +"-ulevel 1 -eva-slevel 100 -eva"
    STDOPT: +"-ulevel 2 -eva-slevel 100 -eva"
diff --git a/tests/syntax/merge_union.c b/tests/syntax/merge_union.c
index abaf79593953e732ca582b99b3a4d12e7da268e1..ca5392d9dbd0e224516dbe15e737fc4a055c064e 100644
--- a/tests/syntax/merge_union.c
+++ b/tests/syntax/merge_union.c
@@ -1,16 +1,7 @@
 /* run.config
-<<<<<<< HEAD
-DEPS: merge_union.h
-OPT: -cpp-extra-args="-I @PTEST_DIR@" %{dep:@PTEST_NAME@_2.c} %{dep:@PTEST_NAME@_3.c} -print
-OPT: -cpp-extra-args="-I @PTEST_DIR@" %{dep:@PTEST_NAME@_2.c} %{dep:@PTEST_NAME@_3.c} -print -kernel-warn-key="linker:drop-conflicting-unused=inactive"
-||||||| 754e522ceb
-OPT: -cpp-extra-args="-I @PTEST_DIR@" @PTEST_DIR@/@PTEST_NAME@_2.c @PTEST_DIR@/@PTEST_NAME@_3.c -print
-OPT: -cpp-extra-args="-I @PTEST_DIR@" @PTEST_DIR@/@PTEST_NAME@_2.c @PTEST_DIR@/@PTEST_NAME@_3.c -print -kernel-warn-key="linker:drop-conflicting-unused=inactive"
-=======
  DEPS: merge_union.h
    OPT: -cpp-extra-args="-I @PTEST_DIR@" %{dep:@PTEST_DIR@/@PTEST_NAME@_2.c} %{dep:@PTEST_DIR@/@PTEST_NAME@_3.c} -print
    OPT: -cpp-extra-args="-I @PTEST_DIR@" %{dep:@PTEST_DIR@/@PTEST_NAME@_2.c} %{dep:@PTEST_DIR@/@PTEST_NAME@_3.c} -print -kernel-warn-key="linker:drop-conflicting-unused=inactive"
->>>>>>> origin/master
 */
 #include "merge_union.h"
 int f(un* u);
diff --git a/tests/syntax/merge_unused.c b/tests/syntax/merge_unused.c
index 30492b9f4109bb51ca781730062fb00326894670..349921c0430dd43c9c8581c9aea91c14b5abfd7f 100644
--- a/tests/syntax/merge_unused.c
+++ b/tests/syntax/merge_unused.c
@@ -1,17 +1,7 @@
-<<<<<<< HEAD
-/* run.config*
-EXIT: 1
-  DEPS: merge_unused.h
-  OPT: -cpp-extra-args="-I@PTEST_DIR@" %{dep:@PTEST_NAME@_2.c} -print
-||||||| 754e522ceb
-/* run.config
-OPT: -cpp-extra-args="-I@PTEST_DIR@" @PTEST_DIR@/@PTEST_NAME@_2.c -print
-=======
 /* run.config*
  EXIT: 1
  DEPS: merge_unused.h
   OPT: -cpp-extra-args="-I@PTEST_DIR@" %{dep:@PTEST_DIR@/@PTEST_NAME@_2.c} -print
->>>>>>> origin/master
 */
 #pragma pack(1)
 
diff --git a/tests/syntax/merge_variadic.i b/tests/syntax/merge_variadic.i
index c8b2ed43f439b2990ab55cf0c09f5c83fec0dcce..b296224e959149e92dd12a8136ea5ed89d60076d 100644
--- a/tests/syntax/merge_variadic.i
+++ b/tests/syntax/merge_variadic.i
@@ -1,12 +1,6 @@
 /* run.config
-<<<<<<< HEAD
-OPT: %{dep:@PTEST_NAME@_aux.i} -print
-||||||| 754e522ceb
-OPT: @PTEST_DIR@/@PTEST_NAME@_aux.i -print
-=======
 PLUGIN: variadic
   OPT: @PTEST_DIR@/@PTEST_NAME@_aux.i -print
->>>>>>> origin/master
 */
 int open (const char* file, int flags, int mode) {
   return -1;
diff --git a/tests/syntax/multiple_assigns.i b/tests/syntax/multiple_assigns.i
index d71188292fd2f84eae4b1edccc8915474f1ce066..1d1d9d7eb516dc6444cf9a41f12ac23d8081b774 100644
--- a/tests/syntax/multiple_assigns.i
+++ b/tests/syntax/multiple_assigns.i
@@ -1,15 +1,7 @@
-<<<<<<< HEAD
-/* run.config*
-  EXIT: 0
-   STDOPT:
-*/
-||||||| 754e522ceb
-=======
 /* run.config*
  EXIT: 0
    STDOPT:
 */
->>>>>>> origin/master
 int z;
 
 /*@ assigns z, z;
diff --git a/tests/syntax/offset.c b/tests/syntax/offset.c
index 7244aff6788ad550a3e4706baf08d222ed36002b..39b1c35f8c49f9e2b5b7409e72c756873e646e5d 100644
--- a/tests/syntax/offset.c
+++ b/tests/syntax/offset.c
@@ -1,7 +1,7 @@
 /* run.config
-   COMMENT: dependency to FRAMA-C share directory is implicit
-   OPT: -cpp-extra-args="-I@FRAMAC_SHARE@/libc" -print
+OPT: -machdep x86_32 -cpp-extra-args="-Ishare/libc" -print
 */
+
 #include "__fc_define_off_t.h"
 
 off_t x = 0;
diff --git a/tests/syntax/oracle/offset.res.oracle b/tests/syntax/oracle/offset.res.oracle
index bfdd8016e57e9c6b4061336116c57965599ffa71..4aebbc69c8dfa72f29457b9e9b48da71b74facb0 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)0;
+off64_t y = (long long)0;
 
diff --git a/tests/syntax/oracle/struct_with_function_field_invalid.res.oracle b/tests/syntax/oracle/struct_with_function_field_invalid.res.oracle
deleted file mode 100644
index f8559a99a0a01bc17663ff569ea676ab7e44b8e0..0000000000000000000000000000000000000000
--- a/tests/syntax/oracle/struct_with_function_field_invalid.res.oracle
+++ /dev/null
@@ -1,5 +0,0 @@
-[kernel] Parsing struct_with_function_field_invalid.i (no preprocessing)
-[kernel] struct_with_function_field_invalid.i:7: User Error: 
-  field `f' declared as a function
-[kernel] User Error: stopping on file "struct_with_function_field_invalid.i" that has errors.
-[kernel] Frama-C aborted: invalid user input.
diff --git a/tests/syntax/rettype.i b/tests/syntax/rettype.i
index e18579a6690485b20a0ad33b5af282aa05a3a228..c95988c278fdcb8bc7a99a76e66c264b087859bb 100644
--- a/tests/syntax/rettype.i
+++ b/tests/syntax/rettype.i
@@ -4,6 +4,7 @@
 */
 // This test must be rejected: return type of foo is not 
 // compatible between decl and def.
+
 //@ assigns \nothing;
 int foo(int* p);
 
diff --git a/tests/syntax/static_formals_1.c b/tests/syntax/static_formals_1.c
index f2802589882fcd184313e9286a18546f3a432811..56662240c4673a7af126f709860d22910cf07502 100644
--- a/tests/syntax/static_formals_1.c
+++ b/tests/syntax/static_formals_1.c
@@ -1,13 +1,6 @@
 /* run.config
-<<<<<<< HEAD
-DEPS: static_formals.h
-STDOPT: +"%{dep:static_formals_2.c}" +"-cpp-extra-args=\"-I @PTEST_DIR@\"" +"-kernel-msg-key printer:vid"
-||||||| 754e522ceb
-STDOPT: +"@PTEST_DIR@/static_formals_2.c" +"-cpp-extra-args=\"-I @PTEST_DIR@\"" +"-kernel-msg-key printer:vid"
-=======
  DEPS: static_formals.h
    STDOPT: +"%{dep:@PTEST_DIR@/static_formals_2.c}" +"-cpp-extra-args=\"-I @PTEST_DIR@\"" +"-kernel-msg-key printer:vid"
->>>>>>> origin/master
 */
 #include "static_formals.h"
 int g() { return f(4); }
diff --git a/tests/syntax/string_concat.c b/tests/syntax/string_concat.c
index 2b1a9575d2b4f5e1765b6ec144ccc601a6e42130..b78a7d85590f3c5981b36737e9d20ec207dc0aad 100644
--- a/tests/syntax/string_concat.c
+++ b/tests/syntax/string_concat.c
@@ -1,9 +1,9 @@
 /* run.config*
 PLUGIN: eva,scope variadic
 TIMEOUT: 600
-PLUGIN: @EVA_PLUGINS@
 OPT: -eva
 */
+
 #include <string.h>
 #include <stdio.h>
 
diff --git a/tests/syntax/struct_with_function_field_invalid.i b/tests/syntax/struct_with_function_field_invalid.i
deleted file mode 100644
index c522453305f94cfd11edab28d158226619f875f7..0000000000000000000000000000000000000000
--- a/tests/syntax/struct_with_function_field_invalid.i
+++ /dev/null
@@ -1,9 +0,0 @@
-/* run.config*
- EXIT: 1
-   STDOPT:
-*/
-
-// invalid field with function type, parsing should fail
-struct {
-  void f(int);
-} s;
diff --git a/tests/syntax/syntactic_hook.i b/tests/syntax/syntactic_hook.i
index 784ffdeb3477ff0ec4aeb8a8f96ff691ff4d9fec..7061a2336c6de7c1009bd0ff14f57990274a38d6 100644
--- a/tests/syntax/syntactic_hook.i
+++ b/tests/syntax/syntactic_hook.i
@@ -1,16 +1,7 @@
 /* run.config
-<<<<<<< HEAD
-   MODULE: @PTEST_NAME@
- EXIT: 1
-   STDOPT:
-||||||| 754e522ceb
-   EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
-   STDOPT: +"-no-autoload-plugins -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs"
-=======
  MODULE: @PTEST_NAME@
  EXIT: 1
    STDOPT: +"-no-autoload-plugins"
->>>>>>> origin/master
 */
 
 
diff --git a/tests/syntax/test_config b/tests/syntax/test_config
index 80f93d551915169658c5708312e7515955ea636c..3d75cb1ea823f0885cd7c5d9e4be187df1b0b67d 100644
--- a/tests/syntax/test_config
+++ b/tests/syntax/test_config
@@ -1,19 +1,5 @@
 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.
-COMMENT: to perform value analyses, the macro @EVA_PLUGINS@ (resp. @EVA_OPTIONS@)
-COMMENT: can be used into PLUGIN (resp. OPT) directives of specific test files.
-
-PLUGIN: variadic
-OPT: -print -machdep x86_32
-||||||| 754e522ceb
-COMMENT: (parser, type-checker, linker, syntactic transformations)
-OPT: -print -journal-disable -check -machdep x86_32
-=======
 COMMENT: (parser, type-checker, linker, syntactic transformations)
 PLUGIN:
 OPT: -print -machdep x86_32
->>>>>>> origin/master
 FILEREG:.*\.\(c\|i\|ci\)$
diff --git a/tests/syntax/transient_block.i b/tests/syntax/transient_block.i
index 3fdbec8e938fbfb23ccc61a852e9514acb3b523a..ed40f930bd9709d4612d4b25ec59ca31120fb8cc 100644
--- a/tests/syntax/transient_block.i
+++ b/tests/syntax/transient_block.i
@@ -1,14 +1,6 @@
 /* run.config
-<<<<<<< HEAD
-   MODULE: @PTEST_NAME@
-   STDOPT: +"-no-print" +"-kernel-warn-key transient-block=active"
-||||||| 754e522ceb
-   EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
-   OPT: -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs -kernel-warn-key transient-block=active
-=======
  MODULE: @PTEST_NAME@
    OPT: -kernel-warn-key transient-block=active
->>>>>>> origin/master
 */
 
 void f(void) { }
diff --git a/tests/syntax/typedef_multi_1.c b/tests/syntax/typedef_multi_1.c
index a62b614d868c29af8b857fff2e22fa341286176e..b5052ec59a08e6033a8d32e14b423079027bb9c7 100644
--- a/tests/syntax/typedef_multi_1.c
+++ b/tests/syntax/typedef_multi_1.c
@@ -1,16 +1,7 @@
 /* run.config
-<<<<<<< HEAD
-   DEPS: typedef_multi.h
-   MODULE: typedef_multi
-   STDOPT: +"-no-print" +"%{dep:typedef_multi_2.c}"
-||||||| 754e522ceb
-   EXECNOW: make -s @PTEST_DIR@/typedef_multi.cmxs
-   OPT: -load-module @PTEST_DIR@/typedef_multi tests/syntax/typedef_multi_2.c
-=======
  MODULE: typedef_multi
  DEPS: typedef_multi.h
    OPT: -no-autoload-plugins %{dep:@PTEST_DIR@/typedef_multi_2.c}
->>>>>>> origin/master
 */
 #include "typedef_multi.h"
 
diff --git a/tests/syntax/typedef_namespace_bts1500.c b/tests/syntax/typedef_namespace_bts1500.c
index 0e4a066a648ca14e136020376812cdbcfe33908e..9e7dd5eb589611b6a55ac8c44db1f858db12f9a7 100644
--- a/tests/syntax/typedef_namespace_bts1500.c
+++ b/tests/syntax/typedef_namespace_bts1500.c
@@ -5,6 +5,7 @@
    STDOPT: +"-cpp-extra-args='-DREDEFINITION'"
 */
 typedef int digit;
+
 struct S {
   digit d1;
   int const digit;
diff --git a/tests/syntax/unroll_labels.i b/tests/syntax/unroll_labels.i
index 337d45adb23f0740ef99846a74ec0ea0e690f34c..4fcef3f5d46dfd9784cf49c16fa8fbe38b7c99f4 100644
--- a/tests/syntax/unroll_labels.i
+++ b/tests/syntax/unroll_labels.i
@@ -1,16 +1,7 @@
 /* run.config
-<<<<<<< HEAD
-  PLUGIN: @EVA_PLUGINS@
-  STDOPT: +"-eva @EVA_OPTIONS@"
-  STDOPT: +"-eva @EVA_OPTIONS@ -main main2 -eva-slevel 3"
-||||||| 754e522ceb
-  STDOPT: +"-eva @EVA_CONFIG@"
-  STDOPT: +"-eva @EVA_CONFIG@ -main main2 -eva-slevel 3"
-=======
 PLUGIN: eva,scope
   STDOPT: +"-eva @EVA_CONFIG@"
   STDOPT: +"-eva @EVA_CONFIG@ -main main2 -eva-slevel 3"
->>>>>>> origin/master
 */
 enum { SIX = 6 } ;
 volatile foo;
diff --git a/tests/syntax/unroll_visit.i b/tests/syntax/unroll_visit.i
index 0f7a37068042c9b7f31dd95bc8a4d8a9fc3b634f..f4d949c53ef9a94e93a366b61bbb2a14caf8356c 100644
--- a/tests/syntax/unroll_visit.i
+++ b/tests/syntax/unroll_visit.i
@@ -1,13 +1,6 @@
 /* run.config
-<<<<<<< HEAD
-   PLUGIN: @EVA_PLUGINS@
-   STDOPT: +"-eva @EVA_OPTIONS@ -deps -out -input -deps"
-||||||| 754e522ceb
-   STDOPT: +"-eva @EVA_CONFIG@ -deps -out -input -deps"
-=======
 PLUGIN: eva,scope,from,inout
    STDOPT: +"-eva @EVA_CONFIG@ -deps -out -input -deps"
->>>>>>> origin/master
  */
 
 typedef char i8; // ideally, pretty-printing should keep 'i8' for some casts
diff --git a/tests/syntax/vdefined_bts1241.i b/tests/syntax/vdefined_bts1241.i
index a694e5f2d67a4c769400d12b53941c623c053806..fb57d75836e844c708592e005026036ec42fc08f 100644
--- a/tests/syntax/vdefined_bts1241.i
+++ b/tests/syntax/vdefined_bts1241.i
@@ -1,11 +1,5 @@
 /* run.config
-<<<<<<< HEAD
-STDOPT: +"%{dep:vdefined_bts1241_1.i}"
-||||||| 754e522ceb
-STDOPT: +"tests/syntax/vdefined_bts1241_1.i"
-=======
 STDOPT: +"@PTEST_DIR@/vdefined_bts1241_1.i"
->>>>>>> origin/master
  */
 
 int f();
diff --git a/tests/syntax/wstring_concat.c b/tests/syntax/wstring_concat.c
index de64e2314d37945f5eea6a86e0dc2174953b47f6..9bd6571dd63b901380598f6dc29c9b769f8f6f24 100644
--- a/tests/syntax/wstring_concat.c
+++ b/tests/syntax/wstring_concat.c
@@ -1,7 +1,6 @@
 /* run.config*
 PLUGIN: eva,scope,variadic
 TIMEOUT: 600
-PLUGIN: @EVA_PLUGINS@
 OPT: -eva
 */
 #include <wchar.h>
diff --git a/tests/test_config b/tests/test_config
index 81fd499ea2b23cb4370e435a38f3b4dcd56061f1..fb474386300e9109653c99839364a33a783455eb 100644
--- a/tests/test_config
+++ b/tests/test_config
@@ -1,13 +1,3 @@
-<<<<<<< HEAD
-COMMENT: macros @EVA_PLUGINS@ (resp. @EVA_OPTIONS@ and @EVA_CONFIG@) are usables
-COMMENT: in test files redefining the PLUGIN (resp. OPT) directives.
-COMMENT: the PLUGIN directive sets automatically the @PTEST_PLUGIN@ macro that can be
-COMMENT: used into others PLUGIN directives in order to extend the parent list
-COMMENT: of used plug'ins.
-
-MACRO: EVA_PLUGINS from inout eva scope variadic
-||||||| 754e522ceb
-=======
 MACRO: EVA_MAIN_PLUGINS eva,scope
 MACRO: EVA_PLUGINS from,inout @EVA_MAIN_PLUGINS@ variadic
 MACRO: EVA_CONFIG @EVA_OPTIONS@ -machdep x86_32
@@ -20,14 +10,4 @@ PLUGIN: @EVA_PLUGINS@
 OPT: @EVA_TEST@
 
 # Late declaration to allow redefinition of EVA_OPTIONS in subsidiary test_config files
->>>>>>> origin/master
 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
-||||||| 754e522ceb
-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
deleted file mode 100644
index f76ab00944e2937e12ad095b1970a0b90fc5f598..0000000000000000000000000000000000000000
--- a/tests/test_config_equalities
+++ /dev/null
@@ -1,9 +0,0 @@
-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
-MACRO: EVA_CONFIG @EVA_OPTIONS@ -machdep x86_32
-
-# Compare the result with the oracle of the default config.
-FILTER: diff --new-file %{dep:../oracle/@PTEST_ORACLE@} -
-
-PLUGIN: @EVA_PLUGINS@
-OPT: -eva @EVA_CONFIG@ -journal-disable -out -input -deps
diff --git a/tests/test_config_octagons b/tests/test_config_octagons
deleted file mode 100644
index 7a50dacf2eb5a33161748967b5e8725570f7e72a..0000000000000000000000000000000000000000
--- a/tests/test_config_octagons
+++ /dev/null
@@ -1,9 +0,0 @@
-MACRO: EVA_PLUGINS from inout eva scope variadic
-MACRO: EVA_OPTIONS -eva-show-progress -eva-msg-key=-summary -eva-domains octagon
-MACRO: EVA_CONFIG @EVA_OPTIONS@ -machdep x86_32
-
-# Compare the result with the oracle of the default config.
-FILTER: diff --new-file %{dep:../oracle/@PTEST_ORACLE@} -
-
-PLUGIN: @EVA_PLUGINS@
-OPT: -eva @EVA_CONFIG@ -out -input -deps
diff --git a/tests/value/diff_apron b/tests/value/diff_apron
deleted file mode 100644
index 9e5d14b53b4ca734fc2cad76ed4060962d98c8fa..0000000000000000000000000000000000000000
--- a/tests/value/diff_apron
+++ /dev/null
@@ -1,2280 +0,0 @@
-diff oracle/alias.1.res.oracle oracle_apron/alias.1.res.oracle
-85c85
-<   z ∈ {0; 1; 2}
----
->   z ∈ {0; 2}
-diff oracle/alias.2.res.oracle oracle_apron/alias.2.res.oracle
-76c76
-<   z ∈ {-5; -4; -3; -2; -1; 0; 1; 1000}
----
->   z ∈ {-1; 1000}
-diff oracle/alias.3.res.oracle oracle_apron/alias.3.res.oracle
-67c67
-<   z ∈ {0; 1; 2}
----
->   z ∈ {0; 2}
-diff oracle/alias.6.res.oracle oracle_apron/alias.6.res.oracle
-82c82
-<   t ∈ {4; 5; 6}
----
->   t ∈ {5}
-diff oracle/array_degenerating_loop.res.oracle oracle_apron/array_degenerating_loop.res.oracle
-11,12d10
-< [eva:alarm] array_degenerating_loop.i:9: Warning: 
-<   signed overflow. assert G + t[i] ≤ 2147483647;
-14c12
-<   Frama_C_show_each: [55..2147483647], [-2147483648..99]
----
->   Frama_C_show_each: [55..155], [-2147483648..99]
-diff oracle/auto_loop_unroll.0.res.oracle oracle_apron/auto_loop_unroll.0.res.oracle
-11,13c11
-< [eva:alarm] auto_loop_unroll.c:25: Warning: 
-<   signed overflow. assert res + 1 ≤ 2147483647;
-< [eva] auto_loop_unroll.c:27: Frama_C_show_each_auto: [0..2147483647]
----
-> [eva] auto_loop_unroll.c:27: Frama_C_show_each_auto: {100}
-15,18c13
-< [eva:alarm] auto_loop_unroll.c:31: Warning: 
-<   signed overflow. assert res + 1 ≤ 2147483647;
-< [eva] auto_loop_unroll.c:33: 
-<   Frama_C_show_each_imprecise: [0..2147483647]
----
-> [eva] auto_loop_unroll.c:33: Frama_C_show_each_imprecise: {1000}
-20,23c15
-< [eva:alarm] auto_loop_unroll.c:39: Warning: 
-<   signed overflow. assert res + 1 ≤ 2147483647;
-< [eva] auto_loop_unroll.c:41: 
-<   Frama_C_show_each_imprecise: [0..2147483647]
----
-> [eva] auto_loop_unroll.c:41: Frama_C_show_each_imprecise: {100}
-32,34c24
-< [eva:alarm] auto_loop_unroll.c:58: Warning: 
-<   signed overflow. assert res + 1 ≤ 2147483647;
-< [eva] auto_loop_unroll.c:59: Frama_C_show_each_64: [0..2147483647]
----
-> [eva] auto_loop_unroll.c:59: Frama_C_show_each_64: {64}
-36,38c26
-< [eva:alarm] auto_loop_unroll.c:63: Warning: 
-<   signed overflow. assert res + 1 ≤ 2147483647;
-< [eva] auto_loop_unroll.c:64: Frama_C_show_each_40: [0..2147483647]
----
-> [eva] auto_loop_unroll.c:64: Frama_C_show_each_40: [0..120]
-40,42c28
-< [eva:alarm] auto_loop_unroll.c:69: Warning: 
-<   signed overflow. assert res + 1 ≤ 2147483647;
-< [eva] auto_loop_unroll.c:72: Frama_C_show_each_80: [0..2147483647]
----
-> [eva] auto_loop_unroll.c:72: Frama_C_show_each_80: [0..160]
-44,47c30
-< [eva:alarm] auto_loop_unroll.c:76: Warning: 
-<   signed overflow. assert res + 1 ≤ 2147483647;
-< [eva] auto_loop_unroll.c:82: 
-<   Frama_C_show_each_32_80: [0..2147483647]
----
-<<<<<<< HEAD
-> [eva] auto_loop_unroll.c:82: Frama_C_show_each_32_80: [0..164]
-49,52c32
-< [eva:alarm] auto_loop_unroll.c:86: Warning: 
-||||||| ac7807782d
-> [eva] tests/value/auto_loop_unroll.c:82: Frama_C_show_each_32_80: [0..164]
-49,52c32
-< [eva:alarm] tests/value/auto_loop_unroll.c:86: Warning: 
-=======
-> [eva] tests/value/auto_loop_unroll.c:82: Frama_C_show_each_32_80: [0..164]
-55,56d37
-< [eva:alarm] tests/value/auto_loop_unroll.c:88: Warning: 
->>>>>>> origin/master
-<   signed overflow. assert res + 1 ≤ 2147483647;
-<<<<<<< HEAD
-< [eva] auto_loop_unroll.c:90: 
-<   Frama_C_show_each_11_111: [0..2147483647]
----
-> [eva] auto_loop_unroll.c:90: Frama_C_show_each_11_111: [11..111]
-60,61d39
-< [eva:alarm] auto_loop_unroll.c:96: Warning: 
-||||||| ac7807782d
-< [eva] tests/value/auto_loop_unroll.c:90: 
-<   Frama_C_show_each_11_111: [0..2147483647]
----
-> [eva] tests/value/auto_loop_unroll.c:90: Frama_C_show_each_11_111: [11..111]
-60,61d39
-< [eva:alarm] tests/value/auto_loop_unroll.c:96: Warning: 
-=======
-60,62c41
-< [eva:alarm] tests/value/auto_loop_unroll.c:93: Warning: 
->>>>>>> origin/master
-<   signed overflow. assert res + 1 ≤ 2147483647;
-<<<<<<< HEAD
-72c50,53
-< [eva] auto_loop_unroll.c:103: Reusing old results for call to incr
-||||||| ac7807782d
-72c50,53
-< [eva] tests/value/auto_loop_unroll.c:103: Reusing old results for call to incr
-=======
-< [eva] tests/value/auto_loop_unroll.c:95: Frama_C_show_each_101: [0..2147483647]
----
-> [eva] tests/value/auto_loop_unroll.c:95: Frama_C_show_each_101: {101}
-71c50,53
-< [eva] tests/value/auto_loop_unroll.c:101: Reusing old results for call to incr
->>>>>>> origin/master
----
-> [eva] computing for function incr <- various_loops <- main.
-<<<<<<< HEAD
->   Called from auto_loop_unroll.c:103.
-||||||| ac7807782d
->   Called from tests/value/auto_loop_unroll.c:103.
-=======
->   Called from tests/value/auto_loop_unroll.c:101.
->>>>>>> origin/master
-> [eva] Recording results for incr
-> [eva] Done for function incr
-<<<<<<< HEAD
-82c63,66
-< [eva] auto_loop_unroll.c:103: Reusing old results for call to incr
-||||||| ac7807782d
-82c63,66
-< [eva] tests/value/auto_loop_unroll.c:103: Reusing old results for call to incr
-=======
-81c63,66
-< [eva] tests/value/auto_loop_unroll.c:101: Reusing old results for call to incr
->>>>>>> origin/master
----
-> [eva] computing for function incr <- various_loops <- main.
-<<<<<<< HEAD
->   Called from auto_loop_unroll.c:103.
-||||||| ac7807782d
->   Called from tests/value/auto_loop_unroll.c:103.
-=======
->   Called from tests/value/auto_loop_unroll.c:101.
->>>>>>> origin/master
-> [eva] Recording results for incr
-> [eva] Done for function incr
-<<<<<<< HEAD
-91c75,78
-< [eva] auto_loop_unroll.c:103: Reusing old results for call to incr
-||||||| ac7807782d
-91c75,78
-< [eva] tests/value/auto_loop_unroll.c:103: Reusing old results for call to incr
-=======
-90c75,78
-< [eva] tests/value/auto_loop_unroll.c:101: Reusing old results for call to incr
->>>>>>> origin/master
----
-> [eva] computing for function incr <- various_loops <- main.
-<<<<<<< HEAD
->   Called from auto_loop_unroll.c:103.
-||||||| ac7807782d
->   Called from tests/value/auto_loop_unroll.c:103.
-=======
->   Called from tests/value/auto_loop_unroll.c:101.
->>>>>>> origin/master
-> [eva] Recording results for incr
-> [eva] Done for function incr
-<<<<<<< HEAD
-108c95,98
-< [eva] auto_loop_unroll.c:102: Reusing old results for call to incr
-||||||| ac7807782d
-108c95,98
-< [eva] tests/value/auto_loop_unroll.c:102: Reusing old results for call to incr
-=======
-107c95,98
-< [eva] tests/value/auto_loop_unroll.c:100: Reusing old results for call to incr
->>>>>>> origin/master
----
-> [eva] computing for function incr <- various_loops <- main.
-<<<<<<< HEAD
->   Called from auto_loop_unroll.c:102.
-||||||| ac7807782d
->   Called from tests/value/auto_loop_unroll.c:102.
-=======
->   Called from tests/value/auto_loop_unroll.c:100.
->>>>>>> origin/master
-> [eva] Recording results for incr
-> [eva] Done for function incr
-<<<<<<< HEAD
-115,116d104
-< [eva:alarm] auto_loop_unroll.c:14: Warning: 
-||||||| ac7807782d
-115,116d104
-< [eva:alarm] tests/value/auto_loop_unroll.c:14: Warning: 
-=======
-114,115d104
-< [eva:alarm] tests/value/auto_loop_unroll.c:14: Warning: 
->>>>>>> origin/master
-<   signed overflow. assert g + 1 ≤ 2147483647;
-<<<<<<< HEAD
-119c107,110
-< [eva] auto_loop_unroll.c:102: Reusing old results for call to incr
----
-> [eva] computing for function incr <- various_loops <- main.
->   Called from auto_loop_unroll.c:102.
-> [eva] Recording results for incr
-> [eva] Done for function incr
-124,125c115,122
-< [eva] auto_loop_unroll.c:101: Reusing old results for call to incr_g
-< [eva] auto_loop_unroll.c:102: Reusing old results for call to incr
-||||||| ac7807782d
-119c107,110
-< [eva] tests/value/auto_loop_unroll.c:102: Reusing old results for call to incr
----
-> [eva] computing for function incr <- various_loops <- main.
->   Called from tests/value/auto_loop_unroll.c:102.
-> [eva] Recording results for incr
-> [eva] Done for function incr
-124,125c115,122
-< [eva] tests/value/auto_loop_unroll.c:101: Reusing old results for call to incr_g
-< [eva] tests/value/auto_loop_unroll.c:102: Reusing old results for call to incr
-=======
-118c107,110
-< [eva] tests/value/auto_loop_unroll.c:100: Reusing old results for call to incr
->>>>>>> origin/master
----
-<<<<<<< HEAD
-> [eva] computing for function incr_g <- various_loops <- main.
->   Called from auto_loop_unroll.c:101.
-> [eva] Recording results for incr_g
-> [eva] Done for function incr_g
-> [eva] computing for function incr <- various_loops <- main.
->   Called from auto_loop_unroll.c:102.
-> [eva] Recording results for incr
-> [eva] Done for function incr
-130,131c127,134
-< [eva] auto_loop_unroll.c:101: Reusing old results for call to incr_g
-< [eva] auto_loop_unroll.c:102: Reusing old results for call to incr
----
-> [eva] computing for function incr_g <- various_loops <- main.
->   Called from auto_loop_unroll.c:101.
-> [eva] Recording results for incr_g
-> [eva] Done for function incr_g
-||||||| ac7807782d
-> [eva] computing for function incr_g <- various_loops <- main.
->   Called from tests/value/auto_loop_unroll.c:101.
-> [eva] Recording results for incr_g
-> [eva] Done for function incr_g
-> [eva] computing for function incr <- various_loops <- main.
->   Called from tests/value/auto_loop_unroll.c:102.
-> [eva] Recording results for incr
-> [eva] Done for function incr
-130,131c127,134
-< [eva] tests/value/auto_loop_unroll.c:101: Reusing old results for call to incr_g
-< [eva] tests/value/auto_loop_unroll.c:102: Reusing old results for call to incr
----
-> [eva] computing for function incr_g <- various_loops <- main.
->   Called from tests/value/auto_loop_unroll.c:101.
-> [eva] Recording results for incr_g
-> [eva] Done for function incr_g
-=======
->>>>>>> origin/master
-> [eva] computing for function incr <- various_loops <- main.
-<<<<<<< HEAD
->   Called from auto_loop_unroll.c:102.
-||||||| ac7807782d
->   Called from tests/value/auto_loop_unroll.c:102.
-=======
->   Called from tests/value/auto_loop_unroll.c:100.
->>>>>>> origin/master
-> [eva] Recording results for incr
-> [eva] Done for function incr
-<<<<<<< HEAD
-134,135d136
-< [eva:alarm] auto_loop_unroll.c:18: Warning: 
-||||||| ac7807782d
-134,135d136
-< [eva:alarm] tests/value/auto_loop_unroll.c:18: Warning: 
-=======
-121,122d112
-< [eva:alarm] tests/value/auto_loop_unroll.c:18: Warning: 
->>>>>>> origin/master
-<   signed overflow. assert i + 1 ≤ 2147483647;
-<<<<<<< HEAD
-138c139
-< [eva] auto_loop_unroll.c:105: Frama_C_show_each_25: [0..2147483647]
-||||||| ac7807782d
-138c139
-< [eva] tests/value/auto_loop_unroll.c:105: Frama_C_show_each_25: [0..2147483647]
-=======
-125c115
-< [eva] tests/value/auto_loop_unroll.c:103: Frama_C_show_each_25: [0..2147483647]
->>>>>>> origin/master
----
-<<<<<<< HEAD
-> [eva] auto_loop_unroll.c:105: Frama_C_show_each_25: {25}
-144c145,146
-< [eva] auto_loop_unroll.c:114: Frama_C_show_each_120: [0..2147483647]
-||||||| ac7807782d
-> [eva] tests/value/auto_loop_unroll.c:105: Frama_C_show_each_25: {25}
-144c145,146
-< [eva] tests/value/auto_loop_unroll.c:114: Frama_C_show_each_120: [0..2147483647]
-=======
-> [eva] tests/value/auto_loop_unroll.c:103: Frama_C_show_each_25: {25}
-131c121,122
-< [eva] tests/value/auto_loop_unroll.c:112: Frama_C_show_each_120: [0..2147483647]
->>>>>>> origin/master
----
-<<<<<<< HEAD
-> [eva] auto_loop_unroll.c:114: 
-||||||| ac7807782d
-> [eva] tests/value/auto_loop_unroll.c:114: 
-=======
-> [eva] tests/value/auto_loop_unroll.c:112: 
->>>>>>> origin/master
->   Frama_C_show_each_120: [15..2147483647]
-<<<<<<< HEAD
-160,161d161
-< [eva:alarm] auto_loop_unroll.c:136: Warning: 
-||||||| ac7807782d
-160,161d161
-< [eva:alarm] tests/value/auto_loop_unroll.c:136: Warning: 
-=======
-133,136c124
-< [eva:alarm] tests/value/auto_loop_unroll.c:120: Warning: 
->>>>>>> origin/master
-<   signed overflow. assert res + 1 ≤ 2147483647;
-< [eva] tests/value/auto_loop_unroll.c:122: 
-<   Frama_C_show_each_32_64: [0..2147483647]
----
-<<<<<<< HEAD
->   Frama_C_show_each_imprecise: [10..2147483647]
-170,174c170,174
-< [eva:alarm] auto_loop_unroll.c:156: Warning: 
-||||||| ac7807782d
->   Frama_C_show_each_imprecise: [10..2147483647]
-170,174c170,174
-< [eva:alarm] tests/value/auto_loop_unroll.c:156: Warning: 
-=======
-> [eva] tests/value/auto_loop_unroll.c:122: Frama_C_show_each_32_64: [0..65]
-152,153d139
-< [eva:alarm] tests/value/auto_loop_unroll.c:145: Warning: 
->>>>>>> origin/master
-<   signed overflow. assert res + 1 ≤ 2147483647;
-<<<<<<< HEAD
-< [eva] auto_loop_unroll.c:158: 
-||||||| ac7807782d
-< [eva] tests/value/auto_loop_unroll.c:158: 
-=======
-160c146
->>>>>>> origin/master
-<   Frama_C_show_each_imprecise: [0..2147483647]
-<<<<<<< HEAD
-< [eva] auto_loop_unroll.c:163: Reusing old results for call to incr_g
-||||||| ac7807782d
-< [eva] tests/value/auto_loop_unroll.c:163: Reusing old results for call to incr_g
-=======
->>>>>>> origin/master
----
-<<<<<<< HEAD
-> [eva] auto_loop_unroll.c:158: Frama_C_show_each_imprecise: {10}
-> [eva] computing for function incr_g <- complex_loops <- main.
->   Called from auto_loop_unroll.c:163.
-> [eva] Recording results for incr_g
-> [eva] Done for function incr_g
-188,193c188,196
-< [eva] auto_loop_unroll.c:163: Reusing old results for call to incr_g
-< [eva] auto_loop_unroll.c:163: Reusing old results for call to incr_g
-< [eva:alarm] auto_loop_unroll.c:165: Warning: 
-||||||| ac7807782d
-> [eva] tests/value/auto_loop_unroll.c:158: Frama_C_show_each_imprecise: {10}
-> [eva] computing for function incr_g <- complex_loops <- main.
->   Called from tests/value/auto_loop_unroll.c:163.
-> [eva] Recording results for incr_g
-> [eva] Done for function incr_g
-188,193c188,196
-< [eva] tests/value/auto_loop_unroll.c:163: Reusing old results for call to incr_g
-< [eva] tests/value/auto_loop_unroll.c:163: Reusing old results for call to incr_g
-< [eva:alarm] tests/value/auto_loop_unroll.c:165: Warning: 
-=======
->   Frama_C_show_each_imprecise: [10..2147483647]
-178,183c164,172
-< [eva] tests/value/auto_loop_unroll.c:162: Reusing old results for call to incr_g
-< [eva] tests/value/auto_loop_unroll.c:162: Reusing old results for call to incr_g
-< [eva:alarm] tests/value/auto_loop_unroll.c:164: Warning: 
->>>>>>> origin/master
-<   signed overflow. assert res + 1 ≤ 2147483647;
-<<<<<<< HEAD
-< [eva] auto_loop_unroll.c:167: 
-||||||| ac7807782d
-< [eva] tests/value/auto_loop_unroll.c:167: 
-=======
-< [eva] tests/value/auto_loop_unroll.c:166: 
->>>>>>> origin/master
-<   Frama_C_show_each_imprecise: [0..2147483647]
----
-> [eva] computing for function incr_g <- complex_loops <- main.
-<<<<<<< HEAD
->   Called from auto_loop_unroll.c:163.
-||||||| ac7807782d
->   Called from tests/value/auto_loop_unroll.c:163.
-=======
->   Called from tests/value/auto_loop_unroll.c:162.
->>>>>>> origin/master
-> [eva] Recording results for incr_g
-> [eva] Done for function incr_g
-> [eva] computing for function incr_g <- complex_loops <- main.
-<<<<<<< HEAD
->   Called from auto_loop_unroll.c:163.
-||||||| ac7807782d
->   Called from tests/value/auto_loop_unroll.c:163.
-=======
->   Called from tests/value/auto_loop_unroll.c:162.
->>>>>>> origin/master
-> [eva] Recording results for incr_g
-> [eva] Done for function incr_g
-<<<<<<< HEAD
-> [eva] auto_loop_unroll.c:167: Frama_C_show_each_imprecise: [0..64]
-195,198c198
-< [eva:alarm] auto_loop_unroll.c:174: Warning: 
-||||||| ac7807782d
-> [eva] tests/value/auto_loop_unroll.c:167: Frama_C_show_each_imprecise: [0..64]
-195,198c198
-< [eva:alarm] tests/value/auto_loop_unroll.c:174: Warning: 
-=======
-> [eva] tests/value/auto_loop_unroll.c:166: Frama_C_show_each_imprecise: [0..64]
-185,188c174
-< [eva:alarm] tests/value/auto_loop_unroll.c:173: Warning: 
->>>>>>> origin/master
-<   signed overflow. assert res + 1 ≤ 2147483647;
-<<<<<<< HEAD
-< [eva] auto_loop_unroll.c:176: 
-||||||| ac7807782d
-< [eva] tests/value/auto_loop_unroll.c:176: 
-=======
-< [eva] tests/value/auto_loop_unroll.c:175: 
->>>>>>> origin/master
-<   Frama_C_show_each_imprecise: [0..2147483647]
----
-<<<<<<< HEAD
-> [eva] auto_loop_unroll.c:176: Frama_C_show_each_imprecise: [0..9]
-200,203c200
-< [eva:alarm] auto_loop_unroll.c:182: Warning: 
-||||||| ac7807782d
-> [eva] tests/value/auto_loop_unroll.c:176: Frama_C_show_each_imprecise: [0..9]
-200,203c200
-< [eva:alarm] tests/value/auto_loop_unroll.c:182: Warning: 
-=======
-> [eva] tests/value/auto_loop_unroll.c:175: Frama_C_show_each_imprecise: [0..9]
-190,191d175
-< [eva:alarm] tests/value/auto_loop_unroll.c:181: Warning: 
->>>>>>> origin/master
-<   signed overflow. assert res + 1 ≤ 2147483647;
-<<<<<<< HEAD
-< [eva] auto_loop_unroll.c:184: 
-||||||| ac7807782d
-< [eva] tests/value/auto_loop_unroll.c:184: 
-=======
-195c179
->>>>>>> origin/master
-<   Frama_C_show_each_imprecise: [0..2147483647]
----
-<<<<<<< HEAD
-> [eva] auto_loop_unroll.c:184: Frama_C_show_each_imprecise: [0..64]
-210c207
-||||||| ac7807782d
-> [eva] tests/value/auto_loop_unroll.c:184: Frama_C_show_each_imprecise: [0..64]
-210c207
-=======
->   Frama_C_show_each_imprecise: [64..2147483647]
-201,203c185
-< [eva:alarm] tests/value/auto_loop_unroll.c:193: Warning: 
-<   signed overflow. assert res + 1 ≤ 2147483647;
-< [eva] tests/value/auto_loop_unroll.c:195: Frama_C_show_each_11: [0..2147483647]
----
-> [eva] tests/value/auto_loop_unroll.c:195: Frama_C_show_each_11: {11}
-205,207c187
-< [eva:alarm] tests/value/auto_loop_unroll.c:198: Warning: 
-<   signed overflow. assert res + 1 ≤ 2147483647;
-< [eva] tests/value/auto_loop_unroll.c:200: Frama_C_show_each_12: [0..2147483647]
----
-> [eva] tests/value/auto_loop_unroll.c:200: Frama_C_show_each_12: {12}
-209,210d188
-< [eva:alarm] tests/value/auto_loop_unroll.c:204: Warning: 
-<   signed overflow. assert res + 1 ≤ 2147483647;
-212a191,192
-> [eva:alarm] tests/value/auto_loop_unroll.c:204: Warning: 
->   signed overflow. assert res + 1 ≤ 2147483647;
-216,217d195
-< [eva:alarm] tests/value/auto_loop_unroll.c:209: Warning: 
-<   signed overflow. assert res + 1 ≤ 2147483647;
-219a198,199
-> [eva:alarm] tests/value/auto_loop_unroll.c:209: Warning: 
->   signed overflow. assert res + 1 ≤ 2147483647;
-223,224d202
-< [eva:alarm] tests/value/auto_loop_unroll.c:217: Warning: 
-<   signed overflow. assert res + 1 ≤ 2147483647;
-228,231c206
-< [eva:alarm] tests/value/auto_loop_unroll.c:222: Warning: 
-<   signed overflow. assert res + 1 ≤ 2147483647;
-< [eva] tests/value/auto_loop_unroll.c:226: 
-<   Frama_C_show_each_11_111: [0..2147483647]
----
-> [eva] tests/value/auto_loop_unroll.c:226: Frama_C_show_each_11_111: [11..111]
-239,241c214
-< [eva:alarm] tests/value/auto_loop_unroll.c:236: Warning: 
-<   signed overflow. assert res + 1 ≤ 2147483647;
-< [eva] tests/value/auto_loop_unroll.c:238: Frama_C_show_each_20: [0..2147483647]
----
-> [eva] tests/value/auto_loop_unroll.c:238: Frama_C_show_each_20: [20..2147483646]
-243,244d215
-< [eva:alarm] tests/value/auto_loop_unroll.c:241: Warning: 
-<   signed overflow. assert res + 1 ≤ 2147483647;
-247c218,220
-< [eva] tests/value/auto_loop_unroll.c:243: Frama_C_show_each_21: [0..2147483647]
----
-> [eva:alarm] tests/value/auto_loop_unroll.c:241: Warning: 
->   signed overflow. assert res + 1 ≤ 2147483647;
-> [eva] tests/value/auto_loop_unroll.c:243: Frama_C_show_each_21: {21}
-253,255c226,227
-< [eva:alarm] tests/value/auto_loop_unroll.c:250: Warning: 
-<   signed overflow. assert res + 1 ≤ 2147483647;
-< [eva] tests/value/auto_loop_unroll.c:254: Frama_C_show_each_30: [0..2147483647]
----
-> [eva] tests/value/auto_loop_unroll.c:254: Frama_C_show_each_30: {30}
-> [eva] tests/value/auto_loop_unroll.c:258: starting to merge loop iterations
-258,259c230,231
-< [eva] tests/value/auto_loop_unroll.c:258: starting to merge loop iterations
-< [eva] tests/value/auto_loop_unroll.c:263: Frama_C_show_each_top: [0..2147483647]
----
-> [eva] tests/value/auto_loop_unroll.c:263: 
->   Frama_C_show_each_top: [31..2147483647]
-261,263c233
-< [eva:alarm] tests/value/auto_loop_unroll.c:267: Warning: 
-<   signed overflow. assert res + 1 ≤ 2147483647;
-< [eva] tests/value/auto_loop_unroll.c:272: Frama_C_show_each_32: [0..2147483647]
----
-> [eva] tests/value/auto_loop_unroll.c:272: Frama_C_show_each_32: {32}
-268c238
-<   Frama_C_show_each_33_inf: [0..2147483647]
----
->   Frama_C_show_each_33_inf: [33..2147483647]
-272,273d241
-< [eva:alarm] tests/value/auto_loop_unroll.c:283: Warning: 
-<   signed overflow. assert res + 1 ≤ 2147483647;
-281c249
->>>>>>> origin/master
-<   __retres ∈ [1..2147483647]
----
->   __retres ∈ [1..25]
-283c251
-<   g ∈ [1..2147483647]
----
-<<<<<<< HEAD
->   g ∈ [1..63]
-diff oracle/auto_loop_unroll.1.res.oracle oracle_apron/auto_loop_unroll.1.res.oracle
-||||||| ac7807782d
->   g ∈ [1..63]
-diff tests/value/oracle/auto_loop_unroll.1.res.oracle tests/value/oracle_apron/auto_loop_unroll.1.res.oracle
-=======
->   g ∈ [1..126]
-diff tests/value/oracle/auto_loop_unroll.1.res.oracle tests/value/oracle_apron/auto_loop_unroll.1.res.oracle
->>>>>>> origin/master
-15,18c15
-< [eva:alarm] auto_loop_unroll.c:31: Warning: 
-<   signed overflow. assert res + 1 ≤ 2147483647;
-< [eva] auto_loop_unroll.c:33: 
-<   Frama_C_show_each_imprecise: [0..2147483647]
----
-> [eva] auto_loop_unroll.c:33: Frama_C_show_each_imprecise: {1000}
-20,23c17
-< [eva:alarm] auto_loop_unroll.c:39: Warning: 
-<   signed overflow. assert res + 1 ≤ 2147483647;
-< [eva] auto_loop_unroll.c:41: 
-<   Frama_C_show_each_imprecise: [0..2147483647]
----
-> [eva] auto_loop_unroll.c:41: Frama_C_show_each_imprecise: {100}
-58c52,55
-<<<<<<< HEAD
-< [eva] auto_loop_unroll.c:103: Reusing old results for call to incr
-||||||| ac7807782d
-< [eva] tests/value/auto_loop_unroll.c:103: Reusing old results for call to incr
-=======
-< [eva] tests/value/auto_loop_unroll.c:101: Reusing old results for call to incr
->>>>>>> origin/master
----
-> [eva] computing for function incr <- various_loops <- main.
-<<<<<<< HEAD
->   Called from auto_loop_unroll.c:103.
-||||||| ac7807782d
->   Called from tests/value/auto_loop_unroll.c:103.
-=======
->   Called from tests/value/auto_loop_unroll.c:101.
->>>>>>> origin/master
-> [eva] Recording results for incr
-> [eva] Done for function incr
-67c64,67
-<<<<<<< HEAD
-< [eva] auto_loop_unroll.c:103: Reusing old results for call to incr
-||||||| ac7807782d
-< [eva] tests/value/auto_loop_unroll.c:103: Reusing old results for call to incr
-=======
-< [eva] tests/value/auto_loop_unroll.c:101: Reusing old results for call to incr
->>>>>>> origin/master
----
-> [eva] computing for function incr <- various_loops <- main.
-<<<<<<< HEAD
->   Called from auto_loop_unroll.c:103.
-||||||| ac7807782d
->   Called from tests/value/auto_loop_unroll.c:103.
-=======
->   Called from tests/value/auto_loop_unroll.c:101.
->>>>>>> origin/master
-> [eva] Recording results for incr
-> [eva] Done for function incr
-76c76,79
-<<<<<<< HEAD
-< [eva] auto_loop_unroll.c:103: Reusing old results for call to incr
-||||||| ac7807782d
-< [eva] tests/value/auto_loop_unroll.c:103: Reusing old results for call to incr
-=======
-< [eva] tests/value/auto_loop_unroll.c:101: Reusing old results for call to incr
->>>>>>> origin/master
----
-> [eva] computing for function incr <- various_loops <- main.
-<<<<<<< HEAD
->   Called from auto_loop_unroll.c:103.
-||||||| ac7807782d
->   Called from tests/value/auto_loop_unroll.c:103.
-=======
->   Called from tests/value/auto_loop_unroll.c:101.
->>>>>>> origin/master
-> [eva] Recording results for incr
-> [eva] Done for function incr
-85c88,91
-<<<<<<< HEAD
-< [eva] auto_loop_unroll.c:103: Reusing old results for call to incr
-||||||| ac7807782d
-< [eva] tests/value/auto_loop_unroll.c:103: Reusing old results for call to incr
-=======
-< [eva] tests/value/auto_loop_unroll.c:101: Reusing old results for call to incr
->>>>>>> origin/master
----
-> [eva] computing for function incr <- various_loops <- main.
-<<<<<<< HEAD
->   Called from auto_loop_unroll.c:103.
-||||||| ac7807782d
->   Called from tests/value/auto_loop_unroll.c:103.
-=======
->   Called from tests/value/auto_loop_unroll.c:101.
->>>>>>> origin/master
-> [eva] Recording results for incr
-> [eva] Done for function incr
-94c100,103
-<<<<<<< HEAD
-< [eva] auto_loop_unroll.c:103: Reusing old results for call to incr
-||||||| ac7807782d
-< [eva] tests/value/auto_loop_unroll.c:103: Reusing old results for call to incr
-=======
-< [eva] tests/value/auto_loop_unroll.c:101: Reusing old results for call to incr
->>>>>>> origin/master
----
-> [eva] computing for function incr <- various_loops <- main.
-<<<<<<< HEAD
->   Called from auto_loop_unroll.c:103.
-||||||| ac7807782d
->   Called from tests/value/auto_loop_unroll.c:103.
-=======
->   Called from tests/value/auto_loop_unroll.c:101.
->>>>>>> origin/master
-> [eva] Recording results for incr
-> [eva] Done for function incr
-103c112,115
-<<<<<<< HEAD
-< [eva] auto_loop_unroll.c:103: Reusing old results for call to incr
-||||||| ac7807782d
-< [eva] tests/value/auto_loop_unroll.c:103: Reusing old results for call to incr
-=======
-< [eva] tests/value/auto_loop_unroll.c:101: Reusing old results for call to incr
->>>>>>> origin/master
----
-> [eva] computing for function incr <- various_loops <- main.
-<<<<<<< HEAD
->   Called from auto_loop_unroll.c:103.
-||||||| ac7807782d
->   Called from tests/value/auto_loop_unroll.c:103.
-=======
->   Called from tests/value/auto_loop_unroll.c:101.
->>>>>>> origin/master
-> [eva] Recording results for incr
-> [eva] Done for function incr
-112c124,127
-<<<<<<< HEAD
-< [eva] auto_loop_unroll.c:103: Reusing old results for call to incr
-||||||| ac7807782d
-< [eva] tests/value/auto_loop_unroll.c:103: Reusing old results for call to incr
-=======
-< [eva] tests/value/auto_loop_unroll.c:101: Reusing old results for call to incr
->>>>>>> origin/master
----
-> [eva] computing for function incr <- various_loops <- main.
-<<<<<<< HEAD
->   Called from auto_loop_unroll.c:103.
-||||||| ac7807782d
->   Called from tests/value/auto_loop_unroll.c:103.
-=======
->   Called from tests/value/auto_loop_unroll.c:101.
->>>>>>> origin/master
-> [eva] Recording results for incr
-> [eva] Done for function incr
-121c136,139
-<<<<<<< HEAD
-< [eva] auto_loop_unroll.c:103: Reusing old results for call to incr
-||||||| ac7807782d
-< [eva] tests/value/auto_loop_unroll.c:103: Reusing old results for call to incr
-=======
-< [eva] tests/value/auto_loop_unroll.c:101: Reusing old results for call to incr
->>>>>>> origin/master
----
-> [eva] computing for function incr <- various_loops <- main.
-<<<<<<< HEAD
->   Called from auto_loop_unroll.c:103.
-||||||| ac7807782d
->   Called from tests/value/auto_loop_unroll.c:103.
-=======
->   Called from tests/value/auto_loop_unroll.c:101.
->>>>>>> origin/master
-> [eva] Recording results for incr
-> [eva] Done for function incr
-130c148,151
-<<<<<<< HEAD
-< [eva] auto_loop_unroll.c:103: Reusing old results for call to incr
-||||||| ac7807782d
-< [eva] tests/value/auto_loop_unroll.c:103: Reusing old results for call to incr
-=======
-< [eva] tests/value/auto_loop_unroll.c:101: Reusing old results for call to incr
->>>>>>> origin/master
----
-> [eva] computing for function incr <- various_loops <- main.
-<<<<<<< HEAD
->   Called from auto_loop_unroll.c:103.
-||||||| ac7807782d
->   Called from tests/value/auto_loop_unroll.c:103.
-=======
->   Called from tests/value/auto_loop_unroll.c:101.
->>>>>>> origin/master
-> [eva] Recording results for incr
-> [eva] Done for function incr
-139c160,163
-<<<<<<< HEAD
-< [eva] auto_loop_unroll.c:103: Reusing old results for call to incr
-||||||| ac7807782d
-< [eva] tests/value/auto_loop_unroll.c:103: Reusing old results for call to incr
-=======
-< [eva] tests/value/auto_loop_unroll.c:101: Reusing old results for call to incr
->>>>>>> origin/master
----
-> [eva] computing for function incr <- various_loops <- main.
-<<<<<<< HEAD
->   Called from auto_loop_unroll.c:103.
-||||||| ac7807782d
->   Called from tests/value/auto_loop_unroll.c:103.
-=======
->   Called from tests/value/auto_loop_unroll.c:101.
->>>>>>> origin/master
-> [eva] Recording results for incr
-> [eva] Done for function incr
-148c172,175
-<<<<<<< HEAD
-< [eva] auto_loop_unroll.c:103: Reusing old results for call to incr
-||||||| ac7807782d
-< [eva] tests/value/auto_loop_unroll.c:103: Reusing old results for call to incr
-=======
-< [eva] tests/value/auto_loop_unroll.c:101: Reusing old results for call to incr
->>>>>>> origin/master
----
-> [eva] computing for function incr <- various_loops <- main.
-<<<<<<< HEAD
->   Called from auto_loop_unroll.c:103.
-||||||| ac7807782d
->   Called from tests/value/auto_loop_unroll.c:103.
-=======
->   Called from tests/value/auto_loop_unroll.c:101.
->>>>>>> origin/master
-> [eva] Recording results for incr
-> [eva] Done for function incr
-157c184,187
-<<<<<<< HEAD
-< [eva] auto_loop_unroll.c:103: Reusing old results for call to incr
-||||||| ac7807782d
-< [eva] tests/value/auto_loop_unroll.c:103: Reusing old results for call to incr
-=======
-< [eva] tests/value/auto_loop_unroll.c:101: Reusing old results for call to incr
->>>>>>> origin/master
----
-> [eva] computing for function incr <- various_loops <- main.
-<<<<<<< HEAD
->   Called from auto_loop_unroll.c:103.
-||||||| ac7807782d
->   Called from tests/value/auto_loop_unroll.c:103.
-=======
->   Called from tests/value/auto_loop_unroll.c:101.
->>>>>>> origin/master
-> [eva] Recording results for incr
-> [eva] Done for function incr
-166c196,199
-<<<<<<< HEAD
-< [eva] auto_loop_unroll.c:103: Reusing old results for call to incr
-||||||| ac7807782d
-< [eva] tests/value/auto_loop_unroll.c:103: Reusing old results for call to incr
-=======
-< [eva] tests/value/auto_loop_unroll.c:101: Reusing old results for call to incr
->>>>>>> origin/master
----
-> [eva] computing for function incr <- various_loops <- main.
-<<<<<<< HEAD
->   Called from auto_loop_unroll.c:103.
-||||||| ac7807782d
->   Called from tests/value/auto_loop_unroll.c:103.
-=======
->   Called from tests/value/auto_loop_unroll.c:101.
->>>>>>> origin/master
-> [eva] Recording results for incr
-> [eva] Done for function incr
-175c208,211
-<<<<<<< HEAD
-< [eva] auto_loop_unroll.c:103: Reusing old results for call to incr
-||||||| ac7807782d
-< [eva] tests/value/auto_loop_unroll.c:103: Reusing old results for call to incr
-=======
-< [eva] tests/value/auto_loop_unroll.c:101: Reusing old results for call to incr
->>>>>>> origin/master
----
-> [eva] computing for function incr <- various_loops <- main.
-<<<<<<< HEAD
->   Called from auto_loop_unroll.c:103.
-||||||| ac7807782d
->   Called from tests/value/auto_loop_unroll.c:103.
-=======
->   Called from tests/value/auto_loop_unroll.c:101.
->>>>>>> origin/master
-> [eva] Recording results for incr
-> [eva] Done for function incr
-184c220,223
-<<<<<<< HEAD
-< [eva] auto_loop_unroll.c:103: Reusing old results for call to incr
-||||||| ac7807782d
-< [eva] tests/value/auto_loop_unroll.c:103: Reusing old results for call to incr
-=======
-< [eva] tests/value/auto_loop_unroll.c:101: Reusing old results for call to incr
->>>>>>> origin/master
----
-> [eva] computing for function incr <- various_loops <- main.
-<<<<<<< HEAD
->   Called from auto_loop_unroll.c:103.
-||||||| ac7807782d
->   Called from tests/value/auto_loop_unroll.c:103.
-=======
->   Called from tests/value/auto_loop_unroll.c:101.
->>>>>>> origin/master
-> [eva] Recording results for incr
-> [eva] Done for function incr
-193c232,235
-<<<<<<< HEAD
-< [eva] auto_loop_unroll.c:103: Reusing old results for call to incr
-||||||| ac7807782d
-< [eva] tests/value/auto_loop_unroll.c:103: Reusing old results for call to incr
-=======
-< [eva] tests/value/auto_loop_unroll.c:101: Reusing old results for call to incr
->>>>>>> origin/master
----
-> [eva] computing for function incr <- various_loops <- main.
-<<<<<<< HEAD
->   Called from auto_loop_unroll.c:103.
-||||||| ac7807782d
->   Called from tests/value/auto_loop_unroll.c:103.
-=======
->   Called from tests/value/auto_loop_unroll.c:101.
->>>>>>> origin/master
-> [eva] Recording results for incr
-> [eva] Done for function incr
-202c244,247
-<<<<<<< HEAD
-< [eva] auto_loop_unroll.c:103: Reusing old results for call to incr
-||||||| ac7807782d
-< [eva] tests/value/auto_loop_unroll.c:103: Reusing old results for call to incr
-=======
-< [eva] tests/value/auto_loop_unroll.c:101: Reusing old results for call to incr
->>>>>>> origin/master
----
-> [eva] computing for function incr <- various_loops <- main.
-<<<<<<< HEAD
->   Called from auto_loop_unroll.c:103.
-||||||| ac7807782d
->   Called from tests/value/auto_loop_unroll.c:103.
-=======
->   Called from tests/value/auto_loop_unroll.c:101.
->>>>>>> origin/master
-> [eva] Recording results for incr
-> [eva] Done for function incr
-211c256,259
-<<<<<<< HEAD
-< [eva] auto_loop_unroll.c:103: Reusing old results for call to incr
-||||||| ac7807782d
-< [eva] tests/value/auto_loop_unroll.c:103: Reusing old results for call to incr
-=======
-< [eva] tests/value/auto_loop_unroll.c:101: Reusing old results for call to incr
->>>>>>> origin/master
----
-> [eva] computing for function incr <- various_loops <- main.
-<<<<<<< HEAD
->   Called from auto_loop_unroll.c:103.
-||||||| ac7807782d
->   Called from tests/value/auto_loop_unroll.c:103.
-=======
->   Called from tests/value/auto_loop_unroll.c:101.
->>>>>>> origin/master
-> [eva] Recording results for incr
-> [eva] Done for function incr
-220c268,271
-<<<<<<< HEAD
-< [eva] auto_loop_unroll.c:103: Reusing old results for call to incr
-||||||| ac7807782d
-< [eva] tests/value/auto_loop_unroll.c:103: Reusing old results for call to incr
-=======
-< [eva] tests/value/auto_loop_unroll.c:101: Reusing old results for call to incr
->>>>>>> origin/master
----
-> [eva] computing for function incr <- various_loops <- main.
-<<<<<<< HEAD
->   Called from auto_loop_unroll.c:103.
-||||||| ac7807782d
->   Called from tests/value/auto_loop_unroll.c:103.
-=======
->   Called from tests/value/auto_loop_unroll.c:101.
->>>>>>> origin/master
-> [eva] Recording results for incr
-> [eva] Done for function incr
-229c280,283
-<<<<<<< HEAD
-< [eva] auto_loop_unroll.c:103: Reusing old results for call to incr
-||||||| ac7807782d
-< [eva] tests/value/auto_loop_unroll.c:103: Reusing old results for call to incr
-=======
-< [eva] tests/value/auto_loop_unroll.c:101: Reusing old results for call to incr
->>>>>>> origin/master
----
-> [eva] computing for function incr <- various_loops <- main.
-<<<<<<< HEAD
->   Called from auto_loop_unroll.c:103.
-||||||| ac7807782d
->   Called from tests/value/auto_loop_unroll.c:103.
-=======
->   Called from tests/value/auto_loop_unroll.c:101.
->>>>>>> origin/master
-> [eva] Recording results for incr
-> [eva] Done for function incr
-238c292,295
-<<<<<<< HEAD
-< [eva] auto_loop_unroll.c:103: Reusing old results for call to incr
-||||||| ac7807782d
-< [eva] tests/value/auto_loop_unroll.c:103: Reusing old results for call to incr
-=======
-< [eva] tests/value/auto_loop_unroll.c:101: Reusing old results for call to incr
->>>>>>> origin/master
----
-> [eva] computing for function incr <- various_loops <- main.
-<<<<<<< HEAD
->   Called from auto_loop_unroll.c:103.
-||||||| ac7807782d
->   Called from tests/value/auto_loop_unroll.c:103.
-=======
->   Called from tests/value/auto_loop_unroll.c:101.
->>>>>>> origin/master
-> [eva] Recording results for incr
-> [eva] Done for function incr
-247c304,307
-<<<<<<< HEAD
-< [eva] auto_loop_unroll.c:103: Reusing old results for call to incr
-||||||| ac7807782d
-< [eva] tests/value/auto_loop_unroll.c:103: Reusing old results for call to incr
-=======
-< [eva] tests/value/auto_loop_unroll.c:101: Reusing old results for call to incr
->>>>>>> origin/master
----
-> [eva] computing for function incr <- various_loops <- main.
-<<<<<<< HEAD
->   Called from auto_loop_unroll.c:103.
-||||||| ac7807782d
->   Called from tests/value/auto_loop_unroll.c:103.
-=======
->   Called from tests/value/auto_loop_unroll.c:101.
->>>>>>> origin/master
-> [eva] Recording results for incr
-> [eva] Done for function incr
-256c316,319
-<<<<<<< HEAD
-< [eva] auto_loop_unroll.c:103: Reusing old results for call to incr
-||||||| ac7807782d
-< [eva] tests/value/auto_loop_unroll.c:103: Reusing old results for call to incr
-=======
-< [eva] tests/value/auto_loop_unroll.c:101: Reusing old results for call to incr
->>>>>>> origin/master
----
-> [eva] computing for function incr <- various_loops <- main.
-<<<<<<< HEAD
->   Called from auto_loop_unroll.c:103.
-||||||| ac7807782d
->   Called from tests/value/auto_loop_unroll.c:103.
-=======
->   Called from tests/value/auto_loop_unroll.c:101.
->>>>>>> origin/master
-> [eva] Recording results for incr
-> [eva] Done for function incr
-265c328,331
-<<<<<<< HEAD
-< [eva] auto_loop_unroll.c:103: Reusing old results for call to incr
-||||||| ac7807782d
-< [eva] tests/value/auto_loop_unroll.c:103: Reusing old results for call to incr
-=======
-< [eva] tests/value/auto_loop_unroll.c:101: Reusing old results for call to incr
->>>>>>> origin/master
----
-> [eva] computing for function incr <- various_loops <- main.
-<<<<<<< HEAD
->   Called from auto_loop_unroll.c:103.
-||||||| ac7807782d
->   Called from tests/value/auto_loop_unroll.c:103.
-=======
->   Called from tests/value/auto_loop_unroll.c:101.
->>>>>>> origin/master
-> [eva] Recording results for incr
-> [eva] Done for function incr
-274c340,343
-<<<<<<< HEAD
-< [eva] auto_loop_unroll.c:103: Reusing old results for call to incr
-||||||| ac7807782d
-< [eva] tests/value/auto_loop_unroll.c:103: Reusing old results for call to incr
-=======
-< [eva] tests/value/auto_loop_unroll.c:101: Reusing old results for call to incr
->>>>>>> origin/master
----
-> [eva] computing for function incr <- various_loops <- main.
-<<<<<<< HEAD
->   Called from auto_loop_unroll.c:103.
-||||||| ac7807782d
->   Called from tests/value/auto_loop_unroll.c:103.
-=======
->   Called from tests/value/auto_loop_unroll.c:101.
->>>>>>> origin/master
-> [eva] Recording results for incr
-> [eva] Done for function incr
-<<<<<<< HEAD
-294,295d362
-< [eva:alarm] auto_loop_unroll.c:136: Warning: 
-||||||| ac7807782d
-294,295d362
-< [eva:alarm] tests/value/auto_loop_unroll.c:136: Warning: 
-=======
-296,297d364
-< [eva:alarm] tests/value/auto_loop_unroll.c:145: Warning: 
->>>>>>> origin/master
-<   signed overflow. assert res + 1 ≤ 2147483647;
-304c371
-<   Frama_C_show_each_imprecise: [0..2147483647]
----
->   Frama_C_show_each_imprecise: [10..2147483647]
-<<<<<<< HEAD
-304,308c371,375
-< [eva:alarm] auto_loop_unroll.c:156: Warning: 
-<   signed overflow. assert res + 1 ≤ 2147483647;
-< [eva] auto_loop_unroll.c:158: 
-<   Frama_C_show_each_imprecise: [0..2147483647]
-< [eva] auto_loop_unroll.c:163: Reusing old results for call to incr_g
----
-> [eva] auto_loop_unroll.c:158: Frama_C_show_each_imprecise: {10}
-> [eva] computing for function incr_g <- complex_loops <- main.
->   Called from auto_loop_unroll.c:163.
-> [eva] Recording results for incr_g
-> [eva] Done for function incr_g
-||||||| ac7807782d
-304,308c371,375
-< [eva:alarm] tests/value/auto_loop_unroll.c:156: Warning: 
-<   signed overflow. assert res + 1 ≤ 2147483647;
-< [eva] tests/value/auto_loop_unroll.c:158: 
-<   Frama_C_show_each_imprecise: [0..2147483647]
-< [eva] tests/value/auto_loop_unroll.c:163: Reusing old results for call to incr_g
----
-> [eva] tests/value/auto_loop_unroll.c:158: Frama_C_show_each_imprecise: {10}
-> [eva] computing for function incr_g <- complex_loops <- main.
->   Called from tests/value/auto_loop_unroll.c:163.
-> [eva] Recording results for incr_g
-> [eva] Done for function incr_g
-=======
->>>>>>> origin/master
-322,327c389,397
-<<<<<<< HEAD
-< [eva] auto_loop_unroll.c:163: Reusing old results for call to incr_g
-< [eva] auto_loop_unroll.c:163: Reusing old results for call to incr_g
-< [eva:alarm] auto_loop_unroll.c:165: Warning: 
-||||||| ac7807782d
-< [eva] tests/value/auto_loop_unroll.c:163: Reusing old results for call to incr_g
-< [eva] tests/value/auto_loop_unroll.c:163: Reusing old results for call to incr_g
-< [eva:alarm] tests/value/auto_loop_unroll.c:165: Warning: 
-=======
-< [eva] tests/value/auto_loop_unroll.c:162: Reusing old results for call to incr_g
-< [eva] tests/value/auto_loop_unroll.c:162: Reusing old results for call to incr_g
-< [eva:alarm] tests/value/auto_loop_unroll.c:164: Warning: 
->>>>>>> origin/master
-<   signed overflow. assert res + 1 ≤ 2147483647;
-<<<<<<< HEAD
-< [eva] auto_loop_unroll.c:167: 
-||||||| ac7807782d
-< [eva] tests/value/auto_loop_unroll.c:167: 
-=======
-< [eva] tests/value/auto_loop_unroll.c:166: 
->>>>>>> origin/master
-<   Frama_C_show_each_imprecise: [0..2147483647]
----
-> [eva] computing for function incr_g <- complex_loops <- main.
-<<<<<<< HEAD
->   Called from auto_loop_unroll.c:163.
-||||||| ac7807782d
->   Called from tests/value/auto_loop_unroll.c:163.
-=======
->   Called from tests/value/auto_loop_unroll.c:162.
->>>>>>> origin/master
-> [eva] Recording results for incr_g
-> [eva] Done for function incr_g
-> [eva] computing for function incr_g <- complex_loops <- main.
-<<<<<<< HEAD
->   Called from auto_loop_unroll.c:163.
-||||||| ac7807782d
->   Called from tests/value/auto_loop_unroll.c:163.
-=======
->   Called from tests/value/auto_loop_unroll.c:162.
->>>>>>> origin/master
-> [eva] Recording results for incr_g
-> [eva] Done for function incr_g
-<<<<<<< HEAD
-> [eva] auto_loop_unroll.c:167: Frama_C_show_each_imprecise: [0..64]
-||||||| ac7807782d
-> [eva] tests/value/auto_loop_unroll.c:167: Frama_C_show_each_imprecise: [0..64]
-=======
-> [eva] tests/value/auto_loop_unroll.c:166: Frama_C_show_each_imprecise: [0..64]
->>>>>>> origin/master
-329,332c399
-<<<<<<< HEAD
-< [eva:alarm] auto_loop_unroll.c:174: Warning: 
-||||||| ac7807782d
-< [eva:alarm] tests/value/auto_loop_unroll.c:174: Warning: 
-=======
-< [eva:alarm] tests/value/auto_loop_unroll.c:173: Warning: 
->>>>>>> origin/master
-<   signed overflow. assert res + 1 ≤ 2147483647;
-<<<<<<< HEAD
-< [eva] auto_loop_unroll.c:176: 
-||||||| ac7807782d
-< [eva] tests/value/auto_loop_unroll.c:176: 
-=======
-< [eva] tests/value/auto_loop_unroll.c:175: 
->>>>>>> origin/master
-<   Frama_C_show_each_imprecise: [0..2147483647]
----
-<<<<<<< HEAD
-> [eva] auto_loop_unroll.c:176: Frama_C_show_each_imprecise: [0..9]
-334,337c401
-< [eva:alarm] auto_loop_unroll.c:182: Warning: 
-||||||| ac7807782d
-> [eva] tests/value/auto_loop_unroll.c:176: Frama_C_show_each_imprecise: [0..9]
-334,337c401
-< [eva:alarm] tests/value/auto_loop_unroll.c:182: Warning: 
-=======
-> [eva] tests/value/auto_loop_unroll.c:175: Frama_C_show_each_imprecise: [0..9]
-334,335d400
-< [eva:alarm] tests/value/auto_loop_unroll.c:181: Warning: 
->>>>>>> origin/master
-<   signed overflow. assert res + 1 ≤ 2147483647;
-<<<<<<< HEAD
-< [eva] auto_loop_unroll.c:184: 
-||||||| ac7807782d
-< [eva] tests/value/auto_loop_unroll.c:184: 
-=======
-339c404
->>>>>>> origin/master
-<   Frama_C_show_each_imprecise: [0..2147483647]
----
-<<<<<<< HEAD
-> [eva] auto_loop_unroll.c:184: Frama_C_show_each_imprecise: [0..64]
-diff oracle/backward_add_ptr.res.oracle oracle_apron/backward_add_ptr.res.oracle
-||||||| ac7807782d
-> [eva] tests/value/auto_loop_unroll.c:184: Frama_C_show_each_imprecise: [0..64]
-diff tests/value/oracle/backward_add_ptr.res.oracle tests/value/oracle_apron/backward_add_ptr.res.oracle
-=======
->   Frama_C_show_each_imprecise: [64..2147483647]
-344c409
-< [eva:loop-unroll] tests/value/auto_loop_unroll.c:192: Automatic loop unrolling.
----
-> [eva] tests/value/auto_loop_unroll.c:192: starting to merge loop iterations
-346c411
-< [eva:loop-unroll] tests/value/auto_loop_unroll.c:197: Automatic loop unrolling.
----
-> [eva] tests/value/auto_loop_unroll.c:197: starting to merge loop iterations
-348,353c413,429
-< [eva:loop-unroll] tests/value/auto_loop_unroll.c:203: Automatic loop unrolling.
-< [eva] tests/value/auto_loop_unroll.c:206: Frama_C_show_each_0_13: [0..13]
-< [eva:loop-unroll] tests/value/auto_loop_unroll.c:208: Automatic loop unrolling.
-< [eva] tests/value/auto_loop_unroll.c:211: Frama_C_show_each_0_14: [0..14]
-< [eva:loop-unroll] tests/value/auto_loop_unroll.c:214: Automatic loop unrolling.
-< [eva] tests/value/auto_loop_unroll.c:219: Frama_C_show_each_0_15: [0..15]
----
-> [eva] tests/value/auto_loop_unroll.c:203: starting to merge loop iterations
-> [eva:alarm] tests/value/auto_loop_unroll.c:203: Warning: 
->   signed overflow. assert -2147483648 ≤ i_0 - 1;
-> [eva:alarm] tests/value/auto_loop_unroll.c:204: Warning: 
->   signed overflow. assert res + 1 ≤ 2147483647;
-> [eva] tests/value/auto_loop_unroll.c:206: 
->   Frama_C_show_each_0_13: [0..2147483647]
-> [eva] tests/value/auto_loop_unroll.c:208: starting to merge loop iterations
-> [eva:alarm] tests/value/auto_loop_unroll.c:208: Warning: 
->   signed overflow. assert -2147483648 ≤ i_1 - 1;
-> [eva:alarm] tests/value/auto_loop_unroll.c:209: Warning: 
->   signed overflow. assert res + 1 ≤ 2147483647;
-> [eva] tests/value/auto_loop_unroll.c:211: 
->   Frama_C_show_each_0_14: [0..2147483647]
-> [eva] tests/value/auto_loop_unroll.c:214: starting to merge loop iterations
-> [eva] tests/value/auto_loop_unroll.c:219: 
->   Frama_C_show_each_0_15: [0..2147483647]
-364c440,444
-< [eva:loop-unroll] tests/value/auto_loop_unroll.c:240: Automatic loop unrolling.
----
-> [eva] tests/value/auto_loop_unroll.c:240: starting to merge loop iterations
-> [eva:alarm] tests/value/auto_loop_unroll.c:240: Warning: 
->   signed overflow. assert -2147483648 ≤ i - 1;
-> [eva:alarm] tests/value/auto_loop_unroll.c:241: Warning: 
->   signed overflow. assert res + 1 ≤ 2147483647;
-375c455,456
-< [eva] tests/value/auto_loop_unroll.c:263: Frama_C_show_each_top: [0..2147483647]
----
-> [eva] tests/value/auto_loop_unroll.c:263: 
->   Frama_C_show_each_top: [31..2147483647]
-391,392d471
-< [eva:alarm] tests/value/auto_loop_unroll.c:283: Warning: 
-<   signed overflow. assert res + 1 ≤ 2147483647;
-425,426c504,505
-<   i ∈ {-1}
-<   res ∈ {21}
----
->   i ∈ [-2147483648..20]
->   res ∈ [0..2147483647]
-diff tests/value/oracle/backward_add_ptr.res.oracle tests/value/oracle_apron/backward_add_ptr.res.oracle
->>>>>>> origin/master
-71c71,74
-< [eva] backward_add_ptr.c:91: Reusing old results for call to gm
----
-> [eva] computing for function gm <- main3 <- main.
->   Called from backward_add_ptr.c:91.
-> [eva] Recording results for gm
-> [eva] Done for function gm
-93c96,99
-< [eva] backward_add_ptr.c:110: Reusing old results for call to gm
----
-> [eva] computing for function gm <- main3 <- main.
->   Called from backward_add_ptr.c:110.
-> [eva] Recording results for gm
-> [eva] Done for function gm
-107c113,116
-< [eva] backward_add_ptr.c:125: Reusing old results for call to gm
----
-> [eva] computing for function gm <- main3 <- main.
->   Called from backward_add_ptr.c:125.
-> [eva] Recording results for gm
-> [eva] Done for function gm
-160c169,172
-< [eva] backward_add_ptr.c:160: Reusing old results for call to gm
----
-> [eva] computing for function gm <- main4 <- main.
->   Called from backward_add_ptr.c:160.
-> [eva] Recording results for gm
-> [eva] Done for function gm
-diff oracle/call_simple.res.oracle oracle_apron/call_simple.res.oracle
-28c28
-<   c ∈ [--..--]
----
->   c ∈ [-2147483648..2147483646]
-diff oracle/deps_compose.res.oracle oracle_apron/deps_compose.res.oracle
-24c24,27
-< [eva] deps_compose.i:26: Reusing old results for call to f
----
-> [eva] computing for function f <- main.
->   Called from deps_compose.i:26.
-> [eva] Recording results for f
-> [eva] Done for function f
-diff oracle/divneg.res.oracle oracle_apron/divneg.res.oracle
-57c57
-<   vic ∈ {4294967295}
----
->   vic ∈ {-1}
-diff oracle/domains_function.res.oracle oracle_apron/domains_function.res.oracle
-107c107,110
-< [eva] domains_function.c:63: Reusing old results for call to use
----
-> [eva] computing for function use <- test_propagation <- main.
->   Called from domains_function.c:63.
-> [eva] Recording results for use
-> [eva] Done for function use
-diff oracle/downcast.1.res.oracle oracle_apron/downcast.1.res.oracle
-61c61
-<   [100000..2147483647], [100145..2147483647], [100145..2147483647]
----
->   [100000..2147483502], [100145..2147483647], [100145..2147483647]
-diff oracle/dur.res.oracle oracle_apron/dur.res.oracle
-310c310
-<   V6 ∈ [--..--] or UNINITIALIZED
----
->   V6 ∈ [0..32767] or UNINITIALIZED
-diff oracle/find_ivaltop.res.oracle oracle_apron/find_ivaltop.res.oracle
-32,33c32,33
-<   j ∈ {0; 1; 2; 3; 4; 5; 6; 7}
-<   X ∈ {1; 2; 3; 4; 5; 6; 7; 8}
----
->   j ∈ {7}
->   X ∈ {8}
-39c39
-<   \result FROM t[0..7]
----
->   \result FROM t[7]
-44c44
-<     t[0..7]
----
->     t[7]
-diff oracle/for_loops.1.res.oracle oracle_apron/for_loops.1.res.oracle
-39,41c39
-< [eva:alarm] for_loops.c:16: Warning: 
-<   signed overflow. assert w + 1 ≤ 2147483647;
-< [eva] for_loops.c:17: Frama_C_show_each_F: [0..2147483647]
----
-> [eva] for_loops.c:17: Frama_C_show_each_F: [0..100]
-47c45
-<   j ∈ [0..2147483647]
----
->   j ∈ [0..100]
-diff oracle/for_loops.2.res.oracle oracle_apron/for_loops.2.res.oracle
-37,39c37
-< [eva:alarm] for_loops.c:42: Warning: 
-<   signed overflow. assert w + T[j] ≤ 2147483647;
-< [eva] for_loops.c:43: Frama_C_show_each: [0..2147483647]
----
-> [eva] for_loops.c:43: Frama_C_show_each: [0..1000]
-diff oracle/fptr.0.res.oracle oracle_apron/fptr.0.res.oracle
-57c57,60
-< [eva] fptr.i:9: Reusing old results for call to h
----
-> [eva] computing for function h <- f <- main.
->   Called from fptr.i:9.
-> [eva] Recording results for h
-> [eva] Done for function h
-66,67c69,76
-< [eva] fptr.i:9: Reusing old results for call to hh
-< [eva] fptr.i:9: Reusing old results for call to h
----
-> [eva] computing for function hh <- f <- main.
->   Called from fptr.i:9.
-> [eva] Recording results for hh
-> [eva] Done for function hh
-> [eva] computing for function h <- f <- main.
->   Called from fptr.i:9.
-> [eva] Recording results for h
-> [eva] Done for function h
-72c81,92
-< [eva] fptr.i:52: Reusing old results for call to f
----
-> [eva] computing for function f <- main.
->   Called from fptr.i:52.
-> [eva] computing for function hh <- f <- main.
->   Called from fptr.i:9.
-> [eva] Recording results for hh
-> [eva] Done for function hh
-> [eva] computing for function h <- f <- main.
->   Called from fptr.i:9.
-> [eva] Recording results for h
-> [eva] Done for function h
-> [eva] Recording results for f
-> [eva] Done for function f
-diff oracle/fptr.1.res.oracle oracle_apron/fptr.1.res.oracle
-42c42,45
-< [eva] fptr.i:9: Reusing old results for call to h
----
-> [eva] computing for function h <- f <- main_uninit.
->   Called from fptr.i:9.
-> [eva] Recording results for h
-> [eva] Done for function h
-51,52c54,61
-< [eva] fptr.i:9: Reusing old results for call to hh
-< [eva] fptr.i:9: Reusing old results for call to h
----
-> [eva] computing for function hh <- f <- main_uninit.
->   Called from fptr.i:9.
-> [eva] Recording results for hh
-> [eva] Done for function hh
-> [eva] computing for function h <- f <- main_uninit.
->   Called from fptr.i:9.
-> [eva] Recording results for h
-> [eva] Done for function h
-57c66,77
-< [eva] fptr.i:68: Reusing old results for call to f
----
-> [eva] computing for function f <- main_uninit.
->   Called from fptr.i:68.
-> [eva] computing for function hh <- f <- main_uninit.
->   Called from fptr.i:9.
-> [eva] Recording results for hh
-> [eva] Done for function hh
-> [eva] computing for function h <- f <- main_uninit.
->   Called from fptr.i:9.
-> [eva] Recording results for h
-> [eva] Done for function h
-> [eva] Recording results for f
-> [eva] Done for function f
-diff oracle/from_call.0.res.oracle oracle_apron/from_call.0.res.oracle
-68c68,73
-< [eva] from_call.i:20: Reusing old results for call to g
----
-> [eva] computing for function g <- f <- main.
->   Called from from_call.i:20.
-> [eva] Recording results for g
-> [from] Computing for function g
-> [from] Done for function g
-> [eva] Done for function g
-78c83,88
-< [eva] from_call.i:20: Reusing old results for call to g
----
-> [eva] computing for function g <- f <- main.
->   Called from from_call.i:20.
-> [eva] Recording results for g
-> [from] Computing for function g
-> [from] Done for function g
-> [eva] Done for function g
-149,150c159,170
-< [eva] from_call.i:44: Reusing old results for call to return_A1
-< [eva] from_call.i:44: Reusing old results for call to return_A2
----
-> [eva] computing for function return_A1 <- dispatcher2 <- call_dispatcher2 <- main.
->   Called from from_call.i:44.
-> [eva] Recording results for return_A1
-> [from] Computing for function return_A1
-> [from] Done for function return_A1
-> [eva] Done for function return_A1
-> [eva] computing for function return_A2 <- dispatcher2 <- call_dispatcher2 <- main.
->   Called from from_call.i:44.
-> [eva] Recording results for return_A2
-> [from] Computing for function return_A2
-> [from] Done for function return_A2
-> [eva] Done for function return_A2
-diff oracle/from_call.1.res.oracle oracle_apron/from_call.1.res.oracle
-64c64,67
-< [eva] from_call.i:20: Reusing old results for call to g
----
-> [eva] computing for function g <- f <- main.
->   Called from from_call.i:20.
-> [eva] Recording results for g
-> [eva] Done for function g
-72c75,78
-< [eva] from_call.i:20: Reusing old results for call to g
----
-> [eva] computing for function g <- f <- main.
->   Called from from_call.i:20.
-> [eva] Recording results for g
-> [eva] Done for function g
-123,124c129,136
-< [eva] from_call.i:44: Reusing old results for call to return_A1
-< [eva] from_call.i:44: Reusing old results for call to return_A2
----
-> [eva] computing for function return_A1 <- dispatcher2 <- call_dispatcher2 <- main.
->   Called from from_call.i:44.
-> [eva] Recording results for return_A1
-> [eva] Done for function return_A1
-> [eva] computing for function return_A2 <- dispatcher2 <- call_dispatcher2 <- main.
->   Called from from_call.i:44.
-> [eva] Recording results for return_A2
-> [eva] Done for function return_A2
-diff oracle/fun_ptr.0.res.oracle oracle_apron/fun_ptr.0.res.oracle
-39c39,42
-< [eva] fun_ptr.i:33: Reusing old results for call to f
----
-> [eva] computing for function f <- test2 <- main.
->   Called from fun_ptr.i:33.
-> [eva] Recording results for f
-> [eva] Done for function f
-diff oracle/fun_ptr.1.res.oracle oracle_apron/fun_ptr.1.res.oracle
-43c43,46
-< [eva] fun_ptr.i:33: Reusing old results for call to f
----
-> [eva] computing for function f <- test2 <- main.
->   Called from fun_ptr.i:33.
-> [eva] Recording results for f
-> [eva] Done for function f
-diff oracle/gauges.res.oracle oracle_apron/gauges.res.oracle
-38,39d37
-< [eva:alarm] gauges.c:26: Warning: 
-<   signed overflow. assert l + 1 ≤ 2147483647;
-70,71d67
-< [eva:alarm] gauges.c:48: Warning: 
-<   signed overflow. assert l + 1 ≤ 2147483647;
-113,114d108
-< [eva:alarm] gauges.c:81: Warning: 
-<   signed overflow. assert k + 1 ≤ 2147483647;
-116,117d109
-< [eva:alarm] gauges.c:84: Warning: 
-<   signed overflow. assert k + 1 ≤ 2147483647;
-123a116,117
-> [eva:alarm] gauges.c:81: Warning: 
->   signed overflow. assert k + 1 ≤ 2147483647;
-125c119,121
-< [eva] gauges.c:86: Frama_C_show_each: [0..2147483647]
----
-> [eva:alarm] gauges.c:84: Warning: 
->   signed overflow. assert k + 1 ≤ 2147483647;
-> [eva] gauges.c:86: Frama_C_show_each: [15..2147483647]
-139,140d134
-< [eva:alarm] gauges.c:99: Warning: 
-<   signed overflow. assert c + 1 ≤ 2147483647;
-187,188d180
-< [eva:alarm] gauges.c:140: Warning: 
-<   signed overflow. assert j + 1 ≤ 2147483647;
-303,304d294
-< [eva:alarm] gauges.c:220: Warning: 
-<   signed overflow. assert -2147483648 ≤ n - 1;
-319,320d308
-< [eva:alarm] gauges.c:240: Warning: 
-<   signed overflow. assert j + 1 ≤ 2147483647;
-322c310
-<   Frama_C_show_each: {45; 46; 47; 48; 49; 50; 51}, [0..2147483647]
----
->   Frama_C_show_each: {45; 46; 47; 48; 49; 50; 51}, [0..46]
-328,329d315
-< [eva:alarm] gauges.c:251: Warning: 
-<   signed overflow. assert j + 1 ≤ 2147483647;
-331c317
-<   Frama_C_show_each: {48; 49; 50; 51; 52; 53; 54}, [0..2147483647]
----
->   Frama_C_show_each: {48; 49; 50; 51; 52; 53; 54}, [0..49]
-337,338d322
-< [eva:alarm] gauges.c:263: Warning: 
-<   signed overflow. assert j + 1 ≤ 2147483647;
-340c324
-<   Frama_C_show_each: {-59; -58; -57; -56; -55; -54; -53}, [0..2147483647]
----
->   Frama_C_show_each: {-59; -58; -57; -56; -55; -54; -53}, [0..65]
-346,347d329
-< [eva:alarm] gauges.c:274: Warning: 
-<   signed overflow. assert j + 1 ≤ 2147483647;
-349c331
-<   Frama_C_show_each: {-64; -63; -62; -61; -60; -59; -58}, [0..2147483647]
----
->   Frama_C_show_each: {-64; -63; -62; -61; -60; -59; -58}, [0..70]
-357,358d338
-< [eva:alarm] gauges.c:293: Warning: 
-<   signed overflow. assert j + 1 ≤ 2147483647;
-360c340
-<   Frama_C_show_each: {-593; -592; -591; -590; -589; -588}, [0..2147483647]
----
->   Frama_C_show_each: {-593; -592; -591; -590; -589; -588}, [0..598]
-802c782
-<   n ∈ [-2147483648..99]
----
->   n ∈ [-2147483547..99]
-805c785
-<   i ∈ [0..2147483647]
----
->   i ∈ [10..2147483647]
-841c821
-<   i ∈ [0..2147483647]
----
->   i ∈ [0..21]
-diff oracle/ghost.res.oracle oracle_apron/ghost.res.oracle
-10,11d9
-< [eva:alarm] ghost.i:17: Warning: 
-<   signed overflow. assert G + 1 ≤ 2147483647;
-diff oracle/hierarchical_convergence.res.oracle oracle_apron/hierarchical_convergence.res.oracle
-40c40
-<   j ∈ [0..2147483647]
----
->   j ∈ [0..99]
-diff oracle/initialized_copy.1.res.oracle oracle_apron/initialized_copy.1.res.oracle
-24,27c24
-<   c_0[bits 0 to 7] ∈ {1} or UNINITIALIZED
-<      [bits 8 to 15] ∈ {2}
-<      [bits 16 to 23] ∈ {3}
-<      [bits 24 to 31] ∈ {4}
----
->   c_0 ∈ {67305985} or UNINITIALIZED
-29,32c26
-<   a_2[bits 0 to 7] ∈ {1} or UNINITIALIZED
-<      [bits 8 to 15] ∈ {2}
-<      [bits 16 to 23] ∈ {3}
-<      [bits 24 to 31] ∈ {4}
----
->   a_2 ∈ {67305985} or UNINITIALIZED
-diff oracle/invalid_loc_return.res.oracle oracle_apron/invalid_loc_return.res.oracle
-70c70,73
-< [eva] invalid_loc_return.i:17: Reusing old results for call to foo
----
-> [eva] computing for function foo <- main <- main2.
->   Called from invalid_loc_return.i:17.
-> [eva] Recording results for foo
-> [eva] Done for function foo
-diff oracle/local.res.oracle oracle_apron/local.res.oracle
-22c22,25
-< [eva] local.i:13: Reusing old results for call to f
----
-> [eva] computing for function f <- g <- main.
->   Called from local.i:13.
-> [eva] Recording results for f
-> [eva] Done for function f
-diff oracle/local_slevel.res.oracle oracle_apron/local_slevel.res.oracle
-13,15c13,15
-< [eva] local_slevel.i:18: Frama_C_show_each: {1}, {1}, {0; 1}
-< [eva] local_slevel.i:18: Frama_C_show_each: {-1}, {0}, {0; 1}
-< [eva] local_slevel.i:18: Frama_C_show_each: {1}, {1}, {0; 1; 2}
----
-> [eva] local_slevel.i:18: Frama_C_show_each: {1}, {1}, {1}
-> [eva] local_slevel.i:18: Frama_C_show_each: {-1}, {0}, {0}
-> [eva] local_slevel.i:18: Frama_C_show_each: {1}, {1}, {1}
-18c18
-<   Frama_C_show_each: {1}, [1..79],1%2, {0; 1; 2; 3}
----
->   Frama_C_show_each: {1}, [1..79],1%2, {1; 2; 3}
-22c22
-<   Frama_C_show_each: {1}, [1..79],1%2, {0; 1; 2; 3; 4}
----
->   Frama_C_show_each: {1}, [1..79],1%2, {1; 2; 3; 4}
-26,34c26
-<   Frama_C_show_each: {1}, [1..79],1%2, [0..2147483647]
-< [eva] local_slevel.i:18: 
-<   Frama_C_show_each: {-1}, [0..78],0%2, [0..2147483647]
-< [eva] local_slevel.i:18: 
-<   Frama_C_show_each: {1}, [1..79],1%2, [0..2147483648]
-< [eva] local_slevel.i:18: 
-<   Frama_C_show_each: {-1}, [0..78],0%2, [0..2147483648]
-< [eva] local_slevel.i:18: 
-<   Frama_C_show_each: {1}, [1..79],1%2, [0..4294967295]
----
->   Frama_C_show_each: {1}, [1..79],1%2, [1..79]
-36c28
-<   Frama_C_show_each: {-1}, [0..78],0%2, [0..4294967295]
----
->   Frama_C_show_each: {-1}, [0..78],0%2, [0..78]
-152c144
-<   r ∈ [--..--]
----
->   r ∈ [0..2147483647]
-393,395c385,387
-< [eva] local_slevel.i:18: Frama_C_show_each: {1}, {1}, {0; 1}
-< [eva] local_slevel.i:18: Frama_C_show_each: {-1}, {0}, {0; 1}
-< [eva] local_slevel.i:18: Frama_C_show_each: {1}, {1}, {0; 1; 2}
----
-> [eva] local_slevel.i:18: Frama_C_show_each: {1}, {1}, {1}
-> [eva] local_slevel.i:18: Frama_C_show_each: {-1}, {0}, {0}
-> [eva] local_slevel.i:18: Frama_C_show_each: {1}, {1}, {1}
-398c390
-<   Frama_C_show_each: {1}, [1..79],1%2, {0; 1; 2; 3}
----
->   Frama_C_show_each: {1}, [1..79],1%2, {1; 2; 3}
-402c394
-<   Frama_C_show_each: {1}, [1..79],1%2, {0; 1; 2; 3; 4}
----
->   Frama_C_show_each: {1}, [1..79],1%2, {1; 2; 3; 4}
-406,414c398
-<   Frama_C_show_each: {1}, [1..79],1%2, [0..2147483647]
-< [eva] local_slevel.i:18: 
-<   Frama_C_show_each: {-1}, [0..78],0%2, [0..2147483647]
-< [eva] local_slevel.i:18: 
-<   Frama_C_show_each: {1}, [1..79],1%2, [0..2147483648]
-< [eva] local_slevel.i:18: 
-<   Frama_C_show_each: {-1}, [0..78],0%2, [0..2147483648]
-< [eva] local_slevel.i:18: 
-<   Frama_C_show_each: {1}, [1..79],1%2, [0..4294967295]
----
->   Frama_C_show_each: {1}, [1..79],1%2, [1..79]
-416c400
-<   Frama_C_show_each: {-1}, [0..78],0%2, [0..4294967295]
----
->   Frama_C_show_each: {-1}, [0..78],0%2, [0..78]
-532c516
-<   r ∈ [--..--]
----
->   r ∈ [0..2147483647]
-diff oracle/logicdeps.res.oracle oracle_apron/logicdeps.res.oracle
-31c31,39
-< [eva] logicdeps.i:25: Reusing old results for call to g
----
-> [eva] computing for function g <- main.
->   Called from logicdeps.i:25.
-> [eva] computing for function f <- g <- main.
->   Called from logicdeps.i:13.
-> [eva] Done for function f
-> [eva] Recording results for g
-> [from] Computing for function g
-> [from] Done for function g
-> [eva] Done for function g
-51c59,67
-< [eva] logicdeps.i:32: Reusing old results for call to g
----
-> [eva] computing for function g <- main.
->   Called from logicdeps.i:32.
-> [eva] computing for function f <- g <- main.
->   Called from logicdeps.i:13.
-> [eva] Done for function f
-> [eva] Recording results for g
-> [from] Computing for function g
-> [from] Done for function g
-> [eva] Done for function g
-diff oracle/long.res.oracle oracle_apron/long.res.oracle
-15,17c15,26
-< [eva] long.i:12: Reusing old results for call to f
-< [eva] long.i:12: Reusing old results for call to f
-< [eva] long.i:12: Reusing old results for call to f
----
-> [eva] computing for function f <- main.
->   Called from long.i:12.
-> [eva] Recording results for f
-> [eva] Done for function f
-> [eva] computing for function f <- main.
->   Called from long.i:12.
-> [eva] Recording results for f
-> [eva] Done for function f
-> [eva] computing for function f <- main.
->   Called from long.i:12.
-> [eva] Recording results for f
-> [eva] Done for function f
-diff oracle/long_const.0.res.oracle oracle_apron/long_const.0.res.oracle
-19c19,22
-< [eva] long_const.i:25: Reusing old results for call to LL_ABS
----
-> [eva] computing for function LL_ABS <- div64 <- main.
->   Called from long_const.i:25.
-> [eva] Recording results for LL_ABS
-> [eva] Done for function LL_ABS
-diff oracle/long_const.1.res.oracle oracle_apron/long_const.1.res.oracle
-19c19,22
-< [eva] long_const.i:25: Reusing old results for call to LL_ABS
----
-> [eva] computing for function LL_ABS <- div64 <- main.
->   Called from long_const.i:25.
-> [eva] Recording results for LL_ABS
-> [eva] Done for function LL_ABS
-diff oracle/loop_wvar.1.res.oracle oracle_apron/loop_wvar.1.res.oracle
-12,13d11
-< [eva:alarm] loop_wvar.i:57: Warning: 
-<   signed overflow. assert next + 1 ≤ 2147483647;
-27,28c25
-< [eva] loop_wvar.i:71: Frama_C_show_each: [0..9], [0..17], [0..11]
-< [eva] loop_wvar.i:71: Frama_C_show_each: [0..9], [0..18], [0..12]
----
-> [eva] loop_wvar.i:71: Frama_C_show_each: [0..9], [0..9], [0..9]
-37,38c34,35
-<   j ∈ [0..18]
-<   k ∈ [0..12]
----
->   j ∈ [0..17]
->   k ∈ [0..11]
-41c38
-<   next ∈ [0..2147483647]
----
->   next ∈ [0..25]
-diff oracle/loopinv.res.oracle oracle_apron/loopinv.res.oracle
-51,53c51
-< [eva:alarm] loopinv.c:45: Warning: 
-<   signed overflow. assert j + 1 ≤ 2147483647;
-< [eva] loopinv.c:46: Frama_C_show_each: [0..99], [0..2147483647]
----
-> [eva] loopinv.c:46: Frama_C_show_each: [0..99], [0..100]
-134,135d131
-< [    -    ] Assertion 'Eva,signed_overflow' (file loopinv.c, line 45)
-<             tried with Eva.
-148,149c144,145
-<      4 To be validated
-<     13 Total
----
->      3 To be validated
->     12 Total
-<<<<<<< HEAD
-diff oracle/memexec.res.oracle oracle_apron/memexec.res.oracle
-27,32c27,50
-< [eva] memexec.c:13: Reusing old results for call to f11
-< [eva] memexec.c:14: Reusing old results for call to f11
-< [eva] memexec.c:16: Reusing old results for call to f11
-< [eva] memexec.c:18: Reusing old results for call to f11
-< [eva] memexec.c:20: Reusing old results for call to f11
-< [eva] memexec.c:21: Reusing old results for call to f11
-||||||| ac7807782d
-diff tests/value/oracle/memexec.res.oracle tests/value/oracle_apron/memexec.res.oracle
-27,32c27,50
-< [eva] tests/value/memexec.c:13: Reusing old results for call to f11
-< [eva] tests/value/memexec.c:14: Reusing old results for call to f11
-< [eva] tests/value/memexec.c:16: Reusing old results for call to f11
-< [eva] tests/value/memexec.c:18: Reusing old results for call to f11
-< [eva] tests/value/memexec.c:20: Reusing old results for call to f11
-< [eva] tests/value/memexec.c:21: Reusing old results for call to f11
-=======
-diff tests/value/oracle/memexec.res.oracle tests/value/oracle_apron/memexec.res.oracle
-29,34c29,52
-< [eva] tests/value/memexec.c:13: Reusing old results for call to f11
-< [eva] tests/value/memexec.c:14: Reusing old results for call to f11
-< [eva] tests/value/memexec.c:16: Reusing old results for call to f11
-< [eva] tests/value/memexec.c:18: Reusing old results for call to f11
-< [eva] tests/value/memexec.c:20: Reusing old results for call to f11
-< [eva] tests/value/memexec.c:21: Reusing old results for call to f11
->>>>>>> origin/master
----
-> [eva] computing for function f11 <- f1 <- main.
->   Called from memexec.c:13.
-> [eva] Recording results for f11
-> [eva] Done for function f11
-> [eva] computing for function f11 <- f1 <- main.
->   Called from memexec.c:14.
-> [eva] Recording results for f11
-> [eva] Done for function f11
-> [eva] computing for function f11 <- f1 <- main.
->   Called from memexec.c:16.
-> [eva] Recording results for f11
-> [eva] Done for function f11
-> [eva] computing for function f11 <- f1 <- main.
->   Called from memexec.c:18.
-> [eva] Recording results for f11
-> [eva] Done for function f11
-> [eva] computing for function f11 <- f1 <- main.
->   Called from memexec.c:20.
-> [eva] Recording results for f11
-> [eva] Done for function f11
-> [eva] computing for function f11 <- f1 <- main.
->   Called from memexec.c:21.
-> [eva] Recording results for f11
-> [eva] Done for function f11
-<<<<<<< HEAD
-106c124,127
-< [eva] memexec.c:113: Reusing old results for call to f5_aux
-||||||| ac7807782d
-106c124,127
-< [eva] tests/value/memexec.c:113: Reusing old results for call to f5_aux
-=======
-108c126,129
-< [eva] tests/value/memexec.c:113: Reusing old results for call to f5_aux
->>>>>>> origin/master
----
-> [eva] computing for function f5_aux <- f5 <- main.
->   Called from memexec.c:113.
-> [eva] Recording results for f5_aux
-> [eva] Done for function f5_aux
-<<<<<<< HEAD
-129c150,153
-< [eva] memexec.c:137: Reusing old results for call to f7_1
-||||||| ac7807782d
-129c150,153
-< [eva] tests/value/memexec.c:137: Reusing old results for call to f7_1
-=======
-131c152,155
-< [eva] tests/value/memexec.c:137: Reusing old results for call to f7_1
->>>>>>> origin/master
----
-> [eva] computing for function f7_1 <- f7 <- main.
->   Called from memexec.c:137.
-> [eva] Recording results for f7_1
-> [eva] Done for function f7_1
-<<<<<<< HEAD
-144c168,171
-< [eva] memexec.c:150: Reusing old results for call to f8_1
-||||||| ac7807782d
-144c168,171
-< [eva] tests/value/memexec.c:150: Reusing old results for call to f8_1
-=======
-146c170,173
-< [eva] tests/value/memexec.c:150: Reusing old results for call to f8_1
->>>>>>> origin/master
----
-> [eva] computing for function f8_1 <- f8 <- main.
->   Called from memexec.c:150.
-> [eva] Recording results for f8_1
-> [eva] Done for function f8_1
-diff oracle/modulo.res.oracle oracle_apron/modulo.res.oracle
-40a41,64
-> [eva] modulo.i:41: Frama_C_show_each_1: [-10..-1], [-9..-1], [-8..0]
-> [eva] modulo.i:41: Frama_C_show_each_1: [-10..-1], [1..9], [-8..0]
-> [eva] modulo.i:41: Frama_C_show_each_1: [1..10], [-9..-1], [0..8]
-> [eva] modulo.i:41: Frama_C_show_each_1: [1..10], [1..9], [0..8]
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1:
->   [1..9], {1; 2; 3; 4; 5; 6; 7; 8}, {0; 1; 2; 3; 4; 5; 6; 7}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1:
->   [-9..-1], {1; 2; 3; 4; 5; 6; 7; 8}, {-7; -6; -5; -4; -3; -2; -1; 0}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1:
->   [1..9], {-8; -7; -6; -5; -4; -3; -2; -1}, {0; 1; 2; 3; 4; 5; 6; 7}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1:
->   [-9..-1], {-8; -7; -6; -5; -4; -3; -2; -1}, {-7; -6; -5; -4; -3; -2; -1; 0}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1:
->   {-8; -7; -6; -5; -4; -3; -2; -1},
->   {1; 2; 3; 4; 5; 6; 7},
->   {-6; -5; -4; -3; -2; -1; 0}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1:
->   {1; 2; 3; 4; 5; 6; 7; 8}, {-7; -6; -5; -4; -3; -2; -1}, {0; 1; 2; 3; 4; 5; 6}
-50a75,98
-> [eva] modulo.i:53: Frama_C_show_each_2: [-10..-1], [1..9], [-8..0]
-> [eva] modulo.i:53: Frama_C_show_each_2: [-10..-1], [-9..-1], [-8..0]
-> [eva] modulo.i:53: Frama_C_show_each_2: [1..10], [1..9], [0..8]
-> [eva] modulo.i:53: Frama_C_show_each_2: [1..10], [-9..-1], [0..8]
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2:
->   [-9..-1], {1; 2; 3; 4; 5; 6; 7; 8}, {-7; -6; -5; -4; -3; -2; -1; 0}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2:
->   [1..9], {1; 2; 3; 4; 5; 6; 7; 8}, {0; 1; 2; 3; 4; 5; 6; 7}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2:
->   [-9..-1], {-8; -7; -6; -5; -4; -3; -2; -1}, {-7; -6; -5; -4; -3; -2; -1; 0}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2:
->   [1..9], {-8; -7; -6; -5; -4; -3; -2; -1}, {0; 1; 2; 3; 4; 5; 6; 7}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2:
->   {-8; -7; -6; -5; -4; -3; -2; -1},
->   {1; 2; 3; 4; 5; 6; 7},
->   {-6; -5; -4; -3; -2; -1; 0}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2:
->   {1; 2; 3; 4; 5; 6; 7; 8}, {-7; -6; -5; -4; -3; -2; -1}, {0; 1; 2; 3; 4; 5; 6}
-60a109,110
-> [eva] modulo.i:64: Frama_C_show_each_3: [-10..10], [-9..9], [-8..8]
-> [eva] modulo.i:64: Frama_C_show_each_3: [-9..9], [-8..8], [-7..7]
-diff oracle/octagons.res.oracle oracle_apron/octagons.res.oracle
-270,273c270,273
-<   a ∈ [-1024..2147483647]
-<   b ∈ [-1023..2147483647]
-<   c ∈ [-1023..2147483647]
-<   d ∈ [-1032..2147483647]
----
->   a ∈ [-603..2147483646]
->   b ∈ [-602..2147483647]
->   c ∈ [-602..1446]
->   d ∈ [-611..2147483647]
-diff oracle/offsetmap.0.res.oracle oracle_apron/offsetmap.0.res.oracle
-64,65c64
-<   a[bits 0 to 7] ∈ {1; 6}
-<    [bits 8 to 31]# ∈ {6}%32, bits 8 to 31 
----
->   a ∈ {1; 6}
-67,68c66
-<   a7[bits 0 to 7] ∈ {1}
-<     [bits 8 to 31]# ∈ {97}%32, bits 8 to 31 
----
->   a7 ∈ {1}
-108,109c106
-<   a[bits 0 to 7] ∈ {1; 6}
-<    [bits 8 to 31]# ∈ {6}%32, bits 8 to 31 
----
->   a ∈ {1; 6}
-111,112c108
-<   a7[bits 0 to 7] ∈ {1}
-<     [bits 8 to 31]# ∈ {97}%32, bits 8 to 31 
----
->   a7 ∈ {1}
-diff oracle/offsetmap.1.res.oracle oracle_apron/offsetmap.1.res.oracle
-64,69c64,66
-<   a[bits 0 to 7] ∈ {1; 6}
-<    [bits 8 to 31]# ∈ {6}%32, bits 8 to 31 
-<   b[bits 0 to 7] ∈ {0; 1}
-<    [bits 8 to 31]# ∈ {0; 6}%32, bits 8 to 31 
-<   a7[bits 0 to 7] ∈ {1}
-<     [bits 8 to 31]# ∈ {97}%32, bits 8 to 31 
----
->   a ∈ {1; 6}
->   b ∈ {0; 1}
->   a7 ∈ {1}
-109,114c106,108
-<   a[bits 0 to 7] ∈ {1; 6}
-<    [bits 8 to 31]# ∈ {6}%32, bits 8 to 31 
-<   b[bits 0 to 7] ∈ {0; 1}
-<    [bits 8 to 31]# ∈ {0; 6}%32, bits 8 to 31 
-<   a7[bits 0 to 7] ∈ {1}
-<     [bits 8 to 31]# ∈ {97}%32, bits 8 to 31 
----
->   a ∈ {1; 6}
->   b ∈ {0; 1}
->   a7 ∈ {1}
-<<<<<<< HEAD
-diff oracle/partitioning-annots.4.res.oracle oracle_apron/partitioning-annots.4.res.oracle
-14,15d13
-< [eva:alarm] partitioning-annots.c:134: Warning: 
-||||||| ac7807782d
-diff tests/value/oracle/partitioning-annots.4.res.oracle tests/value/oracle_apron/partitioning-annots.4.res.oracle
-14,15d13
-< [eva:alarm] tests/value/partitioning-annots.c:134: Warning: 
-=======
-diff tests/value/oracle/partitioning-annots.4.res.oracle tests/value/oracle_apron/partitioning-annots.4.res.oracle
-15,16d14
-< [eva:alarm] tests/value/partitioning-annots.c:138: Warning: 
->>>>>>> origin/master
-<   division by zero. assert j ≢ 0;
-diff oracle/precise_locations.res.oracle oracle_apron/precise_locations.res.oracle
-32,35c32,47
-< [eva] precise_locations.i:39: Reusing old results for call to ct
-< [eva] precise_locations.i:39: Reusing old results for call to ct
-< [eva] precise_locations.i:39: Reusing old results for call to ct
-< [eva] precise_locations.i:39: Reusing old results for call to ct
----
-> [eva] computing for function ct <- main.
->   Called from precise_locations.i:39.
-> [eva] Recording results for ct
-> [eva] Done for function ct
-> [eva] computing for function ct <- main.
->   Called from precise_locations.i:39.
-> [eva] Recording results for ct
-> [eva] Done for function ct
-> [eva] computing for function ct <- main.
->   Called from precise_locations.i:39.
-> [eva] Recording results for ct
-> [eva] Done for function ct
-> [eva] computing for function ct <- main.
->   Called from precise_locations.i:39.
-> [eva] Recording results for ct
-> [eva] Done for function ct
-37,42c49,72
-< [eva] precise_locations.i:39: Reusing old results for call to ct
-< [eva] precise_locations.i:39: Reusing old results for call to ct
-< [eva] precise_locations.i:39: Reusing old results for call to ct
-< [eva] precise_locations.i:39: Reusing old results for call to ct
-< [eva] precise_locations.i:39: Reusing old results for call to ct
-< [eva] precise_locations.i:39: Reusing old results for call to ct
----
-> [eva] computing for function ct <- main.
->   Called from precise_locations.i:39.
-> [eva] Recording results for ct
-> [eva] Done for function ct
-> [eva] computing for function ct <- main.
->   Called from precise_locations.i:39.
-> [eva] Recording results for ct
-> [eva] Done for function ct
-> [eva] computing for function ct <- main.
->   Called from precise_locations.i:39.
-> [eva] Recording results for ct
-> [eva] Done for function ct
-> [eva] computing for function ct <- main.
->   Called from precise_locations.i:39.
-> [eva] Recording results for ct
-> [eva] Done for function ct
-> [eva] computing for function ct <- main.
->   Called from precise_locations.i:39.
-> [eva] Recording results for ct
-> [eva] Done for function ct
-> [eva] computing for function ct <- main.
->   Called from precise_locations.i:39.
-> [eva] Recording results for ct
-> [eva] Done for function ct
-520,529c550,589
-< [eva] precise_locations.i:39: Reusing old results for call to ct
-< [eva] precise_locations.i:39: Reusing old results for call to ct
-< [eva] precise_locations.i:39: Reusing old results for call to ct
-< [eva] precise_locations.i:39: Reusing old results for call to ct
-< [eva] precise_locations.i:39: Reusing old results for call to ct
-< [eva] precise_locations.i:39: Reusing old results for call to ct
-< [eva] precise_locations.i:39: Reusing old results for call to ct
-< [eva] precise_locations.i:39: Reusing old results for call to ct
-< [eva] precise_locations.i:39: Reusing old results for call to ct
-< [eva] precise_locations.i:39: Reusing old results for call to ct
----
-> [eva] computing for function ct <- main.
->   Called from precise_locations.i:39.
-> [eva] Recording results for ct
-> [eva] Done for function ct
-> [eva] computing for function ct <- main.
->   Called from precise_locations.i:39.
-> [eva] Recording results for ct
-> [eva] Done for function ct
-> [eva] computing for function ct <- main.
->   Called from precise_locations.i:39.
-> [eva] Recording results for ct
-> [eva] Done for function ct
-> [eva] computing for function ct <- main.
->   Called from precise_locations.i:39.
-> [eva] Recording results for ct
-> [eva] Done for function ct
-> [eva] computing for function ct <- main.
->   Called from precise_locations.i:39.
-> [eva] Recording results for ct
-> [eva] Done for function ct
-> [eva] computing for function ct <- main.
->   Called from precise_locations.i:39.
-> [eva] Recording results for ct
-> [eva] Done for function ct
-> [eva] computing for function ct <- main.
->   Called from precise_locations.i:39.
-> [eva] Recording results for ct
-> [eva] Done for function ct
-> [eva] computing for function ct <- main.
->   Called from precise_locations.i:39.
-> [eva] Recording results for ct
-> [eva] Done for function ct
-> [eva] computing for function ct <- main.
->   Called from precise_locations.i:39.
-> [eva] Recording results for ct
-> [eva] Done for function ct
-> [eva] computing for function ct <- main.
->   Called from precise_locations.i:39.
-> [eva] Recording results for ct
-> [eva] Done for function ct
-diff oracle/precond.res.oracle oracle_apron/precond.res.oracle
-49a50,51
-> [eva] computing for function f <- main.
->   Called from precond.c:39.
-53c55,56
-< [eva] precond.c:39: Reusing old results for call to f
----
-> [eva] Recording results for f
-> [eva] Done for function f
-diff oracle/ptr_relation.1.res.oracle oracle_apron/ptr_relation.1.res.oracle
-24c24
-<   j ∈ {-1; 0; 1}
----
->   j ∈ {0}
-diff oracle/raz.res.oracle oracle_apron/raz.res.oracle
-14c14
-<   i ∈ [0..2147483647]
----
->   i ∈ [0..10]
-diff oracle/reevaluate_alarms.res.oracle oracle_apron/reevaluate_alarms.res.oracle
-61c61
-<   S ∈ [0..2147483647]
----
->   S ∈ [4..2147483647]
-diff oracle/relation_reduction.res.oracle oracle_apron/relation_reduction.res.oracle
-24,27d23
-< [eva:alarm] relation_reduction.i:20: Warning: 
-<   accessing out of bounds index. assert 0 ≤ y;
-< [eva:alarm] relation_reduction.i:20: Warning: 
-<   accessing out of bounds index. assert y < 9;
-34,37c30,33
-<   R1 ∈ [-2147483648..2147483637]
-<   R2 ∈ [-2147483638..2147483647]
-<   R3 ∈ [--..--]
-<   R4 ∈ {0; 1; 2; 3; 4; 5}
----
->   R1 ∈ {0; 2}
->   R2 ∈ {0; 12}
->   R3 ∈ {0; 7}
->   R4 ∈ {0; 2}
-diff oracle/relation_shift.res.oracle oracle_apron/relation_shift.res.oracle
-31,32c31,32
-<   r1 ∈ [--..--]
-<   r2 ∈ [--..--]
----
->   r1 ∈ {2}
->   r2 ∈ {7}
-35,37c35,37
-<   x ∈ [-2147483647..2147483647]
-<   y ∈ [-2147483648..2147483646]
-<   z ∈ [-2147483642..2147483647]
----
->   x ∈ [-2147483646..2147483642]
->   y ∈ [-2147483648..2147483640]
->   z ∈ [-2147483641..2147483647]
-49,50c49,50
-<   r1 ∈ [--..--]
-<   r2 ∈ [--..--]
----
->   r1 ∈ {2}
->   r2 ∈ {7}
-53,55c53,55
-<   x ∈ [-2147483647..2147483647]
-<   y ∈ [-2147483648..2147483646]
-<   z ∈ [-2147483642..2147483647]
----
->   x ∈ [-2147483646..2147483642]
->   y ∈ [-2147483648..2147483640]
->   z ∈ [-2147483641..2147483647]
-diff oracle/relations.res.oracle oracle_apron/relations.res.oracle
-80,81c80,82
-<   e ∈ [--..--]
-<   f ∈ [--..--]
----
->   e ∈ {1}
->   f[bits 0 to 7] ∈ {1; 4}
->    [bits 8 to 31] ∈ [--..--]
-diff oracle/relations2.res.oracle oracle_apron/relations2.res.oracle
-25c25
-<   len ∈ [--..--]
----
->   len ∈ [0..1023]
-36,37c36
-< [eva] relations2.i:17: 
-<   Frama_C_show_each_end: [0..4294967295], [0..64]
----
-> [eva] relations2.i:17: Frama_C_show_each_end: [0..1023], [0..64]
-69,71d67
-< [eva:alarm] relations2.i:34: Warning: 
-<   accessing out of bounds index.
-<   assert (unsigned int)(i - (unsigned int)(t + 1)) < 514;
-124,125d119
-< [eva:alarm] relations2.i:35: Warning: 
-<   signed overflow. assert s + b3 ≤ 2147483647;
-140c134
-<   len ∈ [--..--]
----
->   len ∈ [0..1023]
-diff oracle/return.res.oracle oracle_apron/return.res.oracle
-12c12,15
-< [eva] return.i:19: Reusing old results for call to f
----
-> [eva] computing for function f <- main.
->   Called from return.i:19.
-> [eva] Recording results for f
-> [eva] Done for function f
-diff oracle/static.res.oracle oracle_apron/static.res.oracle
-22c22,25
-< [eva] static.i:20: Reusing old results for call to f
----
-> [eva] computing for function f <- main.
->   Called from static.i:20.
-> [eva] Recording results for f
-> [eva] Done for function f
-diff oracle/struct2.res.oracle oracle_apron/struct2.res.oracle
-81,84d80
-<   accessing out of bounds index. assert 0 ≤ (int)(i + j);
-< [eva:alarm] struct2.i:185: Warning: 
-<   accessing out of bounds index. assert (int)(i + j) < 2;
-< [eva:alarm] struct2.i:185: Warning: 
-106d101
-< [scope:rm_asserts] removing 2 assertion(s)
-diff oracle/test.0.res.oracle oracle_apron/test.0.res.oracle
-29c29
-<   j ∈ [-1073741822..1]
----
->   j ∈ {-1; 0; 1}
-diff oracle/undefined_sequence.1.res.oracle oracle_apron/undefined_sequence.1.res.oracle
-33c33,36
-< [eva] undefined_sequence.i:54: Reusing old results for call to g
----
-> [eva] computing for function g <- main.
->   Called from undefined_sequence.i:54.
-> [eva] Recording results for g
-> [eva] Done for function g
-<<<<<<< HEAD
-diff oracle/unroll.res.oracle oracle_apron/unroll.res.oracle
-||||||| ac7807782d
-diff tests/value/oracle/unroll.res.oracle tests/value/oracle_apron/unroll.res.oracle
-=======
-Only in tests/value/oracle: unit_tests.res.oracle
-diff tests/value/oracle/unroll.res.oracle tests/value/oracle_apron/unroll.res.oracle
->>>>>>> origin/master
-13,14d12
-< [eva:alarm] unroll.i:34: Warning: 
-<   signed overflow. assert -2147483648 ≤ j - 1;
-26c24
-<   j ∈ [-2147483648..-123]
----
->   j ∈ {-238}
-diff oracle/unroll_simple.res.oracle oracle_apron/unroll_simple.res.oracle
-8,9d7
-< [eva:alarm] unroll_simple.i:11: Warning: 
-<   signed overflow. assert -2147483648 ≤ j - 1;
-21c19
-<   j ∈ [-2147483648..-126]
----
->   j ∈ {-250}
-diff oracle/widen_on_non_monotonic.res.oracle oracle_apron/widen_on_non_monotonic.res.oracle
-25a26
-> [eva] widen_on_non_monotonic.i:21: starting to merge loop iterations
-diff oracle/with_comment.res.oracle oracle_apron/with_comment.res.oracle
-9,10d8
-< [eva:alarm] with_comment.i:21: Warning: 
-<   signed overflow. assert G + 1 ≤ 2147483647;
diff --git a/tests/value/diff_bitwise b/tests/value/diff_bitwise
deleted file mode 100644
index 6b636b22d793c7a6e0f5b8a7980cdd433dfcae86..0000000000000000000000000000000000000000
--- a/tests/value/diff_bitwise
+++ /dev/null
@@ -1,76 +0,0 @@
-diff oracle/addition.res.oracle oracle_bitwise/addition.res.oracle
-121,123c121
-< [eva] addition.i:52: 
-<   Assigning imprecise value to p10.
-<   The imprecision originates from Arithmetic {addition.i:52}
----
-> [eva] addition.i:52: Assigning imprecise value to p10.
-163a162
->   {{ garbled mix of &{p1} (origin: Misaligned {addition.i:52}) }}
-165a165
->   {{ garbled mix of &{p2} (origin: Misaligned {addition.i:56}) }}
-201,203c201
-<   p10 ∈
-<      {{ garbled mix of &{p1}
-<       (origin: Arithmetic {addition.i:52}) }}
----
->   p10 ∈ {{ garbled mix of &{p1} }}
-428a427
->   {{ garbled mix of &{p1} (origin: Misaligned {addition.i:52}) }}
-467,469c466
-<   p10 ∈
-<      {{ garbled mix of &{p1}
-<       (origin: Arithmetic {addition.i:52}) }}
----
->   p10 ∈ {{ garbled mix of &{p1} }}
-<<<<<<< HEAD
-diff oracle/bitwise.res.oracle oracle_bitwise/bitwise.res.oracle
-79c79,82
-< [eva] bitwise.i:144: Frama_C_show_each_dead: {0}
-||||||| ac7807782d
-diff tests/value/oracle/bitwise.res.oracle tests/value/oracle_bitwise/bitwise.res.oracle
-79c79,82
-< [eva] tests/value/bitwise.i:144: Frama_C_show_each_dead: {0}
-=======
-diff tests/value/oracle/bitwise.res.oracle tests/value/oracle_bitwise/bitwise.res.oracle
-98c98,101
-< [eva] tests/value/bitwise.i:158: Frama_C_show_each_dead: {0}
->>>>>>> origin/master
----
-<<<<<<< HEAD
-> [eva] bitwise.i:142: 
-||||||| ac7807782d
-> [eva] tests/value/bitwise.i:142: 
-=======
-> [eva] tests/value/bitwise.i:156: 
->>>>>>> origin/master
->   The evaluation of the expression x & 2
->   led to bottom without alarms:
->   at this point the product of states has no possible concretization.
-diff oracle/bitwise_pointer.res.oracle oracle_bitwise/bitwise_pointer.res.oracle
-34,36c34
-< [eva] bitwise_pointer.i:18: 
-<   Assigning imprecise value to p.
-<   The imprecision originates from Arithmetic {bitwise_pointer.i:18}
----
-> [eva] bitwise_pointer.i:18: Assigning imprecise value to p.
-41,43c39
-< [eva] bitwise_pointer.i:22: 
-<   Assigning imprecise value to p1.
-<   The imprecision originates from Arithmetic {bitwise_pointer.i:22}
----
-> [eva] bitwise_pointer.i:22: Assigning imprecise value to p1.
-diff oracle/logic_ptr_cast.res.oracle oracle_bitwise/logic_ptr_cast.res.oracle
-8,10c8
-< [eva] logic_ptr_cast.i:8: 
-<   Assigning imprecise value to p.
-<   The imprecision originates from Arithmetic {logic_ptr_cast.i:8}
----
-<<<<<<< HEAD
-> [eva] logic_ptr_cast.i:8: Assigning imprecise value to p.
-||||||| ac7807782d
-> [eva] tests/value/logic_ptr_cast.i:8: Assigning imprecise value to p.
-=======
-> [eva] tests/value/logic_ptr_cast.i:8: Assigning imprecise value to p.
-Only in tests/value/oracle: unit_tests.res.oracle
->>>>>>> origin/master
diff --git a/tests/value/diff_equalities b/tests/value/diff_equalities
deleted file mode 100644
index bdf2cb52c2a2ad78d378abc677c911cca19eabc0..0000000000000000000000000000000000000000
--- a/tests/value/diff_equalities
+++ /dev/null
@@ -1,908 +0,0 @@
-diff oracle/CruiseControl.res.oracle oracle_equalities/CruiseControl.res.oracle
-980c980
-<        [0]._C4_ThrottleCmd._I0_Regul_ON ∈ {0; 1}
----
->        [0]._C4_ThrottleCmd._I0_Regul_ON ∈ {1}
-1018c1018
-<        [0]._C4_ThrottleCmd._C0_ThrottleRegulation._C0_SaturateThrottle{._I0_ThrottleIn; ._O0_ThrottleOut} ∈
----
->        [0]._C4_ThrottleCmd._C0_ThrottleRegulation._C0_SaturateThrottle._I0_ThrottleIn ∈
-1019a1020,1021
->        [0]._C4_ThrottleCmd._C0_ThrottleRegulation._C0_SaturateThrottle._O0_ThrottleOut ∈
->        [-0.0000000000000000 .. 1.9999998807907104*2^127]
-1033c1035
-<        [-1.9999998807907104*2^127 .. 1.9999998807907104*2^127]
----
->        [-0.0000000000000000 .. 1.9999998807907104*2^127]
-1218c1220
-<        [0]._C4_ThrottleCmd._I0_Regul_ON ∈ {0; 1}
----
->        [0]._C4_ThrottleCmd._I0_Regul_ON ∈ {1}
-1230c1232,1236
-<        [0]._C4_ThrottleCmd._C0_ThrottleRegulation{._I1_CruiseSpeed; ._I2_VehiculeSpeed; ._O0_Throttle; ._L1_CruiseControl; ._L2_CruiseControl; ._L3_CruiseControl} ∈
----
->        [0]._C4_ThrottleCmd._C0_ThrottleRegulation{._I1_CruiseSpeed; ._I2_VehiculeSpeed} ∈
->        [-1.9999998807907104*2^127 .. 1.9999998807907104*2^127]
->        [0]._C4_ThrottleCmd._C0_ThrottleRegulation._O0_Throttle ∈
->        [-0.0000000000000000 .. 1.9999998807907104*2^127]
->        [0]._C4_ThrottleCmd._C0_ThrottleRegulation{._L1_CruiseControl; ._L2_CruiseControl; ._L3_CruiseControl} ∈
-1248c1254
-<        [0]._C4_ThrottleCmd._C0_ThrottleRegulation{._L4_CruiseControl; ._L13_CruiseControl} ∈
----
->        [0]._C4_ThrottleCmd._C0_ThrottleRegulation._L4_CruiseControl ∈
-1249a1256,1257
->        [0]._C4_ThrottleCmd._C0_ThrottleRegulation._L13_CruiseControl ∈
->        [-0.0000000000000000 .. 1.9999998807907104*2^127]
-1256c1264
-<        [0]._C4_ThrottleCmd._C0_ThrottleRegulation._C0_SaturateThrottle{._I0_ThrottleIn; ._O0_ThrottleOut} ∈
----
->        [0]._C4_ThrottleCmd._C0_ThrottleRegulation._C0_SaturateThrottle._I0_ThrottleIn ∈
-1257a1266,1267
->        [0]._C4_ThrottleCmd._C0_ThrottleRegulation._C0_SaturateThrottle._O0_ThrottleOut ∈
->        [-0.0000000000000000 .. 1.9999998807907104*2^127]
-1271c1281
-<        [-1.9999998807907104*2^127 .. 1.9999998807907104*2^127]
----
->        [-0.0000000000000000 .. 1.9999998807907104*2^127]
-diff oracle/addition.res.oracle oracle_equalities/addition.res.oracle
-138,141d137
-< [eva:alarm] addition.i:61: Warning: 
-<   signed overflow. assert -2147483648 ≤ (int)*((char *)(&q1)) + 2;
-< [eva:alarm] addition.i:61: Warning: 
-<   signed overflow. assert (int)*((char *)(&q1)) + 2 ≤ 2147483647;
-168c164
-< [scope:rm_asserts] removing 9 assertion(s)
----
-> [scope:rm_asserts] removing 7 assertion(s)
-407,410d402
-< [eva:alarm] addition.i:61: Warning: 
-<   signed overflow. assert -2147483648 ≤ (int)*((char *)(&q1)) + 2;
-< [eva:alarm] addition.i:61: Warning: 
-<   signed overflow. assert (int)*((char *)(&q1)) + 2 ≤ 2147483647;
-433c425
-< [scope:rm_asserts] removing 9 assertion(s)
----
-> [scope:rm_asserts] removing 7 assertion(s)
-diff oracle/alias.0.res.oracle oracle_equalities/alias.0.res.oracle
-103,104c103,104
-<   t ∈ {1; 2; 4}
-<   u ∈ {2; 3; 4; 5}
----
->   t ∈ {4}
->   u ∈ {5}
-110c110
-<   t2 ∈ {0; 3; 6}
----
->   t2 ∈ {6}
-diff oracle/alias.1.res.oracle oracle_equalities/alias.1.res.oracle
-85c85
-<   z ∈ {0; 1; 2}
----
->   z ∈ {0; 2}
-87,88c87,88
-<   v2 ∈ {-1; 0; 1; 2; 3; 4}
-<   PTR1 ∈ {{ &p2{[0], [1], [2]} }}
----
->   v2 ∈ {0; 1; 2}
->   PTR1 ∈ {{ &p2{[0], [1]} }}
-90c90
-<   PTR3 ∈ {{ &p2{[1], [2], [4]} }}
----
->   PTR3 ∈ {{ &p2{[1], [2]} }}
-110c110
-<   t2 FROM p2[0..2]; c
----
->   t2 FROM p2[0..1]; c
-diff oracle/alias.2.res.oracle oracle_equalities/alias.2.res.oracle
-76c76
-<   z ∈ {-5; -4; -3; -2; -1; 0; 1; 1000}
----
->   z ∈ {-2; -1; 0; 1000}
-diff oracle/alias.3.res.oracle oracle_equalities/alias.3.res.oracle
-67c67
-<   z ∈ {0; 1; 2}
----
->   z ∈ {0; 2}
-diff oracle/alias.4.res.oracle oracle_equalities/alias.4.res.oracle
-81c81
-<   y ∈ {0; 3; 77}
----
->   y ∈ {77}
-diff oracle/alias.5.res.oracle oracle_equalities/alias.5.res.oracle
-59a60
-> [eva] alias.i:260: starting to merge loop iterations
-170c171
-<   y ∈ {0; 3; 77}
----
->   y ∈ {77}
-diff oracle/alias.6.res.oracle oracle_equalities/alias.6.res.oracle
-86c86
-<   x ∈ {0; 4; 33}
----
->   x ∈ {33}
-<<<<<<< HEAD
-diff oracle/auto_loop_unroll.0.res.oracle oracle_equalities/auto_loop_unroll.0.res.oracle
-82c82,85
-< [eva] auto_loop_unroll.c:103: Reusing old results for call to incr
-||||||| ac7807782d
-diff tests/value/oracle/auto_loop_unroll.0.res.oracle tests/value/oracle_equalities/auto_loop_unroll.0.res.oracle
-82c82,85
-< [eva] tests/value/auto_loop_unroll.c:103: Reusing old results for call to incr
-=======
-diff tests/value/oracle/auto_loop_unroll.0.res.oracle tests/value/oracle_equalities/auto_loop_unroll.0.res.oracle
-81c81,84
-< [eva] tests/value/auto_loop_unroll.c:101: Reusing old results for call to incr
->>>>>>> origin/master
----
-> [eva] computing for function incr <- various_loops <- main.
-<<<<<<< HEAD
->   Called from auto_loop_unroll.c:103.
-||||||| ac7807782d
->   Called from tests/value/auto_loop_unroll.c:103.
-=======
->   Called from tests/value/auto_loop_unroll.c:101.
->>>>>>> origin/master
-> [eva] Recording results for incr
-> [eva] Done for function incr
-<<<<<<< HEAD
-91c94,97
-< [eva] auto_loop_unroll.c:103: Reusing old results for call to incr
-||||||| ac7807782d
-91c94,97
-< [eva] tests/value/auto_loop_unroll.c:103: Reusing old results for call to incr
-=======
-90c93,96
-< [eva] tests/value/auto_loop_unroll.c:101: Reusing old results for call to incr
->>>>>>> origin/master
----
-> [eva] computing for function incr <- various_loops <- main.
-<<<<<<< HEAD
->   Called from auto_loop_unroll.c:103.
-||||||| ac7807782d
->   Called from tests/value/auto_loop_unroll.c:103.
-=======
->   Called from tests/value/auto_loop_unroll.c:101.
->>>>>>> origin/master
-> [eva] Recording results for incr
-> [eva] Done for function incr
-diff oracle/backward_add_ptr.res.oracle oracle_equalities/backward_add_ptr.res.oracle
-12c12
-<   Frama_C_show_each_only_a: {0; 1}, {{ &a }}, {0}
----
->   Frama_C_show_each_only_a: {0}, {{ &a }}, {0}
-93c93,96
-< [eva] backward_add_ptr.c:110: Reusing old results for call to gm
----
-> [eva] computing for function gm <- main3 <- main.
->   Called from backward_add_ptr.c:110.
-> [eva] Recording results for gm
-> [eva] Done for function gm
-107c110,113
-< [eva] backward_add_ptr.c:125: Reusing old results for call to gm
----
-> [eva] computing for function gm <- main3 <- main.
->   Called from backward_add_ptr.c:125.
-> [eva] Recording results for gm
-> [eva] Done for function gm
-119c125
-<   (origin: Arithmetic {backward_add_ptr.c:68}) }},
----
->   (origin: Arithmetic Bottom) }},
-157,160c163,167
-<   {{ garbled mix of &{b}
-<   (origin: Arithmetic {backward_add_ptr.c:68}) }},
-<   [0..4294967295]
-< [eva] backward_add_ptr.c:160: Reusing old results for call to gm
----
->   {{ garbled mix of &{b} (origin: Arithmetic Bottom) }}, [0..4294967295]
-> [eva] computing for function gm <- main4 <- main.
->   Called from backward_add_ptr.c:160.
-> [eva] Recording results for gm
-> [eva] Done for function gm
-178c185
-<   (origin: Arithmetic {backward_add_ptr.c:68}) }},
----
->   (origin: Arithmetic Bottom) }},
-180c187
-<   (origin: Arithmetic {backward_add_ptr.c:68}) }}
----
->   (origin: Arithmetic Bottom) }}
-188c195
-<   (origin: Arithmetic {backward_add_ptr.c:68}) }}
----
->   (origin: Arithmetic Bottom) }}
-194c201
-<   (origin: Arithmetic {backward_add_ptr.c:68}) }},
----
->   (origin: Arithmetic Bottom) }},
-211a219,222
->     (origin: Arithmetic {backward_add_ptr.c:33}) }}
->   {{ garbled mix of &{a}
->     (origin: Arithmetic {backward_add_ptr.c:33}) }}
->   {{ garbled mix of &{b}
-232a244,245
->   {{ garbled mix of &{a; b}
->     (origin: Arithmetic {backward_add_ptr.c:106}) }}
-234a248,251
->   {{ garbled mix of &{a; b}
->     (origin: Arithmetic {backward_add_ptr.c:107}) }}
->   {{ garbled mix of &{a; b}
->     (origin: Arithmetic {backward_add_ptr.c:115}) }}
-238c255,257
-<     (origin: Arithmetic {backward_add_ptr.c:115}) }}
----
->     (origin: Arithmetic {backward_add_ptr.c:116}) }}
->   {{ garbled mix of &{a; b}
->     (origin: Arithmetic {backward_add_ptr.c:121}) }}
-240a260,263
->   {{ garbled mix of &{a; b}
->     (origin: Arithmetic {backward_add_ptr.c:122}) }}
->   {{ garbled mix of &{a; b}
->     (origin: Arithmetic {backward_add_ptr.c:130}) }}
-242a266,267
->   {{ garbled mix of &{a; b}
->     (origin: Arithmetic {backward_add_ptr.c:136}) }}
-245a271,272
->     (origin: Arithmetic {backward_add_ptr.c:137}) }}
->   {{ garbled mix of &{a; b}
-246a274,275
->   {{ garbled mix of &{a; b}
->     (origin: Arithmetic {backward_add_ptr.c:145}) }}
-248a278,285
->   {{ garbled mix of &{a; b}
->     (origin: Arithmetic {backward_add_ptr.c:150}) }}
->   {{ garbled mix of &{a; b}
->     (origin: Arithmetic {backward_add_ptr.c:151}) }}
->   {{ garbled mix of &{a; b}
->     (origin: Arithmetic {backward_add_ptr.c:156}) }}
->   {{ garbled mix of &{a; b}
->     (origin: Arithmetic {backward_add_ptr.c:157}) }}
-250a288,311
->   {{ garbled mix of &{a; b}
->     (origin: Arithmetic {backward_add_ptr.c:165}) }}
->   {{ garbled mix of &{b; c}
->     (origin: Arithmetic {backward_add_ptr.c:165}) }}
->   {{ garbled mix of &{a; b}
->     (origin: Arithmetic {backward_add_ptr.c:166}) }}
->   {{ garbled mix of &{b; c}
->     (origin: Arithmetic {backward_add_ptr.c:166}) }}
->   {{ garbled mix of &{a; b}
->     (origin: Arithmetic {backward_add_ptr.c:171}) }}
->   {{ garbled mix of &{b; c}
->     (origin: Arithmetic {backward_add_ptr.c:171}) }}
->   {{ garbled mix of &{a; b}
->     (origin: Arithmetic {backward_add_ptr.c:172}) }}
->   {{ garbled mix of &{b; c}
->     (origin: Arithmetic {backward_add_ptr.c:172}) }}
->   {{ garbled mix of &{a; b}
->     (origin: Arithmetic {backward_add_ptr.c:177}) }}
->   {{ garbled mix of &{b; c}
->     (origin: Arithmetic {backward_add_ptr.c:177}) }}
->   {{ garbled mix of &{a; b}
->     (origin: Arithmetic {backward_add_ptr.c:178}) }}
->   {{ garbled mix of &{b; c}
->     (origin: Arithmetic {backward_add_ptr.c:178}) }}
-diff oracle/bitfield.res.oracle oracle_equalities/bitfield.res.oracle
-138a139,141
-> [eva] bitfield.i:71: 
->   Frama_C_show_each:
->   {{ garbled mix of &{b} (origin: Misaligned {bitfield.i:70}) }}
-diff oracle/bitwise_pointer.res.oracle oracle_equalities/bitwise_pointer.res.oracle
-62c62
-<   x ∈ [0..9]
----
->   x ∈ {5}
-75c75
-<   x1 ∈ [0..9]
----
->   x1 ∈ {5}
-diff oracle/call_simple.res.oracle oracle_equalities/call_simple.res.oracle
-28c28
-<   c ∈ [--..--]
----
->   c ∈ [-2147483648..2147483646]
-diff oracle/case_analysis.res.oracle oracle_equalities/case_analysis.res.oracle
-11a12,15
-> [eva] case_analysis.i:18: 
->   The evaluation of the expression r * r
->   led to bottom without alarms:
->   at this point the product of states has no possible concretization.
-18c22
-<   rq ∈ [-0.0000000000000000 .. 100.0000000000000000]
----
->   rq ∈ [0.0000000000000000 .. 100.0000000000000000]
-diff oracle/descending.res.oracle oracle_equalities/descending.res.oracle
-42c42
-<   i ∈ {31; 32}
----
->   i ∈ {31}
-diff oracle/domains_function.res.oracle oracle_equalities/domains_function.res.oracle
-19,20c19
-< [eva] domains_function.c:92: 
-<   Frama_C_show_each_top: [-2147483648..2147483647]
----
-> [eva] domains_function.c:92: Frama_C_show_each_top: {3}
-28,29c27
-< [eva] domains_function.c:77: 
-<   Frama_C_show_each_top: [-2147483648..2147483647]
----
-> [eva] domains_function.c:77: Frama_C_show_each_top: {1}
-32,33c30
-< [eva] domains_function.c:96: 
-<   Frama_C_show_each_top: [-2147483648..2147483647]
----
-> [eva] domains_function.c:96: Frama_C_show_each_top: {1}
-36,37c33
-< [eva] domains_function.c:84: 
-<   Frama_C_show_each_top: [-2147483648..2147483647]
----
-> [eva] domains_function.c:84: Frama_C_show_each_top: {2}
-40,41c36
-< [eva] domains_function.c:98: 
-<   Frama_C_show_each_top: [-2147483648..2147483647]
----
-> [eva] domains_function.c:98: Frama_C_show_each_top: {2}
-60,61c55
-< [eva] domains_function.c:84: 
-<   Frama_C_show_each_top: [-2147483648..2147483647]
----
-> [eva] domains_function.c:84: Frama_C_show_each_top: {2}
-64,65c58
-< [eva] domains_function.c:113: 
-<   Frama_C_show_each_top: [-2147483648..2147483647]
----
-> [eva] domains_function.c:113: Frama_C_show_each_top: {2}
-78,79c71
-< [eva] domains_function.c:55: 
-<   Frama_C_show_each_top: [-2147483648..2147483647]
----
-> [eva] domains_function.c:55: Frama_C_show_each_top: {42}
-108,109c100
-< [eva] domains_function.c:64: 
-<   Frama_C_show_each_top: [-2147483648..2147483647]
----
-> [eva] domains_function.c:64: Frama_C_show_each_top: {42}
-116c107
-<   result ∈ [--..--]
----
->   result ∈ {2}
-130c121
-<   result ∈ [--..--]
----
->   result ∈ {1}
-135c126
-<   result ∈ [--..--]
----
->   result ∈ {2}
-138c129
-<   result ∈ [--..--]
----
->   result ∈ {2}
-diff oracle/downcast.2.res.oracle oracle_equalities/downcast.2.res.oracle
-114c114
-<   ux ∈ [--..--]
----
->   ux ∈ [0..65535]
-157c157
-<   ux ∈ [--..--]
----
->   ux ∈ [0..65535]
-diff oracle/fptr.1.res.oracle oracle_equalities/fptr.1.res.oracle
-55,57d54
-< [eva] fptr.i:67: 
-<   Frama_C_show_each_F: {{ NULL + [0..4294967295] ; &h ; &hh }}
-< [eva] fptr.i:68: Reusing old results for call to f
-69c66
-<   n ∈ {0; 1; 2}
----
->   n ∈ {0; 1}
-diff oracle/from_call.0.res.oracle oracle_equalities/from_call.0.res.oracle
-68c68,73
-< [eva] from_call.i:20: Reusing old results for call to g
----
-> [eva] computing for function g <- f <- main.
->   Called from from_call.i:20.
-> [eva] Recording results for g
-> [from] Computing for function g
-> [from] Done for function g
-> [eva] Done for function g
-78c83,88
-< [eva] from_call.i:20: Reusing old results for call to g
----
-> [eva] computing for function g <- f <- main.
->   Called from from_call.i:20.
-> [eva] Recording results for g
-> [from] Computing for function g
-> [from] Done for function g
-> [eva] Done for function g
-diff oracle/from_call.1.res.oracle oracle_equalities/from_call.1.res.oracle
-64c64,67
-< [eva] from_call.i:20: Reusing old results for call to g
----
-> [eva] computing for function g <- f <- main.
->   Called from from_call.i:20.
-> [eva] Recording results for g
-> [eva] Done for function g
-72c75,78
-< [eva] from_call.i:20: Reusing old results for call to g
----
-> [eva] computing for function g <- f <- main.
->   Called from from_call.i:20.
-> [eva] Recording results for g
-> [eva] Done for function g
-diff oracle/from_termin.res.oracle oracle_equalities/from_termin.res.oracle
-9a10
-> [eva] from_termin.i:8: starting to merge loop iterations
-diff oracle/imprecise_invalid_write.res.oracle oracle_equalities/imprecise_invalid_write.res.oracle
-29a30,31
-> [kernel] imprecise_invalid_write.i:9: 
->   imprecise size for variable main1 (Undefined sizeof on a function.)
-diff oracle/incompatible_states.res.oracle oracle_equalities/incompatible_states.res.oracle
-14a15,18
-> [eva] incompatible_states.c:24: 
->   The evaluation of the expression x * x
->   led to bottom without alarms:
->   at this point the product of states has no possible concretization.
-27,29c31,34
-< [eva:alarm] incompatible_states.c:41: Warning: 
-<   accessing uninitialized left-value.
-<   assert \initialized(&t[(int)((int)(2 * i) / 2)]);
----
-> [eva] incompatible_states.c:41: 
->   The evaluation of the expression t[(2 * i) / 2]
->   led to bottom without alarms:
->   at this point the product of states has no possible concretization.
-41,42d45
-< [eva:alarm] incompatible_states.c:53: Warning: 
-<   division by zero. assert t[i] ≢ 0;
-47,49d49
-< [eva] incompatible_states.c:41: 
-<   assertion 'Eva,initialization' got final status invalid.
-< [scope:rm_asserts] removing 2 assertion(s)
-55c55
-<   z ∈ [-3..100]
----
->   z ∈ {-3; -2}
-58c58
-<   t[0] ∈ {0; 1}
----
->   t[0] ∈ {0}
-diff oracle/library.res.oracle oracle_equalities/library.res.oracle
-129,132d128
-< [eva:alarm] library.i:44: Warning: 
-<   non-finite float value. assert \is_finite(*pf);
-< [eva:alarm] library.i:44: Warning: 
-<   non-finite float value. assert \is_finite(\add_float(*pf, *pf));
-diff oracle/long_const.0.res.oracle oracle_equalities/long_const.0.res.oracle
-19c19,22
-< [eva] long_const.i:25: Reusing old results for call to LL_ABS
----
-> [eva] computing for function LL_ABS <- div64 <- main.
->   Called from long_const.i:25.
-> [eva] Recording results for LL_ABS
-> [eva] Done for function LL_ABS
-diff oracle/long_const.1.res.oracle oracle_equalities/long_const.1.res.oracle
-19c19,22
-< [eva] long_const.i:25: Reusing old results for call to LL_ABS
----
-> [eva] computing for function LL_ABS <- div64 <- main.
->   Called from long_const.i:25.
-> [eva] Recording results for LL_ABS
-> [eva] Done for function LL_ABS
-diff oracle/modulo.res.oracle oracle_equalities/modulo.res.oracle
-40a41,119
-> [eva] modulo.i:41: Frama_C_show_each_1: [-10..-1], [-9..-1], [-8..0]
-> [eva] modulo.i:41: Frama_C_show_each_1: [-10..-1], [1..9], [-8..0]
-> [eva] modulo.i:41: Frama_C_show_each_1: [1..10], [-9..-1], [0..8]
-> [eva] modulo.i:41: Frama_C_show_each_1: [1..10], [1..9], [0..8]
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1:
->   [1..9], {1; 2; 3; 4; 5; 6; 7; 8}, {0; 1; 2; 3; 4; 5; 6; 7}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1:
->   [-9..-1], {1; 2; 3; 4; 5; 6; 7; 8}, {-7; -6; -5; -4; -3; -2; -1; 0}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1:
->   [1..9], {-8; -7; -6; -5; -4; -3; -2; -1}, {0; 1; 2; 3; 4; 5; 6; 7}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1:
->   [-9..-1], {-8; -7; -6; -5; -4; -3; -2; -1}, {-7; -6; -5; -4; -3; -2; -1; 0}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1:
->   {-8; -7; -6; -5; -4; -3; -2; -1},
->   {-7; -6; -5; -4; -3; -2; -1},
->   {-6; -5; -4; -3; -2; -1; 0}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1:
->   {-8; -7; -6; -5; -4; -3; -2; -1},
->   {1; 2; 3; 4; 5; 6; 7},
->   {-6; -5; -4; -3; -2; -1; 0}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1:
->   {1; 2; 3; 4; 5; 6; 7; 8}, {-7; -6; -5; -4; -3; -2; -1}, {0; 1; 2; 3; 4; 5; 6}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1:
->   {1; 2; 3; 4; 5; 6; 7; 8}, {1; 2; 3; 4; 5; 6; 7}, {0; 1; 2; 3; 4; 5; 6}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1:
->   {1; 2; 3; 4; 5; 6; 7}, {1; 2; 3; 4; 5; 6}, {0; 1; 2; 3; 4; 5}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1:
->   {-7; -6; -5; -4; -3; -2; -1}, {1; 2; 3; 4; 5; 6}, {-5; -4; -3; -2; -1; 0}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1:
->   {1; 2; 3; 4; 5; 6; 7}, {-6; -5; -4; -3; -2; -1}, {0; 1; 2; 3; 4; 5}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1:
->   {-7; -6; -5; -4; -3; -2; -1},
->   {-6; -5; -4; -3; -2; -1},
->   {-5; -4; -3; -2; -1; 0}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1:
->   {-6; -5; -4; -3; -2; -1}, {-5; -4; -3; -2; -1}, {-4; -3; -2; -1; 0}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1:
->   {-6; -5; -4; -3; -2; -1}, {1; 2; 3; 4; 5}, {-4; -3; -2; -1; 0}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1:
->   {1; 2; 3; 4; 5; 6}, {-5; -4; -3; -2; -1}, {0; 1; 2; 3; 4}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1: {1; 2; 3; 4; 5; 6}, {1; 2; 3; 4; 5}, {0; 1; 2; 3; 4}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1: {1; 2; 3; 4; 5}, {1; 2; 3; 4}, {0; 1; 2; 3}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1: {-5; -4; -3; -2; -1}, {1; 2; 3; 4}, {-3; -2; -1; 0}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1: {1; 2; 3; 4; 5}, {-4; -3; -2; -1}, {0; 1; 2; 3}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1: {-5; -4; -3; -2; -1}, {-4; -3; -2; -1}, {-3; -2; -1; 0}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1: {-4; -3; -2; -1}, {-3; -2; -1}, {-2; -1; 0}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1: {-4; -3; -2; -1}, {1; 2; 3}, {-2; -1; 0}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1: {1; 2; 3; 4}, {-3; -2; -1}, {0; 1; 2}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1: {1; 2; 3; 4}, {1; 2; 3}, {0; 1; 2}
-> [eva] modulo.i:41: Frama_C_show_each_1: {1; 2; 3}, {1; 2}, {0; 1}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1: {-3; -2; -1}, {1; 2}, {-1; 0}
-> [eva] modulo.i:41: Frama_C_show_each_1: {1; 2; 3}, {-2; -1}, {0; 1}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1: {-3; -2; -1}, {-2; -1}, {-1; 0}
-50a130,208
-> [eva] modulo.i:53: Frama_C_show_each_2: [-10..-1], [1..9], [-8..0]
-> [eva] modulo.i:53: Frama_C_show_each_2: [-10..-1], [-9..-1], [-8..0]
-> [eva] modulo.i:53: Frama_C_show_each_2: [1..10], [1..9], [0..8]
-> [eva] modulo.i:53: Frama_C_show_each_2: [1..10], [-9..-1], [0..8]
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2:
->   [-9..-1], {1; 2; 3; 4; 5; 6; 7; 8}, {-7; -6; -5; -4; -3; -2; -1; 0}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2:
->   [1..9], {1; 2; 3; 4; 5; 6; 7; 8}, {0; 1; 2; 3; 4; 5; 6; 7}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2:
->   [-9..-1], {-8; -7; -6; -5; -4; -3; -2; -1}, {-7; -6; -5; -4; -3; -2; -1; 0}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2:
->   [1..9], {-8; -7; -6; -5; -4; -3; -2; -1}, {0; 1; 2; 3; 4; 5; 6; 7}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2:
->   {-8; -7; -6; -5; -4; -3; -2; -1},
->   {1; 2; 3; 4; 5; 6; 7},
->   {-6; -5; -4; -3; -2; -1; 0}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2:
->   {-8; -7; -6; -5; -4; -3; -2; -1},
->   {-7; -6; -5; -4; -3; -2; -1},
->   {-6; -5; -4; -3; -2; -1; 0}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2:
->   {1; 2; 3; 4; 5; 6; 7; 8}, {1; 2; 3; 4; 5; 6; 7}, {0; 1; 2; 3; 4; 5; 6}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2:
->   {1; 2; 3; 4; 5; 6; 7; 8}, {-7; -6; -5; -4; -3; -2; -1}, {0; 1; 2; 3; 4; 5; 6}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2:
->   {-7; -6; -5; -4; -3; -2; -1}, {1; 2; 3; 4; 5; 6}, {-5; -4; -3; -2; -1; 0}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2:
->   {1; 2; 3; 4; 5; 6; 7}, {1; 2; 3; 4; 5; 6}, {0; 1; 2; 3; 4; 5}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2:
->   {-7; -6; -5; -4; -3; -2; -1},
->   {-6; -5; -4; -3; -2; -1},
->   {-5; -4; -3; -2; -1; 0}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2:
->   {1; 2; 3; 4; 5; 6; 7}, {-6; -5; -4; -3; -2; -1}, {0; 1; 2; 3; 4; 5}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2:
->   {-6; -5; -4; -3; -2; -1}, {1; 2; 3; 4; 5}, {-4; -3; -2; -1; 0}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2:
->   {-6; -5; -4; -3; -2; -1}, {-5; -4; -3; -2; -1}, {-4; -3; -2; -1; 0}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2: {1; 2; 3; 4; 5; 6}, {1; 2; 3; 4; 5}, {0; 1; 2; 3; 4}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2:
->   {1; 2; 3; 4; 5; 6}, {-5; -4; -3; -2; -1}, {0; 1; 2; 3; 4}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2: {-5; -4; -3; -2; -1}, {1; 2; 3; 4}, {-3; -2; -1; 0}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2: {1; 2; 3; 4; 5}, {1; 2; 3; 4}, {0; 1; 2; 3}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2: {-5; -4; -3; -2; -1}, {-4; -3; -2; -1}, {-3; -2; -1; 0}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2: {1; 2; 3; 4; 5}, {-4; -3; -2; -1}, {0; 1; 2; 3}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2: {-4; -3; -2; -1}, {1; 2; 3}, {-2; -1; 0}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2: {-4; -3; -2; -1}, {-3; -2; -1}, {-2; -1; 0}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2: {1; 2; 3; 4}, {1; 2; 3}, {0; 1; 2}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2: {1; 2; 3; 4}, {-3; -2; -1}, {0; 1; 2}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2: {-3; -2; -1}, {1; 2}, {-1; 0}
-> [eva] modulo.i:53: Frama_C_show_each_2: {1; 2; 3}, {1; 2}, {0; 1}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2: {-3; -2; -1}, {-2; -1}, {-1; 0}
-> [eva] modulo.i:53: Frama_C_show_each_2: {1; 2; 3}, {-2; -1}, {0; 1}
-60a219,231
-> [eva] modulo.i:64: Frama_C_show_each_3: [-10..10], [-9..9], [-8..8]
-> [eva] modulo.i:64: Frama_C_show_each_3: [-9..9], [-8..8], [-7..7]
-> [eva] modulo.i:64: Frama_C_show_each_3: [-8..8], [-7..7], [-6..6]
-> [eva] modulo.i:64: Frama_C_show_each_3: [-7..7], [-6..6], [-5..5]
-> [eva] modulo.i:64: Frama_C_show_each_3: [-6..6], [-5..5], [-4..4]
-> [eva] modulo.i:64: 
->   Frama_C_show_each_3:
->   [-5..5], {-4; -3; -2; -1; 1; 2; 3; 4}, {-3; -2; -1; 0; 1; 2; 3}
-> [eva] modulo.i:64: 
->   Frama_C_show_each_3:
->   {-4; -3; -2; -1; 1; 2; 3; 4}, {-3; -2; -1; 1; 2; 3}, {-2; -1; 0; 1; 2}
-> [eva] modulo.i:64: 
->   Frama_C_show_each_3: {-3; -2; -1; 1; 2; 3}, {-2; -1; 1; 2}, {-1; 0; 1}
-diff oracle/non_natural.res.oracle oracle_equalities/non_natural.res.oracle
-58a59,60
-> [kernel] non_natural.i:30: 
->   more than 200(12500) elements to enumerate. Approximating.
-65a68,71
-> [kernel] non_natural.i:23: 
->   more than 200(12500) elements to enumerate. Approximating.
-> [kernel] non_natural.i:23: 
->   more than 200(12501) elements to enumerate. Approximating.
-70a77,80
-> [kernel] non_natural.i:24: 
->   more than 200(12500) elements to enumerate. Approximating.
-> [kernel] non_natural.i:24: 
->   more than 200(12501) elements to enumerate. Approximating.
-78a89,90
-> [kernel] non_natural.i:25: 
->   more than 200(12500) elements to enumerate. Approximating.
-86a99,100
-> [kernel] non_natural.i:26: 
->   more than 200(12500) elements to enumerate. Approximating.
-94a109,110
-> [kernel] non_natural.i:27: 
->   more than 200(12500) elements to enumerate. Approximating.
-102a119,120
-> [kernel] non_natural.i:28: 
->   more than 200(12500) elements to enumerate. Approximating.
-110a129,130
-> [kernel] non_natural.i:29: 
->   more than 200(12500) elements to enumerate. Approximating.
-127,146d146
-< [kernel] non_natural.i:23: 
-<   more than 200(12501) elements to enumerate. Approximating.
-< [kernel] non_natural.i:23: 
-<   more than 200(12500) elements to enumerate. Approximating.
-< [kernel] non_natural.i:24: 
-<   more than 200(12501) elements to enumerate. Approximating.
-< [kernel] non_natural.i:24: 
-<   more than 200(12500) elements to enumerate. Approximating.
-< [kernel] non_natural.i:25: 
-<   more than 200(12500) elements to enumerate. Approximating.
-< [kernel] non_natural.i:26: 
-<   more than 200(12500) elements to enumerate. Approximating.
-< [kernel] non_natural.i:27: 
-<   more than 200(12500) elements to enumerate. Approximating.
-< [kernel] non_natural.i:28: 
-<   more than 200(12500) elements to enumerate. Approximating.
-< [kernel] non_natural.i:29: 
-<   more than 200(12500) elements to enumerate. Approximating.
-< [kernel] non_natural.i:30: 
-<   more than 200(12500) elements to enumerate. Approximating.
-199a200,201
-> [kernel] non_natural.i:39: 
->   more than 200(12500) elements to enumerate. Approximating.
-<<<<<<< HEAD
-diff oracle/nonlin.res.oracle oracle_equalities/nonlin.res.oracle
-188c188
-||||||| ac7807782d
-diff tests/value/oracle/nonlin.res.oracle tests/value/oracle_equalities/nonlin.res.oracle
-188c188
-=======
-diff tests/value/oracle/nonlin.res.oracle tests/value/oracle_equalities/nonlin.res.oracle
-194c194
->>>>>>> origin/master
-<   q ∈ {{ &x + [-400..400],0%4 }}
----
->   q ∈ {{ &x }}
-diff oracle/octagons.res.oracle oracle_equalities/octagons.res.oracle
-29c29
-<   Frama_C_show_each_unreduced_unsigned: [0..4294967295], [0..4294967295]
----
->   Frama_C_show_each_unreduced_unsigned: [0..4294967295], [6..4294967295]
-255c255
-<   t ∈ [--..--] or UNINITIALIZED
----
->   t ∈ [6..4294967295] or UNINITIALIZED
-diff oracle/offsetmap.0.res.oracle oracle_equalities/offsetmap.0.res.oracle
-40d39
-< [eva] Recording results for g
-42a42
-> [eva] Recording results for g
-diff oracle/offsetmap.1.res.oracle oracle_equalities/offsetmap.1.res.oracle
-40d39
-< [eva] Recording results for g
-42a42
-> [eva] Recording results for g
-diff oracle/origin.0.res.oracle oracle_equalities/origin.0.res.oracle
-249,250c249
-<   pm2[bits 0 to 15]# ∈ {{ (? *)&a }}%32, bits 16 to 31 
-<      [bits 16 to 31]# ∈ {{ (? *)&b }}%32, bits 0 to 15 
----
->   pm2 ∈ {{ &a + {-4} ; &b + {-4} }}
-289,290c288
-<   pm2[bits 0 to 15]# ∈ {{ (? *)&a }}%32, bits 16 to 31 
-<      [bits 16 to 31]# ∈ {{ (? *)&b }}%32, bits 0 to 15 
----
->   pm2 ∈ {{ &a + {-4} ; &b + {-4} }}
-diff oracle/period.res.oracle oracle_equalities/period.res.oracle
-88,94d87
-< [eva:alarm] period.c:53: Warning: 
-<   pointer downcast. assert (unsigned int)(&g) ≤ 2147483647;
-< [eva] period.c:53: 
-<   Assigning imprecise value to p.
-<   The imprecision originates from Arithmetic {period.c:53}
-< [eva:alarm] period.c:54: Warning: 
-<   out of bounds read. assert \valid_read(p);
-99d91
-< [scope:rm_asserts] removing 1 assertion(s)
-diff oracle/plevel.res.oracle oracle_equalities/plevel.res.oracle
-12d11
-< [eva] Recording results for main
-14a14
-> [eva] Recording results for main
-diff oracle/pointer_comp.res.oracle oracle_equalities/pointer_comp.res.oracle
-30a31,34
-> [kernel] pointer_comp.c:43: 
->   imprecise size for variable g (Undefined sizeof on a function.)
-> [kernel] pointer_comp.c:43: 
->   imprecise size for variable f (Undefined sizeof on a function.)
-diff oracle/ptr_relation.0.res.oracle oracle_equalities/ptr_relation.0.res.oracle
-23c23
-<   i ∈ {0; 77; 333}
----
->   i ∈ {77}
-diff oracle/redundant_alarms.res.oracle oracle_equalities/redundant_alarms.res.oracle
-10,13d9
-< [eva:alarm] redundant_alarms.c:11: Warning: 
-<   accessing uninitialized left-value. assert \initialized(p);
-< [eva:alarm] redundant_alarms.c:12: Warning: 
-<   accessing uninitialized left-value. assert \initialized(p);
-24,25d19
-< [eva:alarm] redundant_alarms.c:21: Warning: 
-<   accessing uninitialized left-value. assert \initialized(&t[i]);
-63,65c57
-< [scope:rm_asserts] removing 3 assertion(s)
-< [scope:rm_asserts] redundant_alarms.c:12: 
-<   removing redundant assert Eva: initialization: \initialized(p);
----
-> [scope:rm_asserts] removing 2 assertion(s)
-108d99
-<   /*@ assert Eva: initialization: \initialized(p); */
-110d100
-<   /*@ assert Eva: initialization: \initialized(p); */
-127d116
-<   /*@ assert Eva: initialization: \initialized(&t[i]); */
-196a186
->   int z;
-199,201d188
-<   *p = 1;
-<   int z = *p + 1;
-<   int w = *p + 2;
-diff oracle/relation_reduction.res.oracle oracle_equalities/relation_reduction.res.oracle
-24,27d23
-< [eva:alarm] relation_reduction.i:20: Warning: 
-<   accessing out of bounds index. assert 0 ≤ y;
-< [eva:alarm] relation_reduction.i:20: Warning: 
-<   accessing out of bounds index. assert y < 9;
-34,37c30,33
-<   R1 ∈ [-2147483648..2147483637]
-<   R2 ∈ [-2147483638..2147483647]
-<   R3 ∈ [--..--]
-<   R4 ∈ {0; 1; 2; 3; 4; 5}
----
->   R1 ∈ {0; 2}
->   R2 ∈ {0; 12}
->   R3 ∈ {0; 7}
->   R4 ∈ {0; 2}
-48c44
-<   R4 FROM tab[0..8]; x (and SELF)
----
->   R4 FROM tab[0..5]; x (and SELF)
-53c49
-<     y; t; tab[0..8]
----
->     y; t; tab[0..5]
-diff oracle/relation_shift.res.oracle oracle_equalities/relation_shift.res.oracle
-35,36c35,36
-<   x ∈ [-2147483647..2147483647]
-<   y ∈ [-2147483648..2147483646]
----
->   x ∈ [-2147483647..2147483642]
->   y ∈ [-2147483648..2147483645]
-53,54c53,54
-<   x ∈ [-2147483647..2147483647]
-<   y ∈ [-2147483648..2147483646]
----
->   x ∈ [-2147483647..2147483642]
->   y ∈ [-2147483648..2147483645]
-diff oracle/relations.res.oracle oracle_equalities/relations.res.oracle
-60,61c60
-<   u[0] ∈ [-2147483648..2147483646]
-<    [1] ∈ [--..--]
----
->   u[0..1] ∈ [-2147483648..2147483646]
-67,70c66,69
-<   R1 ∈ [--..--]
-<   R2 ∈ [--..--]
-<   R3 ∈ [-2147483648..2147483646]
-<   R4 ∈ [--..--]
----
->   R1 ∈ {0; 3}
->   R2 ∈ {0; 3}
->   R3 ∈ {0; 2}
->   R4 ∈ {0; 2}
-diff oracle/relations2.res.oracle oracle_equalities/relations2.res.oracle
-59c59
-<   n ∈ [0..512]
----
->   n ∈ [1..512]
-133d132
-< [eva] relations2.i:57: Frama_C_show_each_NO2:
-diff oracle/struct2.res.oracle oracle_equalities/struct2.res.oracle
-55a56,57
-> [kernel] struct2.i:78: Warning: 
->   all target addresses were invalid. This path is assumed to be dead.
-59,60d60
-<   accessing out of bounds index. assert 0 ≤ (int)(tab2[i] + j);
-< [eva:alarm] struct2.i:82: Warning: 
-83,84d82
-<   accessing out of bounds index. assert (int)(i + j) < 2;
-< [eva:alarm] struct2.i:185: Warning: 
-106c104
-< [scope:rm_asserts] removing 2 assertion(s)
----
-> [scope:rm_asserts] removing 1 assertion(s)
-143,145c141,143
-<   tab3[0..1] ∈ [--..--]
-<   tab4[0] ∈ {0; 2}
-<       [1] ∈ {0}
----
->   tab3[0] ∈ {0; 1}
->       [1] ∈ [--..--]
->   tab4[0..1] ∈ {0}
-148c146,147
-<   tab6[0..1] ∈ {0; 2}
----
->   tab6[0] ∈ {0}
->       [1] ∈ {2}
-219c218
-<            [9].a}; s1; s2; s5.e[0].b; s6.b; s8; tabl[0..1]; tab1[0..1];
----
->            [9].a}; s1; s2; s5.e[0].b; s6.b; s8; tabl[0..1]; tab1[0];
-Only in tests/value/oracle: unit_tests.res.oracle
diff --git a/tests/value/diff_gauges b/tests/value/diff_gauges
deleted file mode 100644
index 04669bcb5731cc0da4d654ddd45374fcb1e8bfea..0000000000000000000000000000000000000000
--- a/tests/value/diff_gauges
+++ /dev/null
@@ -1,1348 +0,0 @@
-diff oracle/alias.5.res.oracle oracle_gauges/alias.5.res.oracle
-59a60
-> [eva] alias.i:260: starting to merge loop iterations
-diff oracle/auto_loop_unroll.0.res.oracle oracle_gauges/auto_loop_unroll.0.res.oracle
-11,13c11
-< [eva:alarm] auto_loop_unroll.c:25: Warning: 
-<   signed overflow. assert res + 1 ≤ 2147483647;
-< [eva] auto_loop_unroll.c:27: Frama_C_show_each_auto: [0..2147483647]
----
-> [eva] auto_loop_unroll.c:27: Frama_C_show_each_auto: {100}
-15,18c13
-< [eva:alarm] auto_loop_unroll.c:31: Warning: 
-<   signed overflow. assert res + 1 ≤ 2147483647;
-< [eva] auto_loop_unroll.c:33: 
-<   Frama_C_show_each_imprecise: [0..2147483647]
----
-> [eva] auto_loop_unroll.c:33: Frama_C_show_each_imprecise: {1000}
-20,23c15
-< [eva:alarm] auto_loop_unroll.c:39: Warning: 
-<   signed overflow. assert res + 1 ≤ 2147483647;
-< [eva] auto_loop_unroll.c:41: 
-<   Frama_C_show_each_imprecise: [0..2147483647]
----
-> [eva] auto_loop_unroll.c:41: Frama_C_show_each_imprecise: {100}
-32,34c24
-< [eva:alarm] auto_loop_unroll.c:58: Warning: 
-<   signed overflow. assert res + 1 ≤ 2147483647;
-< [eva] auto_loop_unroll.c:59: Frama_C_show_each_64: [0..2147483647]
----
-> [eva] auto_loop_unroll.c:59: Frama_C_show_each_64: {64}
-36,38c26
-< [eva:alarm] auto_loop_unroll.c:63: Warning: 
-<   signed overflow. assert res + 1 ≤ 2147483647;
-< [eva] auto_loop_unroll.c:64: Frama_C_show_each_40: [0..2147483647]
----
-> [eva] auto_loop_unroll.c:64: Frama_C_show_each_40: {40}
-40,42c28
-< [eva:alarm] auto_loop_unroll.c:69: Warning: 
-<   signed overflow. assert res + 1 ≤ 2147483647;
-< [eva] auto_loop_unroll.c:72: Frama_C_show_each_80: [0..2147483647]
----
-> [eva] auto_loop_unroll.c:72: Frama_C_show_each_80: {80}
-44,47c30
-< [eva:alarm] auto_loop_unroll.c:76: Warning: 
-<   signed overflow. assert res + 1 ≤ 2147483647;
-< [eva] auto_loop_unroll.c:82: 
-<   Frama_C_show_each_32_80: [0..2147483647]
----
-<<<<<<< HEAD
-> [eva] auto_loop_unroll.c:82: Frama_C_show_each_32_80: [32..83]
-49,52c32
-< [eva:alarm] auto_loop_unroll.c:86: Warning: 
-||||||| ac7807782d
-> [eva] tests/value/auto_loop_unroll.c:82: Frama_C_show_each_32_80: [32..83]
-49,52c32
-< [eva:alarm] tests/value/auto_loop_unroll.c:86: Warning: 
-=======
-> [eva] tests/value/auto_loop_unroll.c:82: Frama_C_show_each_32_80: [32..83]
-55,56d37
-< [eva:alarm] tests/value/auto_loop_unroll.c:88: Warning: 
->>>>>>> origin/master
-<   signed overflow. assert res + 1 ≤ 2147483647;
-<<<<<<< HEAD
-< [eva] auto_loop_unroll.c:90: 
-||||||| ac7807782d
-< [eva] tests/value/auto_loop_unroll.c:90: 
-=======
-58c39
-<   Frama_C_show_each_40_50: [0..2147483647]
----
->   Frama_C_show_each_40_50: [40..1073741861]
-133,136c114
-< [eva:alarm] tests/value/auto_loop_unroll.c:120: Warning: 
-<   signed overflow. assert res + 1 ≤ 2147483647;
-< [eva] tests/value/auto_loop_unroll.c:122: 
-<   Frama_C_show_each_32_64: [0..2147483647]
----
-> [eva] tests/value/auto_loop_unroll.c:122: Frama_C_show_each_32_64: [32..65]
-185,188c163
-< [eva:alarm] tests/value/auto_loop_unroll.c:173: Warning: 
-<   signed overflow. assert res + 1 ≤ 2147483647;
-< [eva] tests/value/auto_loop_unroll.c:175: 
-<   Frama_C_show_each_imprecise: [0..2147483647]
----
-> [eva] tests/value/auto_loop_unroll.c:175: Frama_C_show_each_imprecise: [1..9]
-190,191d164
-< [eva:alarm] tests/value/auto_loop_unroll.c:181: Warning: 
-<   signed overflow. assert res + 1 ≤ 2147483647;
-195c168
-<   Frama_C_show_each_imprecise: [0..2147483647]
----
->   Frama_C_show_each_imprecise: [64..2147483647]
-201,203c174
-< [eva:alarm] tests/value/auto_loop_unroll.c:193: Warning: 
-<   signed overflow. assert res + 1 ≤ 2147483647;
-< [eva] tests/value/auto_loop_unroll.c:195: Frama_C_show_each_11: [0..2147483647]
----
-> [eva] tests/value/auto_loop_unroll.c:195: Frama_C_show_each_11: {11}
-205,207c176
-< [eva:alarm] tests/value/auto_loop_unroll.c:198: Warning: 
-<   signed overflow. assert res + 1 ≤ 2147483647;
-< [eva] tests/value/auto_loop_unroll.c:200: Frama_C_show_each_12: [0..2147483647]
----
-> [eva] tests/value/auto_loop_unroll.c:200: Frama_C_show_each_12: {12}
-209,210d177
-< [eva:alarm] tests/value/auto_loop_unroll.c:204: Warning: 
-<   signed overflow. assert res + 1 ≤ 2147483647;
-212a180,181
-> [eva:alarm] tests/value/auto_loop_unroll.c:204: Warning: 
->   signed overflow. assert res + 1 ≤ 2147483647;
-216,217d184
-< [eva:alarm] tests/value/auto_loop_unroll.c:209: Warning: 
-<   signed overflow. assert res + 1 ≤ 2147483647;
-219a187,188
-> [eva:alarm] tests/value/auto_loop_unroll.c:209: Warning: 
->   signed overflow. assert res + 1 ≤ 2147483647;
-223,224d191
-< [eva:alarm] tests/value/auto_loop_unroll.c:217: Warning: 
-<   signed overflow. assert res + 1 ≤ 2147483647;
-228,231c195
-< [eva:alarm] tests/value/auto_loop_unroll.c:222: Warning: 
-<   signed overflow. assert res + 1 ≤ 2147483647;
-< [eva] tests/value/auto_loop_unroll.c:226: 
->>>>>>> origin/master
-<   Frama_C_show_each_11_111: [0..2147483647]
----
-<<<<<<< HEAD
-> [eva] auto_loop_unroll.c:90: Frama_C_show_each_11_111: [11..111]
-60,61d39
-< [eva:alarm] auto_loop_unroll.c:96: Warning: 
-||||||| ac7807782d
-> [eva] tests/value/auto_loop_unroll.c:90: Frama_C_show_each_11_111: [11..111]
-60,61d39
-< [eva:alarm] tests/value/auto_loop_unroll.c:96: Warning: 
-=======
-> [eva] tests/value/auto_loop_unroll.c:226: Frama_C_show_each_11_111: [11..111]
-239,241c203
-< [eva:alarm] tests/value/auto_loop_unroll.c:236: Warning: 
->>>>>>> origin/master
-<   signed overflow. assert res + 1 ≤ 2147483647;
-< [eva] tests/value/auto_loop_unroll.c:238: Frama_C_show_each_20: [0..2147483647]
----
-<<<<<<< HEAD
->   Frama_C_show_each_40_50: [40..1073741861]
-diff oracle/auto_loop_unroll.1.res.oracle oracle_gauges/auto_loop_unroll.1.res.oracle
-||||||| ac7807782d
->   Frama_C_show_each_40_50: [40..1073741861]
-diff tests/value/oracle/auto_loop_unroll.1.res.oracle tests/value/oracle_gauges/auto_loop_unroll.1.res.oracle
-=======
-> [eva] tests/value/auto_loop_unroll.c:238: Frama_C_show_each_20: [20..2147483646]
-243,244d204
-< [eva:alarm] tests/value/auto_loop_unroll.c:241: Warning: 
-<   signed overflow. assert res + 1 ≤ 2147483647;
-247c207,209
-< [eva] tests/value/auto_loop_unroll.c:243: Frama_C_show_each_21: [0..2147483647]
----
-> [eva:alarm] tests/value/auto_loop_unroll.c:241: Warning: 
->   signed overflow. assert res + 1 ≤ 2147483647;
-> [eva] tests/value/auto_loop_unroll.c:243: Frama_C_show_each_21: {21}
-253,255c215,216
-< [eva:alarm] tests/value/auto_loop_unroll.c:250: Warning: 
-<   signed overflow. assert res + 1 ≤ 2147483647;
-< [eva] tests/value/auto_loop_unroll.c:254: Frama_C_show_each_30: [0..2147483647]
----
-> [eva] tests/value/auto_loop_unroll.c:254: Frama_C_show_each_30: {30}
-> [eva] tests/value/auto_loop_unroll.c:258: starting to merge loop iterations
-258d218
-< [eva] tests/value/auto_loop_unroll.c:258: starting to merge loop iterations
-261,263c221
-< [eva:alarm] tests/value/auto_loop_unroll.c:267: Warning: 
-<   signed overflow. assert res + 1 ≤ 2147483647;
-< [eva] tests/value/auto_loop_unroll.c:272: Frama_C_show_each_32: [0..2147483647]
----
-> [eva] tests/value/auto_loop_unroll.c:272: Frama_C_show_each_32: {32}
-diff tests/value/oracle/auto_loop_unroll.1.res.oracle tests/value/oracle_gauges/auto_loop_unroll.1.res.oracle
->>>>>>> origin/master
-15,18c15
-< [eva:alarm] auto_loop_unroll.c:31: Warning: 
-<   signed overflow. assert res + 1 ≤ 2147483647;
-< [eva] auto_loop_unroll.c:33: 
-<   Frama_C_show_each_imprecise: [0..2147483647]
----
-> [eva] auto_loop_unroll.c:33: Frama_C_show_each_imprecise: {1000}
-20,23c17
-< [eva:alarm] auto_loop_unroll.c:39: Warning: 
-<   signed overflow. assert res + 1 ≤ 2147483647;
-< [eva] auto_loop_unroll.c:41: 
-<   Frama_C_show_each_imprecise: [0..2147483647]
----
-<<<<<<< HEAD
-> [eva] auto_loop_unroll.c:41: Frama_C_show_each_imprecise: {100}
-diff oracle/bad_loop.res.oracle oracle_gauges/bad_loop.res.oracle
-||||||| ac7807782d
-> [eva] tests/value/auto_loop_unroll.c:41: Frama_C_show_each_imprecise: {100}
-diff tests/value/oracle/bad_loop.res.oracle tests/value/oracle_gauges/bad_loop.res.oracle
-=======
-> [eva] tests/value/auto_loop_unroll.c:41: Frama_C_show_each_imprecise: {100}
-329,332c323
-< [eva:alarm] tests/value/auto_loop_unroll.c:173: Warning: 
-<   signed overflow. assert res + 1 ≤ 2147483647;
-< [eva] tests/value/auto_loop_unroll.c:175: 
-<   Frama_C_show_each_imprecise: [0..2147483647]
----
-> [eva] tests/value/auto_loop_unroll.c:175: Frama_C_show_each_imprecise: [1..9]
-334,335d324
-< [eva:alarm] tests/value/auto_loop_unroll.c:181: Warning: 
-<   signed overflow. assert res + 1 ≤ 2147483647;
-339c328
-<   Frama_C_show_each_imprecise: [0..2147483647]
----
->   Frama_C_show_each_imprecise: [64..2147483647]
-385a375,458
-> [eva] tests/value/auto_loop_unroll.c:276: 
->   Trace partitioning superposing up to 200 states
-> [eva] tests/value/auto_loop_unroll.c:276: 
->   Trace partitioning superposing up to 300 states
-> [eva] tests/value/auto_loop_unroll.c:276: 
->   Trace partitioning superposing up to 400 states
-> [eva] tests/value/auto_loop_unroll.c:276: 
->   Trace partitioning superposing up to 500 states
-> [eva] tests/value/auto_loop_unroll.c:276: 
->   Trace partitioning superposing up to 600 states
-> [eva] tests/value/auto_loop_unroll.c:276: 
->   Trace partitioning superposing up to 700 states
-> [eva] tests/value/auto_loop_unroll.c:276: 
->   Trace partitioning superposing up to 800 states
-> [eva] tests/value/auto_loop_unroll.c:276: 
->   Trace partitioning superposing up to 900 states
-> [eva] tests/value/auto_loop_unroll.c:276: 
->   Trace partitioning superposing up to 1000 states
-> [eva] tests/value/auto_loop_unroll.c:276: 
->   Trace partitioning superposing up to 1100 states
-> [eva] tests/value/auto_loop_unroll.c:276: 
->   Trace partitioning superposing up to 1200 states
-> [eva] tests/value/auto_loop_unroll.c:276: 
->   Trace partitioning superposing up to 1300 states
-> [eva] tests/value/auto_loop_unroll.c:276: 
->   Trace partitioning superposing up to 1400 states
-> [eva] tests/value/auto_loop_unroll.c:276: 
->   Trace partitioning superposing up to 1500 states
-> [eva] tests/value/auto_loop_unroll.c:276: 
->   Trace partitioning superposing up to 1600 states
-> [eva] tests/value/auto_loop_unroll.c:276: 
->   Trace partitioning superposing up to 1700 states
-> [eva] tests/value/auto_loop_unroll.c:276: 
->   Trace partitioning superposing up to 1800 states
-> [eva] tests/value/auto_loop_unroll.c:276: 
->   Trace partitioning superposing up to 1900 states
-> [eva] tests/value/auto_loop_unroll.c:276: 
->   Trace partitioning superposing up to 2000 states
-> [eva] tests/value/auto_loop_unroll.c:276: 
->   Trace partitioning superposing up to 2100 states
-> [eva] tests/value/auto_loop_unroll.c:276: 
->   Trace partitioning superposing up to 2200 states
-> [eva] tests/value/auto_loop_unroll.c:276: 
->   Trace partitioning superposing up to 2300 states
-> [eva] tests/value/auto_loop_unroll.c:276: 
->   Trace partitioning superposing up to 2400 states
-> [eva] tests/value/auto_loop_unroll.c:276: 
->   Trace partitioning superposing up to 2500 states
-> [eva] tests/value/auto_loop_unroll.c:276: 
->   Trace partitioning superposing up to 2600 states
-> [eva] tests/value/auto_loop_unroll.c:276: 
->   Trace partitioning superposing up to 2700 states
-> [eva] tests/value/auto_loop_unroll.c:276: 
->   Trace partitioning superposing up to 2800 states
-> [eva] tests/value/auto_loop_unroll.c:276: 
->   Trace partitioning superposing up to 2900 states
-> [eva] tests/value/auto_loop_unroll.c:276: 
->   Trace partitioning superposing up to 3000 states
-> [eva] tests/value/auto_loop_unroll.c:276: 
->   Trace partitioning superposing up to 3100 states
-> [eva] tests/value/auto_loop_unroll.c:276: 
->   Trace partitioning superposing up to 3200 states
-> [eva] tests/value/auto_loop_unroll.c:276: 
->   Trace partitioning superposing up to 3300 states
-> [eva] tests/value/auto_loop_unroll.c:276: 
->   Trace partitioning superposing up to 3400 states
-> [eva] tests/value/auto_loop_unroll.c:276: 
->   Trace partitioning superposing up to 3500 states
-> [eva] tests/value/auto_loop_unroll.c:276: 
->   Trace partitioning superposing up to 3600 states
-> [eva] tests/value/auto_loop_unroll.c:276: 
->   Trace partitioning superposing up to 3700 states
-> [eva] tests/value/auto_loop_unroll.c:276: 
->   Trace partitioning superposing up to 3800 states
-> [eva] tests/value/auto_loop_unroll.c:276: 
->   Trace partitioning superposing up to 3900 states
-> [eva] tests/value/auto_loop_unroll.c:276: 
->   Trace partitioning superposing up to 4000 states
-> [eva] tests/value/auto_loop_unroll.c:276: 
->   Trace partitioning superposing up to 4100 states
-> [eva] tests/value/auto_loop_unroll.c:276: 
->   Trace partitioning superposing up to 4200 states
-> [eva] tests/value/auto_loop_unroll.c:276: 
->   Trace partitioning superposing up to 4300 states
-diff tests/value/oracle/bad_loop.res.oracle tests/value/oracle_gauges/bad_loop.res.oracle
->>>>>>> origin/master
-6a7
-> [eva] bad_loop.i:12: starting to merge loop iterations
-diff oracle/bitfield.res.oracle oracle_gauges/bitfield.res.oracle
-138a139,153
-> [eva] bitfield.i:71: 
->   Frama_C_show_each:
->   {{ garbled mix of &{b} (origin: Misaligned {bitfield.i:70}) }}
-> [eva] bitfield.i:73: 
->   Frama_C_show_each:
->   {{ garbled mix of &{b} (origin: Misaligned {bitfield.i:70}) }}
-> [eva] computing for function leaf <- imprecise_bts_1671 <- main.
->   Called from bitfield.i:70.
-> [eva] Done for function leaf
-> [eva] bitfield.i:71: 
->   Frama_C_show_each:
->   {{ garbled mix of &{b} (origin: Misaligned {bitfield.i:70}) }}
-> [eva] bitfield.i:73: 
->   Frama_C_show_each:
->   {{ garbled mix of &{b} (origin: Misaligned {bitfield.i:70}) }}
-diff oracle/cast2.res.oracle oracle_gauges/cast2.res.oracle
-26a27
-> [eva] cast2.i:24: starting to merge loop iterations
-diff oracle/for_loops.1.res.oracle oracle_gauges/for_loops.1.res.oracle
-39,41c39
-< [eva:alarm] for_loops.c:16: Warning: 
-<   signed overflow. assert w + 1 ≤ 2147483647;
-< [eva] for_loops.c:17: Frama_C_show_each_F: [0..2147483647]
----
-> [eva] for_loops.c:17: Frama_C_show_each_F: [0..100]
-diff oracle/for_loops.2.res.oracle oracle_gauges/for_loops.2.res.oracle
-37,39c37
-< [eva:alarm] for_loops.c:42: Warning: 
-<   signed overflow. assert w + T[j] ≤ 2147483647;
-< [eva] for_loops.c:43: Frama_C_show_each: [0..2147483647]
----
-> [eva] for_loops.c:43: Frama_C_show_each: [0..1000]
-diff oracle/from_termin.res.oracle oracle_gauges/from_termin.res.oracle
-9a10
-> [eva] from_termin.i:8: starting to merge loop iterations
-diff oracle/gauges.res.oracle oracle_gauges/gauges.res.oracle
-25,26d24
-< [eva:alarm] gauges.c:23: Warning: 
-<   signed overflow. assert -2147483648 ≤ j - 4;
-38,39d35
-< [eva:alarm] gauges.c:26: Warning: 
-<   signed overflow. assert l + 1 ≤ 2147483647;
-57,58d52
-< [eva:alarm] gauges.c:45: Warning: 
-<   signed overflow. assert -2147483648 ≤ j - 4;
-61a56,57
-> [eva:alarm] gauges.c:45: Warning: 
->   signed overflow. assert -2147483648 ≤ j - 4;
-70,71d65
-< [eva:alarm] gauges.c:48: Warning: 
-<   signed overflow. assert l + 1 ≤ 2147483647;
-83,84d76
-< [eva:alarm] gauges.c:58: Warning: 
-<   accessing out of bounds index. assert j < 38;
-97,101d88
-< [eva:alarm] gauges.c:71: Warning: 
-<   out of bounds write. assert \valid(tmp);
-<                        (tmp from p++)
-< [eva] gauges.c:72: Frama_C_show_each:
-< [eva] gauges.c:72: Frama_C_show_each:
-113,114d99
-< [eva:alarm] gauges.c:81: Warning: 
-<   signed overflow. assert k + 1 ≤ 2147483647;
-116,117d100
-< [eva:alarm] gauges.c:84: Warning: 
-<   signed overflow. assert k + 1 ≤ 2147483647;
-125c108
-< [eva] gauges.c:86: Frama_C_show_each: [0..2147483647]
----
-> [eva] gauges.c:86: Frama_C_show_each: {390}
-139,140d121
-< [eva:alarm] gauges.c:99: Warning: 
-<   signed overflow. assert c + 1 ≤ 2147483647;
-178,181c159,162
-< [eva] gauges.c:129: Frama_C_show_each: {{ &y + [4..36],0%4 }}
-< [eva] gauges.c:129: Frama_C_show_each: {{ &y + [4..40],0%4 }}
-< [eva:alarm] gauges.c:130: Warning: 
-<   out of bounds write. assert \valid(p);
----
-> [eva] gauges.c:129: 
->   Frama_C_show_each: {{ &y + {4; 8; 12; 16; 20; 24} }}
-> [eva] gauges.c:129: 
->   Frama_C_show_each: {{ &y + {4; 8; 12; 16; 20; 24} }}
-187,188d167
-< [eva:alarm] gauges.c:140: Warning: 
-<   signed overflow. assert j + 1 ≤ 2147483647;
-206,208d184
-< [eva:alarm] gauges.c:158: Warning: 
-<   out of bounds write. assert \valid(tmp);
-<                        (tmp from p--)
-227,231c203,205
-< [eva] gauges.c:172: Frama_C_show_each: [2147483646..4294967294]
-< [eva] gauges.c:172: Frama_C_show_each: [1..4294967294]
-< [eva] gauges.c:172: Frama_C_show_each: [1..4294967294]
-< [eva] gauges.c:172: Frama_C_show_each: [1..4294967294]
-< [eva] gauges.c:172: Frama_C_show_each: [1..4294967294]
----
-> [eva] gauges.c:172: Frama_C_show_each: [2147483647..4294967294]
-> [eva] gauges.c:172: Frama_C_show_each: [2147483647..4294967294]
-> [eva] gauges.c:172: Frama_C_show_each: [2147483647..4294967294]
-235c209,210
-< [eva] gauges.c:172: Frama_C_show_each: [1..4294967294]
----
-> [eva] gauges.c:172: Frama_C_show_each: [2147483647..4294967294]
-> [eva] gauges.c:172: Frama_C_show_each: [2147483647..4294967294]
-259,262d233
-< [eva:alarm] gauges.c:192: Warning: 
-<   out of bounds write. assert \valid(p);
-< [eva:alarm] gauges.c:193: Warning: 
-<   out of bounds write. assert \valid(q);
-270,275d240
-< [eva:alarm] gauges.c:202: Warning: 
-<   out of bounds read. assert \valid_read(tmp);
-<                       (tmp from A++)
-< [eva:alarm] gauges.c:202: Warning: 
-<   out of bounds read. assert \valid_read(tmp_0);
-<                       (tmp_0 from B++)
-303,304d267
-< [eva:alarm] gauges.c:220: Warning: 
-<   signed overflow. assert -2147483648 ≤ n - 1;
-319,322c282
-< [eva:alarm] gauges.c:240: Warning: 
-<   signed overflow. assert j + 1 ≤ 2147483647;
-< [eva] gauges.c:242: 
-<   Frama_C_show_each: {45; 46; 47; 48; 49; 50; 51}, [0..2147483647]
----
-> [eva] gauges.c:242: Frama_C_show_each: {47; 48}, {6}
-328,329d287
-< [eva:alarm] gauges.c:251: Warning: 
-<   signed overflow. assert j + 1 ≤ 2147483647;
-331c289
-<   Frama_C_show_each: {48; 49; 50; 51; 52; 53; 54}, [0..2147483647]
----
->   Frama_C_show_each: {48; 49; 50; 51; 52; 53; 54}, {6; 7}
-337,340c295
-< [eva:alarm] gauges.c:263: Warning: 
-<   signed overflow. assert j + 1 ≤ 2147483647;
-< [eva] gauges.c:265: 
-<   Frama_C_show_each: {-59; -58; -57; -56; -55; -54; -53}, [0..2147483647]
----
-> [eva] gauges.c:265: Frama_C_show_each: {-58; -57}, {9}
-346,347d300
-< [eva:alarm] gauges.c:274: Warning: 
-<   signed overflow. assert j + 1 ≤ 2147483647;
-349c302
-<   Frama_C_show_each: {-64; -63; -62; -61; -60; -59; -58}, [0..2147483647]
----
->   Frama_C_show_each: {-64; -63; -62; -61; -60; -59; -58}, {9; 10}
-357,358d309
-< [eva:alarm] gauges.c:293: Warning: 
-<   signed overflow. assert j + 1 ≤ 2147483647;
-360c311
-<   Frama_C_show_each: {-593; -592; -591; -590; -589; -588}, [0..2147483647]
----
->   Frama_C_show_each: {-593; -592; -591; -590; -589; -588}, [99..119]
-422a374,377
->   # Gauges domain:
->   V: [{[ p -> {{ &x }}
->          i -> {1} ]}]
->   s398: λ(0)
-482a438,441
->   # Gauges domain:
->   V: [{[ i -> {1} ]}]
->   s398: λ([0 .. 1])
->         {[ i -> {1} ]}
-541a501,504
->   # Gauges domain:
->   V: [{[ i -> {1} ]}]
->   s398: λ([0 .. 2])
->         {[ i -> {1} ]}
-600a564,567
->   # Gauges domain:
->   V: [{[ i -> {1} ]}]
->   s398: λ([0 .. 10])
->         {[ i -> {1} ]}
-665a633,637
->   # Gauges domain:
->   V: [{[ p -> {{ &a }}
->          i -> {2} ]}]
->   s412: λ(0)
->   s411: λ(0)
-726a699,703
->   # Gauges domain:
->   V: [{[ i -> {2} ]}]
->   s412: λ(0)
->   s411: λ([0 .. 1])
->         {[ i -> {0} ]}
-728a706,833
-> [eva] gauges.c:325: 
->   Frama_C_dump_each:
->   # Cvalue domain:
->   __fc_heap_status ∈ [--..--]
->   __fc_random_counter ∈ [--..--]
->   __fc_rand_max ∈ {32767}
->   __fc_random48_init ∈ {0}
->   __fc_random48_counter[0..2] ∈ [--..--]
->   __fc_p_random48_counter ∈ {{ &__fc_random48_counter[0] }}
->   __fc_env[0] ∈ {{ NULL ; &S_0___fc_env[0] }}
->           [1] ∈ {{ NULL ; &S_1___fc_env[0] }}
->           [2..4095] ∈ {{ NULL ; &S_0___fc_env[0] ; &S_1___fc_env[0] }}
->   __fc_mblen_state ∈ [--..--]
->   __fc_mbtowc_state ∈ [--..--]
->   __fc_wctomb_state ∈ [--..--]
->   v ∈ [--..--]
->   t[0..4] ∈ {0}
->    [5] ∈ [0..48],0%3
->    [6] ∈ {0}
->    [7] ∈ [0..48],0%3
->    [8] ∈ {0}
->    [9] ∈ [0..48],0%3
->    [10] ∈ {0}
->    [11] ∈ [0..48],0%3
->    [12] ∈ {0}
->    [13] ∈ [0..48],0%3
->    [14] ∈ {0}
->    [15] ∈ [0..48],0%3
->    [16] ∈ {0}
->    [17] ∈ [0..48],0%3
->    [18] ∈ {0}
->    [19] ∈ [0..48],0%3
->    [20] ∈ {0}
->    [21] ∈ [0..48],0%3
->    [22] ∈ {0}
->    [23] ∈ [0..48],0%3
->    [24] ∈ {0}
->    [25] ∈ [0..48],0%3
->    [26] ∈ {0}
->    [27] ∈ [0..48],0%3
->    [28] ∈ {0}
->    [29] ∈ [0..48],0%3
->    [30] ∈ {0}
->    [31] ∈ [0..48],0%3
->    [32] ∈ {0}
->    [33] ∈ [0..48],0%3
->    [34] ∈ {0}
->    [35] ∈ [0..48],0%3
->    [36] ∈ {0}
->    [37] ∈ [0..48],0%3
->   u[0..99] ∈ [0..100]
->   T[0..99] ∈ [--..--]
->   a ∈ {1}
->   b ∈ {0}
->   p ∈ {{ &a ; &b }}
->   i ∈ {2}
->   S_0___fc_env[0..1] ∈ [--..--]
->   S_1___fc_env[0..1] ∈ [--..--]
->   # Gauges domain:
->   V: [{[ i -> {2} ]}]
->   s412: λ(0)
->   s411: λ([0 .. 2])
->         {[ i -> {0} ]}
->   ==END OF DUMP==
-> [eva] gauges.c:325: 
->   Frama_C_dump_each:
->   # Cvalue domain:
->   __fc_heap_status ∈ [--..--]
->   __fc_random_counter ∈ [--..--]
->   __fc_rand_max ∈ {32767}
->   __fc_random48_init ∈ {0}
->   __fc_random48_counter[0..2] ∈ [--..--]
->   __fc_p_random48_counter ∈ {{ &__fc_random48_counter[0] }}
->   __fc_env[0] ∈ {{ NULL ; &S_0___fc_env[0] }}
->           [1] ∈ {{ NULL ; &S_1___fc_env[0] }}
->           [2..4095] ∈ {{ NULL ; &S_0___fc_env[0] ; &S_1___fc_env[0] }}
->   __fc_mblen_state ∈ [--..--]
->   __fc_mbtowc_state ∈ [--..--]
->   __fc_wctomb_state ∈ [--..--]
->   v ∈ [--..--]
->   t[0..4] ∈ {0}
->    [5] ∈ [0..48],0%3
->    [6] ∈ {0}
->    [7] ∈ [0..48],0%3
->    [8] ∈ {0}
->    [9] ∈ [0..48],0%3
->    [10] ∈ {0}
->    [11] ∈ [0..48],0%3
->    [12] ∈ {0}
->    [13] ∈ [0..48],0%3
->    [14] ∈ {0}
->    [15] ∈ [0..48],0%3
->    [16] ∈ {0}
->    [17] ∈ [0..48],0%3
->    [18] ∈ {0}
->    [19] ∈ [0..48],0%3
->    [20] ∈ {0}
->    [21] ∈ [0..48],0%3
->    [22] ∈ {0}
->    [23] ∈ [0..48],0%3
->    [24] ∈ {0}
->    [25] ∈ [0..48],0%3
->    [26] ∈ {0}
->    [27] ∈ [0..48],0%3
->    [28] ∈ {0}
->    [29] ∈ [0..48],0%3
->    [30] ∈ {0}
->    [31] ∈ [0..48],0%3
->    [32] ∈ {0}
->    [33] ∈ [0..48],0%3
->    [34] ∈ {0}
->    [35] ∈ [0..48],0%3
->    [36] ∈ {0}
->    [37] ∈ [0..48],0%3
->   u[0..99] ∈ [0..100]
->   T[0..99] ∈ [--..--]
->   a ∈ {1}
->   b ∈ {0}
->   p ∈ {{ &a ; &b }}
->   i ∈ {2}
->   S_0___fc_env[0..1] ∈ [--..--]
->   S_1___fc_env[0..1] ∈ [--..--]
->   # Gauges domain:
->   V: [{[ i -> {2} ]}]
->   s412: λ(0)
->   s411: λ([0 .. +oo])
->         {[ i -> {0} ]}
->   ==END OF DUMP==
-736a842,843
-> [eva] gauges.c:343: Call to builtin malloc
-> [eva] gauges.c:343: Call to builtin malloc
-789,790c896,897
-<   A ∈ {{ &A + [0..--],0%4 }}
-<   B ∈ {{ &B + [0..--],0%4 }}
----
->   A ∈ {{ &A + [0..36],0%4 }}
->   B ∈ {{ &B + [0..36],0%4 }}
-802c909
-<   n ∈ [-2147483648..99]
----
->   n ∈ [-2147483547..99]
-808c915
-<   i ∈ {45; 46; 47; 48; 49; 50; 51}
----
->   i ∈ {45; 46; 47; 48}
-814c921
-<   i ∈ {-59; -58; -57; -56; -55; -54; -53}
----
->   i ∈ {-58; -57; -56; -55; -54; -53}
-834c941
-<   p ∈ {{ &u + [0..--],0%4 }}
----
->   p ∈ {{ &u + [0..400],0%4 }}
-836c943
-<   k ∈ [0..2147483647]
----
->   k ∈ [0..390]
-841c948
-<   i ∈ [0..2147483647]
----
->   i ∈ [0..21]
-852,853c959,961
-<    [1..9] ∈ {4; 5; 6; 7; 8; 9} or UNINITIALIZED
-<   p ∈ {{ &y + [4..40],0%4 }}
----
->    [1..6] ∈ {4; 5; 6; 7; 8; 9} or UNINITIALIZED
->    [7..9] ∈ UNINITIALIZED
->   p ∈ {{ &y[7] }}
-864c972
-<   p ∈ {{ &T + [--..396],0%4 }}
----
->   p ∈ {{ &T + [-4..396],0%4 }}
-869,873c977
-<   n ∈ {0}
-<   arr[0] ∈ {0}
-<      [1] ∈ {-1}
-<      [2..65535] ∈ [--..--] or UNINITIALIZED
-<   p ∈ {{ &arr + [12..--],0%4 }}
----
->   NON TERMINATING FUNCTION
-976a1081
-> [from] Non-terminating function main8_aux (no dependencies)
-999,1000c1104,1105
-<   p FROM p; A; B; n; p; A[0..9]; B[0..9] (and SELF)
-<   \result FROM p; A; B; n; p; A[0..9]; B[0..9]
----
->   p FROM p; A; B; n; p; A[0..8]; B[0..8] (and SELF)
->   \result FROM p; A; B; n; p; A[0..8]; B[0..8]
-1044c1149
-<   NO EFFECTS
----
->   NON TERMINATING - NO EFFECTS
-1078c1183
-<     p; A[0..9]; B[0..9]
----
->     p; A[0..8]; B[0..8]
-diff oracle/hierarchical_convergence.res.oracle oracle_gauges/hierarchical_convergence.res.oracle
-15a16
-> [eva] hierarchical_convergence.c:10: Frama_C_show_each: {1}, {0}
-diff oracle/infinite.res.oracle oracle_gauges/infinite.res.oracle
-12a13,22
-> [eva] infinite.i:6: starting to merge loop iterations
-> [eva] computing for function pause <- main.
->   Called from infinite.i:9.
-> [eva] Done for function pause
-> [eva] computing for function pause <- main.
->   Called from infinite.i:9.
-> [eva] Done for function pause
-> [eva] computing for function pause <- main.
->   Called from infinite.i:9.
-> [eva] Done for function pause
-diff oracle/inout.2.res.oracle oracle_gauges/inout.2.res.oracle
-22a23
-> [eva] inout.i:50: starting to merge loop iterations
-diff oracle/inout.3.res.oracle oracle_gauges/inout.3.res.oracle
-22a23
-> [eva] inout.i:60: starting to merge loop iterations
-diff oracle/inout.4.res.oracle oracle_gauges/inout.4.res.oracle
-24a25
-> [eva] inout.i:60: starting to merge loop iterations
-diff oracle/local_slevel.res.oracle oracle_gauges/local_slevel.res.oracle
-13,15c13,15
-< [eva] local_slevel.i:18: Frama_C_show_each: {1}, {1}, {0; 1}
-< [eva] local_slevel.i:18: Frama_C_show_each: {-1}, {0}, {0; 1}
-< [eva] local_slevel.i:18: Frama_C_show_each: {1}, {1}, {0; 1; 2}
----
-> [eva] local_slevel.i:18: Frama_C_show_each: {1}, {1}, {1}
-> [eva] local_slevel.i:18: Frama_C_show_each: {-1}, {0}, {0}
-> [eva] local_slevel.i:18: Frama_C_show_each: {1}, {1}, {1}
-18c18
-<   Frama_C_show_each: {1}, [1..79],1%2, {0; 1; 2; 3}
----
->   Frama_C_show_each: {1}, [1..79],1%2, {1; 2; 3}
-22c22
-<   Frama_C_show_each: {1}, [1..79],1%2, {0; 1; 2; 3; 4}
----
->   Frama_C_show_each: {1}, [1..79],1%2, {1; 2; 3; 4}
-26,34c26
-<   Frama_C_show_each: {1}, [1..79],1%2, [0..2147483647]
-< [eva] local_slevel.i:18: 
-<   Frama_C_show_each: {-1}, [0..78],0%2, [0..2147483647]
-< [eva] local_slevel.i:18: 
-<   Frama_C_show_each: {1}, [1..79],1%2, [0..2147483648]
-< [eva] local_slevel.i:18: 
-<   Frama_C_show_each: {-1}, [0..78],0%2, [0..2147483648]
-< [eva] local_slevel.i:18: 
-<   Frama_C_show_each: {1}, [1..79],1%2, [0..4294967295]
----
->   Frama_C_show_each: {1}, [1..79],1%2, [1..79]
-36c28
-<   Frama_C_show_each: {-1}, [0..78],0%2, [0..4294967295]
----
->   Frama_C_show_each: {-1}, [0..78],0%2, [0..78]
-152c144
-<   r ∈ [--..--]
----
->   r ∈ [0..2147483647]
-393,395c385,387
-< [eva] local_slevel.i:18: Frama_C_show_each: {1}, {1}, {0; 1}
-< [eva] local_slevel.i:18: Frama_C_show_each: {-1}, {0}, {0; 1}
-< [eva] local_slevel.i:18: Frama_C_show_each: {1}, {1}, {0; 1; 2}
----
-> [eva] local_slevel.i:18: Frama_C_show_each: {1}, {1}, {1}
-> [eva] local_slevel.i:18: Frama_C_show_each: {-1}, {0}, {0}
-> [eva] local_slevel.i:18: Frama_C_show_each: {1}, {1}, {1}
-398c390
-<   Frama_C_show_each: {1}, [1..79],1%2, {0; 1; 2; 3}
----
->   Frama_C_show_each: {1}, [1..79],1%2, {1; 2; 3}
-402c394
-<   Frama_C_show_each: {1}, [1..79],1%2, {0; 1; 2; 3; 4}
----
->   Frama_C_show_each: {1}, [1..79],1%2, {1; 2; 3; 4}
-406,414c398
-<   Frama_C_show_each: {1}, [1..79],1%2, [0..2147483647]
-< [eva] local_slevel.i:18: 
-<   Frama_C_show_each: {-1}, [0..78],0%2, [0..2147483647]
-< [eva] local_slevel.i:18: 
-<   Frama_C_show_each: {1}, [1..79],1%2, [0..2147483648]
-< [eva] local_slevel.i:18: 
-<   Frama_C_show_each: {-1}, [0..78],0%2, [0..2147483648]
-< [eva] local_slevel.i:18: 
-<   Frama_C_show_each: {1}, [1..79],1%2, [0..4294967295]
----
->   Frama_C_show_each: {1}, [1..79],1%2, [1..79]
-416c400
-<   Frama_C_show_each: {-1}, [0..78],0%2, [0..4294967295]
----
->   Frama_C_show_each: {-1}, [0..78],0%2, [0..78]
-532c516
-<   r ∈ [--..--]
----
->   r ∈ [0..2147483647]
-diff oracle/loop_no_var.res.oracle oracle_gauges/loop_no_var.res.oracle
-6a7
-> [eva] loop_no_var.i:3: starting to merge loop iterations
-diff oracle/loop_wvar.1.res.oracle oracle_gauges/loop_wvar.1.res.oracle
-27,28c27
-< [eva] loop_wvar.i:71: Frama_C_show_each: [0..9], [0..17], [0..11]
-< [eva] loop_wvar.i:71: Frama_C_show_each: [0..9], [0..18], [0..12]
----
-> [eva] loop_wvar.i:71: Frama_C_show_each: [0..9], [0..9], [0..9]
-37,38c36,37
-<   j ∈ [0..18]
-<   k ∈ [0..12]
----
->   j ∈ [0..17]
->   k ∈ [0..11]
-diff oracle/loopfun.1.res.oracle oracle_gauges/loopfun.1.res.oracle
-9a10,12
-> [eva] loopfun.i:23: starting to merge loop iterations
-> [eva:loop-unroll] loopfun.i:25: loop not completely unrolled
-> [eva] loopfun.i:25: starting to merge loop iterations
-11a15
-> [eva] loopfun.i:26: starting to merge loop iterations
-13a18
-<<<<<<< HEAD
-> [eva] loopfun.i:27: starting to merge loop iterations
-diff oracle/memexec.res.oracle oracle_gauges/memexec.res.oracle
-101a102
-> [eva] memexec.c:98: starting to merge loop iterations
-diff oracle/modulo.res.oracle oracle_gauges/modulo.res.oracle
-||||||| ac7807782d
-> [eva] tests/value/loopfun.i:27: starting to merge loop iterations
-diff tests/value/oracle/memexec.res.oracle tests/value/oracle_gauges/memexec.res.oracle
-101a102
-> [eva] tests/value/memexec.c:98: starting to merge loop iterations
-diff tests/value/oracle/modulo.res.oracle tests/value/oracle_gauges/modulo.res.oracle
-=======
-> [eva] tests/value/loopfun.i:27: starting to merge loop iterations
-diff tests/value/oracle/memexec.res.oracle tests/value/oracle_gauges/memexec.res.oracle
-103a104
-> [eva] tests/value/memexec.c:98: starting to merge loop iterations
-diff tests/value/oracle/modulo.res.oracle tests/value/oracle_gauges/modulo.res.oracle
->>>>>>> origin/master
-40a41,123
-> [eva] modulo.i:41: Frama_C_show_each_1: [-10..-1], [-9..-1], [-8..0]
-> [eva] modulo.i:41: Frama_C_show_each_1: [-10..-1], [1..9], [-8..0]
-> [eva] modulo.i:41: Frama_C_show_each_1: [1..10], [-9..-1], [0..8]
-> [eva] modulo.i:41: Frama_C_show_each_1: [1..10], [1..9], [0..8]
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1:
->   [1..9], {1; 2; 3; 4; 5; 6; 7; 8}, {0; 1; 2; 3; 4; 5; 6; 7}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1:
->   [-9..-1], {1; 2; 3; 4; 5; 6; 7; 8}, {-7; -6; -5; -4; -3; -2; -1; 0}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1:
->   [1..9], {-8; -7; -6; -5; -4; -3; -2; -1}, {0; 1; 2; 3; 4; 5; 6; 7}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1:
->   [-9..-1], {-8; -7; -6; -5; -4; -3; -2; -1}, {-7; -6; -5; -4; -3; -2; -1; 0}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1:
->   {-8; -7; -6; -5; -4; -3; -2; -1},
->   {-7; -6; -5; -4; -3; -2; -1},
->   {-6; -5; -4; -3; -2; -1; 0}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1:
->   {-8; -7; -6; -5; -4; -3; -2; -1},
->   {1; 2; 3; 4; 5; 6; 7},
->   {-6; -5; -4; -3; -2; -1; 0}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1:
->   {1; 2; 3; 4; 5; 6; 7; 8}, {-7; -6; -5; -4; -3; -2; -1}, {0; 1; 2; 3; 4; 5; 6}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1:
->   {1; 2; 3; 4; 5; 6; 7; 8}, {1; 2; 3; 4; 5; 6; 7}, {0; 1; 2; 3; 4; 5; 6}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1:
->   {1; 2; 3; 4; 5; 6; 7}, {1; 2; 3; 4; 5; 6}, {0; 1; 2; 3; 4; 5}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1:
->   {-7; -6; -5; -4; -3; -2; -1}, {1; 2; 3; 4; 5; 6}, {-5; -4; -3; -2; -1; 0}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1:
->   {1; 2; 3; 4; 5; 6; 7}, {-6; -5; -4; -3; -2; -1}, {0; 1; 2; 3; 4; 5}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1:
->   {-7; -6; -5; -4; -3; -2; -1},
->   {-6; -5; -4; -3; -2; -1},
->   {-5; -4; -3; -2; -1; 0}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1:
->   {-6; -5; -4; -3; -2; -1}, {-5; -4; -3; -2; -1}, {-4; -3; -2; -1; 0}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1:
->   {-6; -5; -4; -3; -2; -1}, {1; 2; 3; 4; 5}, {-4; -3; -2; -1; 0}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1:
->   {1; 2; 3; 4; 5; 6}, {-5; -4; -3; -2; -1}, {0; 1; 2; 3; 4}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1: {1; 2; 3; 4; 5; 6}, {1; 2; 3; 4; 5}, {0; 1; 2; 3; 4}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1: {1; 2; 3; 4; 5}, {1; 2; 3; 4}, {0; 1; 2; 3}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1: {-5; -4; -3; -2; -1}, {1; 2; 3; 4}, {-3; -2; -1; 0}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1: {1; 2; 3; 4; 5}, {-4; -3; -2; -1}, {0; 1; 2; 3}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1: {-5; -4; -3; -2; -1}, {-4; -3; -2; -1}, {-3; -2; -1; 0}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1: {-4; -3; -2; -1}, {-3; -2; -1}, {-2; -1; 0}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1: {-4; -3; -2; -1}, {1; 2; 3}, {-2; -1; 0}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1: {1; 2; 3; 4}, {-3; -2; -1}, {0; 1; 2}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1: {1; 2; 3; 4}, {1; 2; 3}, {0; 1; 2}
-> [eva] modulo.i:41: Frama_C_show_each_1: {1; 2; 3}, {1; 2}, {0; 1}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1: {-3; -2; -1}, {1; 2}, {-1; 0}
-> [eva] modulo.i:41: Frama_C_show_each_1: {1; 2; 3}, {-2; -1}, {0; 1}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1: {-3; -2; -1}, {-2; -1}, {-1; 0}
-> [eva] modulo.i:41: Frama_C_show_each_1: {-2; -1}, {-1}, {0}
-> [eva] modulo.i:41: Frama_C_show_each_1: {-2; -1}, {1}, {0}
-> [eva] modulo.i:41: Frama_C_show_each_1: {1; 2}, {-1}, {0}
-> [eva] modulo.i:41: Frama_C_show_each_1: {1; 2}, {1}, {0}
-50a134,216
-> [eva] modulo.i:53: Frama_C_show_each_2: [-10..-1], [1..9], [-8..0]
-> [eva] modulo.i:53: Frama_C_show_each_2: [-10..-1], [-9..-1], [-8..0]
-> [eva] modulo.i:53: Frama_C_show_each_2: [1..10], [1..9], [0..8]
-> [eva] modulo.i:53: Frama_C_show_each_2: [1..10], [-9..-1], [0..8]
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2:
->   [-9..-1], {1; 2; 3; 4; 5; 6; 7; 8}, {-7; -6; -5; -4; -3; -2; -1; 0}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2:
->   [1..9], {1; 2; 3; 4; 5; 6; 7; 8}, {0; 1; 2; 3; 4; 5; 6; 7}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2:
->   [-9..-1], {-8; -7; -6; -5; -4; -3; -2; -1}, {-7; -6; -5; -4; -3; -2; -1; 0}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2:
->   [1..9], {-8; -7; -6; -5; -4; -3; -2; -1}, {0; 1; 2; 3; 4; 5; 6; 7}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2:
->   {-8; -7; -6; -5; -4; -3; -2; -1},
->   {1; 2; 3; 4; 5; 6; 7},
->   {-6; -5; -4; -3; -2; -1; 0}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2:
->   {-8; -7; -6; -5; -4; -3; -2; -1},
->   {-7; -6; -5; -4; -3; -2; -1},
->   {-6; -5; -4; -3; -2; -1; 0}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2:
->   {1; 2; 3; 4; 5; 6; 7; 8}, {1; 2; 3; 4; 5; 6; 7}, {0; 1; 2; 3; 4; 5; 6}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2:
->   {1; 2; 3; 4; 5; 6; 7; 8}, {-7; -6; -5; -4; -3; -2; -1}, {0; 1; 2; 3; 4; 5; 6}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2:
->   {-7; -6; -5; -4; -3; -2; -1}, {1; 2; 3; 4; 5; 6}, {-5; -4; -3; -2; -1; 0}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2:
->   {1; 2; 3; 4; 5; 6; 7}, {1; 2; 3; 4; 5; 6}, {0; 1; 2; 3; 4; 5}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2:
->   {-7; -6; -5; -4; -3; -2; -1},
->   {-6; -5; -4; -3; -2; -1},
->   {-5; -4; -3; -2; -1; 0}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2:
->   {1; 2; 3; 4; 5; 6; 7}, {-6; -5; -4; -3; -2; -1}, {0; 1; 2; 3; 4; 5}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2:
->   {-6; -5; -4; -3; -2; -1}, {1; 2; 3; 4; 5}, {-4; -3; -2; -1; 0}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2:
->   {-6; -5; -4; -3; -2; -1}, {-5; -4; -3; -2; -1}, {-4; -3; -2; -1; 0}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2: {1; 2; 3; 4; 5; 6}, {1; 2; 3; 4; 5}, {0; 1; 2; 3; 4}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2:
->   {1; 2; 3; 4; 5; 6}, {-5; -4; -3; -2; -1}, {0; 1; 2; 3; 4}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2: {-5; -4; -3; -2; -1}, {1; 2; 3; 4}, {-3; -2; -1; 0}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2: {1; 2; 3; 4; 5}, {1; 2; 3; 4}, {0; 1; 2; 3}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2: {-5; -4; -3; -2; -1}, {-4; -3; -2; -1}, {-3; -2; -1; 0}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2: {1; 2; 3; 4; 5}, {-4; -3; -2; -1}, {0; 1; 2; 3}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2: {-4; -3; -2; -1}, {1; 2; 3}, {-2; -1; 0}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2: {-4; -3; -2; -1}, {-3; -2; -1}, {-2; -1; 0}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2: {1; 2; 3; 4}, {1; 2; 3}, {0; 1; 2}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2: {1; 2; 3; 4}, {-3; -2; -1}, {0; 1; 2}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2: {-3; -2; -1}, {1; 2}, {-1; 0}
-> [eva] modulo.i:53: Frama_C_show_each_2: {1; 2; 3}, {1; 2}, {0; 1}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2: {-3; -2; -1}, {-2; -1}, {-1; 0}
-> [eva] modulo.i:53: Frama_C_show_each_2: {1; 2; 3}, {-2; -1}, {0; 1}
-> [eva] modulo.i:53: Frama_C_show_each_2: {-2; -1}, {1}, {0}
-> [eva] modulo.i:53: Frama_C_show_each_2: {-2; -1}, {-1}, {0}
-> [eva] modulo.i:53: Frama_C_show_each_2: {1; 2}, {1}, {0}
-> [eva] modulo.i:53: Frama_C_show_each_2: {1; 2}, {-1}, {0}
-60a227,240
-> [eva] modulo.i:64: Frama_C_show_each_3: [-10..10], [-9..9], [-8..8]
-> [eva] modulo.i:64: Frama_C_show_each_3: [-9..9], [-8..8], [-7..7]
-> [eva] modulo.i:64: Frama_C_show_each_3: [-8..8], [-7..7], [-6..6]
-> [eva] modulo.i:64: Frama_C_show_each_3: [-7..7], [-6..6], [-5..5]
-> [eva] modulo.i:64: Frama_C_show_each_3: [-6..6], [-5..5], [-4..4]
-> [eva] modulo.i:64: 
->   Frama_C_show_each_3:
->   [-5..5], {-4; -3; -2; -1; 1; 2; 3; 4}, {-3; -2; -1; 0; 1; 2; 3}
-> [eva] modulo.i:64: 
->   Frama_C_show_each_3:
->   {-4; -3; -2; -1; 1; 2; 3; 4}, {-3; -2; -1; 1; 2; 3}, {-2; -1; 0; 1; 2}
-> [eva] modulo.i:64: 
->   Frama_C_show_each_3: {-3; -2; -1; 1; 2; 3}, {-2; -1; 1; 2}, {-1; 0; 1}
-> [eva] modulo.i:64: Frama_C_show_each_3: {-2; -1; 1; 2}, {-1; 1}, {0}
-81a262,263
-> [eva] modulo.i:95: starting to merge loop iterations
-> [eva] modulo.i:82: starting to merge loop iterations
-diff oracle/non_natural.res.oracle oracle_gauges/non_natural.res.oracle
-60,63c60
-<   Frama_C_show_each: {{ &p2 + [0..400000],0%32 }}
-< [eva:alarm] non_natural.i:23: Warning: 
-<   out of bounds write. assert \valid(tmp);
-<                        (tmp from to++)
----
->   Frama_C_show_each: {{ &p2 + [0..399968],0%32 }}
-66,68d62
-< [eva:alarm] non_natural.i:24: Warning: 
-<   out of bounds write. assert \valid(tmp_1);
-<                        (tmp_1 from to++)
-71,76d64
-< [eva:alarm] non_natural.i:25: Warning: 
-<   out of bounds write. assert \valid(tmp_3);
-<                        (tmp_3 from to++)
-< [eva:alarm] non_natural.i:25: Warning: 
-<   out of bounds read. assert \valid_read(tmp_4);
-<                       (tmp_4 from from++)
-79,84d66
-< [eva:alarm] non_natural.i:26: Warning: 
-<   out of bounds write. assert \valid(tmp_5);
-<                        (tmp_5 from to++)
-< [eva:alarm] non_natural.i:26: Warning: 
-<   out of bounds read. assert \valid_read(tmp_6);
-<                       (tmp_6 from from++)
-87,92d68
-< [eva:alarm] non_natural.i:27: Warning: 
-<   out of bounds write. assert \valid(tmp_7);
-<                        (tmp_7 from to++)
-< [eva:alarm] non_natural.i:27: Warning: 
-<   out of bounds read. assert \valid_read(tmp_8);
-<                       (tmp_8 from from++)
-95,100d70
-< [eva:alarm] non_natural.i:28: Warning: 
-<   out of bounds write. assert \valid(tmp_9);
-<                        (tmp_9 from to++)
-< [eva:alarm] non_natural.i:28: Warning: 
-<   out of bounds read. assert \valid_read(tmp_10);
-<                       (tmp_10 from from++)
-103,108d72
-< [eva:alarm] non_natural.i:29: Warning: 
-<   out of bounds write. assert \valid(tmp_11);
-<                        (tmp_11 from to++)
-< [eva:alarm] non_natural.i:29: Warning: 
-<   out of bounds read. assert \valid_read(tmp_12);
-<                       (tmp_12 from from++)
-111,125d74
-< [eva:alarm] non_natural.i:30: Warning: 
-<   out of bounds write. assert \valid(tmp_13);
-<                        (tmp_13 from to++)
-< [eva:alarm] non_natural.i:30: Warning: 
-<   out of bounds read. assert \valid_read(tmp_14);
-<                       (tmp_14 from from++)
-< [eva] non_natural.i:22: 
-<   Frama_C_show_each: {{ &p2 + [0..400032],0%32 }}
-< [eva:alarm] non_natural.i:23: Warning: 
-<   out of bounds read. assert \valid_read(tmp_0);
-<                       (tmp_0 from from++)
-< [eva:alarm] non_natural.i:24: Warning: 
-<   out of bounds read. assert \valid_read(tmp_2);
-<                       (tmp_2 from from++)
-< [eva] non_natural.i:22: Frama_C_show_each: {{ &p2 + [0..--],0%32 }}
-128,129d76
-<   more than 200(12501) elements to enumerate. Approximating.
-< [kernel] non_natural.i:23: 
-132,133d78
-<   more than 200(12501) elements to enumerate. Approximating.
-< [kernel] non_natural.i:24: 
-194,197c139
-<   Frama_C_show_each: {{ &p2 + [0..400000],0%32 }}
-< [eva:alarm] non_natural.i:39: Warning: 
-<   out of bounds write. assert \valid(tmp);
-<                        (tmp from to++)
----
->   Frama_C_show_each: {{ &p2 + [0..399968],0%32 }}
-200,202d141
-< [eva:alarm] non_natural.i:40: Warning: 
-<   out of bounds write. assert \valid(tmp_1);
-<                        (tmp_1 from to++)
-205,210d143
-< [eva:alarm] non_natural.i:41: Warning: 
-<   out of bounds write. assert \valid(tmp_3);
-<                        (tmp_3 from to++)
-< [eva:alarm] non_natural.i:41: Warning: 
-<   out of bounds read. assert \valid_read(tmp_4);
-<                       (tmp_4 from from++)
-213,218d145
-< [eva:alarm] non_natural.i:42: Warning: 
-<   out of bounds write. assert \valid(tmp_5);
-<                        (tmp_5 from to++)
-< [eva:alarm] non_natural.i:42: Warning: 
-<   out of bounds read. assert \valid_read(tmp_6);
-<                       (tmp_6 from from++)
-221,226d147
-< [eva:alarm] non_natural.i:43: Warning: 
-<   out of bounds write. assert \valid(tmp_7);
-<                        (tmp_7 from to++)
-< [eva:alarm] non_natural.i:43: Warning: 
-<   out of bounds read. assert \valid_read(tmp_8);
-<                       (tmp_8 from from++)
-229,234d149
-< [eva:alarm] non_natural.i:44: Warning: 
-<   out of bounds write. assert \valid(tmp_9);
-<                        (tmp_9 from to++)
-< [eva:alarm] non_natural.i:44: Warning: 
-<   out of bounds read. assert \valid_read(tmp_10);
-<                       (tmp_10 from from++)
-237,242d151
-< [eva:alarm] non_natural.i:45: Warning: 
-<   out of bounds write. assert \valid(tmp_11);
-<                        (tmp_11 from to++)
-< [eva:alarm] non_natural.i:45: Warning: 
-<   out of bounds read. assert \valid_read(tmp_12);
-<                       (tmp_12 from from++)
-245,259d153
-< [eva:alarm] non_natural.i:46: Warning: 
-<   out of bounds write. assert \valid(tmp_13);
-<                        (tmp_13 from to++)
-< [eva:alarm] non_natural.i:46: Warning: 
-<   out of bounds read. assert \valid_read(tmp_14);
-<                       (tmp_14 from from++)
-< [eva] non_natural.i:38: 
-<   Frama_C_show_each: {{ &p2 + [0..400032],0%32 }}
-< [eva:alarm] non_natural.i:39: Warning: 
-<   out of bounds read. assert \valid_read(tmp_0);
-<                       (tmp_0 from from++)
-< [eva:alarm] non_natural.i:40: Warning: 
-<   out of bounds read. assert \valid_read(tmp_2);
-<                       (tmp_2 from from++)
-< [eva] non_natural.i:38: Frama_C_show_each: {{ &p2 + [0..--],0%32 }}
-268,269c162,163
-<   to ∈ {{ &p2 + [32..--],0%32 }}
-<   from ∈ {{ &p1 + [32..--],0%32 }}
----
->   to ∈ {{ &p2 + [32..400000],0%32 }}
->   from ∈ {{ &p1 + [32..400000],0%32 }}
-273,274c167,168
-<   to ∈ {{ &p2 + [32..--],0%32 }}
-<   from ∈ {{ &p1 + [32..--],0%32 }}
----
->   to ∈ {{ &p2 + [32..400000],0%32 }}
->   from ∈ {{ &p1 + [32..400000],0%32 }}
-330,332c224,232
-<   p2[0] FROM to; from; count; p1[0..100000] (and SELF)
-<     [1..99992] FROM to; from; count; p1[0..100001] (and SELF)
-<     [99993] FROM to; from; count; p1[1..100001] (and SELF)
----
->   p2[0] FROM to; from; count; p1[0..99992] (and SELF)
->     [1] FROM to; from; count; p1[0..99993] (and SELF)
->     [2] FROM to; from; count; p1[0..99994] (and SELF)
->     [3] FROM to; from; count; p1[0..99995] (and SELF)
->     [4] FROM to; from; count; p1[0..99996] (and SELF)
->     [5] FROM to; from; count; p1[0..99997] (and SELF)
->     [6] FROM to; from; count; p1[0..99998] (and SELF)
->     [7..99992] FROM to; from; count; p1[0..99999] (and SELF)
->     [99993] FROM to; from; count; p1[1..99999] (and SELF)
-340,342c240,248
-<   p2[0] FROM to; from; count; p1[0..100000] (and SELF)
-<     [1..99992] FROM to; from; count; p1[0..100001] (and SELF)
-<     [99993] FROM to; from; count; p1[1..100001] (and SELF)
----
->   p2[0] FROM to; from; count; p1[0..99992] (and SELF)
->     [1] FROM to; from; count; p1[0..99993] (and SELF)
->     [2] FROM to; from; count; p1[0..99994] (and SELF)
->     [3] FROM to; from; count; p1[0..99995] (and SELF)
->     [4] FROM to; from; count; p1[0..99996] (and SELF)
->     [5] FROM to; from; count; p1[0..99997] (and SELF)
->     [6] FROM to; from; count; p1[0..99998] (and SELF)
->     [7..99992] FROM to; from; count; p1[0..99999] (and SELF)
->     [99993] FROM to; from; count; p1[1..99999] (and SELF)
-360c266
-<     p1[0..100001]
----
->     p1[0..99999]
-365c271
-<     p1[0..100001]
----
->     p1[0..99999]
-diff oracle/noreturn.res.oracle oracle_gauges/noreturn.res.oracle
-8a9
-> [eva] noreturn.i:20: starting to merge loop iterations
-16a18
-> [eva] noreturn.i:16: starting to merge loop iterations
-32a35
-> [eva] noreturn.i:7: starting to merge loop iterations
-36a40
-> [eva] noreturn.i:13: starting to merge loop iterations
-diff oracle/octagons.res.oracle oracle_gauges/octagons.res.oracle
-121,128d120
-< [eva:alarm] octagons.c:107: Warning: 
-<   signed overflow. assert a + 2 ≤ 2147483647;
-< [eva:alarm] octagons.c:108: Warning: 
-<   signed overflow. assert b + 2 ≤ 2147483647;
-< [eva:alarm] octagons.c:110: Warning: 
-<   signed overflow. assert a + k ≤ 2147483647;
-< [eva:alarm] octagons.c:113: Warning: 
-<   signed overflow. assert -2147483648 ≤ c - a;
-130c122
-< [eva] octagons.c:116: Frama_C_show_each_imprecise: [-2147483648..1]
----
-> [eva] octagons.c:116: Frama_C_show_each_imprecise: [-2468..1]
-270,273c262,265
-<   a ∈ [-1024..2147483647]
-<   b ∈ [-1023..2147483647]
-<   c ∈ [-1023..2147483647]
-<   d ∈ [-1032..2147483647]
----
->   a ∈ [-182..1866]
->   b ∈ [-181..1867]
->   c ∈ [-602..1446]
->   d ∈ [-190..1874]
-275c267
-<   d2 ∈ [-2147483648..1]
----
->   d2 ∈ [-2468..1]
-diff oracle/reduce_formals.res.oracle oracle_gauges/reduce_formals.res.oracle
-10a11
-> [eva] reduce_formals.i:5: starting to merge loop iterations
-diff oracle/redundant_alarms.res.oracle oracle_gauges/redundant_alarms.res.oracle
-47a48
-> [eva] redundant_alarms.c:39: starting to merge loop iterations
-diff oracle/reevaluate_alarms.res.oracle oracle_gauges/reevaluate_alarms.res.oracle
-14,16d13
-< [eva:alarm] reevaluate_alarms.i:14: Warning: 
-<   out of bounds write. assert \valid(tmp);
-<                        (tmp from p++)
-59c56
-<   p ∈ {{ &T + [0..--],0%4 }}
----
->   p ∈ {{ &T{[0], [1], [2], [3], [4], [5]} }}
-124,125d120
-< [    -    ] Assertion 'Eva,mem_access' (file reevaluate_alarms.i, line 14)
-<             tried with Eva.
-144,145c139,140
-<      4 To be validated
-<      4 Total
----
->      3 To be validated
->      3 Total
-182,183d176
-< [eva] reevaluate_alarms.i:14: 
-<   assertion 'Eva,mem_access' got final status valid.
-274,275d266
-< [  Valid  ] Assertion 'Eva,mem_access' (file reevaluate_alarms.i, line 14)
-<             by Eva (v2).
-294,295c285,286
-<      4 Completely validated
-<      4 Total
----
->      3 Completely validated
->      3 Total
-diff oracle/semaphore.res.oracle oracle_gauges/semaphore.res.oracle
-24a25,33
-> [eva] computing for function V <- g.
->   Called from semaphore.i:31.
-> [eva] Done for function V
-> [eva] computing for function V <- g.
->   Called from semaphore.i:31.
-> [eva] Done for function V
-> [eva] computing for function V <- g.
->   Called from semaphore.i:31.
-> [eva] Done for function V
-diff oracle/symbolic_locs.res.oracle oracle_gauges/symbolic_locs.res.oracle
-135a136
-> [eva] symbolic_locs.i:93: starting to merge loop iterations
-diff oracle/undefined_sequence.0.res.oracle oracle_gauges/undefined_sequence.0.res.oracle
-97a98
-> [eva] undefined_sequence.i:43: starting to merge loop iterations
-101a103
-<<<<<<< HEAD
-> [eva] undefined_sequence.i:49: starting to merge loop iterations
-diff oracle/unroll.res.oracle oracle_gauges/unroll.res.oracle
-||||||| ac7807782d
-> [eva] tests/value/undefined_sequence.i:49: starting to merge loop iterations
-diff tests/value/oracle/unroll.res.oracle tests/value/oracle_gauges/unroll.res.oracle
-=======
-> [eva] tests/value/undefined_sequence.i:49: starting to merge loop iterations
-Only in tests/value/oracle: unit_tests.res.oracle
-diff tests/value/oracle/unroll.res.oracle tests/value/oracle_gauges/unroll.res.oracle
->>>>>>> origin/master
-13,14d12
-< [eva:alarm] unroll.i:34: Warning: 
-<   signed overflow. assert -2147483648 ≤ j - 1;
-16a15
-> [eva] unroll.i:39: starting to merge loop iterations
-26c25
-<   j ∈ [-2147483648..-123]
----
->   j ∈ {-238}
-diff oracle/unroll_simple.res.oracle oracle_gauges/unroll_simple.res.oracle
-8,9d7
-< [eva:alarm] unroll_simple.i:11: Warning: 
-<   signed overflow. assert -2147483648 ≤ j - 1;
-11a10
-> [eva] unroll_simple.i:16: starting to merge loop iterations
-21c20
-<   j ∈ [-2147483648..-126]
----
->   j ∈ {-250}
-diff oracle/va_list2.0.res.oracle oracle_gauges/va_list2.0.res.oracle
-50a51,62
-> [eva] va_list2.c:16: 
->   Frama_C_show_each_i:
->   {{ garbled mix of &{S_0_S___va_params; S_1_S___va_params} (origin: Well) }}
-> [eva] va_list2.c:21: 
->   Frama_C_show_each_f:
->   {{ garbled mix of &{S_0_S___va_params; S_1_S___va_params} (origin: Well) }}
-> [eva] va_list2.c:16: 
->   Frama_C_show_each_i:
->   {{ garbled mix of &{S_0_S___va_params; S_1_S___va_params} (origin: Well) }}
-> [eva] va_list2.c:21: 
->   Frama_C_show_each_f:
->   {{ garbled mix of &{S_0_S___va_params; S_1_S___va_params} (origin: Well) }}
-diff oracle/va_list2.1.res.oracle oracle_gauges/va_list2.1.res.oracle
-40a41,52
-> [eva] computing for function __builtin_va_arg <- main.
->   Called from va_list2.c:15.
-> [eva] Done for function __builtin_va_arg
-> [eva] computing for function __builtin_va_arg <- main.
->   Called from va_list2.c:20.
-> [eva] Done for function __builtin_va_arg
-> [eva] computing for function __builtin_va_arg <- main.
->   Called from va_list2.c:15.
-> [eva] Done for function __builtin_va_arg
-> [eva] computing for function __builtin_va_arg <- main.
->   Called from va_list2.c:20.
-> [eva] Done for function __builtin_va_arg
-diff oracle/widen_on_non_monotonic.res.oracle oracle_gauges/widen_on_non_monotonic.res.oracle
-25a26,27
-> [eva] widen_on_non_monotonic.i:21: starting to merge loop iterations
-> [eva] widen_on_non_monotonic.i:18: starting to merge loop iterations
-diff oracle/widen_overflow.res.oracle oracle_gauges/widen_overflow.res.oracle
-31a32,34
-> [eva] computing for function u <- main.
->   Called from widen_overflow.i:9.
-> [eva] Done for function u
diff --git a/tests/value/diff_octagons b/tests/value/diff_octagons
deleted file mode 100644
index a45ce7e5d6dd5eeb2ef8a6388b1250053ba4fabf..0000000000000000000000000000000000000000
--- a/tests/value/diff_octagons
+++ /dev/null
@@ -1,467 +0,0 @@
-diff oracle/alias.1.res.oracle oracle_octagons/alias.1.res.oracle
-85c85
-<   z ∈ {0; 1; 2}
----
->   z ∈ {0; 2}
-diff oracle/alias.2.res.oracle oracle_octagons/alias.2.res.oracle
-76c76
-<   z ∈ {-5; -4; -3; -2; -1; 0; 1; 1000}
----
->   z ∈ {-2; -1; 0; 1000}
-diff oracle/alias.3.res.oracle oracle_octagons/alias.3.res.oracle
-67c67
-<   z ∈ {0; 1; 2}
----
->   z ∈ {0; 2}
-diff oracle/alias.5.res.oracle oracle_octagons/alias.5.res.oracle
-59a60
-> [eva] alias.i:260: starting to merge loop iterations
-diff oracle/alias.6.res.oracle oracle_octagons/alias.6.res.oracle
-82c82
-<   t ∈ {4; 5; 6}
----
->   t ∈ {5}
-87c87
-<   y ∈ {0; 1}
----
->   y ∈ {1}
-94,96c94,96
-<   tz1 ∈ {0; 1}
-<   tz2 ∈ {0; 1}
-<   tz3 ∈ {0; 1}
----
->   tz1 ∈ {1}
->   tz2 ∈ {1}
->   tz3 ∈ {1}
-<<<<<<< HEAD
-diff oracle/bitfield.res.oracle oracle_octagons/bitfield.res.oracle
-||||||| ac7807782d
-diff tests/value/oracle/bitfield.res.oracle tests/value/oracle_octagons/bitfield.res.oracle
-=======
-diff tests/value/oracle/auto_loop_unroll.0.res.oracle tests/value/oracle_octagons/auto_loop_unroll.0.res.oracle
-211,212d210
-< [eva:alarm] tests/value/auto_loop_unroll.c:203: Warning: 
-<   signed overflow. assert -2147483648 ≤ i_0 - 1;
-218,219d215
-< [eva:alarm] tests/value/auto_loop_unroll.c:208: Warning: 
-<   signed overflow. assert -2147483648 ≤ i_1 - 1;
-245,246d240
-< [eva:alarm] tests/value/auto_loop_unroll.c:240: Warning: 
-<   signed overflow. assert -2147483648 ≤ i - 1;
-306c300
-<   i ∈ [-2147483648..20]
----
->   i ∈ {-1}
-diff tests/value/oracle/bitfield.res.oracle tests/value/oracle_octagons/bitfield.res.oracle
->>>>>>> origin/master
-138a139,141
-> [eva] bitfield.i:71: 
->   Frama_C_show_each:
->   {{ garbled mix of &{b} (origin: Misaligned {bitfield.i:70}) }}
-diff oracle/builtins_split.res.oracle oracle_octagons/builtins_split.res.oracle
-70a71,84
-> [eva] builtins_split.c:104: 
->   Call to builtin Frama_C_builtin_split_all
-> [eva] builtins_split.c:104: 
->   Call to builtin Frama_C_builtin_split_all
-> [eva] builtins_split.c:104: 
->   Call to builtin Frama_C_builtin_split_all
-> [eva] builtins_split.c:104: 
->   Call to builtin Frama_C_builtin_split_all
-> [eva] builtins_split.c:104: 
->   Call to builtin Frama_C_builtin_split_all
-> [eva] builtins_split.c:104: 
->   Call to builtin Frama_C_builtin_split_all
-> [eva] builtins_split.c:104: 
->   Call to builtin Frama_C_builtin_split_all
-81a96,109
-> [eva] builtins_split.c:112: 
->   Call to builtin Frama_C_builtin_split_all
-> [eva] builtins_split.c:112: 
->   Call to builtin Frama_C_builtin_split_all
-> [eva] builtins_split.c:112: 
->   Call to builtin Frama_C_builtin_split_all
-> [eva] builtins_split.c:112: 
->   Call to builtin Frama_C_builtin_split_all
-> [eva] builtins_split.c:112: 
->   Call to builtin Frama_C_builtin_split_all
-> [eva] builtins_split.c:112: 
->   Call to builtin Frama_C_builtin_split_all
-> [eva] builtins_split.c:112: 
->   Call to builtin Frama_C_builtin_split_all
-diff oracle/call_simple.res.oracle oracle_octagons/call_simple.res.oracle
-28c28
-<   c ∈ [--..--]
----
->   c ∈ [-2147483648..2147483646]
-diff oracle/descending.res.oracle oracle_octagons/descending.res.oracle
-42c42
-<   i ∈ {31; 32}
----
->   i ∈ {31}
-diff oracle/downcast.1.res.oracle oracle_octagons/downcast.1.res.oracle
-61c61
-<   [100000..2147483647], [100145..2147483647], [100145..2147483647]
----
->   [100000..2147483502], [100145..2147483647], [100145..2147483647]
-166c166
-<   x_0 ∈ [100000..2147483647]
----
->   x_0 ∈ [100000..2147483502]
-diff oracle/equality.res.oracle oracle_octagons/equality.res.oracle
-29,30c29,30
-<   y ∈ [0..42] or UNINITIALIZED
-<   w ∈ [0..42] or UNINITIALIZED
----
->   y ∈ [0..42]
->   w ∈ [0..42]
-diff oracle/find_ivaltop.res.oracle oracle_octagons/find_ivaltop.res.oracle
-32,33c32,33
-<   j ∈ {0; 1; 2; 3; 4; 5; 6; 7}
-<   X ∈ {1; 2; 3; 4; 5; 6; 7; 8}
----
->   j ∈ {7}
->   X ∈ {8}
-39c39
-<   \result FROM t[0..7]
----
->   \result FROM t[7]
-44c44
-<     t[0..7]
----
->     t[7]
-diff oracle/for_loops.3.res.oracle oracle_octagons/for_loops.3.res.oracle
-20c20
-<   v ∈ [0..2147483647]
----
->   v ∈ [5..2147483647]
-diff oracle/gauges.res.oracle oracle_octagons/gauges.res.oracle
-209,210d208
-< [eva:alarm] gauges.c:156: Warning: 
-<   signed overflow. assert -2147483648 ≤ toCopy - 1;
-276,277d273
-< [eva:alarm] gauges.c:201: Warning: 
-<   signed overflow. assert -2147483648 ≤ numNonZero - 1;
-300,304d295
-< [eva] gauges.c:218: Frama_C_show_each:
-< [eva] gauges.c:218: Frama_C_show_each:
-< [eva] gauges.c:218: Frama_C_show_each:
-< [eva:alarm] gauges.c:220: Warning: 
-<   signed overflow. assert -2147483648 ≤ n - 1;
-791c782
-<   numNonZero ∈ [-2147483648..8]
----
->   numNonZero ∈ {-1}
-802c793
-<   n ∈ [-2147483648..99]
----
->   n ∈ {-1}
-863c854
-<   toCopy ∈ [-2147483648..99]
----
->   toCopy ∈ {-1}
-diff oracle/loop.res.oracle oracle_octagons/loop.res.oracle
-26c26
-<   r ∈ [0..2147483646],0%2
----
->   r ∈ [46..2147483646],0%2
-diff oracle/loop_wvar.1.res.oracle oracle_octagons/loop_wvar.1.res.oracle
-12,13d11
-< [eva:alarm] loop_wvar.i:57: Warning: 
-<   signed overflow. assert next + 1 ≤ 2147483647;
-41c39
-<   next ∈ [0..2147483647]
----
->   next ∈ [0..25]
-diff oracle/modulo.res.oracle oracle_octagons/modulo.res.oracle
-40a41,56
-> [eva] modulo.i:41: Frama_C_show_each_1: [-10..-1], [-9..-1], [-8..0]
-> [eva] modulo.i:41: Frama_C_show_each_1: [-10..-1], [1..9], [-8..0]
-> [eva] modulo.i:41: Frama_C_show_each_1: [1..10], [-9..-1], [0..8]
-> [eva] modulo.i:41: Frama_C_show_each_1: [1..10], [1..9], [0..8]
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1:
->   [1..9], {1; 2; 3; 4; 5; 6; 7; 8}, {0; 1; 2; 3; 4; 5; 6; 7}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1:
->   [-9..-1], {1; 2; 3; 4; 5; 6; 7; 8}, {-7; -6; -5; -4; -3; -2; -1; 0}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1:
->   [1..9], {-8; -7; -6; -5; -4; -3; -2; -1}, {0; 1; 2; 3; 4; 5; 6; 7}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1:
->   [-9..-1], {-8; -7; -6; -5; -4; -3; -2; -1}, {-7; -6; -5; -4; -3; -2; -1; 0}
-50a67,82
-> [eva] modulo.i:53: Frama_C_show_each_2: [-10..-1], [1..9], [-8..0]
-> [eva] modulo.i:53: Frama_C_show_each_2: [-10..-1], [-9..-1], [-8..0]
-> [eva] modulo.i:53: Frama_C_show_each_2: [1..10], [1..9], [0..8]
-> [eva] modulo.i:53: Frama_C_show_each_2: [1..10], [-9..-1], [0..8]
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2:
->   [-9..-1], {1; 2; 3; 4; 5; 6; 7; 8}, {-7; -6; -5; -4; -3; -2; -1; 0}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2:
->   [1..9], {1; 2; 3; 4; 5; 6; 7; 8}, {0; 1; 2; 3; 4; 5; 6; 7}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2:
->   [-9..-1], {-8; -7; -6; -5; -4; -3; -2; -1}, {-7; -6; -5; -4; -3; -2; -1; 0}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2:
->   [1..9], {-8; -7; -6; -5; -4; -3; -2; -1}, {0; 1; 2; 3; 4; 5; 6; 7}
-60a93,94
-> [eva] modulo.i:64: Frama_C_show_each_3: [-10..10], [-9..9], [-8..8]
-> [eva] modulo.i:64: Frama_C_show_each_3: [-9..9], [-8..8], [-7..7]
-diff oracle/non_natural.res.oracle oracle_octagons/non_natural.res.oracle
-58a59,60
-> [kernel] non_natural.i:30: 
->   more than 200(12500) elements to enumerate. Approximating.
-65a68,69
-> [kernel] non_natural.i:23: 
->   more than 200(12500) elements to enumerate. Approximating.
-70a75,76
-> [kernel] non_natural.i:24: 
->   more than 200(12500) elements to enumerate. Approximating.
-78a85,86
-> [kernel] non_natural.i:25: 
->   more than 200(12500) elements to enumerate. Approximating.
-86a95,96
-> [kernel] non_natural.i:26: 
->   more than 200(12500) elements to enumerate. Approximating.
-94a105,106
-> [kernel] non_natural.i:27: 
->   more than 200(12500) elements to enumerate. Approximating.
-102a115,116
-> [kernel] non_natural.i:28: 
->   more than 200(12500) elements to enumerate. Approximating.
-110a125,126
-> [kernel] non_natural.i:29: 
->   more than 200(12500) elements to enumerate. Approximating.
-129,130d144
-< [kernel] non_natural.i:23: 
-<   more than 200(12500) elements to enumerate. Approximating.
-133,146d146
-< [kernel] non_natural.i:24: 
-<   more than 200(12500) elements to enumerate. Approximating.
-< [kernel] non_natural.i:25: 
-<   more than 200(12500) elements to enumerate. Approximating.
-< [kernel] non_natural.i:26: 
-<   more than 200(12500) elements to enumerate. Approximating.
-< [kernel] non_natural.i:27: 
-<   more than 200(12500) elements to enumerate. Approximating.
-< [kernel] non_natural.i:28: 
-<   more than 200(12500) elements to enumerate. Approximating.
-< [kernel] non_natural.i:29: 
-<   more than 200(12500) elements to enumerate. Approximating.
-< [kernel] non_natural.i:30: 
-<   more than 200(12500) elements to enumerate. Approximating.
-199a200,201
-> [kernel] non_natural.i:39: 
->   more than 200(12500) elements to enumerate. Approximating.
-<<<<<<< HEAD
-diff oracle/nonlin.res.oracle oracle_octagons/nonlin.res.oracle
-107a108,109
-> [eva:nonlin] nonlin.c:65: non-linear 'x * x', lv 'x'
-> [eva:nonlin] nonlin.c:65: subdividing on x
-110a113,115
-> [eva:nonlin] nonlin.c:66: subdividing on x
-> [eva:nonlin] nonlin.c:66: non-linear 'y * y', lv 'y'
-> [eva:nonlin] nonlin.c:66: subdividing on y
-113a119,120
-> [eva:nonlin] nonlin.c:68: non-linear 'z * x + x * y', lv 'x'
-> [eva:nonlin] nonlin.c:68: subdividing on x
-151a159,160
-> [eva:nonlin] nonlin.c:112: non-linear 'x * x', lv 'x'
-> [eva:nonlin] nonlin.c:112: subdividing on x
-154a164
-> [eva:nonlin] nonlin.c:113: subdividing on x
-155a166
-> [eva:nonlin] nonlin.c:115: subdividing on x
-diff oracle/plevel.res.oracle oracle_octagons/plevel.res.oracle
-||||||| ac7807782d
-diff tests/value/oracle/nonlin.res.oracle tests/value/oracle_octagons/nonlin.res.oracle
-107a108,109
-> [eva:nonlin] tests/value/nonlin.c:65: non-linear 'x * x', lv 'x'
-> [eva:nonlin] tests/value/nonlin.c:65: subdividing on x
-110a113,115
-> [eva:nonlin] tests/value/nonlin.c:66: subdividing on x
-> [eva:nonlin] tests/value/nonlin.c:66: non-linear 'y * y', lv 'y'
-> [eva:nonlin] tests/value/nonlin.c:66: subdividing on y
-113a119,120
-> [eva:nonlin] tests/value/nonlin.c:68: non-linear 'z * x + x * y', lv 'x'
-> [eva:nonlin] tests/value/nonlin.c:68: subdividing on x
-151a159,160
-> [eva:nonlin] tests/value/nonlin.c:112: non-linear 'x * x', lv 'x'
-> [eva:nonlin] tests/value/nonlin.c:112: subdividing on x
-154a164
-> [eva:nonlin] tests/value/nonlin.c:113: subdividing on x
-155a166
-> [eva:nonlin] tests/value/nonlin.c:115: subdividing on x
-diff tests/value/oracle/plevel.res.oracle tests/value/oracle_octagons/plevel.res.oracle
-=======
-diff tests/value/oracle/nonlin.res.oracle tests/value/oracle_octagons/nonlin.res.oracle
-113a114,115
-> [eva:nonlin] tests/value/nonlin.c:71: non-linear 'x * x', lv 'x'
-> [eva:nonlin] tests/value/nonlin.c:71: subdividing on x
-116a119,121
-> [eva:nonlin] tests/value/nonlin.c:72: subdividing on x
-> [eva:nonlin] tests/value/nonlin.c:72: non-linear 'y * y', lv 'y'
-> [eva:nonlin] tests/value/nonlin.c:72: subdividing on y
-119a125,126
-> [eva:nonlin] tests/value/nonlin.c:74: non-linear 'z * x + x * y', lv 'x'
-> [eva:nonlin] tests/value/nonlin.c:74: subdividing on x
-157a165,166
-> [eva:nonlin] tests/value/nonlin.c:118: non-linear 'x * x', lv 'x'
-> [eva:nonlin] tests/value/nonlin.c:118: subdividing on x
-160a170
-> [eva:nonlin] tests/value/nonlin.c:119: subdividing on x
-161a172
-> [eva:nonlin] tests/value/nonlin.c:121: subdividing on x
-diff tests/value/oracle/plevel.res.oracle tests/value/oracle_octagons/plevel.res.oracle
->>>>>>> origin/master
-12d11
-< [eva] Recording results for main
-14a14
-> [eva] Recording results for main
-diff oracle/ptr_relation.1.res.oracle oracle_octagons/ptr_relation.1.res.oracle
-24c24
-<   j ∈ {-1; 0; 1}
----
->   j ∈ {0}
-diff oracle/relation_reduction.res.oracle oracle_octagons/relation_reduction.res.oracle
-24,27d23
-< [eva:alarm] relation_reduction.i:20: Warning: 
-<   accessing out of bounds index. assert 0 ≤ y;
-< [eva:alarm] relation_reduction.i:20: Warning: 
-<   accessing out of bounds index. assert y < 9;
-34,37c30,33
-<   R1 ∈ [-2147483648..2147483637]
-<   R2 ∈ [-2147483638..2147483647]
-<   R3 ∈ [--..--]
-<   R4 ∈ {0; 1; 2; 3; 4; 5}
----
->   R1 ∈ {0; 2}
->   R2 ∈ {0; 12}
->   R3 ∈ {0; 7}
->   R4 ∈ {0; 2}
-48c44
-<   R4 FROM tab[0..8]; x (and SELF)
----
->   R4 FROM tab[0..5]; x (and SELF)
-53c49
-<     y; t; tab[0..8]
----
->     y; t; tab[0..5]
-diff oracle/relation_shift.res.oracle oracle_octagons/relation_shift.res.oracle
-18,25d17
-< [eva:alarm] relation_shift.i:15: Warning: 
-<   signed overflow. assert -2147483648 ≤ x - y;
-< [eva:alarm] relation_shift.i:15: Warning: 
-<   signed overflow. assert x - y ≤ 2147483647;
-< [eva:alarm] relation_shift.i:16: Warning: 
-<   signed overflow. assert -2147483648 ≤ z - y;
-< [eva:alarm] relation_shift.i:16: Warning: 
-<   signed overflow. assert z - y ≤ 2147483647;
-31,32c23,24
-<   r1 ∈ [--..--]
-<   r2 ∈ [--..--]
----
->   r1 ∈ {2}
->   r2 ∈ {7}
-35,37c27,29
-<   x ∈ [-2147483647..2147483647]
-<   y ∈ [-2147483648..2147483646]
-<   z ∈ [-2147483642..2147483647]
----
->   x ∈ [-2147483646..2147483642]
->   y ∈ [-2147483648..2147483640]
->   z ∈ [-2147483641..2147483647]
-49,50c41,42
-<   r1 ∈ [--..--]
-<   r2 ∈ [--..--]
----
->   r1 ∈ {2}
->   r2 ∈ {7}
-53,55c45,47
-<   x ∈ [-2147483647..2147483647]
-<   y ∈ [-2147483648..2147483646]
-<   z ∈ [-2147483642..2147483647]
----
->   x ∈ [-2147483646..2147483642]
->   y ∈ [-2147483648..2147483640]
->   z ∈ [-2147483641..2147483647]
-diff oracle/relations.res.oracle oracle_octagons/relations.res.oracle
-80,81c80,82
-<   e ∈ [--..--]
-<   f ∈ [--..--]
----
->   e ∈ {1}
->   f[bits 0 to 7] ∈ {1; 4}
->    [bits 8 to 31] ∈ [--..--]
-diff oracle/relations2.res.oracle oracle_octagons/relations2.res.oracle
-25c25
-<   len ∈ [--..--]
----
->   len ∈ [0..1023]
-36,37c36
-< [eva] relations2.i:17: 
-<   Frama_C_show_each_end: [0..4294967295], [0..64]
----
-> [eva] relations2.i:17: Frama_C_show_each_end: [0..1023], [0..64]
-59c58
-<   n ∈ [0..512]
----
->   n ∈ [1..512]
-69,71d67
-< [eva:alarm] relations2.i:34: Warning: 
-<   accessing out of bounds index.
-<   assert (unsigned int)(i - (unsigned int)(t + 1)) < 514;
-80c76
-<   n ∈ [0..512]
----
->   n ∈ [1..512]
-97c93
-<   n ∈ [0..512]
----
->   n ∈ [1..512]
-140c136
-<   len ∈ [--..--]
----
->   len ∈ [0..1023]
-diff oracle/semaphore.res.oracle oracle_octagons/semaphore.res.oracle
-65c65
-<   c ∈ {-26; -1}
----
->   c ∈ {-1}
-diff oracle/struct2.res.oracle oracle_octagons/struct2.res.oracle
-81,84d80
-<   accessing out of bounds index. assert 0 ≤ (int)(i + j);
-< [eva:alarm] struct2.i:185: Warning: 
-<   accessing out of bounds index. assert (int)(i + j) < 2;
-< [eva:alarm] struct2.i:185: Warning: 
-106d101
-< [scope:rm_asserts] removing 2 assertion(s)
-diff oracle/test.0.res.oracle oracle_octagons/test.0.res.oracle
-17,18d16
-< [eva:alarm] test.i:11: Warning: 
-<   signed overflow. assert j + ecart ≤ 2147483647;
-29c27
-<   j ∈ [-1073741822..1]
----
->   j ∈ {-1; 0; 1}
-<<<<<<< HEAD
-diff oracle/unroll.res.oracle oracle_octagons/unroll.res.oracle
-||||||| ac7807782d
-diff tests/value/oracle/unroll.res.oracle tests/value/oracle_octagons/unroll.res.oracle
-=======
-Only in tests/value/oracle: unit_tests.res.oracle
-diff tests/value/oracle/unroll.res.oracle tests/value/oracle_octagons/unroll.res.oracle
->>>>>>> origin/master
-22c22
-<   G ∈ [17739..2147483647]
----
->   G ∈ [17854..2147483647]
-diff oracle/unroll_simple.res.oracle oracle_octagons/unroll_simple.res.oracle
-17c17
-<   G ∈ [8772..2147483647]
----
->   G ∈ [8896..2147483647]
diff --git a/tests/value/diff_symblocs b/tests/value/diff_symblocs
deleted file mode 100644
index 0409787495622e07771cc58c4afb260694420a4b..0000000000000000000000000000000000000000
--- a/tests/value/diff_symblocs
+++ /dev/null
@@ -1,329 +0,0 @@
-diff oracle/alias.0.res.oracle oracle_symblocs/alias.0.res.oracle
-103,104c103,104
-<   t ∈ {1; 2; 4}
-<   u ∈ {2; 3; 4; 5}
----
->   t ∈ {4}
->   u ∈ {5}
-110c110
-<   t2 ∈ {0; 3; 6}
----
->   t2 ∈ {6}
-diff oracle/alias.4.res.oracle oracle_symblocs/alias.4.res.oracle
-81c81
-<   y ∈ {0; 3; 77}
----
->   y ∈ {77}
-diff oracle/alias.5.res.oracle oracle_symblocs/alias.5.res.oracle
-170c170
-<   y ∈ {0; 3; 77}
----
->   y ∈ {77}
-diff oracle/alias.6.res.oracle oracle_symblocs/alias.6.res.oracle
-86c86
-<   x ∈ {0; 4; 33}
----
->   x ∈ {33}
-diff oracle/bitwise_pointer.res.oracle oracle_symblocs/bitwise_pointer.res.oracle
-62c62
-<   x ∈ [0..9]
----
->   x ∈ {5}
-75c75
-<   x1 ∈ [0..9]
----
->   x1 ∈ {5}
-diff oracle/bitwise_reduction.res.oracle oracle_symblocs/bitwise_reduction.res.oracle
-20c20
-<   {0; 1}, {0; 1; 0x3000; 0x3001; 0x3200; 0x3201; 0xF000; 0xFF00}
----
->   {0; 1}, {0x3000; 0x3001; 0x3200; 0x3201; 0xF000; 0xFF00}
-23c23
-<   {0; 1}, {0; 1; 0x3000; 0x3001; 0x3200; 0x3201; 0xF000; 0xFF00}
----
->   {0; 1}, {0x3000; 0x3001; 0x3200; 0x3201; 0xF000; 0xFF00}
-30c30
-<   {{ &t + {0; 4} }}, {0; 1; 0x3000; 0x3001; 0x3200; 0x3201; 0xF000; 0xFF00}
----
->   {{ &t + {0; 4} }}, {0x3000; 0x3001; 0x3200; 0x3201; 0xF000; 0xFF00}
-33c33
-<   {0; 1}, {0; 1; 0x3000; 0x3001; 0x3200; 0x3201; 0xF000; 0xFF00}
----
->   {0; 1}, {0x3000; 0x3001; 0x3200; 0x3201; 0xF000; 0xFF00}
-diff oracle/domains_function.res.oracle oracle_symblocs/domains_function.res.oracle
-19,20c19
-< [eva] domains_function.c:92: 
-<   Frama_C_show_each_top: [-2147483648..2147483647]
----
-> [eva] domains_function.c:92: Frama_C_show_each_top: {3}
-28,29c27
-< [eva] domains_function.c:77: 
-<   Frama_C_show_each_top: [-2147483648..2147483647]
----
-> [eva] domains_function.c:77: Frama_C_show_each_top: {1}
-32,33c30
-< [eva] domains_function.c:96: 
-<   Frama_C_show_each_top: [-2147483648..2147483647]
----
-> [eva] domains_function.c:96: Frama_C_show_each_top: {1}
-52,56c49,50
-< [eva] computing for function not_enabled <- recursively_enabled <- main.
-<   Called from domains_function.c:110.
-< [eva] domains_function.c:77: Frama_C_show_each_top: {1}
-< [eva] Recording results for not_enabled
-< [eva] Done for function not_enabled
----
-> [eva] domains_function.c:110: 
->   Reusing old results for call to not_enabled
-58,63c52,53
-< [eva] computing for function disabled <- recursively_enabled <- main.
-<   Called from domains_function.c:112.
-< [eva] domains_function.c:84: 
-<   Frama_C_show_each_top: [-2147483648..2147483647]
-< [eva] Recording results for disabled
-< [eva] Done for function disabled
----
-> [eva] domains_function.c:112: 
->   Reusing old results for call to disabled
-130c120
-<   result ∈ [--..--]
----
->   result ∈ {1}
-diff oracle/incompatible_states.res.oracle oracle_symblocs/incompatible_states.res.oracle
-41,42d40
-< [eva:alarm] incompatible_states.c:53: Warning: 
-<   division by zero. assert t[i] ≢ 0;
-49c47
-< [scope:rm_asserts] removing 2 assertion(s)
----
-> [scope:rm_asserts] removing 1 assertion(s)
-diff oracle/library.res.oracle oracle_symblocs/library.res.oracle
-129,132d128
-< [eva:alarm] library.i:44: Warning: 
-<   non-finite float value. assert \is_finite(*pf);
-< [eva:alarm] library.i:44: Warning: 
-<   non-finite float value. assert \is_finite(\add_float(*pf, *pf));
-diff oracle/non_natural.res.oracle oracle_symblocs/non_natural.res.oracle
-58a59,60
-> [kernel] non_natural.i:30: 
->   more than 200(12500) elements to enumerate. Approximating.
-65a68,71
-> [kernel] non_natural.i:23: 
->   more than 200(12501) elements to enumerate. Approximating.
-> [kernel] non_natural.i:23: 
->   more than 200(12500) elements to enumerate. Approximating.
-70a77,80
-> [kernel] non_natural.i:24: 
->   more than 200(12501) elements to enumerate. Approximating.
-> [kernel] non_natural.i:24: 
->   more than 200(12500) elements to enumerate. Approximating.
-78a89,90
-> [kernel] non_natural.i:25: 
->   more than 200(12500) elements to enumerate. Approximating.
-86a99,100
-> [kernel] non_natural.i:26: 
->   more than 200(12500) elements to enumerate. Approximating.
-94a109,110
-> [kernel] non_natural.i:27: 
->   more than 200(12500) elements to enumerate. Approximating.
-102a119,120
-> [kernel] non_natural.i:28: 
->   more than 200(12500) elements to enumerate. Approximating.
-110a129,130
-> [kernel] non_natural.i:29: 
->   more than 200(12500) elements to enumerate. Approximating.
-127,146d146
-< [kernel] non_natural.i:23: 
-<   more than 200(12501) elements to enumerate. Approximating.
-< [kernel] non_natural.i:23: 
-<   more than 200(12500) elements to enumerate. Approximating.
-< [kernel] non_natural.i:24: 
-<   more than 200(12501) elements to enumerate. Approximating.
-< [kernel] non_natural.i:24: 
-<   more than 200(12500) elements to enumerate. Approximating.
-< [kernel] non_natural.i:25: 
-<   more than 200(12500) elements to enumerate. Approximating.
-< [kernel] non_natural.i:26: 
-<   more than 200(12500) elements to enumerate. Approximating.
-< [kernel] non_natural.i:27: 
-<   more than 200(12500) elements to enumerate. Approximating.
-< [kernel] non_natural.i:28: 
-<   more than 200(12500) elements to enumerate. Approximating.
-< [kernel] non_natural.i:29: 
-<   more than 200(12500) elements to enumerate. Approximating.
-< [kernel] non_natural.i:30: 
-<   more than 200(12500) elements to enumerate. Approximating.
-199a200,201
-> [kernel] non_natural.i:39: 
->   more than 200(12500) elements to enumerate. Approximating.
-diff oracle/offsetmap.0.res.oracle oracle_symblocs/offsetmap.0.res.oracle
-40d39
-< [eva] Recording results for g
-42a42
-> [eva] Recording results for g
-diff oracle/offsetmap.1.res.oracle oracle_symblocs/offsetmap.1.res.oracle
-40d39
-< [eva] Recording results for g
-42a42
-> [eva] Recording results for g
-diff oracle/plevel.res.oracle oracle_symblocs/plevel.res.oracle
-12d11
-< [eva] Recording results for main
-14a14
-> [eva] Recording results for main
-diff oracle/ptr_relation.0.res.oracle oracle_symblocs/ptr_relation.0.res.oracle
-23c23
-<   i ∈ {0; 77; 333}
----
->   i ∈ {77}
-diff oracle/redundant_alarms.res.oracle oracle_symblocs/redundant_alarms.res.oracle
-10,13d9
-< [eva:alarm] redundant_alarms.c:11: Warning: 
-<   accessing uninitialized left-value. assert \initialized(p);
-< [eva:alarm] redundant_alarms.c:12: Warning: 
-<   accessing uninitialized left-value. assert \initialized(p);
-24,27d19
-< [eva:alarm] redundant_alarms.c:21: Warning: 
-<   accessing uninitialized left-value. assert \initialized(&t[i]);
-< [eva:alarm] redundant_alarms.c:22: Warning: 
-<   accessing uninitialized left-value. assert \initialized(&t[i]);
-38,41d29
-< [eva:alarm] redundant_alarms.c:32: Warning: 
-<   accessing uninitialized left-value. assert \initialized(&t[j]);
-< [eva:alarm] redundant_alarms.c:33: Warning: 
-<   accessing uninitialized left-value. assert \initialized(&t[i]);
-63,69d50
-< [scope:rm_asserts] removing 3 assertion(s)
-< [scope:rm_asserts] redundant_alarms.c:12: 
-<   removing redundant assert Eva: initialization: \initialized(p);
-< [scope:rm_asserts] redundant_alarms.c:32: 
-<   removing redundant assert Eva: initialization: \initialized(&t[j]);
-< [scope:rm_asserts] redundant_alarms.c:33: 
-<   removing redundant assert Eva: initialization: \initialized(&t[i]);
-108d88
-<   /*@ assert Eva: initialization: \initialized(p); */
-110d89
-<   /*@ assert Eva: initialization: \initialized(p); */
-127d105
-<   /*@ assert Eva: initialization: \initialized(&t[i]); */
-129d106
-<   /*@ assert Eva: initialization: \initialized(&t[i]); */
-142d118
-<     /*@ assert Eva: initialization: \initialized(&t[j]); */
-144d119
-<     /*@ assert Eva: initialization: \initialized(&t[i]); */
-196a172
->   int z;
-199,201d174
-<   *p = 1;
-<   int z = *p + 1;
-<   int w = *p + 2;
-diff oracle/relations2.res.oracle oracle_symblocs/relations2.res.oracle
-133d132
-< [eva] relations2.i:57: Frama_C_show_each_NO2:
-diff oracle/struct2.res.oracle oracle_symblocs/struct2.res.oracle
-55a56,57
-> [kernel] struct2.i:78: Warning: 
->   all target addresses were invalid. This path is assumed to be dead.
-59,60d60
-<   accessing out of bounds index. assert 0 ≤ (int)(tab2[i] + j);
-< [eva:alarm] struct2.i:82: Warning: 
-83,84d82
-<   accessing out of bounds index. assert (int)(i + j) < 2;
-< [eva:alarm] struct2.i:185: Warning: 
-106c104
-< [scope:rm_asserts] removing 2 assertion(s)
----
-> [scope:rm_asserts] removing 1 assertion(s)
-144,145c142
-<   tab4[0] ∈ {0; 2}
-<       [1] ∈ {0}
----
->   tab4[0..1] ∈ {0}
-148c145,146
-<   tab6[0..1] ∈ {0; 2}
----
->   tab6[0] ∈ {0}
->       [1] ∈ {2}
-219c217
-<            [9].a}; s1; s2; s5.e[0].b; s6.b; s8; tabl[0..1]; tab1[0..1];
----
->            [9].a}; s1; s2; s5.e[0].b; s6.b; s8; tabl[0..1]; tab1[0];
-diff oracle/symbolic_locs.res.oracle oracle_symblocs/symbolic_locs.res.oracle
-20a21,26
->   # Symbolic locations domain:
->   V: {[ t[i] -> {4} ]}
->   Z: {[ t[i] -> t[0..8]; i ]}
->   I: {[ t -> {t[i]}
->         i -> {t[i]} ]}
->   S: {[ i -> {t[i]} ]}
-31a38,42
->   # Symbolic locations domain:
->   V: {[  ]}
->   Z: {[  ]}
->   I: {[  ]}
->   S: {[  ]}
-48a60,65
->   # Symbolic locations domain:
->   V: {[ t[i] -> {4} ]}
->   Z: {[ t[i] -> t[0..8]; i ]}
->   I: {[ t -> {t[i]}
->         i -> {t[i]} ]}
->   S: {[ i -> {t[i]} ]}
-59a77,81
->   # Symbolic locations domain:
->   V: {[  ]}
->   Z: {[  ]}
->   I: {[  ]}
->   S: {[  ]}
-79a102,108
->   # Symbolic locations domain:
->   V: {[ t[i] -> {{ &x }} ]}
->   Z: {[ t[i] -> t[0..8]; i ]}
->   I: {[ t -> {t[i]}
->         i -> {t[i]} ]}
->   S: {[ i -> {t[i]}
->         x -> {t[i]} ]}
-92a122,126
->   # Symbolic locations domain:
->   V: {[  ]}
->   Z: {[  ]}
->   I: {[  ]}
->   S: {[  ]}
-108a143,148
->   # Symbolic locations domain:
->   V: {[ t[i] -> {1} ]}
->   Z: {[ t[i] -> t[0..8]; i ]}
->   I: {[ t -> {t[i]}
->         i -> {t[i]} ]}
->   S: {[ i -> {t[i]} ]}
-117a158,162
->   # Symbolic locations domain:
->   V: {[  ]}
->   Z: {[  ]}
->   I: {[  ]}
->   S: {[  ]}
-134a180,184
->   # Symbolic locations domain:
->   V: {[  ]}
->   Z: {[  ]}
->   I: {[  ]}
->   S: {[  ]}
-141,143c191
-< [eva:alarm] symbolic_locs.i:111: Warning: 
-<   signed overflow. assert *p + 1 ≤ 2147483647;
-< [eva] symbolic_locs.i:113: Frama_C_show_each: [0..2147483647]
----
-> [eva] symbolic_locs.i:113: Frama_C_show_each: [10001..2147483647]
-152a201,205
->   # Symbolic locations domain:
->   V: {[  ]}
->   Z: {[  ]}
->   I: {[  ]}
->   S: {[  ]}
-diff oracle/test.0.res.oracle oracle_symblocs/test.0.res.oracle
-31c31
-<   tmp ∈ [--..--] or UNINITIALIZED
----
->   tmp ∈ [-2147483647..2147483647] or UNINITIALIZED
-Only in tests/value/oracle: unit_tests.res.oracle
diff --git a/tests/value/empty_base.c b/tests/value/empty_base.c
index 7a291adf07de70b330a859aab1b73c56553b35b5..aa5ec8b81fab8ea4b87f59eef114cb4d99bab814 100644
--- a/tests/value/empty_base.c
+++ b/tests/value/empty_base.c
@@ -11,6 +11,7 @@
 volatile int nondet;
 
 struct empty {};
+
 struct empty global_empty;
 
 typedef struct {
diff --git a/tests/value/empty_struct.c b/tests/value/empty_struct.c
index 0c35f9a3276e992dd5abbc569c28d08a277e6841..7ee04c5c827d4c542b4bdcfe107d9d8a0f41fdbf 100644
--- a/tests/value/empty_struct.c
+++ b/tests/value/empty_struct.c
@@ -4,12 +4,12 @@
    STDOPT: +" -machdep gcc_x86_32 -cpp-extra-args=-DP3 -lib-entry"
    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"
-   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/numerors/numerors.c b/tests/value/numerors/numerors.c
index 64531f3393cc990a84737a45629056db838f40b2..fd0609d1213af2c53e128e9dce2573823dc773df 100644
--- a/tests/value/numerors/numerors.c
+++ b/tests/value/numerors/numerors.c
@@ -1,7 +1,7 @@
 /* run.config
    OPT: -eva -eva-domains numerors -eva-msg-key=d-numerors
-   COMMENT: requires opam package mlgmpidl and system libraries for MPFR
 */
+
 /* Tests for the numerors domain, that computes absolute and relative errors
    of floating-point computations. */
 
diff --git a/tests/value/oracle/partitioning-annots.5.res.oracle b/tests/value/oracle/partitioning-annots.5.res.oracle
deleted file mode 100644
index 86b522118c4bbd3faa95abf843a0603c2aa186b7..0000000000000000000000000000000000000000
--- a/tests/value/oracle/partitioning-annots.5.res.oracle
+++ /dev/null
@@ -1,39 +0,0 @@
-[kernel] Parsing partitioning-annots.c (with preprocessing)
-[eva] Analyzing a complete application starting at test_history
-[eva] Computing initial state
-[eva] Initial state computed
-[eva:initial-state] Values of globals at initialization
-  k ∈ {0}
-  nondet ∈ [--..--]
-[eva] computing for function Frama_C_interval <- test_history.
-  Called from partitioning-annots.c:129.
-[eva] using specification for function Frama_C_interval
-[eva] partitioning-annots.c:129: 
-  function Frama_C_interval: precondition 'order' got status valid.
-[eva] Done for function Frama_C_interval
-[eva] partitioning-annots.c:135: Frama_C_show_each: {0}, {0}
-[eva] partitioning-annots.c:135: Frama_C_show_each: {1}, {1}
-[eva] Recording results for test_history
-[eva] done for function test_history
-[eva] ====== VALUES COMPUTED ======
-[eva:final-states] Values at end of function test_history:
-  Frama_C_entropy_source ∈ [--..--]
-  i ∈ {0; 1}
-  j ∈ {0; 1}
-  k_0 ∈ {1}
-[from] Computing for function test_history
-[from] Computing for function Frama_C_interval <-test_history
-[from] Done for function Frama_C_interval
-[from] Done for function test_history
-[from] ====== DEPENDENCIES COMPUTED ======
-  These dependencies hold at termination for the executions that terminate:
-[from] Function Frama_C_interval:
-  Frama_C_entropy_source FROM Frama_C_entropy_source (and SELF)
-  \result FROM Frama_C_entropy_source; min; max
-[from] Function test_history:
-  Frama_C_entropy_source FROM Frama_C_entropy_source (and SELF)
-[from] ====== END OF DEPENDENCIES ======
-[inout] Out (internal) for function test_history:
-    Frama_C_entropy_source; i; j; k_0
-[inout] Inputs for function test_history:
-    Frama_C_entropy_source
diff --git a/tests/value/oracle/partitioning-annots.6.res.oracle b/tests/value/oracle/partitioning-annots.6.res.oracle
deleted file mode 100644
index fb8cb1079e8bc637416fe8153a62692f78f29e99..0000000000000000000000000000000000000000
--- a/tests/value/oracle/partitioning-annots.6.res.oracle
+++ /dev/null
@@ -1,30 +0,0 @@
-[kernel] Parsing partitioning-annots.c (with preprocessing)
-[eva] Analyzing a complete application starting at test_slevel
-[eva] Computing initial state
-[eva] Initial state computed
-[eva:initial-state] Values of globals at initialization
-  k ∈ {0}
-  nondet ∈ [--..--]
-[eva] partitioning-annots.c:152: starting to merge loop iterations
-[eva] partitioning-annots.c:157: starting to merge loop iterations
-[eva] Recording results for test_slevel
-[eva] done for function test_slevel
-[eva] ====== VALUES COMPUTED ======
-[eva:final-states] Values at end of function test_slevel:
-  a[0..9] ∈ {42}
-  b[0..9] ∈ {42} or UNINITIALIZED
-  c[0..3] ∈ {33; 42}
-   [4..9] ∈ {33; 42} or UNINITIALIZED
-  d[0..9] ∈ {33; 42}
-  e[0..3] ∈ {33; 42}
-[from] Computing for function test_slevel
-[from] Done for function test_slevel
-[from] ====== DEPENDENCIES COMPUTED ======
-  These dependencies hold at termination for the executions that terminate:
-[from] Function test_slevel:
-  NO EFFECTS
-[from] ====== END OF DEPENDENCIES ======
-[inout] Out (internal) for function test_slevel:
-    a[0..9]; b[0..9]; c[0..9]; d[0..9]; e[0..3]; i; i_0; i_1; i_2; i_3
-[inout] Inputs for function test_slevel:
-    nondet
diff --git a/tests/value/oracle/rec.res.oracle b/tests/value/oracle/rec.res.oracle
deleted file mode 100644
index e5dfd7a40df73af6d83d6f16588643182990b90c..0000000000000000000000000000000000000000
--- a/tests/value/oracle/rec.res.oracle
+++ /dev/null
@@ -1,22 +0,0 @@
-[kernel] Parsing rec.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] Recording results for main
-[eva] done for function main
-[eva] ====== VALUES COMPUTED ======
-[eva:final-states] Values at end of function main:
-  X ∈ {0}
-[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 main:
-  NO EFFECTS
-[from] ====== END OF DEPENDENCIES ======
-[inout] Out (internal) for function main:
-    X
-[inout] Inputs for function main:
-    \nothing
diff --git a/tests/value/oracle/recursion2.res.oracle b/tests/value/oracle/recursion2.res.oracle
deleted file mode 100644
index 5139f31d09a7dedbc29d65434342fd51987be56d..0000000000000000000000000000000000000000
--- a/tests/value/oracle/recursion2.res.oracle
+++ /dev/null
@@ -1,67 +0,0 @@
-[kernel] Parsing recursion2.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
-  x ∈ {0}
-  y ∈ {0}
-[eva] computing for function h2 <- main.
-  Called from recursion2.i:21.
-[eva] computing for function h1 <- h2 <- main.
-  Called from recursion2.i:17.
-[eva] Recording results for h1
-[eva] Done for function h1
-[eva] Recording results for h2
-[eva] Done for function h2
-[eva] computing for function h1 <- main.
-  Called from recursion2.i:22.
-[eva] computing for function h2 <- h1 <- main.
-  Called from recursion2.i:12.
-[eva] Recording results for h2
-[eva] Done for function h2
-[eva] Recording results for h1
-[eva] Done for function h1
-[eva] Recording results for main
-[eva] done for function main
-[eva] ====== VALUES COMPUTED ======
-[eva:final-states] Values at end of function h1:
-  r ∈ {0}
-  q ∈ {0}
-[eva:final-states] Values at end of function h2:
-  r ∈ {0}
-  q ∈ {0}
-[eva:final-states] Values at end of function main:
-  
-[inout] Out (internal) for function h1:
-    r; q
-[inout] Inputs for function h1:
-    x; y; i; j
-[inout] InOut (internal) for function h1:
-  Operational inputs:
-    x; y; i
-  Operational inputs on termination:
-    x; y; i
-  Sure outputs:
-    r
-[inout] Out (internal) for function h2:
-    r; q
-[inout] Inputs for function h2:
-    x; y; i; j
-[inout] InOut (internal) for function h2:
-  Operational inputs:
-    x; y; j
-  Operational inputs on termination:
-    x; y; j
-  Sure outputs:
-    q
-[inout] Out (internal) for function main:
-    \nothing
-[inout] Inputs for function main:
-    x; y
-[inout] InOut (internal) for function main:
-  Operational inputs:
-    x; y
-  Operational inputs on termination:
-    x; y
-  Sure outputs:
-    \nothing
diff --git a/tests/value/oracle_equalities/CruiseControl.res.oracle b/tests/value/oracle_equalities/CruiseControl.res.oracle
deleted file mode 100644
index 7f482051f093841492bedd32ba5c5c66e84b594b..0000000000000000000000000000000000000000
--- a/tests/value/oracle_equalities/CruiseControl.res.oracle
+++ /dev/null
@@ -1,45 +0,0 @@
-979c979
-<        [0]._C4_ThrottleCmd._I0_Regul_ON ∈ {0; 1}
----
->        [0]._C4_ThrottleCmd._I0_Regul_ON ∈ {1}
-1017c1017
-<        [0]._C4_ThrottleCmd._C0_ThrottleRegulation._C0_SaturateThrottle{._I0_ThrottleIn; ._O0_ThrottleOut} ∈
----
->        [0]._C4_ThrottleCmd._C0_ThrottleRegulation._C0_SaturateThrottle._I0_ThrottleIn ∈
-1018a1019,1020
->        [0]._C4_ThrottleCmd._C0_ThrottleRegulation._C0_SaturateThrottle._O0_ThrottleOut ∈
->        [-0.0000000000000000 .. 1.9999998807907104*2^127]
-1032c1034
-<        [-1.9999998807907104*2^127 .. 1.9999998807907104*2^127]
----
->        [-0.0000000000000000 .. 1.9999998807907104*2^127]
-1217c1219
-<        [0]._C4_ThrottleCmd._I0_Regul_ON ∈ {0; 1}
----
->        [0]._C4_ThrottleCmd._I0_Regul_ON ∈ {1}
-1229c1231,1235
-<        [0]._C4_ThrottleCmd._C0_ThrottleRegulation{._I1_CruiseSpeed; ._I2_VehiculeSpeed; ._O0_Throttle; ._L1_CruiseControl; ._L2_CruiseControl; ._L3_CruiseControl} ∈
----
->        [0]._C4_ThrottleCmd._C0_ThrottleRegulation{._I1_CruiseSpeed; ._I2_VehiculeSpeed} ∈
->        [-1.9999998807907104*2^127 .. 1.9999998807907104*2^127]
->        [0]._C4_ThrottleCmd._C0_ThrottleRegulation._O0_Throttle ∈
->        [-0.0000000000000000 .. 1.9999998807907104*2^127]
->        [0]._C4_ThrottleCmd._C0_ThrottleRegulation{._L1_CruiseControl; ._L2_CruiseControl; ._L3_CruiseControl} ∈
-1247c1253
-<        [0]._C4_ThrottleCmd._C0_ThrottleRegulation{._L4_CruiseControl; ._L13_CruiseControl} ∈
----
->        [0]._C4_ThrottleCmd._C0_ThrottleRegulation._L4_CruiseControl ∈
-1248a1255,1256
->        [0]._C4_ThrottleCmd._C0_ThrottleRegulation._L13_CruiseControl ∈
->        [-0.0000000000000000 .. 1.9999998807907104*2^127]
-1255c1263
-<        [0]._C4_ThrottleCmd._C0_ThrottleRegulation._C0_SaturateThrottle{._I0_ThrottleIn; ._O0_ThrottleOut} ∈
----
->        [0]._C4_ThrottleCmd._C0_ThrottleRegulation._C0_SaturateThrottle._I0_ThrottleIn ∈
-1256a1265,1266
->        [0]._C4_ThrottleCmd._C0_ThrottleRegulation._C0_SaturateThrottle._O0_ThrottleOut ∈
->        [-0.0000000000000000 .. 1.9999998807907104*2^127]
-1270c1280
-<        [-1.9999998807907104*2^127 .. 1.9999998807907104*2^127]
----
->        [-0.0000000000000000 .. 1.9999998807907104*2^127]
diff --git a/tests/value/oracle_equalities/addition.res.oracle b/tests/value/oracle_equalities/addition.res.oracle
deleted file mode 100644
index 05493bd86cacf8b5cd209c6f697a5afa28c210c5..0000000000000000000000000000000000000000
--- a/tests/value/oracle_equalities/addition.res.oracle
+++ /dev/null
@@ -1,18 +0,0 @@
-138,141d137
-< [eva:alarm] addition.i:61: Warning: 
-<   signed overflow. assert -2147483648 ≤ (int)*((char *)(&q1)) + 2;
-< [eva:alarm] addition.i:61: Warning: 
-<   signed overflow. assert (int)*((char *)(&q1)) + 2 ≤ 2147483647;
-168c164
-< [scope:rm_asserts] removing 9 assertion(s)
----
-> [scope:rm_asserts] removing 7 assertion(s)
-384,387d379
-< [eva:alarm] addition.i:61: Warning: 
-<   signed overflow. assert -2147483648 ≤ (int)*((char *)(&q1)) + 2;
-< [eva:alarm] addition.i:61: Warning: 
-<   signed overflow. assert (int)*((char *)(&q1)) + 2 ≤ 2147483647;
-410c402
-< [scope:rm_asserts] removing 9 assertion(s)
----
-> [scope:rm_asserts] removing 7 assertion(s)
diff --git a/tests/value/oracle_equalities/alias.0.res.oracle b/tests/value/oracle_equalities/alias.0.res.oracle
deleted file mode 100644
index c234ab23c2ef7ade7fb11fd8bd401d1a710a0a37..0000000000000000000000000000000000000000
--- a/tests/value/oracle_equalities/alias.0.res.oracle
+++ /dev/null
@@ -1,10 +0,0 @@
-103,104c103,104
-<   t ∈ {1; 2; 4}
-<   u ∈ {2; 3; 4; 5}
----
->   t ∈ {4}
->   u ∈ {5}
-110c110
-<   t2 ∈ {0; 3; 6}
----
->   t2 ∈ {6}
diff --git a/tests/value/oracle_equalities/alias.1.res.oracle b/tests/value/oracle_equalities/alias.1.res.oracle
deleted file mode 100644
index 2ffa7026570231605e3636e730d48be1bfe597cf..0000000000000000000000000000000000000000
--- a/tests/value/oracle_equalities/alias.1.res.oracle
+++ /dev/null
@@ -1,18 +0,0 @@
-78c78
-<   z ∈ {0; 1; 2}
----
->   z ∈ {0; 2}
-80,81c80,81
-<   v2 ∈ {-1; 0; 1; 2; 3; 4}
-<   PTR1 ∈ {{ &p2{[0], [1], [2]} }}
----
->   v2 ∈ {0; 1; 2}
->   PTR1 ∈ {{ &p2{[0], [1]} }}
-83c83
-<   PTR3 ∈ {{ &p2{[1], [2], [4]} }}
----
->   PTR3 ∈ {{ &p2{[1], [2]} }}
-103c103
-<   t2 FROM p2[0..2]; c
----
->   t2 FROM p2[0..1]; c
diff --git a/tests/value/oracle_equalities/alias.2.res.oracle b/tests/value/oracle_equalities/alias.2.res.oracle
deleted file mode 100644
index 8c1e8d3d857c3b89e74cd4540785b5b72a187611..0000000000000000000000000000000000000000
--- a/tests/value/oracle_equalities/alias.2.res.oracle
+++ /dev/null
@@ -1,4 +0,0 @@
-72c72
-<   z ∈ {-5; -4; -3; -2; -1; 0; 1; 1000}
----
->   z ∈ {-2; -1; 0; 1000}
diff --git a/tests/value/oracle_equalities/alias.3.res.oracle b/tests/value/oracle_equalities/alias.3.res.oracle
deleted file mode 100644
index 3d46613b080510824e65c2fea7cf01b8a5e65ebe..0000000000000000000000000000000000000000
--- a/tests/value/oracle_equalities/alias.3.res.oracle
+++ /dev/null
@@ -1,4 +0,0 @@
-66c66
-<   z ∈ {0; 1; 2}
----
->   z ∈ {0; 2}
diff --git a/tests/value/oracle_equalities/alias.4.res.oracle b/tests/value/oracle_equalities/alias.4.res.oracle
deleted file mode 100644
index a9bf84a72d6f486015f425b702646395d1c6d465..0000000000000000000000000000000000000000
--- a/tests/value/oracle_equalities/alias.4.res.oracle
+++ /dev/null
@@ -1,4 +0,0 @@
-80c80
-<   y ∈ {0; 3; 77}
----
->   y ∈ {77}
diff --git a/tests/value/oracle_equalities/alias.5.res.oracle b/tests/value/oracle_equalities/alias.5.res.oracle
deleted file mode 100644
index 7e9d6756cbbfab00239a7fddd99290aa7b420c21..0000000000000000000000000000000000000000
--- a/tests/value/oracle_equalities/alias.5.res.oracle
+++ /dev/null
@@ -1,6 +0,0 @@
-59a60
-> [eva] alias.i:260: starting to merge loop iterations
-167c168
-<   y ∈ {0; 3; 77}
----
->   y ∈ {77}
diff --git a/tests/value/oracle_equalities/alias.6.res.oracle b/tests/value/oracle_equalities/alias.6.res.oracle
deleted file mode 100644
index a7dfd3031756c0781ca8579ae7e21c2b0a65e1c0..0000000000000000000000000000000000000000
--- a/tests/value/oracle_equalities/alias.6.res.oracle
+++ /dev/null
@@ -1,4 +0,0 @@
-86c86
-<   x ∈ {0; 4; 33}
----
->   x ∈ {33}
diff --git a/tests/value/oracle_equalities/auto_loop_unroll.0.res.oracle b/tests/value/oracle_equalities/auto_loop_unroll.0.res.oracle
deleted file mode 100644
index 73c9dc2735a60f22c55b4610f9128304cd63567a..0000000000000000000000000000000000000000
--- a/tests/value/oracle_equalities/auto_loop_unroll.0.res.oracle
+++ /dev/null
@@ -1,14 +0,0 @@
-76c76,79
-< [eva] auto_loop_unroll.c:101: Reusing old results for call to incr
----
-> [eva] computing for function incr <- various_loops <- main.
->   Called from auto_loop_unroll.c:101.
-> [eva] Recording results for incr
-> [eva] Done for function incr
-85c88,91
-< [eva] auto_loop_unroll.c:101: Reusing old results for call to incr
----
-> [eva] computing for function incr <- various_loops <- main.
->   Called from auto_loop_unroll.c:101.
-> [eva] Recording results for incr
-> [eva] Done for function incr
diff --git a/tests/value/oracle_equalities/backward_add_ptr.res.oracle b/tests/value/oracle_equalities/backward_add_ptr.res.oracle
deleted file mode 100644
index 5b5b8346ea63aba56797a7f8e1788fa6678940a7..0000000000000000000000000000000000000000
--- a/tests/value/oracle_equalities/backward_add_ptr.res.oracle
+++ /dev/null
@@ -1,89 +0,0 @@
-11c11
-< [eva] backward_add_ptr.c:26: Frama_C_show_each_only_a: {0; 1}, {{ &a }}, {0}
----
-> [eva] backward_add_ptr.c:26: Frama_C_show_each_only_a: {0}, {{ &a }}, {0}
-85c85,88
-< [eva] backward_add_ptr.c:110: Reusing old results for call to gm
----
-> [eva] computing for function gm <- main3 <- main.
->   Called from backward_add_ptr.c:110.
-> [eva] Recording results for gm
-> [eva] Done for function gm
-97c100,103
-< [eva] backward_add_ptr.c:125: Reusing old results for call to gm
----
-> [eva] computing for function gm <- main3 <- main.
->   Called from backward_add_ptr.c:125.
-> [eva] Recording results for gm
-> [eva] Done for function gm
-108c114
-<   (origin: Arithmetic {backward_add_ptr.c:68}) }},
----
->   (origin: Arithmetic Bottom) }},
-143,146c149,153
-<   {{ garbled mix of &{b}
-<   (origin: Arithmetic {backward_add_ptr.c:68}) }},
-<   [0..4294967295]
-< [eva] backward_add_ptr.c:160: Reusing old results for call to gm
----
->   {{ garbled mix of &{b} (origin: Arithmetic Bottom) }}, [0..4294967295]
-> [eva] computing for function gm <- main4 <- main.
->   Called from backward_add_ptr.c:160.
-> [eva] Recording results for gm
-> [eva] Done for function gm
-162c169
-<   (origin: Arithmetic {backward_add_ptr.c:68}) }},
----
->   (origin: Arithmetic Bottom) }},
-164c171
-<   (origin: Arithmetic {backward_add_ptr.c:68}) }}
----
->   (origin: Arithmetic Bottom) }}
-172c179
-<   (origin: Arithmetic {backward_add_ptr.c:68}) }}
----
->   (origin: Arithmetic Bottom) }}
-178c185
-<   (origin: Arithmetic {backward_add_ptr.c:68}) }},
----
->   (origin: Arithmetic Bottom) }},
-190a198,199
->   {{ garbled mix of &{b} (origin: Arithmetic {backward_add_ptr.c:33}) }}
->   {{ garbled mix of &{a} (origin: Arithmetic {backward_add_ptr.c:33}) }}
-201a211
->   {{ garbled mix of &{a; b} (origin: Arithmetic {backward_add_ptr.c:106}) }}
-203c213
-<   {{ garbled mix of &{c} (origin: Arithmetic {backward_add_ptr.c:115}) }}
----
->   {{ garbled mix of &{a; b} (origin: Arithmetic {backward_add_ptr.c:107}) }}
-204a215,217
->   {{ garbled mix of &{c} (origin: Arithmetic {backward_add_ptr.c:115}) }}
->   {{ garbled mix of &{a; b} (origin: Arithmetic {backward_add_ptr.c:116}) }}
->   {{ garbled mix of &{a; b} (origin: Arithmetic {backward_add_ptr.c:121}) }}
-205a219,220
->   {{ garbled mix of &{a; b} (origin: Arithmetic {backward_add_ptr.c:122}) }}
->   {{ garbled mix of &{a; b} (origin: Arithmetic {backward_add_ptr.c:130}) }}
-206a222
->   {{ garbled mix of &{a; b} (origin: Arithmetic {backward_add_ptr.c:136}) }}
-207a224
->   {{ garbled mix of &{a; b} (origin: Arithmetic {backward_add_ptr.c:137}) }}
-208a226
->   {{ garbled mix of &{a; b} (origin: Arithmetic {backward_add_ptr.c:145}) }}
-209a228,231
->   {{ garbled mix of &{a; b} (origin: Arithmetic {backward_add_ptr.c:150}) }}
->   {{ garbled mix of &{a; b} (origin: Arithmetic {backward_add_ptr.c:151}) }}
->   {{ garbled mix of &{a; b} (origin: Arithmetic {backward_add_ptr.c:156}) }}
->   {{ garbled mix of &{a; b} (origin: Arithmetic {backward_add_ptr.c:157}) }}
-210a233,244
->   {{ garbled mix of &{a; b} (origin: Arithmetic {backward_add_ptr.c:165}) }}
->   {{ garbled mix of &{b; c} (origin: Arithmetic {backward_add_ptr.c:165}) }}
->   {{ garbled mix of &{a; b} (origin: Arithmetic {backward_add_ptr.c:166}) }}
->   {{ garbled mix of &{b; c} (origin: Arithmetic {backward_add_ptr.c:166}) }}
->   {{ garbled mix of &{a; b} (origin: Arithmetic {backward_add_ptr.c:171}) }}
->   {{ garbled mix of &{b; c} (origin: Arithmetic {backward_add_ptr.c:171}) }}
->   {{ garbled mix of &{a; b} (origin: Arithmetic {backward_add_ptr.c:172}) }}
->   {{ garbled mix of &{b; c} (origin: Arithmetic {backward_add_ptr.c:172}) }}
->   {{ garbled mix of &{a; b} (origin: Arithmetic {backward_add_ptr.c:177}) }}
->   {{ garbled mix of &{b; c} (origin: Arithmetic {backward_add_ptr.c:177}) }}
->   {{ garbled mix of &{a; b} (origin: Arithmetic {backward_add_ptr.c:178}) }}
->   {{ garbled mix of &{b; c} (origin: Arithmetic {backward_add_ptr.c:178}) }}
diff --git a/tests/value/oracle_equalities/bitfield.res.oracle b/tests/value/oracle_equalities/bitfield.res.oracle
deleted file mode 100644
index 10b95b54d73ec2a8ccf6076faacace23c66117da..0000000000000000000000000000000000000000
--- a/tests/value/oracle_equalities/bitfield.res.oracle
+++ /dev/null
@@ -1,4 +0,0 @@
-136a137,139
-> [eva] bitfield.i:71: 
->   Frama_C_show_each:
->   {{ garbled mix of &{b} (origin: Misaligned {bitfield.i:70}) }}
diff --git a/tests/value/oracle_equalities/bitwise_pointer.res.oracle b/tests/value/oracle_equalities/bitwise_pointer.res.oracle
deleted file mode 100644
index f04f7077977a5a61ea7d346c6ff6f90a2e4237e4..0000000000000000000000000000000000000000
--- a/tests/value/oracle_equalities/bitwise_pointer.res.oracle
+++ /dev/null
@@ -1,8 +0,0 @@
-62c62
-<   x ∈ [0..9]
----
->   x ∈ {5}
-75c75
-<   x1 ∈ [0..9]
----
->   x1 ∈ {5}
diff --git a/tests/value/oracle_equalities/builtins_split.res.oracle b/tests/value/oracle_equalities/builtins_split.res.oracle
deleted file mode 100644
index 9e88f384bc874d83ca09c8d03373778734c95ab2..0000000000000000000000000000000000000000
--- a/tests/value/oracle_equalities/builtins_split.res.oracle
+++ /dev/null
@@ -1,4 +0,0 @@
-51c51
-<   Frama_C_show_each_t_i_2: {1; 2; 3; 4; 5; 6; 7; 8}, {0; 4; 8; 12}
----
->   Frama_C_show_each_t_i_2: {1; 2; 3; 4; 5; 6; 7; 8}, {8}
diff --git a/tests/value/oracle_equalities/call_simple.res.oracle b/tests/value/oracle_equalities/call_simple.res.oracle
deleted file mode 100644
index 74d12f1f99b9b00efad1a5bf4a6df343d225573b..0000000000000000000000000000000000000000
--- a/tests/value/oracle_equalities/call_simple.res.oracle
+++ /dev/null
@@ -1,4 +0,0 @@
-28c28
-<   c ∈ [--..--]
----
->   c ∈ [-2147483648..2147483646]
diff --git a/tests/value/oracle_equalities/case_analysis.res.oracle b/tests/value/oracle_equalities/case_analysis.res.oracle
deleted file mode 100644
index a44bc348c99b27fa92776cd12c236e5f1a5946e3..0000000000000000000000000000000000000000
--- a/tests/value/oracle_equalities/case_analysis.res.oracle
+++ /dev/null
@@ -1,9 +0,0 @@
-11a12,15
-> [eva] case_analysis.i:18: 
->   The evaluation of the expression r * r
->   led to bottom without alarms:
->   at this point the product of states has no possible concretization.
-18c22
-<   rq ∈ [-0.0000000000000000 .. 100.0000000000000000]
----
->   rq ∈ [0.0000000000000000 .. 100.0000000000000000]
diff --git a/tests/value/oracle_equalities/descending.res.oracle b/tests/value/oracle_equalities/descending.res.oracle
deleted file mode 100644
index 4f7f74dacd94a03077b450e88028ef39d7764628..0000000000000000000000000000000000000000
--- a/tests/value/oracle_equalities/descending.res.oracle
+++ /dev/null
@@ -1,4 +0,0 @@
-42c42
-<   i ∈ {31; 32}
----
->   i ∈ {31}
diff --git a/tests/value/oracle_equalities/domains_function.res.oracle b/tests/value/oracle_equalities/domains_function.res.oracle
deleted file mode 100644
index 792b3d12a6ca5ec8f9b3d7743707b1c0d92d369b..0000000000000000000000000000000000000000
--- a/tests/value/oracle_equalities/domains_function.res.oracle
+++ /dev/null
@@ -1,52 +0,0 @@
-19c19
-< [eva] domains_function.c:92: Frama_C_show_each_top: [-2147483648..2147483647]
----
-> [eva] domains_function.c:92: Frama_C_show_each_top: {3}
-27c27
-< [eva] domains_function.c:77: Frama_C_show_each_top: [-2147483648..2147483647]
----
-> [eva] domains_function.c:77: Frama_C_show_each_top: {1}
-30c30
-< [eva] domains_function.c:96: Frama_C_show_each_top: [-2147483648..2147483647]
----
-> [eva] domains_function.c:96: Frama_C_show_each_top: {1}
-33c33
-< [eva] domains_function.c:84: Frama_C_show_each_top: [-2147483648..2147483647]
----
-> [eva] domains_function.c:84: Frama_C_show_each_top: {2}
-36c36
-< [eva] domains_function.c:98: Frama_C_show_each_top: [-2147483648..2147483647]
----
-> [eva] domains_function.c:98: Frama_C_show_each_top: {2}
-55c55
-< [eva] domains_function.c:84: Frama_C_show_each_top: [-2147483648..2147483647]
----
-> [eva] domains_function.c:84: Frama_C_show_each_top: {2}
-58c58
-< [eva] domains_function.c:113: Frama_C_show_each_top: [-2147483648..2147483647]
----
-> [eva] domains_function.c:113: Frama_C_show_each_top: {2}
-71c71
-< [eva] domains_function.c:55: Frama_C_show_each_top: [-2147483648..2147483647]
----
-> [eva] domains_function.c:55: Frama_C_show_each_top: {42}
-99c99
-< [eva] domains_function.c:64: Frama_C_show_each_top: [-2147483648..2147483647]
----
-> [eva] domains_function.c:64: Frama_C_show_each_top: {42}
-106c106
-<   result ∈ [--..--]
----
->   result ∈ {2}
-120c120
-<   result ∈ [--..--]
----
->   result ∈ {1}
-125c125
-<   result ∈ [--..--]
----
->   result ∈ {2}
-128c128
-<   result ∈ [--..--]
----
->   result ∈ {2}
diff --git a/tests/value/oracle_equalities/downcast.2.res.oracle b/tests/value/oracle_equalities/downcast.2.res.oracle
deleted file mode 100644
index 947c8b0bd67cf7f45e2ecae56cecb4e5fd7296a3..0000000000000000000000000000000000000000
--- a/tests/value/oracle_equalities/downcast.2.res.oracle
+++ /dev/null
@@ -1,8 +0,0 @@
-100c100
-<   ux ∈ [--..--]
----
->   ux ∈ [0..65535]
-143c143
-<   ux ∈ [--..--]
----
->   ux ∈ [0..65535]
diff --git a/tests/value/oracle_equalities/fptr.1.res.oracle b/tests/value/oracle_equalities/fptr.1.res.oracle
deleted file mode 100644
index 8cfc412173fe3919f6055d22bc416063cd3dc2a0..0000000000000000000000000000000000000000
--- a/tests/value/oracle_equalities/fptr.1.res.oracle
+++ /dev/null
@@ -1,7 +0,0 @@
-54,55d53
-< [eva] fptr.i:67: Frama_C_show_each_F: {{ NULL + [0..4294967295] ; &h ; &hh }}
-< [eva] fptr.i:68: Reusing old results for call to f
-67c65
-<   n ∈ {0; 1; 2}
----
->   n ∈ {0; 1}
diff --git a/tests/value/oracle_equalities/from_call.0.res.oracle b/tests/value/oracle_equalities/from_call.0.res.oracle
deleted file mode 100644
index 61e2153e7adcd8fdc9155a9b86a8e6386f701c22..0000000000000000000000000000000000000000
--- a/tests/value/oracle_equalities/from_call.0.res.oracle
+++ /dev/null
@@ -1,14 +0,0 @@
-64c64,67
-< [eva] from_call.i:21: Reusing old results for call to g
----
-> [eva] computing for function g <- f <- main.
->   Called from from_call.i:21.
-> [eva] Recording results for g
-> [eva] Done for function g
-72c75,78
-< [eva] from_call.i:21: Reusing old results for call to g
----
-> [eva] computing for function g <- f <- main.
->   Called from from_call.i:21.
-> [eva] Recording results for g
-> [eva] Done for function g
diff --git a/tests/value/oracle_equalities/from_call.1.res.oracle b/tests/value/oracle_equalities/from_call.1.res.oracle
deleted file mode 100644
index 5cda358fccfbd41a69891850b66b55680ed3af89..0000000000000000000000000000000000000000
--- a/tests/value/oracle_equalities/from_call.1.res.oracle
+++ /dev/null
@@ -1,18 +0,0 @@
-68c68,73
-< [eva] from_call.i:21: Reusing old results for call to g
----
-> [eva] computing for function g <- f <- main.
->   Called from from_call.i:21.
-> [eva] Recording results for g
-> [from] Computing for function g
-> [from] Done for function g
-> [eva] Done for function g
-78c83,88
-< [eva] from_call.i:21: Reusing old results for call to g
----
-> [eva] computing for function g <- f <- main.
->   Called from from_call.i:21.
-> [eva] Recording results for g
-> [from] Computing for function g
-> [from] Done for function g
-> [eva] Done for function g
diff --git a/tests/value/oracle_equalities/from_termin.res.oracle b/tests/value/oracle_equalities/from_termin.res.oracle
deleted file mode 100644
index d03d84f92d569928f2f9156ff651c33acd1a291b..0000000000000000000000000000000000000000
--- a/tests/value/oracle_equalities/from_termin.res.oracle
+++ /dev/null
@@ -1,2 +0,0 @@
-9a10
-> [eva] from_termin.i:8: starting to merge loop iterations
diff --git a/tests/value/oracle_equalities/imprecise_invalid_write.res.oracle b/tests/value/oracle_equalities/imprecise_invalid_write.res.oracle
deleted file mode 100644
index bb982e73d80195bfc94798bd4ae7791b502f93ef..0000000000000000000000000000000000000000
--- a/tests/value/oracle_equalities/imprecise_invalid_write.res.oracle
+++ /dev/null
@@ -1,3 +0,0 @@
-28a29,30
-> [kernel] imprecise_invalid_write.i:9: 
->   imprecise size for variable main1 (Undefined sizeof on a function.)
diff --git a/tests/value/oracle_equalities/incompatible_states.res.oracle b/tests/value/oracle_equalities/incompatible_states.res.oracle
deleted file mode 100644
index 698e2a3e8658e9fba41c1ad8d130a4458bf80109..0000000000000000000000000000000000000000
--- a/tests/value/oracle_equalities/incompatible_states.res.oracle
+++ /dev/null
@@ -1,29 +0,0 @@
-14a15,18
-> [eva] incompatible_states.c:24: 
->   The evaluation of the expression x * x
->   led to bottom without alarms:
->   at this point the product of states has no possible concretization.
-27,29c31,34
-< [eva:alarm] incompatible_states.c:41: Warning: 
-<   accessing uninitialized left-value.
-<   assert \initialized(&t[(int)((int)(2 * i) / 2)]);
----
-> [eva] incompatible_states.c:41: 
->   The evaluation of the expression t[(2 * i) / 2]
->   led to bottom without alarms:
->   at this point the product of states has no possible concretization.
-41,42d45
-< [eva:alarm] incompatible_states.c:53: Warning: 
-<   division by zero. assert t[i] ≢ 0;
-47,49d49
-< [eva] incompatible_states.c:41: 
-<   assertion 'Eva,initialization' got final status invalid.
-< [scope:rm_asserts] removing 2 assertion(s)
-55c55
-<   z ∈ [-3..100]
----
->   z ∈ {-3; -2}
-58c58
-<   t[0] ∈ {0; 1}
----
->   t[0] ∈ {0}
diff --git a/tests/value/oracle_equalities/library.res.oracle b/tests/value/oracle_equalities/library.res.oracle
deleted file mode 100644
index 7414f97802c482fc12a2774225d2ae7d301f5ba4..0000000000000000000000000000000000000000
--- a/tests/value/oracle_equalities/library.res.oracle
+++ /dev/null
@@ -1,5 +0,0 @@
-122,125d121
-< [eva:alarm] library.i:44: Warning: 
-<   non-finite float value. assert \is_finite(*pf);
-< [eva:alarm] library.i:44: Warning: 
-<   non-finite float value. assert \is_finite(\add_float(*pf, *pf));
diff --git a/tests/value/oracle_equalities/long_const.0.res.oracle b/tests/value/oracle_equalities/long_const.0.res.oracle
deleted file mode 100644
index f2a6313deff60ca2490ab6c276360f8666224869..0000000000000000000000000000000000000000
--- a/tests/value/oracle_equalities/long_const.0.res.oracle
+++ /dev/null
@@ -1,7 +0,0 @@
-18c18,21
-< [eva] long_const.i:25: Reusing old results for call to LL_ABS
----
-> [eva] computing for function LL_ABS <- div64 <- main.
->   Called from long_const.i:25.
-> [eva] Recording results for LL_ABS
-> [eva] Done for function LL_ABS
diff --git a/tests/value/oracle_equalities/long_const.1.res.oracle b/tests/value/oracle_equalities/long_const.1.res.oracle
deleted file mode 100644
index f2a6313deff60ca2490ab6c276360f8666224869..0000000000000000000000000000000000000000
--- a/tests/value/oracle_equalities/long_const.1.res.oracle
+++ /dev/null
@@ -1,7 +0,0 @@
-18c18,21
-< [eva] long_const.i:25: Reusing old results for call to LL_ABS
----
-> [eva] computing for function LL_ABS <- div64 <- main.
->   Called from long_const.i:25.
-> [eva] Recording results for LL_ABS
-> [eva] Done for function LL_ABS
diff --git a/tests/value/oracle_equalities/modulo.res.oracle b/tests/value/oracle_equalities/modulo.res.oracle
deleted file mode 100644
index 2cc91bee2a0858f87733c524a3e0255c95289246..0000000000000000000000000000000000000000
--- a/tests/value/oracle_equalities/modulo.res.oracle
+++ /dev/null
@@ -1,164 +0,0 @@
-39a40,113
-> [eva] modulo.i:41: Frama_C_show_each_1: [-10..-1], [-9..-1], [-8..0]
-> [eva] modulo.i:41: Frama_C_show_each_1: [-10..-1], [1..9], [-8..0]
-> [eva] modulo.i:41: Frama_C_show_each_1: [1..10], [-9..-1], [0..8]
-> [eva] modulo.i:41: Frama_C_show_each_1: [1..10], [1..9], [0..8]
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1:
->   [1..9], {1; 2; 3; 4; 5; 6; 7; 8}, {0; 1; 2; 3; 4; 5; 6; 7}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1:
->   [-9..-1], {1; 2; 3; 4; 5; 6; 7; 8}, {-7; -6; -5; -4; -3; -2; -1; 0}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1:
->   [1..9], {-8; -7; -6; -5; -4; -3; -2; -1}, {0; 1; 2; 3; 4; 5; 6; 7}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1:
->   [-9..-1], {-8; -7; -6; -5; -4; -3; -2; -1}, {-7; -6; -5; -4; -3; -2; -1; 0}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1:
->   {-8; -7; -6; -5; -4; -3; -2; -1},
->   {-7; -6; -5; -4; -3; -2; -1},
->   {-6; -5; -4; -3; -2; -1; 0}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1:
->   {-8; -7; -6; -5; -4; -3; -2; -1},
->   {1; 2; 3; 4; 5; 6; 7},
->   {-6; -5; -4; -3; -2; -1; 0}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1:
->   {1; 2; 3; 4; 5; 6; 7; 8}, {-7; -6; -5; -4; -3; -2; -1}, {0; 1; 2; 3; 4; 5; 6}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1:
->   {1; 2; 3; 4; 5; 6; 7; 8}, {1; 2; 3; 4; 5; 6; 7}, {0; 1; 2; 3; 4; 5; 6}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1:
->   {1; 2; 3; 4; 5; 6; 7}, {1; 2; 3; 4; 5; 6}, {0; 1; 2; 3; 4; 5}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1:
->   {-7; -6; -5; -4; -3; -2; -1}, {1; 2; 3; 4; 5; 6}, {-5; -4; -3; -2; -1; 0}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1:
->   {1; 2; 3; 4; 5; 6; 7}, {-6; -5; -4; -3; -2; -1}, {0; 1; 2; 3; 4; 5}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1:
->   {-7; -6; -5; -4; -3; -2; -1},
->   {-6; -5; -4; -3; -2; -1},
->   {-5; -4; -3; -2; -1; 0}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1:
->   {-6; -5; -4; -3; -2; -1}, {-5; -4; -3; -2; -1}, {-4; -3; -2; -1; 0}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1:
->   {-6; -5; -4; -3; -2; -1}, {1; 2; 3; 4; 5}, {-4; -3; -2; -1; 0}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1:
->   {1; 2; 3; 4; 5; 6}, {-5; -4; -3; -2; -1}, {0; 1; 2; 3; 4}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1: {1; 2; 3; 4; 5; 6}, {1; 2; 3; 4; 5}, {0; 1; 2; 3; 4}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1: {1; 2; 3; 4; 5}, {1; 2; 3; 4}, {0; 1; 2; 3}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1: {-5; -4; -3; -2; -1}, {1; 2; 3; 4}, {-3; -2; -1; 0}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1: {1; 2; 3; 4; 5}, {-4; -3; -2; -1}, {0; 1; 2; 3}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1: {-5; -4; -3; -2; -1}, {-4; -3; -2; -1}, {-3; -2; -1; 0}
-> [eva] modulo.i:41: 
->   Frama_C_show_each_1: {-4; -3; -2; -1}, {-3; -2; -1}, {-2; -1; 0}
-> [eva] modulo.i:41: Frama_C_show_each_1: {-4; -3; -2; -1}, {1; 2; 3}, {-2; -1; 0}
-> [eva] modulo.i:41: Frama_C_show_each_1: {1; 2; 3; 4}, {-3; -2; -1}, {0; 1; 2}
-> [eva] modulo.i:41: Frama_C_show_each_1: {1; 2; 3; 4}, {1; 2; 3}, {0; 1; 2}
-> [eva] modulo.i:41: Frama_C_show_each_1: {1; 2; 3}, {1; 2}, {0; 1}
-> [eva] modulo.i:41: Frama_C_show_each_1: {-3; -2; -1}, {1; 2}, {-1; 0}
-> [eva] modulo.i:41: Frama_C_show_each_1: {1; 2; 3}, {-2; -1}, {0; 1}
-> [eva] modulo.i:41: Frama_C_show_each_1: {-3; -2; -1}, {-2; -1}, {-1; 0}
-48a123,196
-> [eva] modulo.i:53: Frama_C_show_each_2: [-10..-1], [1..9], [-8..0]
-> [eva] modulo.i:53: Frama_C_show_each_2: [-10..-1], [-9..-1], [-8..0]
-> [eva] modulo.i:53: Frama_C_show_each_2: [1..10], [1..9], [0..8]
-> [eva] modulo.i:53: Frama_C_show_each_2: [1..10], [-9..-1], [0..8]
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2:
->   [-9..-1], {1; 2; 3; 4; 5; 6; 7; 8}, {-7; -6; -5; -4; -3; -2; -1; 0}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2:
->   [1..9], {1; 2; 3; 4; 5; 6; 7; 8}, {0; 1; 2; 3; 4; 5; 6; 7}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2:
->   [-9..-1], {-8; -7; -6; -5; -4; -3; -2; -1}, {-7; -6; -5; -4; -3; -2; -1; 0}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2:
->   [1..9], {-8; -7; -6; -5; -4; -3; -2; -1}, {0; 1; 2; 3; 4; 5; 6; 7}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2:
->   {-8; -7; -6; -5; -4; -3; -2; -1},
->   {1; 2; 3; 4; 5; 6; 7},
->   {-6; -5; -4; -3; -2; -1; 0}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2:
->   {-8; -7; -6; -5; -4; -3; -2; -1},
->   {-7; -6; -5; -4; -3; -2; -1},
->   {-6; -5; -4; -3; -2; -1; 0}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2:
->   {1; 2; 3; 4; 5; 6; 7; 8}, {1; 2; 3; 4; 5; 6; 7}, {0; 1; 2; 3; 4; 5; 6}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2:
->   {1; 2; 3; 4; 5; 6; 7; 8}, {-7; -6; -5; -4; -3; -2; -1}, {0; 1; 2; 3; 4; 5; 6}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2:
->   {-7; -6; -5; -4; -3; -2; -1}, {1; 2; 3; 4; 5; 6}, {-5; -4; -3; -2; -1; 0}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2:
->   {1; 2; 3; 4; 5; 6; 7}, {1; 2; 3; 4; 5; 6}, {0; 1; 2; 3; 4; 5}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2:
->   {-7; -6; -5; -4; -3; -2; -1},
->   {-6; -5; -4; -3; -2; -1},
->   {-5; -4; -3; -2; -1; 0}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2:
->   {1; 2; 3; 4; 5; 6; 7}, {-6; -5; -4; -3; -2; -1}, {0; 1; 2; 3; 4; 5}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2:
->   {-6; -5; -4; -3; -2; -1}, {1; 2; 3; 4; 5}, {-4; -3; -2; -1; 0}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2:
->   {-6; -5; -4; -3; -2; -1}, {-5; -4; -3; -2; -1}, {-4; -3; -2; -1; 0}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2: {1; 2; 3; 4; 5; 6}, {1; 2; 3; 4; 5}, {0; 1; 2; 3; 4}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2:
->   {1; 2; 3; 4; 5; 6}, {-5; -4; -3; -2; -1}, {0; 1; 2; 3; 4}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2: {-5; -4; -3; -2; -1}, {1; 2; 3; 4}, {-3; -2; -1; 0}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2: {1; 2; 3; 4; 5}, {1; 2; 3; 4}, {0; 1; 2; 3}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2: {-5; -4; -3; -2; -1}, {-4; -3; -2; -1}, {-3; -2; -1; 0}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2: {1; 2; 3; 4; 5}, {-4; -3; -2; -1}, {0; 1; 2; 3}
-> [eva] modulo.i:53: Frama_C_show_each_2: {-4; -3; -2; -1}, {1; 2; 3}, {-2; -1; 0}
-> [eva] modulo.i:53: 
->   Frama_C_show_each_2: {-4; -3; -2; -1}, {-3; -2; -1}, {-2; -1; 0}
-> [eva] modulo.i:53: Frama_C_show_each_2: {1; 2; 3; 4}, {1; 2; 3}, {0; 1; 2}
-> [eva] modulo.i:53: Frama_C_show_each_2: {1; 2; 3; 4}, {-3; -2; -1}, {0; 1; 2}
-> [eva] modulo.i:53: Frama_C_show_each_2: {-3; -2; -1}, {1; 2}, {-1; 0}
-> [eva] modulo.i:53: Frama_C_show_each_2: {1; 2; 3}, {1; 2}, {0; 1}
-> [eva] modulo.i:53: Frama_C_show_each_2: {-3; -2; -1}, {-2; -1}, {-1; 0}
-> [eva] modulo.i:53: Frama_C_show_each_2: {1; 2; 3}, {-2; -1}, {0; 1}
-56a205,217
-> [eva] modulo.i:64: Frama_C_show_each_3: [-10..10], [-9..9], [-8..8]
-> [eva] modulo.i:64: Frama_C_show_each_3: [-9..9], [-8..8], [-7..7]
-> [eva] modulo.i:64: Frama_C_show_each_3: [-8..8], [-7..7], [-6..6]
-> [eva] modulo.i:64: Frama_C_show_each_3: [-7..7], [-6..6], [-5..5]
-> [eva] modulo.i:64: Frama_C_show_each_3: [-6..6], [-5..5], [-4..4]
-> [eva] modulo.i:64: 
->   Frama_C_show_each_3:
->   [-5..5], {-4; -3; -2; -1; 1; 2; 3; 4}, {-3; -2; -1; 0; 1; 2; 3}
-> [eva] modulo.i:64: 
->   Frama_C_show_each_3:
->   {-4; -3; -2; -1; 1; 2; 3; 4}, {-3; -2; -1; 1; 2; 3}, {-2; -1; 0; 1; 2}
-> [eva] modulo.i:64: 
->   Frama_C_show_each_3: {-3; -2; -1; 1; 2; 3}, {-2; -1; 1; 2}, {-1; 0; 1}
diff --git a/tests/value/oracle_equalities/non_natural.res.oracle b/tests/value/oracle_equalities/non_natural.res.oracle
deleted file mode 100644
index 10937ade1eb8718fd63fea37a336c372eb48eec5..0000000000000000000000000000000000000000
--- a/tests/value/oracle_equalities/non_natural.res.oracle
+++ /dev/null
@@ -1,52 +0,0 @@
-57a58,59
-> [kernel] non_natural.i:30: 
->   more than 200(12500) elements to enumerate. Approximating.
-63a66,69
-> [kernel] non_natural.i:23: 
->   more than 200(12500) elements to enumerate. Approximating.
-> [kernel] non_natural.i:23: 
->   more than 200(12501) elements to enumerate. Approximating.
-68a75,78
-> [kernel] non_natural.i:24: 
->   more than 200(12500) elements to enumerate. Approximating.
-> [kernel] non_natural.i:24: 
->   more than 200(12501) elements to enumerate. Approximating.
-76a87,88
-> [kernel] non_natural.i:25: 
->   more than 200(12500) elements to enumerate. Approximating.
-84a97,98
-> [kernel] non_natural.i:26: 
->   more than 200(12500) elements to enumerate. Approximating.
-92a107,108
-> [kernel] non_natural.i:27: 
->   more than 200(12500) elements to enumerate. Approximating.
-100a117,118
-> [kernel] non_natural.i:28: 
->   more than 200(12500) elements to enumerate. Approximating.
-108a127,128
-> [kernel] non_natural.i:29: 
->   more than 200(12500) elements to enumerate. Approximating.
-124,143d143
-< [kernel] non_natural.i:23: 
-<   more than 200(12501) elements to enumerate. Approximating.
-< [kernel] non_natural.i:23: 
-<   more than 200(12500) elements to enumerate. Approximating.
-< [kernel] non_natural.i:24: 
-<   more than 200(12501) elements to enumerate. Approximating.
-< [kernel] non_natural.i:24: 
-<   more than 200(12500) elements to enumerate. Approximating.
-< [kernel] non_natural.i:25: 
-<   more than 200(12500) elements to enumerate. Approximating.
-< [kernel] non_natural.i:26: 
-<   more than 200(12500) elements to enumerate. Approximating.
-< [kernel] non_natural.i:27: 
-<   more than 200(12500) elements to enumerate. Approximating.
-< [kernel] non_natural.i:28: 
-<   more than 200(12500) elements to enumerate. Approximating.
-< [kernel] non_natural.i:29: 
-<   more than 200(12500) elements to enumerate. Approximating.
-< [kernel] non_natural.i:30: 
-<   more than 200(12500) elements to enumerate. Approximating.
-194a195,196
-> [kernel] non_natural.i:39: 
->   more than 200(12500) elements to enumerate. Approximating.
diff --git a/tests/value/oracle_equalities/nonlin.res.oracle b/tests/value/oracle_equalities/nonlin.res.oracle
deleted file mode 100644
index ea6922cad99027c8ab350b07e23719b9e01d6fbd..0000000000000000000000000000000000000000
--- a/tests/value/oracle_equalities/nonlin.res.oracle
+++ /dev/null
@@ -1,4 +0,0 @@
-187c187
-<   q ∈ {{ &x + [-400..400],0%4 }}
----
->   q ∈ {{ &x }}
diff --git a/tests/value/oracle_equalities/octagons.res.oracle b/tests/value/oracle_equalities/octagons.res.oracle
deleted file mode 100644
index 30610a5b5ff54c2db41ea3379917fe92f063fb05..0000000000000000000000000000000000000000
--- a/tests/value/oracle_equalities/octagons.res.oracle
+++ /dev/null
@@ -1,8 +0,0 @@
-29c29
-<   Frama_C_show_each_unreduced_unsigned: [0..4294967295], [0..4294967295]
----
->   Frama_C_show_each_unreduced_unsigned: [0..4294967295], [6..4294967295]
-253c253
-<   t ∈ [--..--] or UNINITIALIZED
----
->   t ∈ [6..4294967295] or UNINITIALIZED
diff --git a/tests/value/oracle_equalities/offsetmap.0.res.oracle b/tests/value/oracle_equalities/offsetmap.0.res.oracle
deleted file mode 100644
index 6bebb89e738e4c6703b3d8b869f9d852e34a9e44..0000000000000000000000000000000000000000
--- a/tests/value/oracle_equalities/offsetmap.0.res.oracle
+++ /dev/null
@@ -1,4 +0,0 @@
-40d39
-< [eva] Recording results for g
-42a42
-> [eva] Recording results for g
diff --git a/tests/value/oracle_equalities/offsetmap.1.res.oracle b/tests/value/oracle_equalities/offsetmap.1.res.oracle
deleted file mode 100644
index 6bebb89e738e4c6703b3d8b869f9d852e34a9e44..0000000000000000000000000000000000000000
--- a/tests/value/oracle_equalities/offsetmap.1.res.oracle
+++ /dev/null
@@ -1,4 +0,0 @@
-40d39
-< [eva] Recording results for g
-42a42
-> [eva] Recording results for g
diff --git a/tests/value/oracle_equalities/origin.0.res.oracle b/tests/value/oracle_equalities/origin.0.res.oracle
deleted file mode 100644
index 2427bbb1cc7517af563787e1b680b5bc9490902e..0000000000000000000000000000000000000000
--- a/tests/value/oracle_equalities/origin.0.res.oracle
+++ /dev/null
@@ -1,10 +0,0 @@
-236,237c236
-<   pm2[bits 0 to 15]# ∈ {{ (? *)&a }}%32, bits 16 to 31 
-<      [bits 16 to 31]# ∈ {{ (? *)&b }}%32, bits 0 to 15 
----
->   pm2 ∈ {{ &a + {-4} ; &b + {-4} }}
-271,272c270
-<   pm2[bits 0 to 15]# ∈ {{ (? *)&a }}%32, bits 16 to 31 
-<      [bits 16 to 31]# ∈ {{ (? *)&b }}%32, bits 0 to 15 
----
->   pm2 ∈ {{ &a + {-4} ; &b + {-4} }}
diff --git a/tests/value/oracle_equalities/period.res.oracle b/tests/value/oracle_equalities/period.res.oracle
deleted file mode 100644
index 208bb785c666f3d05fd6161dba406ac1cf4ae010..0000000000000000000000000000000000000000
--- a/tests/value/oracle_equalities/period.res.oracle
+++ /dev/null
@@ -1,9 +0,0 @@
-87,92d86
-< [eva:alarm] period.c:53: Warning: 
-<   pointer downcast. assert (unsigned int)(&g) ≤ 2147483647;
-< [eva] period.c:53: 
-<   Assigning imprecise value to p.
-<   The imprecision originates from Arithmetic {period.c:53}
-< [eva:alarm] period.c:54: Warning: out of bounds read. assert \valid_read(p);
-97d90
-< [scope:rm_asserts] removing 1 assertion(s)
diff --git a/tests/value/oracle_equalities/plevel.res.oracle b/tests/value/oracle_equalities/plevel.res.oracle
deleted file mode 100644
index 80295e5723f5bf368e511c973dba796ddd937095..0000000000000000000000000000000000000000
--- a/tests/value/oracle_equalities/plevel.res.oracle
+++ /dev/null
@@ -1,4 +0,0 @@
-12d11
-< [eva] Recording results for main
-13a13
-> [eva] Recording results for main
diff --git a/tests/value/oracle_equalities/pointer_comp.res.oracle b/tests/value/oracle_equalities/pointer_comp.res.oracle
deleted file mode 100644
index 087a06fb508cf64f10b27f25fab056fa094a526e..0000000000000000000000000000000000000000
--- a/tests/value/oracle_equalities/pointer_comp.res.oracle
+++ /dev/null
@@ -1,5 +0,0 @@
-30a31,34
-> [kernel] pointer_comp.c:43: 
->   imprecise size for variable g (Undefined sizeof on a function.)
-> [kernel] pointer_comp.c:43: 
->   imprecise size for variable f (Undefined sizeof on a function.)
diff --git a/tests/value/oracle_equalities/ptr_relation.0.res.oracle b/tests/value/oracle_equalities/ptr_relation.0.res.oracle
deleted file mode 100644
index 0ae744ec7d6e6fcde013d15696dcf66e9f1424b5..0000000000000000000000000000000000000000
--- a/tests/value/oracle_equalities/ptr_relation.0.res.oracle
+++ /dev/null
@@ -1,4 +0,0 @@
-23c23
-<   i ∈ {0; 77; 333}
----
->   i ∈ {77}
diff --git a/tests/value/oracle_equalities/redundant_alarms.res.oracle b/tests/value/oracle_equalities/redundant_alarms.res.oracle
deleted file mode 100644
index 2f36670a266fa8d3feaced6d73fc9009a4965302..0000000000000000000000000000000000000000
--- a/tests/value/oracle_equalities/redundant_alarms.res.oracle
+++ /dev/null
@@ -1,26 +0,0 @@
-10,13d9
-< [eva:alarm] redundant_alarms.c:12: Warning: 
-<   accessing uninitialized left-value. assert \initialized(p);
-< [eva:alarm] redundant_alarms.c:13: Warning: 
-<   accessing uninitialized left-value. assert \initialized(p);
-24,25d19
-< [eva:alarm] redundant_alarms.c:22: Warning: 
-<   accessing uninitialized left-value. assert \initialized(&t[i]);
-61,63c55
-< [scope:rm_asserts] removing 3 assertion(s)
-< [scope:rm_asserts] redundant_alarms.c:13: 
-<   removing redundant assert Eva: initialization: \initialized(p);
----
-> [scope:rm_asserts] removing 2 assertion(s)
-106d97
-<   /*@ assert Eva: initialization: \initialized(p); */
-108d98
-<   /*@ assert Eva: initialization: \initialized(p); */
-125d114
-<   /*@ assert Eva: initialization: \initialized(&t[i]); */
-194a184
->   int z;
-197,199d186
-<   *p = 1;
-<   int z = *p + 1;
-<   int w = *p + 2;
diff --git a/tests/value/oracle_equalities/relation_reduction.res.oracle b/tests/value/oracle_equalities/relation_reduction.res.oracle
deleted file mode 100644
index cb9102afadb1c2426e8f28eeba0cbd148a787039..0000000000000000000000000000000000000000
--- a/tests/value/oracle_equalities/relation_reduction.res.oracle
+++ /dev/null
@@ -1,23 +0,0 @@
-24,27d23
-< [eva:alarm] relation_reduction.i:20: Warning: 
-<   accessing out of bounds index. assert 0 ≤ y;
-< [eva:alarm] relation_reduction.i:20: Warning: 
-<   accessing out of bounds index. assert y < 9;
-34,37c30,33
-<   R1 ∈ [-2147483648..2147483637]
-<   R2 ∈ [-2147483638..2147483647]
-<   R3 ∈ [--..--]
-<   R4 ∈ {0; 1; 2; 3; 4; 5}
----
->   R1 ∈ {0; 2}
->   R2 ∈ {0; 12}
->   R3 ∈ {0; 7}
->   R4 ∈ {0; 2}
-48c44
-<   R4 FROM tab[0..8]; x (and SELF)
----
->   R4 FROM tab[0..5]; x (and SELF)
-53c49
-<     y; t; tab[0..8]
----
->     y; t; tab[0..5]
diff --git a/tests/value/oracle_equalities/relation_shift.res.oracle b/tests/value/oracle_equalities/relation_shift.res.oracle
deleted file mode 100644
index a7aa398b0eae520c23b130cc66216789f497f66c..0000000000000000000000000000000000000000
--- a/tests/value/oracle_equalities/relation_shift.res.oracle
+++ /dev/null
@@ -1,12 +0,0 @@
-34,35c34,35
-<   x ∈ [-2147483647..2147483647]
-<   y ∈ [-2147483648..2147483646]
----
->   x ∈ [-2147483647..2147483642]
->   y ∈ [-2147483648..2147483645]
-52,53c52,53
-<   x ∈ [-2147483647..2147483647]
-<   y ∈ [-2147483648..2147483646]
----
->   x ∈ [-2147483647..2147483642]
->   y ∈ [-2147483648..2147483645]
diff --git a/tests/value/oracle_equalities/relations.res.oracle b/tests/value/oracle_equalities/relations.res.oracle
deleted file mode 100644
index 4617cf21e379162224ce9806eb48d3cb6c53028c..0000000000000000000000000000000000000000
--- a/tests/value/oracle_equalities/relations.res.oracle
+++ /dev/null
@@ -1,15 +0,0 @@
-60,61c60
-<   u[0] ∈ [-2147483648..2147483646]
-<    [1] ∈ [--..--]
----
->   u[0..1] ∈ [-2147483648..2147483646]
-67,70c66,69
-<   R1 ∈ [--..--]
-<   R2 ∈ [--..--]
-<   R3 ∈ [-2147483648..2147483646]
-<   R4 ∈ [--..--]
----
->   R1 ∈ {0; 3}
->   R2 ∈ {0; 3}
->   R3 ∈ {0; 2}
->   R4 ∈ {0; 2}
diff --git a/tests/value/oracle_equalities/relations2.res.oracle b/tests/value/oracle_equalities/relations2.res.oracle
deleted file mode 100644
index f28c7db295829a43b3ea15839fda057ad54c22b5..0000000000000000000000000000000000000000
--- a/tests/value/oracle_equalities/relations2.res.oracle
+++ /dev/null
@@ -1,6 +0,0 @@
-58c58
-<   n ∈ [0..512]
----
->   n ∈ [1..512]
-132d131
-< [eva] relations2.i:57: Frama_C_show_each_NO2:
diff --git a/tests/value/oracle_equalities/struct2.res.oracle b/tests/value/oracle_equalities/struct2.res.oracle
deleted file mode 100644
index 848a02fcf02af843f93025e3241dc58bfe59ef05..0000000000000000000000000000000000000000
--- a/tests/value/oracle_equalities/struct2.res.oracle
+++ /dev/null
@@ -1,30 +0,0 @@
-53a54,55
-> [kernel] struct2.i:78: Warning: 
->   all target addresses were invalid. This path is assumed to be dead.
-57,58d58
-<   accessing out of bounds index. assert 0 ≤ (int)(tab2[i] + j);
-< [eva:alarm] struct2.i:82: Warning: 
-79,80d78
-<   accessing out of bounds index. assert (int)(i + j) < 2;
-< [eva:alarm] struct2.i:185: Warning: 
-98c96
-< [scope:rm_asserts] removing 2 assertion(s)
----
-> [scope:rm_asserts] removing 1 assertion(s)
-135,137c133,135
-<   tab3[0..1] ∈ [--..--]
-<   tab4[0] ∈ {0; 2}
-<       [1] ∈ {0}
----
->   tab3[0] ∈ {0; 1}
->       [1] ∈ [--..--]
->   tab4[0..1] ∈ {0}
-140c138,139
-<   tab6[0..1] ∈ {0; 2}
----
->   tab6[0] ∈ {0}
->       [1] ∈ {2}
-211c210
-<            [9].a}; s1; s2; s5.e[0].b; s6.b; s8; tabl[0..1]; tab1[0..1];
----
->            [9].a}; s1; s2; s5.e[0].b; s6.b; s8; tabl[0..1]; tab1[0];
diff --git a/tests/value/oracle_symblocs/builtins_split.res.oracle b/tests/value/oracle_symblocs/builtins_split.res.oracle
deleted file mode 100644
index 9e88f384bc874d83ca09c8d03373778734c95ab2..0000000000000000000000000000000000000000
--- a/tests/value/oracle_symblocs/builtins_split.res.oracle
+++ /dev/null
@@ -1,4 +0,0 @@
-51c51
-<   Frama_C_show_each_t_i_2: {1; 2; 3; 4; 5; 6; 7; 8}, {0; 4; 8; 12}
----
->   Frama_C_show_each_t_i_2: {1; 2; 3; 4; 5; 6; 7; 8}, {8}
diff --git a/tests/value/oracle_symblocs/symbolic_locs.res.oracle b/tests/value/oracle_symblocs/symbolic_locs.res.oracle
deleted file mode 100644
index 49bbe86eb13a9a1e51ded1a3c2abcd78acea01c1..0000000000000000000000000000000000000000
--- a/tests/value/oracle_symblocs/symbolic_locs.res.oracle
+++ /dev/null
@@ -1,71 +0,0 @@
-19a20,25
->   # Symbolic locations domain:
->   V: {[ t[i] -> {4} ]}
->   Z: {[ t[i] -> t[0..8]; i ]}
->   I: {[ t -> {t[i]}
->         i -> {t[i]} ]}
->   S: {[ i -> {t[i]} ]}
-30a37,41
->   # Symbolic locations domain:
->   V: {[  ]}
->   Z: {[  ]}
->   I: {[  ]}
->   S: {[  ]}
-46a58,63
->   # Symbolic locations domain:
->   V: {[ t[i] -> {4} ]}
->   Z: {[ t[i] -> t[0..8]; i ]}
->   I: {[ t -> {t[i]}
->         i -> {t[i]} ]}
->   S: {[ i -> {t[i]} ]}
-57a75,79
->   # Symbolic locations domain:
->   V: {[  ]}
->   Z: {[  ]}
->   I: {[  ]}
->   S: {[  ]}
-76a99,105
->   # Symbolic locations domain:
->   V: {[ t[i] -> {{ &x }} ]}
->   Z: {[ t[i] -> t[0..8]; i ]}
->   I: {[ t -> {t[i]}
->         i -> {t[i]} ]}
->   S: {[ i -> {t[i]}
->         x -> {t[i]} ]}
-89a119,123
->   # Symbolic locations domain:
->   V: {[  ]}
->   Z: {[  ]}
->   I: {[  ]}
->   S: {[  ]}
-104a139,144
->   # Symbolic locations domain:
->   V: {[ t[i] -> {1} ]}
->   Z: {[ t[i] -> t[0..8]; i ]}
->   I: {[ t -> {t[i]}
->         i -> {t[i]} ]}
->   S: {[ i -> {t[i]} ]}
-113a154,158
->   # Symbolic locations domain:
->   V: {[  ]}
->   Z: {[  ]}
->   I: {[  ]}
->   S: {[  ]}
-128a174,178
->   # Symbolic locations domain:
->   V: {[  ]}
->   Z: {[  ]}
->   I: {[  ]}
->   S: {[  ]}
-135,137c185
-< [eva:alarm] symbolic_locs.i:111: Warning: 
-<   signed overflow. assert *p + 1 ≤ 2147483647;
-< [eva] symbolic_locs.i:113: Frama_C_show_each: [0..2147483647]
----
-> [eva] symbolic_locs.i:113: Frama_C_show_each: [10001..2147483647]
-146a195,199
->   # Symbolic locations domain:
->   V: {[  ]}
->   Z: {[  ]}
->   I: {[  ]}
->   S: {[  ]}
diff --git a/tests/value/recursion2.i b/tests/value/recursion2.i
deleted file mode 100644
index dd3a75161c5f2a120cb9cb8e2a253733ceb39f23..0000000000000000000000000000000000000000
--- a/tests/value/recursion2.i
+++ /dev/null
@@ -1,23 +0,0 @@
-/*run.config*
-  OPT: -eva @EVA_CONFIG@ -then -input -out -inout
- */
-int x, y;
-
-void h2 (int);
-void h1 (int);
-
-void h1 (int i) {
-  int r = x;
-  if (i)
-    h2 (i);
-}
-void h2 (int j) {
-  int q = y;
-  if (!j)
-    h1 (j);
-}
-
-void main() {
-  h2(0);
-  h1(1);
-}
diff --git a/tests/value/va_list.c b/tests/value/va_list.c
index 553dbdce5a2b9399df38f420570c5f6d120d6ea7..374d236b163780ee612f7d470a45e6c351f6a8b1 100644
--- a/tests/value/va_list.c
+++ b/tests/value/va_list.c
@@ -8,6 +8,7 @@ typedef void *va_list;
 #define va_start(AP, LASTARG) \
  (AP = ((va_list) __builtin_next_arg (LASTARG)))
 
+
 void main(const char *pszMessage,...) {
   va_list vlParameters;
   va_start(vlParameters,pszMessage);