From 43d061be49ab5f6c168430b5749b544c0e0eba75 Mon Sep 17 00:00:00 2001
From: Konstantina Chremmou <konstantina.chremmou@citrix.com>
Date: Tue, 15 Jan 2019 13:55:01 +0000
Subject: [PATCH] Corrected coverage rewriter.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
---
 .coverage.sh | 30 ------------------------------
 .travis.yml  |  6 +++++-
 lib/dune     |  5 ++---
 3 files changed, 7 insertions(+), 34 deletions(-)
 delete mode 100644 .coverage.sh

diff --git a/.coverage.sh b/.coverage.sh
deleted file mode 100644
index 6c5fa71..0000000
--- a/.coverage.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-set -ex
-
-COVERAGE_DIR=.coverage
-rm -rf $COVERAGE_DIR
-mkdir -p $COVERAGE_DIR
-pushd $COVERAGE_DIR
-if [ -z "$KEEP" ]; then trap "popd; rm -rf $COVERAGE_DIR" EXIT; fi
-
-$(which cp) -r ../* .
-
-opam install bisect_ppx ocveralls ounit -y
-
-export BISECT_ENABLE=YES
-jbuilder runtest
-
-outs=$(find . | grep bisect.*.out)
-bisect-ppx-report -I $(dirname $outs[1]) -text report $outs
-bisect-ppx-report -I $(dirname $outs[1]) -summary-only -text summary $outs
-if [ -n "$HTML" ]; then bisect-ppx-report -I $(dirname $outs[1]) -html ../html-report $outs; fi
-
-if [ -n "$TRAVIS" ]; then
-  echo "\$TRAVIS set; running ocveralls and sending to coveralls.io..."
-  ocveralls --prefix _build/default $outs --send
-else
-  echo "\$TRAVIS not set; displaying results of bisect-report..."
-  cat report
-  cat summary
-fi
diff --git a/.travis.yml b/.travis.yml
index 668170f..24fbf69 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,8 +2,11 @@ language: c
 sudo: required
 install:
   - wget https://raw.githubusercontent.com/ocaml/ocaml-travisci-skeleton/master/.travis-docker.sh
+  - wget https://raw.githubusercontent.com/xapi-project/xapi-travis-scripts/master/coverage.sh
 script:
   - bash -ex .travis-docker.sh
+services:
+  - docker
 env:
   global:
     - OCAML_VERSION=4.07
@@ -11,7 +14,8 @@ env:
     - PACKAGE=xen-api-client
     - DISTRO="debian-9"
   matrix:
-    - BASE_REMOTE=git://github.com/xapi-project/xs-opam POST_INSTALL_HOOK="env TRAVIS=$TRAVIS TRAVIS_JOB_ID=$TRAVIS_JOB_ID bash -ex .coverage.sh"
+    - BASE_REMOTE=git://github.com/xapi-project/xs-opam \
+        POST_INSTALL_HOOK="env TRAVIS=$TRAVIS TRAVIS_JOB_ID=$TRAVIS_JOB_ID bash -ex coverage.sh"
     - PACKAGE=xen-api-client-async BASE_REMOTE=git://github.com/xapi-project/xs-opam POST_INSTALL_HOOK="make async-examples"
     - PACKAGE=xen-api-client-lwt BASE_REMOTE=git://github.com/xapi-project/xs-opam POST_INSTALL_HOOL="make lwt-examples"
     - EXTRA_REMOTES=git://github.com/xapi-project/xs-opam
diff --git a/lib/dune b/lib/dune
index 75952a8..23413ae 100644
--- a/lib/dune
+++ b/lib/dune
@@ -2,7 +2,7 @@
 
 let coverage_rewriter =
   match Sys.getenv "BISECT_ENABLE" with
-  | "YES" -> "(preprocess (pps bisect_ppx))"
+  | "YES" -> "bisect_ppx"
   | _ -> ""
   | exception Not_found -> ""
 
@@ -13,8 +13,7 @@ let () = Printf.ksprintf Jbuild_plugin.V1.send {|
   (public_name xen-api-client)
   (flags (:standard -w -39))
   (wrapped false)
-  (preprocess (pps ppx_deriving_rpc))
-  %s
+  (preprocess (pps ppx_deriving_rpc %s))
   (libraries
     astring
     cohttp