Fix SolverTest compilation

Author: sim642

unittest/dune

@@ -2,7 +2,7 @@
 
 (test
   (name mainTest)
-  (libraries ounit2 qcheck-ounit goblint.std goblint.lib goblint.sites.dune goblint.build-info.dune)
+  (libraries ounit2 qcheck-ounit goblint.std goblint.lib goblint.constraint goblint.solver goblint.sites.dune goblint.build-info.dune)
   (preprocess (pps ppx_deriving.std ppx_deriving_hash ppx_deriving_yojson))
   (flags :standard -linkall))
 

unittest/solver/solverTest.ml

@@ -2,6 +2,8 @@ open Goblint_lib
 open OUnit2
 open GoblintCil
 open Pretty
+open ConstrSys
+open Goblint_solver
 
 (* variables are strings *)
 module StringVar =
@@ -43,7 +45,7 @@ module ConstrSys = struct
     | _   -> None
 
   let iter_vars _ _ _ _ _ = ()
-  let sys_change _ _ = {Analyses.obsolete = []; delete = []; reluctant = []; restart = []}
+  let sys_change _ _ = {obsolete = []; delete = []; reluctant = []; restart = []}
 end
 
 module LH = BatHashtbl.Make (ConstrSys.LVar)
@@ -55,7 +57,7 @@ struct
   let should_warn = false
   let should_save_run = false
 end
-module Solver = Constraints.GlobSolverFromEqSolver (Constraints.EqIncrSolverFromEqSolver (EffectWConEq.Make) (PostSolverArg)) (ConstrSys) (LH) (GH)
+module Solver = GlobSolverFromEqSolver (PostSolver.EqIncrSolverFromEqSolver (EffectWConEq.Make) (PostSolverArg)) (ConstrSys) (LH) (GH)
 
 let test1 _ =
   let id x = x in

unittest/util/intOpsTest.ml

@@ -1,6 +1,5 @@
 open OUnit2
 open Goblint_std
-open Goblint_lib
 
 (* If the first operand of a div is negative, Zarith rounds the result away from zero.
     We thus always transform this into a division with a non-negative first operand. *)