From 7fd140b99ac1a3762f68f9d24360aecf1330e6e2 Mon Sep 17 00:00:00 2001 From: aph Date: Sun, 30 Mar 2014 12:57:23 +0100 Subject: enable coveralls support --- .travis.yml | 2 ++ CMakeLists.txt | 9 +++++++++ README.md | 1 + scripts/travis-setup.sh | 2 ++ scripts/travis.sh | 6 +++--- 5 files changed, 17 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 99de0aeaf4..95e977ae4d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,3 +6,5 @@ before_install: - sudo ./scripts/travis-setup.sh script: - ./scripts/travis.sh +after_success: + - coveralls --encoding iso-8859-1 diff --git a/CMakeLists.txt b/CMakeLists.txt index f89f47ace0..ffb7f44b92 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,6 +28,15 @@ else() set(DEBUG 0) endif() +option(USE_GCOV "Enable gcov support" OFF) + +if(USE_GCOV) + message(STATUS "Enabling gcov support") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --coverage") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --coverage") + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} --coverage") +endif() + # Modules used by platform auto-detection include(CheckLibraryExists) diff --git a/README.md b/README.md index 637a7d9ac9..96ca15644c 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,7 @@ [![Build Status](https://travis-ci.org/neovim/neovim.png?branch=master)](https://travis-ci.org/neovim/neovim) [![Stories in Ready](https://badge.waffle.io/neovim/neovim.png?label=ready)](https://waffle.io/neovim/neovim) +[![Coverage Status](https://coveralls.io/repos/neovim/neovim/badge.png)](https://coveralls.io/r/neovim/neovim) Neovim is a project that seeks to aggressively refactor Vim in order to: diff --git a/scripts/travis-setup.sh b/scripts/travis-setup.sh index 2ed2b9e9eb..e372a64b03 100755 --- a/scripts/travis-setup.sh +++ b/scripts/travis-setup.sh @@ -42,3 +42,5 @@ wget -q -O - http://llvm.org/releases/3.4/clang+llvm-3.4-x86_64-unknown-ubuntu12 # [ -n "$USE_CLANG_34" ] && # apt-get -qq -y --no-install-recommends install clang-3.4 lldb-3.4 + +pip install cpp-coveralls --use-mirrors diff --git a/scripts/travis.sh b/scripts/travis.sh index b66c14e388..1f2b17a3de 100755 --- a/scripts/travis.sh +++ b/scripts/travis.sh @@ -60,7 +60,7 @@ if [ "$CC" = "clang" ]; then export SKIP_UNITTEST=1 export UBSAN_OPTIONS="log_path=$tmpdir/ubsan" # not sure if this works - $MAKE_CMD cmake CMAKE_EXTRA_FLAGS="-DCMAKE_INSTALL_PREFIX=$install_dir" + $MAKE_CMD cmake CMAKE_EXTRA_FLAGS="-DCMAKE_INSTALL_PREFIX=$install_dir -DUSE_GCOV=ON" $MAKE_CMD if ! $MAKE_CMD test; then reset @@ -70,7 +70,7 @@ if [ "$CC" = "clang" ]; then $MAKE_CMD install else export SKIP_EXEC=1 - $MAKE_CMD CMAKE_EXTRA_FLAGS="-DBUSTED_OUTPUT_TYPE=TAP" - $MAKE_CMD cmake + $MAKE_CMD CMAKE_EXTRA_FLAGS="-DBUSTED_OUTPUT_TYPE=TAP -DUSE_GCOV=ON" + $MAKE_CMD cmake CMAKE_EXTRA_FLAGS="-DUSE_GCOV=ON" $MAKE_CMD unittest fi -- cgit