From c481e1f51ae35b4404efd6aec8a296d5d2dae9dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20B=C3=BChler?= <david.buhler@cea.fr>
Date: Wed, 17 Jun 2020 14:39:37 +0200
Subject: [PATCH] [Dive] Updates test oracles.

---
 .../dive/tests/dive/oracle/callstack_strategy.res.oracle      | 2 +-
 src/plugins/dive/tests/dive/oracle/global.res.oracle          | 2 +-
 src/plugins/dive/tests/dive/oracle/per_callstack.res.oracle   | 4 ++--
 .../dive/tests/dive/oracle/unfocused_callers.res.oracle       | 4 ++--
 src/plugins/dive/tests/dive/oracle/various.dot                | 4 ++--
 src/plugins/dive/tests/dive/oracle/various.res.oracle         | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/plugins/dive/tests/dive/oracle/callstack_strategy.res.oracle b/src/plugins/dive/tests/dive/oracle/callstack_strategy.res.oracle
index db657295bfd..de74d0e71cb 100644
--- a/src/plugins/dive/tests/dive/oracle/callstack_strategy.res.oracle
+++ b/src/plugins/dive/tests/dive/oracle/callstack_strategy.res.oracle
@@ -3,7 +3,7 @@
 [eva] Computing initial state
 [eva] Initial state computed
 [eva:alarm] tests/dive/callstack_strategy.i:11: Warning: 
-  non-finite float value. assert \is_finite((float)(y + z));
+  non-finite float value. assert \is_finite(\add_float(y, z));
 [eva] done for function main
 [eva:summary] ====== ANALYSIS SUMMARY ======
   ----------------------------------------------------------------------------
diff --git a/src/plugins/dive/tests/dive/oracle/global.res.oracle b/src/plugins/dive/tests/dive/oracle/global.res.oracle
index 933b0df87f2..d46beb72b69 100644
--- a/src/plugins/dive/tests/dive/oracle/global.res.oracle
+++ b/src/plugins/dive/tests/dive/oracle/global.res.oracle
@@ -3,7 +3,7 @@
 [eva] Computing initial state
 [eva] Initial state computed
 [eva:alarm] tests/dive/global.i:11: Warning: 
-  non-finite float value. assert \is_finite((float)(g + x));
+  non-finite float value. assert \is_finite(\add_float(g, x));
 [eva] done for function main
 [eva:summary] ====== ANALYSIS SUMMARY ======
   ----------------------------------------------------------------------------
diff --git a/src/plugins/dive/tests/dive/oracle/per_callstack.res.oracle b/src/plugins/dive/tests/dive/oracle/per_callstack.res.oracle
index b306565b38e..bd8ebb87aa3 100644
--- a/src/plugins/dive/tests/dive/oracle/per_callstack.res.oracle
+++ b/src/plugins/dive/tests/dive/oracle/per_callstack.res.oracle
@@ -3,9 +3,9 @@
 [eva] Computing initial state
 [eva] Initial state computed
 [eva:alarm] tests/dive/per_callstack.i:15: Warning: 
-  non-finite float value. assert \is_finite((float)(x + y));
+  non-finite float value. assert \is_finite(\add_float(x, y));
 [eva:alarm] tests/dive/per_callstack.i:15: Warning: 
-  non-finite float value. assert \is_finite((float)((float)(x + y) + z));
+  non-finite float value. assert \is_finite(\add_float(\add_float(x, y), z));
 [eva] done for function main
 [eva:summary] ====== ANALYSIS SUMMARY ======
   ----------------------------------------------------------------------------
diff --git a/src/plugins/dive/tests/dive/oracle/unfocused_callers.res.oracle b/src/plugins/dive/tests/dive/oracle/unfocused_callers.res.oracle
index fc3e53ef112..8e9668ded4a 100644
--- a/src/plugins/dive/tests/dive/oracle/unfocused_callers.res.oracle
+++ b/src/plugins/dive/tests/dive/oracle/unfocused_callers.res.oracle
@@ -4,11 +4,11 @@
 [eva] Initial state computed
 [eva:alarm] tests/dive/unfocused_callers.i:16: Warning: 
   non-finite float value.
-  assert \is_finite((float)(tmp + tmp_0));
+  assert \is_finite(\add_float(tmp, tmp_0));
   (tmp from f1(x), tmp_0 from f2(x))
 [eva:alarm] tests/dive/unfocused_callers.i:16: Warning: 
   non-finite float value.
-  assert \is_finite((float)((float)(tmp + tmp_0) + tmp_1));
+  assert \is_finite(\add_float(\add_float(tmp, tmp_0), tmp_1));
   (tmp from f1(x), tmp_0 from f2(x), tmp_1 from f3(x))
 [eva] done for function main
 [eva:summary] ====== ANALYSIS SUMMARY ======
diff --git a/src/plugins/dive/tests/dive/oracle/various.dot b/src/plugins/dive/tests/dive/oracle/various.dot
index da2d98fbed8..14afa37a197 100644
--- a/src/plugins/dive/tests/dive/oracle/various.dot
+++ b/src/plugins/dive/tests/dive/oracle/various.dot
@@ -23,10 +23,10 @@ digraph G {
         style="filled", ];
   cp26 [label=<y>, shape=box, fillcolor="#FFBBBB", color="#FF0000",
         style="filled", ];
-  cp30 [label=<is_nan_or_infinite: \is_finite((float)((double)((double)y * 2.0)))>,
+  cp30 [label=<is_nan_or_infinite: \is_finite((float)\mul_double((double)y, (double)2.0))>,
         fillcolor="#FF0000", color="#FF0000", shape=doubleoctagon,
         style="filled,bold", ];
-  cp32 [label=<is_nan_or_infinite: \is_finite((float)(y + w))>,
+  cp32 [label=<is_nan_or_infinite: \is_finite(\add_float(y, w))>,
         fillcolor="#FF0000", color="#FF0000", shape=doubleoctagon,
         style="filled,bold", ];
   
diff --git a/src/plugins/dive/tests/dive/oracle/various.res.oracle b/src/plugins/dive/tests/dive/oracle/various.res.oracle
index da2ba410c6a..f85c474b7ad 100644
--- a/src/plugins/dive/tests/dive/oracle/various.res.oracle
+++ b/src/plugins/dive/tests/dive/oracle/various.res.oracle
@@ -5,9 +5,9 @@
 [eva] tests/dive/various.i:10: starting to merge loop iterations
 [eva:alarm] tests/dive/various.i:13: Warning: 
   non-finite float value.
-  assert \is_finite((float)((double)((double)y * 2.0)));
+  assert \is_finite((float)\mul_double((double)y, (double)2.0));
 [eva:alarm] tests/dive/various.i:27: Warning: 
-  non-finite float value. assert \is_finite((float)(y + w));
+  non-finite float value. assert \is_finite(\add_float(y, w));
 [eva] done for function main
 [eva:summary] ====== ANALYSIS SUMMARY ======
   ----------------------------------------------------------------------------
-- 
GitLab