From 92237e6b816e378a331fcb62d16e88269e43dc02 Mon Sep 17 00:00:00 2001
From: Valentin Perrelle <valentin.perrelle@cea.fr>
Date: Wed, 28 Aug 2019 14:37:47 +0200
Subject: [PATCH] [Dive] Update tests
---
src/plugins/dive/build.ml | 4 ++--
.../dive/tests/dive/oracle/assigned_param.dot | 15 ++++++-------
src/plugins/dive/tests/dive/oracle/const.dot | 21 +++++++++++--------
src/plugins/dive/tests/dive/oracle/global.dot | 6 ++----
.../dive/tests/dive/oracle/pointed_param.dot | 12 ++++-------
.../tests/dive/oracle/pointers_to_local.dot | 12 ++---------
.../tests/dive/oracle/unfocused_callers.dot | 15 +++++--------
.../dive/tests/dive/oracle/various.dot | 15 +++++--------
8 files changed, 40 insertions(+), 60 deletions(-)
diff --git a/src/plugins/dive/build.ml b/src/plugins/dive/build.ml
index c69caf28221..ba98a800bf7 100644
--- a/src/plugins/dive/build.ml
+++ b/src/plugins/dive/build.ml
@@ -129,8 +129,8 @@ let update_node_values node kinstr lval =
values_grade = float_grade fkind (min,max);
}
end
- | _ -> Self.result "node %a has type %a" Node_kind.pretty node.node_kind Cil_printer.pp_typ typ
- with Cvalue.V.Not_based_on_null -> Self.result "node %a is not numeric" Node_kind.pretty node.node_kind
+ | _ -> ()
+ with Cvalue.V.Not_based_on_null -> ()
(* --- Locations handling --- *)
diff --git a/src/plugins/dive/tests/dive/oracle/assigned_param.dot b/src/plugins/dive/tests/dive/oracle/assigned_param.dot
index 9c450998aa9..94e9d61fcfc 100644
--- a/src/plugins/dive/tests/dive/oracle/assigned_param.dot
+++ b/src/plugins/dive/tests/dive/oracle/assigned_param.dot
@@ -1,14 +1,15 @@
digraph G {
cp0 [label=<w>, shape=box, ];
cp1 [label=<x>, shape=box, ];
- cp3 [label=<z>, shape=box, ];
- cp5 [label=<x>, shape=box, ];
- cp7 [label=<z>, shape=box, ];
- cp9 [style="invis,dotted", ];
- cp10 [style="invis,dotted", ];
+ cp3 [label=<z>, shape=box, fillcolor="#FFBBBB", color="#FF0000",
+ style="filled", ];
+ cp5 [label=<x>, shape=box, fillcolor="#FFBBBB", color="#FF0000",
+ style="filled", ];
+ cp7 [label=<z>, shape=box, fillcolor="#FFBBBB", color="#FF0000",
+ style="filled", ];
- subgraph cluster_cs_1 { label=<main>; cp9;cp7;cp5;cp0;
- subgraph cluster_cs_2 { label=<f>; cp10;cp3;cp1;
+ subgraph cluster_cs_1 { label=<main>; cp7;cp5;cp0;
+ subgraph cluster_cs_2 { label=<f>; cp3;cp1;
};
};
diff --git a/src/plugins/dive/tests/dive/oracle/const.dot b/src/plugins/dive/tests/dive/oracle/const.dot
index 0a766f76f04..18dc1ed3ba1 100644
--- a/src/plugins/dive/tests/dive/oracle/const.dot
+++ b/src/plugins/dive/tests/dive/oracle/const.dot
@@ -1,16 +1,19 @@
digraph G {
cp0 [label=<res>, shape=box, ];
cp1 [label=<__retres>, shape=box, ];
- cp3 [label=<c>, shape=box, ];
- cp5 [label=<w>, shape=box, ];
- cp7 [label=<x>, shape=box, ];
- cp9 [label=<y>, shape=box, ];
- cp11 [label=<i>, shape=box, style="dotted", ];
- cp14 [style="invis,dotted", ];
- cp15 [style="invis,dotted", ];
+ cp3 [label=<c>, shape=box, fillcolor="#FFBBBB", color="#FF0000",
+ style="filled", ];
+ cp5 [label=<w>, shape=box, fillcolor="#FFBBBB", color="#FF0000",
+ style="filled", ];
+ cp7 [label=<x>, shape=box, fillcolor="#FFBBBB", color="#FF0000",
+ style="filled", ];
+ cp9 [label=<y>, shape=box, fillcolor="#FFBBBB", color="#FF0000",
+ style="filled", ];
+ cp11 [label=<i>, shape=box, fillcolor="#FFBBBB", color="#FF0000",
+ style="filled,dotted", ];
- subgraph cluster_cs_1 { label=<main>; cp14;cp11;cp0;
- subgraph cluster_cs_2 { label=<f>; cp15;cp9;cp7;cp5;cp3;cp1;
+ subgraph cluster_cs_1 { label=<main>; cp11;cp0;
+ subgraph cluster_cs_2 { label=<f>; cp9;cp7;cp5;cp3;cp1;
};
};
diff --git a/src/plugins/dive/tests/dive/oracle/global.dot b/src/plugins/dive/tests/dive/oracle/global.dot
index 6bfc454a9bf..b64b502f0e5 100644
--- a/src/plugins/dive/tests/dive/oracle/global.dot
+++ b/src/plugins/dive/tests/dive/oracle/global.dot
@@ -6,12 +6,10 @@ digraph G {
style="filled", ];
cp5 [label=<y>, shape=box, fillcolor="#FFBBBB", color="#FF0000",
style="filled,dotted", ];
- cp7 [style="invis,dotted", ];
- cp8 [style="invis,dotted", ];
- subgraph cluster_cs_1 { label=<main>; cp7;cp5;cp3;cp0;
+ subgraph cluster_cs_1 { label=<main>; cp5;cp3;cp0;
};
- subgraph cluster_file_1 { label=<tests/dive/global.i>; cp8;cp1;
+ subgraph cluster_file_1 { label=<tests/dive/global.i>; cp1;
};
cp1 -> cp0;
diff --git a/src/plugins/dive/tests/dive/oracle/pointed_param.dot b/src/plugins/dive/tests/dive/oracle/pointed_param.dot
index dadfd9a1f49..c5da80a51f2 100644
--- a/src/plugins/dive/tests/dive/oracle/pointed_param.dot
+++ b/src/plugins/dive/tests/dive/oracle/pointed_param.dot
@@ -7,15 +7,11 @@ digraph G {
cp7 [label=<__retres>, shape=box, ];
cp9 [label=<x>, shape=box, fillcolor="#FFBBBB", color="#FF0000",
style="filled,dotted", ];
- cp11 [style="invis,dotted", ];
- cp12 [style="invis,dotted", ];
- cp13 [style="invis,dotted", ];
- cp14 [style="invis,dotted", ];
- subgraph cluster_cs_1 { label=<main>; cp11;cp1;cp0;
- subgraph cluster_cs_2 { label=<f>; cp12;cp9;cp3;
- subgraph cluster_cs_3 { label=<g>; cp13;cp5;
- subgraph cluster_cs_4 { label=<h>; cp14;cp7;
+ subgraph cluster_cs_1 { label=<main>; cp1;cp0;
+ subgraph cluster_cs_2 { label=<f>; cp9;cp3;
+ subgraph cluster_cs_3 { label=<g>; cp5;
+ subgraph cluster_cs_4 { label=<h>; cp7;
};
};
};
diff --git a/src/plugins/dive/tests/dive/oracle/pointers_to_local.dot b/src/plugins/dive/tests/dive/oracle/pointers_to_local.dot
index 741dc456cad..714f41eccb2 100644
--- a/src/plugins/dive/tests/dive/oracle/pointers_to_local.dot
+++ b/src/plugins/dive/tests/dive/oracle/pointers_to_local.dot
@@ -5,17 +5,9 @@ digraph G {
style="filled", ];
cp4 [label=<x>, shape=box, fillcolor="#AACCFF", color="#88AAFF",
style="filled", ];
- cp8 [style="invis,dotted", ];
- cp9 [style="invis,dotted", ];
- cp10 [style="invis,dotted", ];
- cp11 [style="invis,dotted", ];
- subgraph cluster_cs_1 { label=<main>; cp8;cp0;
- subgraph cluster_cs_2 { label=<f1>; cp9;
- subgraph cluster_cs_3 { label=<g>; cp10;cp1;
- };
- };
- subgraph cluster_cs_4 { label=<f2>; cp11;cp4;
+ subgraph cluster_cs_1 { label=<main>; cp0;
+ subgraph cluster_cs_4 { label=<f2>; cp4;
};
};
diff --git a/src/plugins/dive/tests/dive/oracle/unfocused_callers.dot b/src/plugins/dive/tests/dive/oracle/unfocused_callers.dot
index 594da3bbe32..1009dfdd36f 100644
--- a/src/plugins/dive/tests/dive/oracle/unfocused_callers.dot
+++ b/src/plugins/dive/tests/dive/oracle/unfocused_callers.dot
@@ -8,21 +8,16 @@ digraph G {
style="filled", ];
cp7 [label=<x>, shape=box, fillcolor="#FFBBBB", color="#FF0000",
style="filled", ];
- cp11 [style="invis,dotted", ];
- cp12 [style="invis,dotted", ];
- cp13 [style="invis,dotted", ];
- cp14 [style="invis,dotted", ];
- cp15 [style="invis,dotted", ];
- subgraph cluster_cs_1 { label=<g>; cp11;cp0;
+ subgraph cluster_cs_1 { label=<g>; cp0;
};
- subgraph cluster_cs_2 { label=<f3>; cp12;cp1;
+ subgraph cluster_cs_2 { label=<f3>; cp1;
};
- subgraph cluster_cs_3 { label=<f2>; cp13;cp3;
+ subgraph cluster_cs_3 { label=<f2>; cp3;
};
- subgraph cluster_cs_4 { label=<f1>; cp14;cp5;
+ subgraph cluster_cs_4 { label=<f1>; cp5;
};
- subgraph cluster_cs_5 { label=<main>; cp15;cp7;
+ subgraph cluster_cs_5 { label=<main>; cp7;
};
cp1 -> cp0;
diff --git a/src/plugins/dive/tests/dive/oracle/various.dot b/src/plugins/dive/tests/dive/oracle/various.dot
index bed90b44079..da2d98fbed8 100644
--- a/src/plugins/dive/tests/dive/oracle/various.dot
+++ b/src/plugins/dive/tests/dive/oracle/various.dot
@@ -29,21 +29,16 @@ digraph G {
cp32 [label=<is_nan_or_infinite: \is_finite((float)(y + w))>,
fillcolor="#FF0000", color="#FF0000", shape=doubleoctagon,
style="filled,bold", ];
- cp35 [style="invis,dotted", ];
- cp36 [style="invis,dotted", ];
- cp37 [style="invis,dotted", ];
- cp38 [style="invis,dotted", ];
- cp39 [style="invis,dotted", ];
- subgraph cluster_cs_1 { label=<f>; cp35;cp30;cp1;cp0;
+ subgraph cluster_cs_1 { label=<f>; cp30;cp1;cp0;
};
- subgraph cluster_cs_2 { label=<main>; cp36;cp32;cp21;cp16;cp12;cp10;cp9;cp3;
- subgraph cluster_cs_3 { label=<f>; cp38;cp18;cp14;
+ subgraph cluster_cs_2 { label=<main>; cp32;cp21;cp16;cp12;cp10;cp9;cp3;
+ subgraph cluster_cs_3 { label=<f>; cp18;cp14;
};
- subgraph cluster_cs_4 { label=<f>; cp39;cp26;cp23;
+ subgraph cluster_cs_4 { label=<f>; cp26;cp23;
};
};
- subgraph cluster_file_1 { label=<tests/dive/various.i>; cp37;cp7;
+ subgraph cluster_file_1 { label=<tests/dive/various.i>; cp7;
};
cp0 -> cp1;
--
GitLab