Merge pull request #73 from kc284/master

Corrected coverage rewriter.

.travis.yml

@@ -2,16 +2,20 @@ 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
     - PINS="xen-api-client:. xen-api-client-lwt:. xen-api-client-async:."
     - 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

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