Integrate coverage build better

odoc is now always built with coverage in development, so one doesn't
have to run make clean when switching between coverage and regular
testing.

The Dune --force option requires Jbuilder >= 1.0+beta17.

Makefile

@@ -21,10 +21,9 @@ BISECT_FILES_PATTERN := _build/default/test/*/bisect*.out
 
 .PHONY : coverage
 coverage :
-	BISECT_ENABLE=yes jbuilder build --dev @tester
 	find . -name 'bisect*.out' | xargs rm -f
-	(cd _build/default/test/parser && ./test.exe) || true
-	(cd _build/default/test/html && ./test.exe) || true
+	jbuilder build @test/parser/runtest --dev --no-buffer -j 1 --force
+	jbuilder build @test/html/runtest --dev --no-buffer -j 1 --force
 	@bisect-ppx-report \
 	    -I _build/default/ -html $(COVERAGE)/ \
 	    -text - -summary-only \

odoc.opam

@@ -19,7 +19,7 @@ depends: [
   "cmdliner" {build}
   "cppo" {build}
   "fpath" {build}
-  "jbuilder" {build & >= "1.0+beta10"}
+  "jbuilder" {build & >= "1.0+beta17"}
   "tyxml" {build & >= "4.0.0"}
 
   # Development dependencies. These should be removed in opam files sent to the

src/html/jbuild

@@ -2,5 +2,5 @@
 
 (library
  ((name html)
-  (preprocess (pps (bisect_ppx -conditional)))
+  (preprocess (pps (bisect_ppx)))
   (libraries (model tyxml))))

src/parser/jbuild

@@ -4,5 +4,5 @@
 
 (library
  ((name parser_)
-  (preprocess (pps (bisect_ppx -conditional)))
+  (preprocess (pps (bisect_ppx)))
   (libraries (model))))