diff options
| author | Arseny Kapoulkine <arseny.kapoulkine@gmail.com> | 2015-08-25 09:32:48 -0700 |
|---|---|---|
| committer | Arseny Kapoulkine <arseny.kapoulkine@gmail.com> | 2015-08-25 09:57:21 -0700 |
| commit | c7acc6d1f46be6a53dd999e570fe46bc6ce0d686 (patch) | |
| tree | 5e802ab47c21b325cdc460bc7f66467e36f37071 | |
| parent | 9865f042ede0186f932e611e50e2ec3b789ee986 (diff) | |
build: Rework config=coverage to be more robust
Use find -exec instead of xargs to work around differences between xargs on OSX
and Linux.
Use -b option of gcov - for some reason gcov on Travis can't find .gcno files
otherwise (old version?).
And finally enable config=coverage again.
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | Makefile | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 0721c83..9a8dcda 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,5 +7,5 @@ env: - DEFINES=standard - DEFINES=PUGIXML_WCHAR_MODE - DEFINES=PUGIXML_COMPACT -script: make test defines=$DEFINES -j2 +script: make test defines=$DEFINES config=coverage -j2 after_success: bash <(curl -s https://codecov.io/bash) @@ -54,10 +54,10 @@ all: $(EXECUTABLE) ifeq ($(config),coverage) test: $(EXECUTABLE) - -@find $(BUILD) -name '*.gcda' | xargs rm + -@find $(BUILD) -name '*.gcda' -exec rm {} + ./$(EXECUTABLE) - @gcov -b -c $(BUILD)/src/pugixml.cpp.gcda | sed -e '/./{H;$!d;}' -e 'x;/pugixml.cpp/!d;' - @ls *.gcov | grep -v pugixml.cpp.gcov | xargs rm + @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) ./$(EXECUTABLE) |