Add bisect_ppx preprocessing

Signed-off-by: Edwin Török <[email protected]>

Author: edwintorok

.coverage.sh

@@ -10,8 +10,7 @@ if [ -z "$KEEP" ]; then trap "popd; rm -rf $COVERAGE_DIR" EXIT; fi
 
 $(which cp) -r ../* .
 
-opam pin add bisect_ppx 1.3.0 -y
-opam install ocveralls -y
+opam install bisect_ppx ocveralls -y
 
 export BISECT_ENABLE=YES
 jbuilder runtest

example/jbuild

@@ -18,16 +18,24 @@ let flags = function
 let rewriters = ["ppx_deriving_rpc"]
 let flags = flags rewriters
 
+let coverage_rewriter =
+  let is_coverage = try Unix.getenv "BISECT_ENABLE" = "YES" with Not_found -> false in
+  if is_coverage then
+    "(preprocess (pps (bisect_ppx -conditional)))"
+  else
+    ""
+
 let () = Printf.ksprintf Jbuild_plugin.V1.send {|
 (jbuild_version 1)
 
 (executable
  ((name example)
   (flags (:standard -w -39 %s))
-  (libraries (lwt lwt.unix xcp rpclib))))
+  (libraries (lwt lwt.unix xcp rpclib))
+  %s))
 
 (alias
  ((name  runtest)
   (deps (example.exe))
   ))
-|} flags
+|} flags coverage_rewriter

lib/jbuild

@@ -15,6 +15,13 @@ let flags = function
   in
   go ic ""
 
+let coverage_rewriter =
+  let is_coverage = try Unix.getenv "BISECT_ENABLE" = "YES" with Not_found -> false in
+  if is_coverage then
+    "(preprocess (pps (bisect_ppx -conditional)))"
+  else
+    ""
+
 let rewriters = ["ppx_deriving_rpc"]
 let flags = flags rewriters
 
@@ -30,15 +37,19 @@ let () = Printf.ksprintf Jbuild_plugin.V1.send {|
   (libraries (cmdliner uri re cohttp xmlm unix sexplib
               ppx_deriving_rpc rpclib rpclib.xml threads message_switch.unix
               fd-send-recv xcp-inventory xapi-backtrace))
-  (wrapped false)))
+  (wrapped false)
+  %s
+))
 
 (library
  ((name xcp_updates)
   (public_name xcp.updates)
   (flags (:standard -w -39 %s))
   (modules (updates task_server scheduler))
   (libraries (xcp lwt))
-  (wrapped false)))
+  (wrapped false)
+  %s
+))
 
 (executable
  ((name channel_helper)
@@ -50,4 +61,4 @@ let () = Printf.ksprintf Jbuild_plugin.V1.send {|
  ((name runtest)
   (deps (channel_helper.exe))))
 
-|} flags flags flags
+|} flags coverage_rewriter flags coverage_rewriter flags

lib_test/jbuild

@@ -18,17 +18,25 @@ let flags = function
 let rewriters = ["ppx_deriving_rpc"; "ppx_sexp_conv"]
 let flags = flags rewriters
 
+let coverage_rewriter =
+  let is_coverage = try Unix.getenv "BISECT_ENABLE" = "YES" with Not_found -> false in
+  if is_coverage then
+    "(preprocess (pps (bisect_ppx -conditional)))"
+  else
+    ""
+
 let () = Printf.ksprintf Jbuild_plugin.V1.send {|
 (jbuild_version 1)
 
 (executable
  ((name test)
   (flags (:standard -w -39 %s))
-  (libraries (lwt lwt.unix xcp xcp.xen threads rpclib oUnit xcp.updates))))
+  (libraries (lwt lwt.unix xcp xcp.xen threads rpclib oUnit xcp.updates))
+  %s))
 
 (alias
  ((name runtest)
   (deps (test.exe))
   (action (run ${<} -runner sequential))))
 
-|} flags
+|} flags coverage_rewriter

memory/jbuild

@@ -18,6 +18,13 @@ let flags = function
 let rewriters = ["ppx_deriving_rpc"]
 let flags = flags rewriters
 
+let coverage_rewriter =
+  let is_coverage = try Unix.getenv "BISECT_ENABLE" = "YES" with Not_found -> false in
+  if is_coverage then
+    "(preprocess (pps (bisect_ppx -conditional)))"
+  else
+    ""
+
 let () = Printf.ksprintf Jbuild_plugin.V1.send {|
 (jbuild_version 1)
 
@@ -27,7 +34,8 @@ let () = Printf.ksprintf Jbuild_plugin.V1.send {|
   (flags (:standard -w -39 %s))
   (modules (:standard \ memory_cli))
   (libraries (xcp threads rpclib))
-  (wrapped false)))
+  (wrapped false)
+  %s))
 
 (executable
  ((name memory_cli)
@@ -38,4 +46,4 @@ let () = Printf.ksprintf Jbuild_plugin.V1.send {|
  ((name runtest)
   (deps (memory_cli.exe))))
 
-|} flags
+|} flags coverage_rewriter

network/jbuild

@@ -15,6 +15,13 @@ let flags = function
   in
   go ic ""
 
+let coverage_rewriter =
+  let is_coverage = try Unix.getenv "BISECT_ENABLE" = "YES" with Not_found -> false in
+  if is_coverage then
+    "(preprocess (pps (bisect_ppx -conditional)))"
+  else
+    ""
+
 let rewriters_camlp4 = ["rpclib.idl -syntax camlp4o"]
 let rewriters_ppx = ["ppx_deriving_rpc"; "ppx_sexp_conv"]
 
@@ -27,14 +34,16 @@ let () = Printf.ksprintf Jbuild_plugin.V1.send {|
   (modules (network_interface))
   (flags (:standard -w -39 %s))
   (libraries (xcp threads rpclib))
-  (wrapped false)))
+  (wrapped false)
+  %s))
 
 (library
  ((name xcp_network)
   (public_name xcp.network)
   (modules (:standard \ network_interface))
   (flags (:standard -w -39-33 %s))
   (libraries (xcp threads rpclib xcp_network_interface))
-  (wrapped false)))
+  (wrapped false)
+  %s))
 
-|} (flags rewriters_camlp4) (flags rewriters_ppx)
+|} (flags rewriters_camlp4) coverage_rewriter (flags rewriters_ppx) coverage_rewriter

rrd/jbuild

@@ -18,6 +18,13 @@ let flags = function
 let rewriters_camlp4 = ["rpclib.idl -syntax camlp4o"]
 let rewriters_ppx = ["ppx_deriving_rpc"]
 
+let coverage_rewriter =
+  let is_coverage = try Unix.getenv "BISECT_ENABLE" = "YES" with Not_found -> false in
+  if is_coverage then
+    "(preprocess (pps (bisect_ppx -conditional)))"
+  else
+    ""
+
 let () = Printf.ksprintf Jbuild_plugin.V1.send {|
 (jbuild_version 1)
 
@@ -27,21 +34,24 @@ let () = Printf.ksprintf Jbuild_plugin.V1.send {|
   (modules (data_source))
   (flags (:standard -w -39 %s))
   (libraries (xcp threads rpclib rrd))
-  (wrapped false)))
+  (wrapped false)
+  %s))
 
 (library
  ((name xcp_rrd_interface)
   (public_name xcp.rrd.interface)
   (modules (rrd_interface))
   (flags (:standard -w -39 %s))
   (libraries (xcp threads rpclib rrd xcp_rrd_interface_types))
-  (wrapped false)))
+  (wrapped false)
+  %s))
 
 (library
  ((name xcp_rrd)
   (public_name xcp.rrd)
   (modules (:standard \ rrd_interface data_source))
   (flags (:standard -w -39 %s))
   (libraries (xcp threads rpclib rrd xcp_rrd_interface))
-  (wrapped false)))
-|} (flags rewriters_ppx) (flags rewriters_camlp4) (flags rewriters_ppx)
+  (wrapped false)
+  %s))
+|} (flags rewriters_ppx) coverage_rewriter (flags rewriters_camlp4) coverage_rewriter (flags rewriters_ppx) coverage_rewriter

storage/jbuild

@@ -15,6 +15,13 @@ let flags = function
   in
   go ic ""
 
+let coverage_rewriter =
+  let is_coverage = try Unix.getenv "BISECT_ENABLE" = "YES" with Not_found -> false in
+  if is_coverage then
+    "(preprocess (pps (bisect_ppx -conditional)))"
+  else
+    ""
+
 let rewriters_camlp4 = ["rpclib.idl -syntax camlp4o"]
 let rewriters_ppx = ["ppx_deriving_rpc"; "ppx_sexp_conv"]
 
@@ -27,28 +34,32 @@ let () = Printf.ksprintf Jbuild_plugin.V1.send {|
   (flags (:standard -w -39 %s))
   (modules (vdi_automaton))
   (libraries (xcp threads rpclib))
-  (wrapped false)))
+  (wrapped false)
+  %s))
 
 (library
  ((name xcp_storage_interface)
   (public_name xcp.storage.interface)
   (flags (:standard -w -39 %s))
   (modules (storage_interface))
   (libraries (xcp threads rpclib xcp_storage_interface_types))
-  (wrapped false)))
+  (wrapped false)
+  %s))
 
 (library
  ((name xcp_storage)
   (public_name xcp.storage)
   (flags (:standard -w -39 %s))
   (modules (:standard \ storage_test storage_interface vdi_automaton))
   (libraries (xcp threads rpclib xcp_storage_interface xcp_storage_interface_types))
-  (wrapped false)))
+  (wrapped false)
+  %s))
 
 (executable
   ((name storage_test)
    (flags (:standard -w -39 %s))
    (modules (storage_test))
-   (libraries (xcp xcp_storage oUnit cmdliner))))
+   (libraries (xcp xcp_storage oUnit cmdliner))
+   %s))
 
-|} (flags rewriters_ppx) (flags rewriters_camlp4) (flags rewriters_ppx) (flags rewriters_ppx)
+|} (flags rewriters_ppx) coverage_rewriter (flags rewriters_camlp4) coverage_rewriter (flags rewriters_ppx) coverage_rewriter (flags rewriters_ppx) coverage_rewriter

v6/jbuild

@@ -18,6 +18,13 @@ let flags = function
 let rewriters_camlp4 = ["rpclib.idl -syntax camlp4o"]
 let rewriters_ppx = ["ppx_deriving_rpc"; "ppx_sexp_conv"]
 
+let coverage_rewriter =
+  let is_coverage = try Unix.getenv "BISECT_ENABLE" = "YES" with Not_found -> false in
+  if is_coverage then
+    "(preprocess (pps (bisect_ppx -conditional)))"
+  else
+    ""
+
 let () = Printf.ksprintf Jbuild_plugin.V1.send {|
 (jbuild_version 1)
 
@@ -27,14 +34,16 @@ let () = Printf.ksprintf Jbuild_plugin.V1.send {|
   (modules (v6_interface))
   (flags (:standard -w -39 %s))
   (libraries (xcp threads rpclib))
-  (wrapped false)))
+  (wrapped false)
+  %s))
 
 (library
  ((name xapi_v6)
   (public_name xcp.v6)
   (modules (:standard \ v6_interface))
   (flags (:standard -w -39 %s))
   (libraries (xcp threads rpclib xapi_v6_interface))
-  (wrapped false)))
+  (wrapped false)
+  %s))
 
-|} (flags rewriters_camlp4) (flags rewriters_ppx)
+|} (flags rewriters_camlp4) coverage_rewriter (flags rewriters_ppx) coverage_rewriter

xen/jbuild

@@ -18,6 +18,14 @@ let flags = function
 let rewriters_ppx = ["ppx_deriving_rpc"; "ppx_sexp_conv"]
 let rewriters_camlp4 = ["rpclib.idl -syntax camlp4o"]
 
+let coverage_rewriter = ""
+(* (preprocess (pps)) doesn't work with camlp4 and  the other ppx derivers,
+ it complains about missing rpc_of_t *)
+let rewriters_ppx =
+  let is_coverage = try Unix.getenv "BISECT_ENABLE" = "YES" with Not_found -> false in
+  if is_coverage then "bisect_ppx" :: rewriters_ppx else rewriters_ppx
+
+
 let () = Printf.ksprintf Jbuild_plugin.V1.send {|
 (jbuild_version 1)
 
@@ -27,19 +35,24 @@ let () = Printf.ksprintf Jbuild_plugin.V1.send {|
   (modules (xenops_types device_number))
   (flags (:standard -w -39 %s))
   (libraries (xcp threads rpclib))
-  (wrapped false)))
+  (wrapped false)
+  %s))
+
 (library
  ((name xcp_xen_interface)
   (public_name xcp.xen.interface)
   (modules (xenops_interface))
   (flags (:standard -w -39 %s))
   (libraries (xcp threads rpclib xcp_xen_interface_types))
-  (wrapped false)))
+  (wrapped false)
+  %s))
+
 (library
  ((name xcp_xen)
   (public_name xcp.xen)
   (modules (:standard \ xenops_interface xenops_types device_number))
   (flags (:standard -w -39 %s))
   (libraries (xcp threads rpclib xcp_xen_interface))
-  (wrapped false)))
-|} (flags rewriters_ppx) (flags rewriters_camlp4) (flags rewriters_ppx)
+  (wrapped false)
+  %s))
+|} (flags rewriters_ppx) coverage_rewriter (flags rewriters_camlp4) coverage_rewriter (flags rewriters_ppx) coverage_rewriter