From e9236e69664e245ab330451801d456e4ad480f07 Mon Sep 17 00:00:00 2001
From: Valentin Perrelle <valentin.perrelle@cea.fr>
Date: Tue, 8 Feb 2022 23:44:38 +0100
Subject: [PATCH] [Tests] Use the new Eva API
---
tests/crowbar/constfold.ml | 2 +-
tests/misc/bts1201.ml | 4 ++--
tests/misc/bts1347.ml | 2 +-
tests/misc/ensures.ml | 2 +-
tests/misc/issue109.ml | 4 ++--
tests/misc/log_twice.ml | 4 ++--
tests/misc/well_typed_alarm.ml | 2 +-
tests/saveload/load_one.ml | 4 ++--
tests/slicing/combine.ml | 2 +-
tests/slicing/libSelect.ml | 2 +-
tests/syntax/Refresh_visitor.ml | 2 +-
11 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/tests/crowbar/constfold.ml b/tests/crowbar/constfold.ml
index b98c69153c1..91de9a16715 100644
--- a/tests/crowbar/constfold.ml
+++ b/tests/crowbar/constfold.ml
@@ -206,7 +206,7 @@ let run typ expr =
end;
File.prepare_cil_file cil;
Kernel.MainFunction.set "f";
- !Db.Value.compute ();
+ Eva.Analysis.compute ();
let kf = Globals.Functions.find_by_name "f" in
let r = Globals.Vars.find_from_astinfo "result" Cil_types.VGlobal in
let ret = Kernel_function.find_return kf in
diff --git a/tests/misc/bts1201.ml b/tests/misc/bts1201.ml
index 9e3c1b2a3ff..8cb421763f5 100644
--- a/tests/misc/bts1201.ml
+++ b/tests/misc/bts1201.ml
@@ -1,7 +1,7 @@
let main () =
- !Db.Value.compute ();
+ Eva.Analysis.compute ();
Globals.set_entry_point "main2" false;
- !Db.Value.compute ();
+ Eva.Analysis.compute ();
;;
let () = Db.Main.extend main
diff --git a/tests/misc/bts1347.ml b/tests/misc/bts1347.ml
index d2319d0f4b8..e1336805421 100644
--- a/tests/misc/bts1347.ml
+++ b/tests/misc/bts1347.ml
@@ -7,7 +7,7 @@ let run () =
(fun kf ->
if not (Cil_builtins.is_builtin (Kernel_function.get_vi kf)) then begin
Globals.set_entry_point (Kernel_function.get_name kf) true;
- !Db.Value.compute();
+ Eva.Analysis.compute();
let hyps =
Alarms.fold
(fun _ kf' s ~rank:_ _ a l ->
diff --git a/tests/misc/ensures.ml b/tests/misc/ensures.ml
index cfe3fc78941..a08e28e31b1 100644
--- a/tests/misc/ensures.ml
+++ b/tests/misc/ensures.ml
@@ -2,7 +2,7 @@ open Cil_types
let run () =
Dynamic.Parameter.Bool.set "-eva-context-valid-pointers" true;
- !Db.Value.compute ();
+ Eva.Analysis.compute ();
Globals.Functions.iter
(fun kf ->
let kf_name = Kernel_function.get_name kf in
diff --git a/tests/misc/issue109.ml b/tests/misc/issue109.ml
index 98cc840b15e..fee1af6952d 100644
--- a/tests/misc/issue109.ml
+++ b/tests/misc/issue109.ml
@@ -6,10 +6,10 @@ let ptest_file =
with Not_found -> fun dir file -> dir ^ file
let main () =
- !Db.Value.compute ();
+ Eva.Analysis.compute ();
Dynamic.Parameter.String.set "" "";
Dynamic.Parameter.String.set "" (ptest_file "tests/misc/" "issue109.i");
File.init_from_cmdline ();
- !Db.Value.compute ()
+ Eva.Analysis.compute ()
let main = Db.Main.extend main
diff --git a/tests/misc/log_twice.ml b/tests/misc/log_twice.ml
index df47c2fe750..15145a12185 100644
--- a/tests/misc/log_twice.ml
+++ b/tests/misc/log_twice.ml
@@ -8,9 +8,9 @@ let run () =
~last:false
"default"
in
- !Db.Value.compute ();
+ Eva.Analysis.compute ();
Project.set_current p_default;
- !Db.Value.compute ();
+ Eva.Analysis.compute ();
()
let () = Db.Main.extend run
diff --git a/tests/misc/well_typed_alarm.ml b/tests/misc/well_typed_alarm.ml
index d0e210e9c00..6c792a3d3ee 100644
--- a/tests/misc/well_typed_alarm.ml
+++ b/tests/misc/well_typed_alarm.ml
@@ -1,5 +1,5 @@
let main () =
- !Db.Value.compute();
+ Eva.Analysis.compute();
Filecheck.check_ast "Check alarm";
File.pretty_ast ()
diff --git a/tests/saveload/load_one.ml b/tests/saveload/load_one.ml
index cef2bc0f80b..9440328dc2d 100644
--- a/tests/saveload/load_one.ml
+++ b/tests/saveload/load_one.ml
@@ -18,13 +18,13 @@ let main () =
Project.save fp;
Project.remove ~project:p ();
let p = Project.load fp in
- Project.on p (fun () -> !Db.Value.compute (); ignore (sparecode ())) ()
+ Project.on p (fun () -> Eva.Analysis.compute (); ignore (sparecode ())) ()
let () = Db.Main.extend main
(* testing Project.create_by_copy *)
let main2 () =
- !Db.Value.compute ();
+ Eva.Analysis.compute ();
let prj = Project.create_by_copy ~last:false "copy" in
Format.printf "INIT AST@.";
File.pretty_ast ();
diff --git a/tests/slicing/combine.ml b/tests/slicing/combine.ml
index 853545c0c48..bbe23a110ed 100644
--- a/tests/slicing/combine.ml
+++ b/tests/slicing/combine.ml
@@ -63,7 +63,7 @@ let main _ =
Cil.visitCilFile infos new_cil_file (* the cil file after slicing *);;
*)
Dynamic.Parameter.Bool.set "-eva-show-progress" true;
- !Db.Value.compute ();
+ Eva.Analysis.compute ();
let all = Cil_datatype.Fundec.Set.empty in
let proj3 = Constant_Propagation.Api.get all ~cast_intro:true in
Project.set_current proj3;
diff --git a/tests/slicing/libSelect.ml b/tests/slicing/libSelect.ml
index 41e55de6abc..309d0927848 100644
--- a/tests/slicing/libSelect.ml
+++ b/tests/slicing/libSelect.ml
@@ -64,7 +64,7 @@ let load_source_file ?entry_point filename =
in
ignore (Db.get_cil_file ());
let kf = Db.find_function_def_by_name entry_point in
- ignore (!Db.Value.compute_entry_point kf ~library);
+ ignore (Eva.Analysis.compute_entry_point kf ~library);
Db.iter_on_functions
(fun kf -> if Db.is_definition kf && Db.Value.is_called kf
then !Db.From.compute kf)
diff --git a/tests/syntax/Refresh_visitor.ml b/tests/syntax/Refresh_visitor.ml
index 9a82d0fd6b4..d4075698d68 100644
--- a/tests/syntax/Refresh_visitor.ml
+++ b/tests/syntax/Refresh_visitor.ml
@@ -72,7 +72,7 @@ let main () =
);
Project.on p (fun () ->
Dynamic.Parameter.Bool.set "-eva-show-progress" true;
- !Db.Value.compute ()
+ Eva.Analysis.compute ()
) ();
File.pretty_ast ~prj:p ()
--
GitLab