Merge pull request #89 from noahdesu/coveralls

basic coveralls support

Signed-off-by: Noah Watkins <[email protected]>

.gitignore

@@ -33,7 +33,7 @@ src/zlog-seqr
 src/test/zlog-test-ceph
 src/test/zlog-test-ram
 src/test/zstate-test
-src/test/db_test
+src/test/db-test
 src/stream-stress
 src/append-check
 src/zlog
@@ -47,3 +47,4 @@ cmake_install.cmake
 
 build
 *.dylib
+coverage

.travis.yml

@@ -7,9 +7,15 @@ dist: trusty
 services:   
   - docker
 
+matrix:
+  include:
+    - os: linux
+      env: COVERAGE=1
+    - os: linux
+      env: COVERAGE=0
+
 before_install:
-  - sudo apt-get -qq update
-  - sudo apt-get install -y libprotobuf-dev protobuf-compiler libboost-all-dev
+  - sudo pip install cpp-coveralls
 
 env:
   global:
@@ -18,6 +24,12 @@ env:
    - secure: "EhSojL5dZ7LY9S59Iixzw8KUtMqVdE8dZTZqZ0gnA1VfG4XcQr8u8Vi9jJzGaGxcXIL10p3nE4whrmhlEhUpxKkrcOgKo9vKmn9xByUHd0CBhBudZAdlQsq4DMEp20qAwg+5iuCUHS6cn3UjduQqdo9YMhfqFuRiH+U3oZxS0W4="
 
 addons:
+  apt:
+    packages:
+    - lcov
+    - libboost-all-dev
+    - libprotobuf-dev
+    - protobuf-compiler
   coverity_scan:
     project:
       name: "noahdesu/zlog"
@@ -27,4 +39,5 @@ addons:
     build_command:   "make"
     branch_pattern: coverity_scan
 
-script: if [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then docker run -v $TRAVIS_BUILD_DIR:/src/zlog zlog/ci ; fi
+script: ci/script.sh
+after_success: ci/after_success.sh

README.md

@@ -1,6 +1,8 @@
 # Zlog - a distributed shared log for ceph
 
-[![Build Status](https://travis-ci.org/noahdesu/zlog.svg?branch=master)](https://travis-ci.org/noahdesu/zlog) [![Coverity Scan Build Status](https://scan.coverity.com/projects/9894/badge.svg)](https://scan.coverity.com/projects/noahdesu-zlog)
+[![Build Status](https://travis-ci.org/noahdesu/zlog.svg?branch=master)](https://travis-ci.org/noahdesu/zlog)
+[![Coverity Scan Build Status](https://scan.coverity.com/projects/9894/badge.svg)](https://scan.coverity.com/projects/noahdesu-zlog)
+[![Coverage Status](https://coveralls.io/repos/github/noahdesu/zlog/badge.svg?branch=master)](https://coveralls.io/github/noahdesu/zlog?branch=master)
 
 Zlog is a strongly consistent shared log designed to run on top of Ceph.
 Specifically, it is an implementation of the CORFU protocol adapted for RADOS,

ci/after_success.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+set -e
+
+#coveralls --exclude lib --exclude tests --gcov-options '\-lp'

ci/script.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+set -e
+
+# we don't run any tests for a coverity build
+if [ "${COVERITY_SCAN_BRANCH}" == 1 ]; then
+  exit 0
+fi
+
+if [ "${COVERAGE}" == 1 ]; then
+  cmake -DCMAKE_BUILD_TYPE=Coverage .
+  make
+  make db-test-cov
+  make zlog-test-ram-cov
+  coveralls --exclude src/googletest --exclude src/proto \
+    --exclude src/kvstore/kvstore.pb.h --exclude src/kvstore/kvstore.pb.cc \
+    --gcov-options '\-lp'
+else
+  docker run -v $TRAVIS_BUILD_DIR:/src/zlog zlog/ci
+fi

cmake/modules/CodeCoverage.cmake

@@ -140,7 +140,7 @@ FUNCTION(SETUP_TARGET_FOR_COVERAGE _targetname _testrunner _outputname)
 	ADD_CUSTOM_TARGET(${_targetname}
 
 		# Cleanup lcov
-		${LCOV_PATH} --directory . --zerocounters
+        #${LCOV_PATH} --directory . --zerocounters
 
 		# Run tests
 		COMMAND ${test_command} ${ARGV3}

docker/ci/run.sh

@@ -42,7 +42,7 @@ export CEPH_CONF=/tmp/ceph/ceph.conf
 ./zlog-seqr --streams --port 5678 --daemon
 ./test/zlog-test-ceph
 ./test/zlog-test-ram
-./test/db_test
+./test/db-test
 
 skill zlog-seqr
 skill -9 zlog-seqr

src/test/CMakeLists.txt

@@ -1,7 +1,7 @@
-add_executable(db_test db_test.cc)
-target_link_libraries(db_test libzlog zlog_seqr gtest_main libkvstore)
+add_executable(db-test db_test.cc)
+target_link_libraries(db-test libzlog zlog_seqr gtest_main libkvstore)
 if (CMAKE_BUILD_TYPE STREQUAL "Coverage")
-    setup_target_for_coverage(dbtest2-cov db_test coverage)
+    setup_target_for_coverage(db-test-cov db-test coverage)
 endif()