Skip to content

Commit 5d05350

Browse files
author
David Scott
committed
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]>
1 parent 7b5b72b commit 5d05350

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

.travis.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@ eval `opam config env`
55
export BISECT_FILE=_build/xenvm.coverage
66
# Needed to support Unix domain sockets:
77
sudo opam pin add conduit git://github.com/mirage/ocaml-conduit -y
8+
# run the OCaml test suite
89
make test
10+
# run the bash test suite
11+
./setup.sh
912

1013
echo Generating bisect report-- this fails on travis
1114
(cd _build; bisect-report xenvm*.out -summary-only -html /vagrant/report/ || echo Ignoring bisect-report failure)

setup.sh

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,8 @@ else
3030
fi
3131
cat test.xenvmd.conf.in | sed -r "s|@BIGDISK@|$LOOP|g" > test.xenvmd.conf
3232
mkdir -p /tmp/xenvm.d
33-
BISECT_FILE=_build/xenvm.coverage ./xenvm.native format $LOOP --vg djstest --configdir /tmp/xenvm.d $MOCK_ARG
34-
BISECT_FILE=_build/xenvmd.coverage ./xenvmd.native --config ./test.xenvmd.conf --daemon
35-
36-
export BISECT_FILE=_build/xenvm.coverage
33+
./xenvm.native format $LOOP --vg djstest --configdir /tmp/xenvm.d $MOCK_ARG
34+
./xenvmd.native --config ./test.xenvmd.conf --daemon
3735

3836
./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
3937

0 commit comments

Comments
 (0)