diff --git a/.travis.yml b/.travis.yml index 3f18de490..3e0427b48 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,9 +12,9 @@ addons: script: - set -e - - export CXX="g++-4.8" CC="gcc-4.8" + - export CXX="g++-4.8" CC="gcc-4.8" GCOV="gcov-4.8" - pushd $TRAVIS_BUILD_DIR/tests/host - - make test gcov + - make - bash <(curl -s https://codecov.io/bash) -X gcov - make clean - popd diff --git a/tests/host/Makefile b/tests/host/Makefile index 86e7f32ca..122dd94bd 100644 --- a/tests/host/Makefile +++ b/tests/host/Makefile @@ -8,6 +8,7 @@ ifeq ($(shell uname -s),Darwin) CC := gcc CXX := g++ endif +GCOV ?= gcov CORE_CPP_FILES := $(addprefix $(CORE_PATH)/,\ StreamString.cpp \ @@ -56,7 +57,7 @@ CPP_OBJECTS = $(CPP_SOURCE_FILES:.cpp=.cpp.o) OBJECTS = $(C_OBJECTS) $(CPP_OBJECTS) COVERAGE_FILES = $(OBJECTS:.o=.gc*) -all: $(OUTPUT_BINARY) test +all: build-info $(OUTPUT_BINARY) test gcov test: $(OUTPUT_BINARY) $(OUTPUT_BINARY) @@ -67,7 +68,17 @@ clean: rm -rf $(COVERAGE_FILES) *.gcov gcov: test - find $(CORE_PATH) -name "*.gcno" -exec gcov -r -pb {} + + find $(CORE_PATH) -name "*.gcno" -exec $(GCOV) -r -pb {} + + +build-info: + echo "-------- build tools info --------" + echo "CC: " $(CC) + $(CC) -v + echo "CXX: " $(CXX) + $(CXX) -v + echo "GCOV: " $(GCOV) + $(GCOV) -v + echo "----------------------------------" $(BINARY_DIRECTORY): mkdir -p $@