Fix a couple of issues when compiling with future versions of dependencies

Makefile

@@ -156,7 +156,7 @@ DUNE_IU_PACKAGES1+=message-switch message-switch-cli message-switch-core message
 DUNE_IU_PACKAGES1+=message-switch-unix xapi-idl xapi-forkexecd xapi-storage xapi-storage-script xapi-storage-cli
 DUNE_IU_PACKAGES1+=xapi-nbd varstored-guard xapi-log xapi-open-uri xapi-tracing xapi-tracing-export xapi-expiry-alerts cohttp-posix
 DUNE_IU_PACKAGES1+=xapi-rrd xapi-inventory clock xapi-sdk
-DUNE_IU_PACKAGES1+=xapi-stdext-date xapi-stdext-encodings xapi-stdext-pervasives xapi-stdext-std xapi-stdext-threads xapi-stdext-unix xapi-stdext-zerocheck xapi-tools
+DUNE_IU_PACKAGES1+=xapi-stdext-encodings xapi-stdext-pervasives xapi-stdext-std xapi-stdext-threads xapi-stdext-unix xapi-stdext-zerocheck xapi-tools
 
 
 install-dune1:

dune-project

@@ -669,16 +669,6 @@ This package provides an Lwt compatible interface to the library.")
   (name xapi-inventory)
 )
 
-(package
-  (name xapi-stdext-date)
-  (synopsis "Xapi's standard library extension, Dates")
-  (authors "Jonathan Ludlam")
-  (depends
-    (clock (= :version))
-    ptime
-  )
-)
-
 (package
   (name xapi-stdext-encodings)
   (synopsis "Xapi's standard library extension, Encodings")

ocaml/libs/resources/test/dune

@@ -4,6 +4,7 @@
   (action (run %{test} -e))
   (libraries
     safe-resources
+    logs
     logs.fmt
     alcotest
   )

ocaml/libs/xapi-stdext/lib/xapi-stdext-threads/ipq.ml

@@ -19,6 +19,8 @@ type 'a t = {default: 'a event; mutable size: int; mutable data: 'a event array}
 
 exception EmptyHeap
 
+exception OutOfBounds of int
+
 let create n default =
   if n <= 0 then
     invalid_arg "create"
@@ -61,7 +63,7 @@ let maximum h =
 let remove h s =
   if h.size <= 0 then raise EmptyHeap ;
   if s < 0 || s >= h.size then
-    invalid_arg (Printf.sprintf "%s: index %d out of bounds" __FUNCTION__ s) ;
+    raise (OutOfBounds s) ;
   let n = h.size - 1 in
   let d = h.data in
   let x = d.(n) in

ocaml/libs/xapi-stdext/lib/xapi-stdext-threads/ipq.mli

@@ -18,6 +18,8 @@ type 'a t
 
 exception EmptyHeap
 
+exception OutOfBounds of int
+
 val create : int -> 'a -> 'a t
 (** [create n default] creates an empty Imperative priority queue.
    The queue initially is initialized to store [n] elements.

ocaml/libs/xapi-stdext/lib/xapi-stdext-threads/ipq_test.ml

@@ -18,14 +18,9 @@ module Ipq = Xapi_stdext_threads_scheduler.Ipq
 let test_out_of_index () =
   let q = Ipq.create 10 0 in
   Ipq.add q {Ipq.ev= 123; Ipq.time= Mtime_clock.elapsed ()} ;
-  let is_oob = function
-    | Invalid_argument s when String.ends_with ~suffix:"  out of bounds" s ->
-        true
-    | _ ->
-        false
-  in
   let oob_check n =
-    (Alcotest.match_raises "out of bound" is_oob @@ fun () -> Ipq.remove q n) ;
+    let oob = Ipq.OutOfBounds n in
+    (Alcotest.check_raises "out of bound" oob @@ fun () -> Ipq.remove q n) ;
     Alcotest.(check bool) "same value" false (Ipq.is_empty q)
   in
   oob_check 10 ;