xapi-log: remove circular dependency on tests

unfortunately threadext uses this log package, define a with_lock in xapi-log
tests to avoid using the former.

Signed-off-by: Pau Ruiz Safont <[email protected]>

Author: psafont

dune-project

@@ -231,8 +231,7 @@
   logs
   mtime
   xapi-backtrace
-  (xapi-stdext-pervasives (= :version))
-  (xapi-stdext-threads (and :with-test (= :version)))))
+  (xapi-stdext-pervasives (= :version))))
 
 (package
  (name xapi-idl))

ocaml/libs/log/test/dune

@@ -1,6 +1,6 @@
 (executable
  (name log_test)
- (libraries log xapi-stdext-threads threads.posix xapi-backtrace))
+ (libraries log threads.posix xapi-backtrace))
 
 (cram
  (package xapi-log)

ocaml/libs/log/test/log_test.ml

@@ -6,12 +6,16 @@ let a = [||]
 
 let buggy () = a.(1) <- 0
 
+let with_lock mutex f =
+  let finally () = Mutex.unlock mutex in
+  Mutex.lock mutex ; Fun.protect ~finally f
+
 let () =
   Printexc.record_backtrace true ;
   Debug.log_to_stdout () ;
   ()
   |> Debug.with_thread_associated "main" @@ fun () ->
-     try Xapi_stdext_threads.Threadext.Mutex.execute m buggy
+     try with_lock m buggy
      with e ->
        D.log_backtrace e ;
        D.warn "Got exception: %s" (Printexc.to_string e)

ocaml/libs/log/test/log_test.t

@@ -3,7 +3,7 @@
   [|error||0 |main|backtrace] 1/4 log_test.exe Raised at file ocaml/libs/log/test/log_test.ml, line 7
   [|error||0 |main|backtrace] 2/4 log_test.exe Called from file fun.ml, line 33
   [|error||0 |main|backtrace] 3/4 log_test.exe Called from file fun.ml, line 38
-  [|error||0 |main|backtrace] 4/4 log_test.exe Called from file ocaml/libs/log/test/log_test.ml, line 14
+  [|error||0 |main|backtrace] 4/4 log_test.exe Called from file ocaml/libs/log/test/log_test.ml, line 18
   [|error||0 |main|backtrace] 
   [| warn||0 |main|log_test.ml] Got exception: Invalid_argument("index out of bounds")
 

opam/xapi-log.opam

@@ -16,7 +16,6 @@ depends: [
   "mtime"
   "xapi-backtrace"
   "xapi-stdext-pervasives" {= version}
-  "xapi-stdext-threads" {with-test & = version}
   "odoc" {with-doc}
 ]
 build: [