Merge pull request #5402 from edwintorok/private/edvint/merge-stdext2…

…-tests2

CP-47001: stdext: quickcheck-style tests and select->epoll conversion

.gitignore

@@ -2,6 +2,7 @@ _build/
 *.bak
 *.native
 .merlin
+_coverage/
 *.install
 *.swp
 compile_flags.txt

Makefile

@@ -6,7 +6,7 @@ JOBS = $(shell getconf _NPROCESSORS_ONLN)
 PROFILE=release
 OPTMANDIR ?= $(OPTDIR)/man/man1/
 
-.PHONY: build clean test doc python format install uninstall
+.PHONY: build clean test doc python format install uninstall coverage
 
 # if we have XAPI_VERSION set then set it in dune-project so we use that version number instead of the one obtained from git
 # this is typically used when we're not building from a git repo
@@ -20,6 +20,11 @@ build:
 check:
 	dune build @check -j $(JOBS)
 
+coverage:
+	dune runtest --instrument-with bisect_ppx --force --profile=$(RELEASE) -j $(JOBS)
+	bisect-ppx-report html
+	bisect-ppx-report summary --per-file
+
 clean:
 	dune clean
 

dune-project

@@ -1,6 +1,8 @@
-(lang dune 2.0)
+(lang dune 2.7)
 (formatting (enabled_for ocaml))
 
+(cram enable)
+(implicit_transitive_deps false)
 (generate_opam_files true)
 
 (source (github xapi-project/xen-api))
@@ -274,6 +276,7 @@
     (xapi-stdext-threads (= :version))
     (xapi-stdext-unix (= :version))
     (xapi-stdext-zerocheck (= :version))
+    (xapi-fdcaps (= :version))
   )
 )
 
@@ -333,6 +336,8 @@
     base-unix
     (odoc :with-doc)
     (xapi-stdext-pervasives (= :version))
+    (mtime :with-test)
+    (xapi-stdext-unix (= :version))
   )
 )
 
@@ -346,6 +351,7 @@
     (odoc :with-doc)
     xapi-backtrace
     (xapi-stdext-pervasives (= :version))
+    polly
   )
 )
 
@@ -357,3 +363,27 @@
     (odoc :with-doc)
   )
 )
+
+(package
+  (name xapi-fdcaps)
+  (synopsis "Static capabilities for file descriptor operations")
+  (depends
+    (alcotest :with-test)
+    base-unix
+    fmt
+    (bisect_ppx :with-test)
+  )
+)
+
+(package
+  (name xapi-fd-test)
+  (synopsis "Test framework for file descriptor operations")
+  (depends
+    (alcotest :with-test)
+    base-unix
+    fmt
+    (mtime (>= 2.0.0))
+    logs
+    (qcheck-core (>= 0.21.2))
+  )
+)

ocaml/database/dune

@@ -21,6 +21,7 @@
 
 (library
   (name xapi_database)
+  (modes best)
   (modules
     (:standard \ database_server_main db_cache_test db_names db_exn
       block_device_io string_marshall_helper string_unmarshall_helper schema
@@ -40,6 +41,7 @@
     xapi-datamodel
     xapi-log
     (re_export xapi-schema)
+    xapi-idl.updates
     xapi-stdext-encodings
     xapi-stdext-pervasives
     xapi-stdext-std

ocaml/forkexecd/lib/dune

@@ -7,6 +7,7 @@
    fd-send-recv
    rpclib.core
    rpclib.json
+   rpclib.xml
    uuid
    xapi-backtrace
    xapi-log

ocaml/libs/ezxenstore/core/dune

@@ -7,6 +7,8 @@
     logs
     threads
     uuidm
-    xenstore_transport
-    xenstore.unix)
+    (re_export xenstore)
+    (re_export xenstore_transport)
+    threads.posix
+    (re_export xenstore.unix))
 )

ocaml/libs/ezxenstore/lib/dune

@@ -3,7 +3,7 @@
   (public_name ezxenstore)
   (wrapped false)
   (libraries
-    ezxenstore_core
-    ezxenstore_watch
+    (re_export ezxenstore_core)
+    (re_export ezxenstore_watch)
   )
 )

ocaml/libs/ezxenstore/lib_test/dune

@@ -2,5 +2,5 @@
   (name main)
   (package ezxenstore)
   (deps main.exe)
-  (libraries cmdliner ezxenstore xenstore_transport)
+  (libraries cmdliner ezxenstore xenstore_transport xenstore xenstore.unix)
 )

ocaml/libs/ezxenstore/watch/dune

@@ -4,5 +4,8 @@
   (wrapped false)
   (libraries
     ezxenstore_core
-    xenctrl)
+    xenctrl
+    uuidm
+    threads.posix
+   )
 )

ocaml/libs/http-lib/dune

@@ -8,6 +8,7 @@
   (libraries
     astring
     base64
+    fmt
     ipaddr
     mtime
     mtime.clock.os
@@ -35,10 +36,12 @@
 (library
   (name httpsvr)
   (wrapped false)
+  (modes best)
   (modules http_svr http_proxy server_io)
   (libraries
     astring
     http_lib
+    ipaddr
     polly
     threads.posix
     xapi-log
@@ -51,10 +54,12 @@
 (tests
   (names http_test radix_tree_test)
   (package http-lib)
+  (modes (best exe))
   (modules http_test radix_tree_test)
   (libraries
     alcotest
     dune-build-info
+    fmt
     http_lib
   )
 )

ocaml/libs/tracing/dune

@@ -1,7 +1,7 @@
 (library
  (name tracing)
  (modules tracing)
- (libraries re uri xapi-log xapi-stdext-threads)
+ (libraries re uri xapi-log xapi-stdext-threads threads.posix)
  (public_name xapi-tracing))
 
 (library
@@ -15,7 +15,10 @@
   ptime.clock.os
   rpclib.core
   rpclib.json
+  result
+  rresult
   tracing
+  threads.posix
   uri
   xapi-log
   xapi-open-uri

ocaml/libs/uuid/dune

@@ -3,7 +3,7 @@
   (public_name uuid)
   (modules uuidx)
   (libraries
-    unix uuidm
+    unix (re_export uuidm)
   )
   (wrapped false)
 )

ocaml/libs/vhd/cli/dune

@@ -2,4 +2,4 @@
  (name disk_to_ocaml)
  (public_name disk_to_ocaml)
  (package vhd-format-lwt)
- (libraries disk lwt))
+ (libraries disk lwt lwt.unix))

ocaml/libs/vhd/vhd_format/dune

@@ -2,5 +2,5 @@
  (name vhd_format)
  (public_name vhd-format)
  (flags :standard -w -32-34-37)
- (libraries stdlib-shims cstruct io-page rresult uuidm)
+ (libraries stdlib-shims (re_export bigarray-compat) cstruct io-page rresult uuidm)
  (preprocess (pps ppx_cstruct)))

ocaml/libs/vhd/vhd_format_lwt/dune

@@ -1,7 +1,7 @@
 (library
  (name vhd_format_lwt)
  (public_name vhd-format-lwt)
- (libraries cstruct lwt lwt.unix mirage-block vhd-format)
+ (libraries bigarray-compat cstruct-lwt cstruct lwt lwt.unix mirage-block vhd-format rresult)
  (foreign_stubs
    (language c)
    (names blkgetsize64_stubs lseek64_stubs odirect_stubs)))

ocaml/libs/xapi-inventory/lib/dune

@@ -7,6 +7,6 @@
     astring
     xapi-stdext-unix
     xapi-stdext-threads
-    threads
+    threads.posix
   )
 )

ocaml/libs/xapi-rrd/lib/dune

@@ -6,6 +6,7 @@
   (libraries
     bigarray
     rpclib.json
+    rpclib.core
     xmlm
     yojson
   )

ocaml/libs/xapi-rrd/lib_test/dune

@@ -9,6 +9,8 @@
     unix
     xapi-rrd
     xapi-stdext-unix
+    rpclib.xml
+    xmlm
   )
 )
 

ocaml/libs/xapi-stdext/lib/xapi-fd-test/dune

@@ -0,0 +1,9 @@
+; This will be used to test stdext itself, so do not depend on stdext here
+(library
+	(public_name xapi-fd-test)
+	(name xapi_fd_test)
+	(libraries (re_export xapi-fdcaps) unix qcheck-core logs fmt (re_export mtime) mtime.clock.os rresult threads.posix)
+
+	; off by default, enable with --instrument-with bisect_ppx
+	(instrumentation (backend bisect_ppx))
+)