From 4327d45cd2fa89a2f8a5591a1416aa214a5e2d08 Mon Sep 17 00:00:00 2001
From: Anton Bachin <antonbachin@yahoo.com>
Date: Sun, 25 Aug 2019 23:27:50 +0300
Subject: [PATCH 1/2] Self-coverage: use more typical reporter command

This allows self-coverage to serve more realistically as another Dune
integration test.
---
 Makefile            | 11 ++++++-----
 test/travis-opam.sh | 11 ++++++-----
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index d73104d7..8f62bc89 100644
--- a/Makefile
+++ b/Makefile
@@ -103,9 +103,10 @@ self-coverage-test :
 	cd $(SELF_COVERAGE) && dune build
 	cd $(SELF_COVERAGE) && dune runtest --force --no-buffer -j 1
 	rm -rf _coverage
-	$(SELF_COVERAGE)/_build/install/default/bin/meta-bisect-ppx-report \
-	  -I $(SELF_COVERAGE)/_build/default \
-	  --text - --summary-only \
-	  --html _coverage \
-	  $(SELF_COVERAGE)/bisect*.meta
+	cd $(SELF_COVERAGE) && \
+	  _build/install/default/bin/meta-bisect-ppx-report \
+	    -I _build/default \
+	    --text - --summary-only \
+	    --html ../_coverage \
+	    bisect*.meta
 	@echo See _coverage/index.html
diff --git a/test/travis-opam.sh b/test/travis-opam.sh
index be9a3f78..f1af69f5 100644
--- a/test/travis-opam.sh
+++ b/test/travis-opam.sh
@@ -67,10 +67,11 @@ which bisect-ppx-report
 if [ "$SELF_COVERAGE" == YES ]
 then
     make self-coverage
-    _self/_build/install/default/bin/meta-bisect-ppx-report \
-        -I _self/_build/default \
-        --coveralls coverage.json \
-        --service-name travis-ci --service-job-id $TRAVIS_JOB_ID \
-        _self/bisect*.meta
+    (cd _self && \
+        _build/install/default/bin/meta-bisect-ppx-report \
+            -I _build/default \
+            --coveralls ../coverage.json \
+            --service-name travis-ci --service-job-id $TRAVIS_JOB_ID \
+            bisect*.meta)
     curl -L -F json_file=@./coverage.json https://coveralls.io/api/v1/jobs
 fi

From f4010ea4a2adc84088e83035b367a3200d73901f Mon Sep 17 00:00:00 2001
From: Anton Bachin <antonbachin@yahoo.com>
Date: Sun, 25 Aug 2019 23:41:55 +0300
Subject: [PATCH 2/2] Reporter: don't require -I _build/default for Dune

---
 Makefile                   | 1 -
 src/report/report.ml       | 2 +-
 test/travis-opam.sh        | 1 -
 test/usage/reason/Makefile | 3 +--
 4 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 8f62bc89..ae2159b1 100644
--- a/Makefile
+++ b/Makefile
@@ -105,7 +105,6 @@ self-coverage-test :
 	rm -rf _coverage
 	cd $(SELF_COVERAGE) && \
 	  _build/install/default/bin/meta-bisect-ppx-report \
-	    -I _build/default \
 	    --text - --summary-only \
 	    --html ../_coverage \
 	    bisect*.meta
diff --git a/src/report/report.ml b/src/report/report.ml
index 41847b84..f84a55dc 100644
--- a/src/report/report.ml
+++ b/src/report/report.ml
@@ -26,7 +26,7 @@ let report_title = ref "Coverage report"
 
 let csv_separator = ref ";"
 
-let search_path = ref [""]
+let search_path = ref ["_build/default"; ""]
 
 let add_search_path sp =
   search_path := sp :: !search_path
diff --git a/test/travis-opam.sh b/test/travis-opam.sh
index f1af69f5..2fdc1bc7 100644
--- a/test/travis-opam.sh
+++ b/test/travis-opam.sh
@@ -69,7 +69,6 @@ then
     make self-coverage
     (cd _self && \
         _build/install/default/bin/meta-bisect-ppx-report \
-            -I _build/default \
             --coveralls ../coverage.json \
             --service-name travis-ci --service-job-id $TRAVIS_JOB_ID \
             bisect*.meta)
diff --git a/test/usage/reason/Makefile b/test/usage/reason/Makefile
index 60cb706b..44cd3dc1 100644
--- a/test/usage/reason/Makefile
+++ b/test/usage/reason/Makefile
@@ -6,8 +6,7 @@ test : clean
 	BISECT_ENABLE=YES dune exec ./source.exe
 	ls -l _build
 	test -f bisect*.out
-	bisect-ppx-report \
-	  -I _build/default/ --html _coverage/ `find . -name 'bisect*.out'`
+	bisect-ppx-report --html _coverage/ `find . -name 'bisect*.out'`
 
 .PHONY : clean
 clean :