Skip to content

Commit 678a8ff

Browse files
committed
Request gcov-4.8 on Travis
1 parent de2c815 commit 678a8ff

File tree

2 files changed

+15
-4
lines changed

2 files changed

+15
-4
lines changed

.travis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ addons:
1212

1313
script:
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

tests/host/Makefile

+13-2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ ifeq ($(shell uname -s),Darwin)
88
CC := gcc
99
CXX := g++
1010
endif
11+
GCOV ?= gcov
1112

1213
CORE_CPP_FILES := $(addprefix $(CORE_PATH)/,\
1314
StreamString.cpp \
@@ -56,7 +57,7 @@ CPP_OBJECTS = $(CPP_SOURCE_FILES:.cpp=.cpp.o)
5657
OBJECTS = $(C_OBJECTS) $(CPP_OBJECTS)
5758
COVERAGE_FILES = $(OBJECTS:.o=.gc*)
5859

59-
all: $(OUTPUT_BINARY) test
60+
all: build-info $(OUTPUT_BINARY) test gcov
6061

6162
test: $(OUTPUT_BINARY)
6263
$(OUTPUT_BINARY)
@@ -67,7 +68,17 @@ clean:
6768
rm -rf $(COVERAGE_FILES) *.gcov
6869

6970
gcov: 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 $@

0 commit comments

Comments
 (0)