From 9514e911bc7ccd1db1348b97103d5b4cd10c9345 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20B=C3=BChler?= <david.buhler@cea.fr>
Date: Fri, 19 Jun 2020 17:20:50 +0200
Subject: [PATCH] [Dive] Renames options -dive-from and
 -dive-from-function-alarms.

Into -dive-from-variables and -dive-from-alarms respectively.
---
 src/plugins/dive/self.ml                         | 4 ++--
 src/plugins/dive/tests/dive/assigned_param.i     | 2 +-
 src/plugins/dive/tests/dive/callstack_strategy.i | 2 +-
 src/plugins/dive/tests/dive/const.i              | 4 ++--
 src/plugins/dive/tests/dive/global.i             | 2 +-
 src/plugins/dive/tests/dive/per_callstack.i      | 2 +-
 src/plugins/dive/tests/dive/pointed_param.i      | 2 +-
 src/plugins/dive/tests/dive/pointers_to_local.i  | 2 +-
 src/plugins/dive/tests/dive/unfocused_callers.i  | 2 +-
 src/plugins/dive/tests/dive/various.i            | 2 +-
 10 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/plugins/dive/self.ml b/src/plugins/dive/self.ml
index 4d5fc538ba3..75bc7d1cce2 100644
--- a/src/plugins/dive/self.ml
+++ b/src/plugins/dive/self.ml
@@ -53,7 +53,7 @@ module DepthLimit = Int
 
 module FromFunctionAlarms = Kernel_function_set
     (struct
-      let option_name = "-dive-from-function-alarms"
+      let option_name = "-dive-from-alarms"
       let help = "Build the graph from the alarms emitted in the given functions."
       let arg_name = "f1,..."
     end)
@@ -109,7 +109,7 @@ module Varinfo_set (X: Parameter_sig.Input_with_arg) =
 
 module FromBases = Varinfo_set
     (struct
-      let option_name = "-dive-from"
+      let option_name = "-dive-from-variables"
       let help = "Build the graph from these local variables."
       let arg_name = "f::v,..."
     end)
diff --git a/src/plugins/dive/tests/dive/assigned_param.i b/src/plugins/dive/tests/dive/assigned_param.i
index a5d5fd969b4..fb2876d7010 100644
--- a/src/plugins/dive/tests/dive/assigned_param.i
+++ b/src/plugins/dive/tests/dive/assigned_param.i
@@ -1,5 +1,5 @@
 /* run.config
-STDOPT: +"-dive-from main::w -dive-depth-limit 5"
+STDOPT: +"-dive-from-variables main::w -dive-depth-limit 5"
 */
 
 volatile int nondet;
diff --git a/src/plugins/dive/tests/dive/callstack_strategy.i b/src/plugins/dive/tests/dive/callstack_strategy.i
index 72d1f5a832c..b309e51cfc2 100644
--- a/src/plugins/dive/tests/dive/callstack_strategy.i
+++ b/src/plugins/dive/tests/dive/callstack_strategy.i
@@ -1,5 +1,5 @@
 /* run.config
-STDOPT: +"-dive-from g::r -dive-depth-limit 20"
+STDOPT: +"-dive-from-variables g::r -dive-depth-limit 20"
 */
 
 float f(float z) {
diff --git a/src/plugins/dive/tests/dive/const.i b/src/plugins/dive/tests/dive/const.i
index 84c62df4f10..7001746bea3 100644
--- a/src/plugins/dive/tests/dive/const.i
+++ b/src/plugins/dive/tests/dive/const.i
@@ -1,5 +1,5 @@
 /* run.config
-STDOPT: +"-dive-from main::res -dive-depth-limit 4"
+STDOPT: +"-dive-from-variables main::res -dive-depth-limit 4"
 */
 
 int f(int x, int y)
@@ -13,4 +13,4 @@ int main(int i)
 {
   int res = f(i, 2*i);
   return res;
-}
\ No newline at end of file
+}
diff --git a/src/plugins/dive/tests/dive/global.i b/src/plugins/dive/tests/dive/global.i
index d475e3862e4..ca08f89790d 100644
--- a/src/plugins/dive/tests/dive/global.i
+++ b/src/plugins/dive/tests/dive/global.i
@@ -1,5 +1,5 @@
 /* run.config
-STDOPT: +"-dive-from main::z"
+STDOPT: +"-dive-from-variables main::z"
 */
 
 float g;
diff --git a/src/plugins/dive/tests/dive/per_callstack.i b/src/plugins/dive/tests/dive/per_callstack.i
index a264d1a6844..5a5d81b22cc 100644
--- a/src/plugins/dive/tests/dive/per_callstack.i
+++ b/src/plugins/dive/tests/dive/per_callstack.i
@@ -1,5 +1,5 @@
 /* run.config
-STDOPT: +"-dive-from main::w -dive-depth-limit 20"
+STDOPT: +"-dive-from-variables main::w -dive-depth-limit 20"
 */
 
 float f(float x) {
diff --git a/src/plugins/dive/tests/dive/pointed_param.i b/src/plugins/dive/tests/dive/pointed_param.i
index 3a47e7648f4..e6bd4f47db0 100644
--- a/src/plugins/dive/tests/dive/pointed_param.i
+++ b/src/plugins/dive/tests/dive/pointed_param.i
@@ -1,5 +1,5 @@
 /* run.config
-STDOPT: +"-dive-from main::y -dive-depth-limit 5"
+STDOPT: +"-dive-from-variables main::y -dive-depth-limit 5"
 */
 
 float h(float *p)
diff --git a/src/plugins/dive/tests/dive/pointers_to_local.i b/src/plugins/dive/tests/dive/pointers_to_local.i
index 832b282261a..a1f5c7af079 100644
--- a/src/plugins/dive/tests/dive/pointers_to_local.i
+++ b/src/plugins/dive/tests/dive/pointers_to_local.i
@@ -1,5 +1,5 @@
 /* run.config
-STDOPT: +"-dive-from main::x -dive-depth-limit 5"
+STDOPT: +"-dive-from-variables main::x -dive-depth-limit 5"
 */
 
 void g(float *p) {
diff --git a/src/plugins/dive/tests/dive/unfocused_callers.i b/src/plugins/dive/tests/dive/unfocused_callers.i
index f61e8438737..44723b2c92f 100644
--- a/src/plugins/dive/tests/dive/unfocused_callers.i
+++ b/src/plugins/dive/tests/dive/unfocused_callers.i
@@ -1,5 +1,5 @@
 /* run.config
-STDOPT: +"-dive-from g::x -dive-depth-limit 7"
+STDOPT: +"-dive-from-variables g::x -dive-depth-limit 7"
 */
 
 float g(float x) {
diff --git a/src/plugins/dive/tests/dive/various.i b/src/plugins/dive/tests/dive/various.i
index f4008ace228..62468d375e7 100644
--- a/src/plugins/dive/tests/dive/various.i
+++ b/src/plugins/dive/tests/dive/various.i
@@ -1,5 +1,5 @@
 /* run.config
-STDOPT: +"-dive-from main::z,f::x2 -dive-from-function-alarms f,main -dive-depth-limit 5"
+STDOPT: +"-dive-from-variables main::z,f::x2 -dive-from-alarms f,main -dive-depth-limit 5"
 */
 
 float g;
-- 
GitLab