travis: run both test suites and measure coverage

We have 2 small test suites which test different things:

- test/test.ml: checks LV-level operations
- setup.sh: uses the local allocator

Signed-off-by: David Scott <[email protected]>

Author: David Scott

.travis.sh

@@ -5,7 +5,10 @@ eval `opam config env`
 export BISECT_FILE=_build/xenvm.coverage
 # Needed to support Unix domain sockets:
 sudo opam pin add conduit git://github.com/mirage/ocaml-conduit -y
+# run the OCaml test suite
 make test
+# run the bash test suite
+./setup.sh
 
 echo Generating bisect report-- this fails on travis
 (cd _build; bisect-report xenvm*.out -summary-only -html /vagrant/report/ || echo Ignoring bisect-report failure)

setup.sh

@@ -30,10 +30,8 @@ else
 fi
 cat test.xenvmd.conf.in | sed -r "s|@BIGDISK@|$LOOP|g" > test.xenvmd.conf
 mkdir -p /tmp/xenvm.d
-BISECT_FILE=_build/xenvm.coverage ./xenvm.native format $LOOP --vg djstest --configdir /tmp/xenvm.d $MOCK_ARG
-BISECT_FILE=_build/xenvmd.coverage ./xenvmd.native --config ./test.xenvmd.conf --daemon
-
-export BISECT_FILE=_build/xenvm.coverage
+./xenvm.native format $LOOP --vg djstest --configdir /tmp/xenvm.d $MOCK_ARG
+./xenvmd.native --config ./test.xenvmd.conf --daemon
 
 ./xenvm.native set-vg-info --pvpath $LOOP -S /tmp/xenvmd djstest --local-allocator-path /tmp/xenvm-local-allocator --uri file://local/services/xenvmd/djstest --configdir /tmp/xenvm.d $MOCK_ARG