summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArseny Kapoulkine <arseny.kapoulkine@gmail.com>2015-08-25 10:24:49 -0700
committerArseny Kapoulkine <arseny.kapoulkine@gmail.com>2015-08-25 10:36:44 -0700
commitabdba2235df8e1bceea2ebe868ebfa468e744ecd (patch)
tree940316a1aa2375b569a41805dc442020d64bdf87
parentc7acc6d1f46be6a53dd999e570fe46bc6ce0d686 (diff)
build: Fix -o gcov option
Also upload just pugixml.cpp.gcov to codecov to avoid issues the script has with old gcov.
-rw-r--r--.travis.yml2
-rw-r--r--Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 9a8dcda..549a150 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,4 +8,4 @@ env:
- DEFINES=PUGIXML_WCHAR_MODE
- DEFINES=PUGIXML_COMPACT
script: make test defines=$DEFINES config=coverage -j2
-after_success: bash <(curl -s https://codecov.io/bash)
+after_success: bash <(curl -s https://codecov.io/bash) -f pugixml.cpp.gcov
diff --git a/Makefile b/Makefile
index 6831882..e6b2b36 100644
--- a/Makefile
+++ b/Makefile
@@ -56,7 +56,7 @@ ifeq ($(config),coverage)
test: $(EXECUTABLE)
-@find $(BUILD) -name '*.gcda' -exec rm {} +
./$(EXECUTABLE)
- @gcov -b -o=$(BUILD)/src pugixml.cpp.gcda | sed -e '/./{H;$!d;}' -e 'x;/pugixml.cpp/!d;'
+ @gcov -b -o $(BUILD)/src/ pugixml.cpp.gcda | sed -e '/./{H;$!d;}' -e 'x;/pugixml.cpp/!d;'
@find . -name '*.gcov' -and -not -name 'pugixml.cpp.gcov' -exec rm {} +
else
test: $(EXECUTABLE)