File tree Expand file tree Collapse file tree 2 files changed +15
-4
lines changed
Expand file tree Collapse file tree 2 files changed +15
-4
lines changed Original file line number Diff line number Diff line change @@ -12,9 +12,9 @@ addons:
1212
1313script :
1414 - set -e
15- - export CXX="g++-4.8" CC="gcc-4.8"
15+ - export CXX="g++-4.8" CC="gcc-4.8" GCOV="gcov-4.8"
1616 - pushd $TRAVIS_BUILD_DIR/tests/host
17- - make test gcov
17+ - make
1818 - bash <(curl -s https://codecov.io/bash) -X gcov
1919 - make clean
2020 - popd
Original file line number Diff line number Diff line change @@ -8,6 +8,7 @@ ifeq ($(shell uname -s),Darwin)
88CC := gcc
99CXX := g++
1010endif
11+ GCOV ?= gcov
1112
1213CORE_CPP_FILES := $(addprefix $(CORE_PATH ) /,\
1314 StreamString.cpp \
@@ -56,7 +57,7 @@ CPP_OBJECTS = $(CPP_SOURCE_FILES:.cpp=.cpp.o)
5657OBJECTS = $(C_OBJECTS ) $(CPP_OBJECTS )
5758COVERAGE_FILES = $(OBJECTS:.o=.gc* )
5859
59- all : $(OUTPUT_BINARY ) test
60+ all : build-info $(OUTPUT_BINARY ) test gcov
6061
6162test : $(OUTPUT_BINARY )
6263 $(OUTPUT_BINARY )
@@ -67,7 +68,17 @@ clean:
6768 rm -rf $(COVERAGE_FILES ) * .gcov
6869
6970gcov : test
70- find $(CORE_PATH ) -name " *.gcno" -exec gcov -r -pb {} +
71+ find $(CORE_PATH ) -name " *.gcno" -exec $(GCOV ) -r -pb {} +
72+
73+ build-info :
74+ echo " -------- build tools info --------"
75+ echo " CC: " $(CC )
76+ $(CC ) -v
77+ echo " CXX: " $(CXX )
78+ $(CXX ) -v
79+ echo " GCOV: " $(GCOV )
80+ $(GCOV ) -v
81+ echo " ----------------------------------"
7182
7283$(BINARY_DIRECTORY ) :
7384 mkdir -p $@
You can’t perform that action at this time.
0 commit comments