Skip to content

Commit 587940c

Browse files
lindiglindig
committed
Remove bisect_ppx instrumentation
This removes stale code for instrumentation with bisect_ppx which we have not used for a long time and whose integration into the dune build system is likely to change in the future. Signed-off-by: Christian Lindig <[email protected]>
1 parent 2229bb2 commit 587940c

File tree

12 files changed

+24
-154
lines changed

12 files changed

+24
-154
lines changed

‎cluster/dune‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
1-
(* -*- tuareg -*- *)
2-
let coverage_rewriter =
3-
match Sys.getenv "BISECT_ENABLE" with
4-
| "YES" -> "bisect_ppx"
5-
| _ -> ""
6-
| exception Not_found -> ""
7-
8-
let () = Printf.ksprintf Jbuild_plugin.V1.send {|
91

102
(library
113
(name xcp_cluster)
@@ -14,7 +6,7 @@ let () = Printf.ksprintf Jbuild_plugin.V1.send {|
146
(flags (:standard -w -39))
157
(libraries xapi-idl threads rpclib.core)
168
(wrapped false)
17-
(preprocess (pps ppx_deriving_rpc %s))
9+
(preprocess (pps ppx_deriving_rpc ))
1810
)
1911

2012
(executable
@@ -31,6 +23,5 @@ let () = Printf.ksprintf Jbuild_plugin.V1.send {|
3123
(alias
3224
(name runtest)
3325
(deps (:x cluster_cli.exe))
34-
(action (run %%{x}))
26+
(action (run %{x}))
3527
)
36-
|} coverage_rewriter

‎example/dune‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
1-
(* -*- tuareg -*- *)
2-
let coverage_rewriter =
3-
match Sys.getenv "BISECT_ENABLE" with
4-
| "YES" -> "bisect_ppx"
5-
| _ -> ""
6-
| exception Not_found -> ""
7-
8-
let () = Printf.ksprintf Jbuild_plugin.V1.send {|
91

102
(executable
113
(name example)
@@ -14,12 +6,11 @@ let () = Printf.ksprintf Jbuild_plugin.V1.send {|
146
rpclib.core
157
xapi-idl
168
)
17-
(preprocess (pps ppx_deriving_rpc %s))
9+
(preprocess (pps ppx_deriving_rpc ))
1810
)
1911

2012
(alias
2113
(name runtest)
2214
(deps (:x example.exe))
23-
(action (run %%{x}))
15+
(action (run %{x}))
2416
)
25-
|} coverage_rewriter

‎gpumon/dune‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
1-
(* -*- tuareg -*- *)
2-
let coverage_rewriter =
3-
match Sys.getenv "BISECT_ENABLE" with
4-
| "YES" -> "bisect_ppx"
5-
| _ -> ""
6-
| exception Not_found -> ""
7-
8-
let () = Printf.ksprintf Jbuild_plugin.V1.send {|
91

102
(library
113
(name xapi_gpumon)
@@ -18,7 +10,7 @@ let () = Printf.ksprintf Jbuild_plugin.V1.send {|
1810
xapi-idl
1911
)
2012
(wrapped false)
21-
(preprocess (pps ppx_deriving_rpc %s))
13+
(preprocess (pps ppx_deriving_rpc ))
2214
)
2315

2416
(executable
@@ -35,6 +27,5 @@ let () = Printf.ksprintf Jbuild_plugin.V1.send {|
3527
(alias
3628
(name runtest)
3729
(deps (:x gpumon_cli.exe))
38-
(action (run %%{x}))
30+
(action (run %{x}))
3931
)
40-
|} coverage_rewriter

‎lib/dune‎

Lines changed: 2 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,3 @@
1-
(* -*- tuareg -*- *)
2-
let coverage_rewriter =
3-
match Sys.getenv "BISECT_ENABLE" with
4-
| "YES" -> "bisect_ppx"
5-
| _ -> ""
6-
| exception Not_found -> ""
7-
8-
let runtime_coverage_enabled, coverage_dep =
9-
let use_bisect_runtime =
10-
match Sys.getenv "BISECT_RUNTIME" with
11-
| "YES" -> true
12-
| _ -> false
13-
| exception Not_found -> false in
14-
if use_bisect_runtime then
15-
"enabled.ml", "bisect_ppx.runtime"
16-
else
17-
"disabled.ml", ""
18-
19-
let () = Printf.ksprintf Jbuild_plugin.V1.send {|
20-
21-
(rule
22-
(targets xcp_coverage.ml)
23-
(action (copy coverage/%s %%{targets}))
24-
)
251

262
(library
273
(name xcp)
@@ -30,7 +6,6 @@ let () = Printf.ksprintf Jbuild_plugin.V1.send {|
306
(modules (:standard \ scheduler task_server updates))
317
(c_names syslog_stubs)
328
(libraries
33-
%s
349
cmdliner
3510
cohttp
3611
fd-send-recv
@@ -53,7 +28,7 @@ let () = Printf.ksprintf Jbuild_plugin.V1.send {|
5328
xmlm
5429
)
5530
(wrapped false)
56-
(preprocess (pps ppx_sexp_conv ppx_deriving_rpc %s))
31+
(preprocess (pps ppx_sexp_conv ppx_deriving_rpc ))
5732
)
5833

5934
(library
@@ -63,6 +38,5 @@ let () = Printf.ksprintf Jbuild_plugin.V1.send {|
6338
(modules updates task_server scheduler)
6439
(libraries xapi-idl)
6540
(wrapped false)
66-
(preprocess (pps ppx_deriving_rpc %s))
41+
(preprocess (pps ppx_deriving_rpc ))
6742
)
68-
|} runtime_coverage_enabled coverage_dep coverage_rewriter coverage_rewriter

‎lib/xcp_coverage.mli‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎lib/xcp_service.ml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,6 @@ type ('a, 'b) error = [
361361

362362
let configure2 ~name ~version ~doc ?(options=[]) ?(resources=[]) () =
363363
try
364-
Xcp_coverage.init name;
365364
configure_common ~options ~resources
366365
(fun config_spec ->
367366
match Term.eval (command_of ~name ~version ~doc config_spec) with

‎lib_test/dune‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,3 @@
1-
(* -*- tuareg -*- *)
2-
let coverage_rewriter =
3-
match Sys.getenv "BISECT_ENABLE" with
4-
| "YES" -> "bisect_ppx"
5-
| _ -> ""
6-
| exception Not_found -> ""
7-
8-
9-
let () = Printf.ksprintf Jbuild_plugin.V1.send {|
101

112
(executables
123
(names test)
@@ -29,19 +20,18 @@ let () = Printf.ksprintf Jbuild_plugin.V1.send {|
2920
xapi-idl.v6
3021
xapi-idl.xen
3122
)
32-
(preprocess (pps ppx_deriving_rpc %s))
23+
(preprocess (pps ppx_deriving_rpc ))
3324
)
3425

3526
(alias
3627
(name runtest)
3728
(deps (:x test.exe) (source_tree test_data))
38-
(action (run %%{x}))
29+
(action (run %{x}))
3930
)
4031

4132
(alias
4233
(name runtest-quick)
4334
(deps (:x test.exe) (source_tree test_data))
44-
(action (run %%{x} -q))
35+
(action (run %{x} -q))
4536
)
4637

47-
|} coverage_rewriter

‎memory/dune‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
1-
(* -*- tuareg -*- *)
2-
let coverage_rewriter =
3-
match Sys.getenv "BISECT_ENABLE" with
4-
| "YES" -> "bisect_ppx"
5-
| _ -> ""
6-
| exception Not_found -> ""
7-
8-
let () = Printf.ksprintf Jbuild_plugin.V1.send {|
91

102
(library
113
(name xcp_memory)
@@ -18,7 +10,7 @@ let () = Printf.ksprintf Jbuild_plugin.V1.send {|
1810
xapi-idl
1911
)
2012
(wrapped false)
21-
(preprocess (pps ppx_deriving_rpc %s))
13+
(preprocess (pps ppx_deriving_rpc ))
2214
)
2315

2416
(executable
@@ -35,7 +27,6 @@ let () = Printf.ksprintf Jbuild_plugin.V1.send {|
3527
(alias
3628
(name runtest)
3729
(deps (:x memory_cli.exe))
38-
(action (run %%{x}))
30+
(action (run %{x}))
3931
)
4032

41-
|} coverage_rewriter

‎network/dune‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
1-
(* -*- tuareg -*- *)
2-
let coverage_rewriter =
3-
match Sys.getenv "BISECT_ENABLE" with
4-
| "YES" -> "bisect_ppx"
5-
| _ -> ""
6-
| exception Not_found -> ""
7-
8-
let () = Printf.ksprintf Jbuild_plugin.V1.send {|
91

102
(library
113
(name xcp_network)
@@ -18,7 +10,7 @@ let () = Printf.ksprintf Jbuild_plugin.V1.send {|
1810
xapi-idl
1911
)
2012
(wrapped false)
21-
(preprocess (pps ppx_deriving_rpc %s))
13+
(preprocess (pps ppx_deriving_rpc ))
2214
)
2315

2416
(executable
@@ -35,7 +27,6 @@ let () = Printf.ksprintf Jbuild_plugin.V1.send {|
3527
(alias
3628
(name runtest)
3729
(deps (:x network_cli.exe))
38-
(action (run %%{x}))
30+
(action (run %{x}))
3931
)
4032

41-
|} coverage_rewriter

‎rrd/dune‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
1-
(* -*- tuareg -*- *)
2-
let coverage_rewriter =
3-
match Sys.getenv "BISECT_ENABLE" with
4-
| "YES" -> "bisect_ppx"
5-
| _ -> ""
6-
| exception Not_found -> ""
7-
8-
let () = Printf.ksprintf Jbuild_plugin.V1.send {|
91

102
(library
113
(name xcp_rrd_interface_types)
@@ -19,7 +11,7 @@ let () = Printf.ksprintf Jbuild_plugin.V1.send {|
1911
xapi-idl
2012
)
2113
(wrapped false)
22-
(preprocess (pps ppx_deriving_rpc %s))
14+
(preprocess (pps ppx_deriving_rpc ))
2315
)
2416

2517
(library
@@ -35,7 +27,7 @@ let () = Printf.ksprintf Jbuild_plugin.V1.send {|
3527
xapi-idl.rrd.interface.types
3628
)
3729
(wrapped false)
38-
(preprocess (pps ppx_deriving_rpc %s))
30+
(preprocess (pps ppx_deriving_rpc ))
3931
)
4032

4133
(library
@@ -51,7 +43,7 @@ let () = Printf.ksprintf Jbuild_plugin.V1.send {|
5143
xapi-idl.rrd.interface
5244
)
5345
(wrapped false)
54-
(preprocess (pps ppx_deriving_rpc %s))
46+
(preprocess (pps ppx_deriving_rpc ))
5547
)
5648

5749
(executable
@@ -68,7 +60,6 @@ let () = Printf.ksprintf Jbuild_plugin.V1.send {|
6860
(alias
6961
(name runtest)
7062
(deps (:x rrd_cli.exe))
71-
(action (run %%{x}))
63+
(action (run %{x}))
7264
)
7365

74-
|} coverage_rewriter coverage_rewriter coverage_rewriter

0 commit comments

Comments
 (0)