Use bisect_ppx backend

benfaerber · benfaerber · commit 0f165d2e978b · 2025-11-25T02:59:53.000-07:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -29,8 +29,7 @@ jobs:
     - name: Install dependencies
       run: |
         eval $(opam env)
-        opam install . --deps-only --with-test --yes
-        opam install bisect_ppx --yes
+        opam install . --deps-only --with-test --with-dev-setup --yes
         opam install ppx_deriving --yes
 
     - name: Build
diff --git a/Makefile b/Makefile
@@ -26,9 +26,8 @@ runbin:
 
 coverage:
 	@mkdir -p _coverage
-	@export BISECT_FILE=$$(pwd)/_coverage/bisect && \
-	export BISECT_ENABLE=yes && \
-	dune runtest --instrument-with bisect_ppx --force
+	@rm -f _coverage/bisect*.coverage
+	@BISECT_FILE=$$(pwd)/_coverage/bisect BISECT_ENABLE=yes dune runtest --instrument-with bisect_ppx --force
 	@echo ""
 	@echo "Coverage Summary:"
 	@echo "================"
diff --git a/bin/dune b/bin/dune
@@ -1,5 +1,3 @@
 (executables
  (names main)
- (libraries liquid_ml base core)
- (preprocess
-  (pps bisect_ppx --conditional)))
+ (libraries liquid_ml base core))
diff --git a/dune-project b/dune-project
@@ -1,2 +1,2 @@
-(lang dune 2.5)
+(lang dune 2.7)
 (name liquid)
diff --git a/liquid_interpreter/dune b/liquid_interpreter/dune
@@ -1,5 +1,4 @@
 (library
  (public_name liquid_interpreter)
  (libraries base core stdio re2 liquid_syntax liquid_parser liquid_std)
- (preprocess
-  (pps bisect_ppx --conditional)))
+ (instrumentation (backend bisect_ppx)))
diff --git a/liquid_ml.opam b/liquid_ml.opam
@@ -24,6 +24,7 @@ depends: [
     "liquid_std" { = version }
     "liquid_interpreter" { = version }
     "alcotest" { >= "1.5.0" & with-test }
+    "bisect_ppx" { >= "2.0.0" & with-dev-setup }
 ]
 build: [
     ["dune" "build" "-p" name "-j" jobs]
diff --git a/liquid_ml/dune b/liquid_ml/dune
@@ -1,5 +1,4 @@
 (library
  (public_name liquid_ml)
  (libraries base core stdio liquid_syntax liquid_parser liquid_interpreter)
- (preprocess
-  (pps bisect_ppx --conditional)))
+ (instrumentation (backend bisect_ppx)))
diff --git a/liquid_parser/dune b/liquid_parser/dune
@@ -1,5 +1,4 @@
 (library
  (public_name liquid_parser)
  (libraries base core stdio re2 liquid_syntax)
- (preprocess
-  (pps bisect_ppx --conditional)))
+ (instrumentation (backend bisect_ppx)))
diff --git a/liquid_std/dune b/liquid_std/dune
@@ -2,5 +2,4 @@
  (public_name liquid_std)
  (libraries base core stdio re2 calendar base64 sha str liquid_syntax
    liquid_parser)
- (preprocess
-  (pps bisect_ppx --conditional)))
+ (instrumentation (backend bisect_ppx)))
diff --git a/liquid_syntax/dune b/liquid_syntax/dune
@@ -2,4 +2,5 @@
  (public_name liquid_syntax)
  (libraries base core stdio re2 calendar ppx_deriving.runtime)
  (preprocess
-  (pps bisect_ppx --conditional ppx_deriving.show)))
+  (pps ppx_deriving.show))
+ (instrumentation (backend bisect_ppx)))
diff --git a/test/dune b/test/dune
@@ -1,7 +1,6 @@
 (test
  (name test_runner)
  (libraries alcotest liquid_ml base core stdio)
- (preprocess
-  (pps bisect_ppx --conditional)))
+ (instrumentation (backend bisect_ppx)))
 
 (dirs templates)

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-(lang dune 2.5)`
	`1`	`+(lang dune 2.7)`
`2`	`2`	`(name liquid)`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ depends: [`
`24`	`24`	`"liquid_std" { = version }`
`25`	`25`	`"liquid_interpreter" { = version }`
`26`	`26`	`"alcotest" { >= "1.5.0" & with-test }`
	`27`	`+ "bisect_ppx" { >= "2.0.0" & with-dev-setup }`
`27`	`28`	`]`
`28`	`29`	`build: [`
`29`	`30`	`["dune" "build" "-p" name "-j" jobs]`