Run make reset-gcov after the script target in Travis CI is done.

This should ensure that GCDA files are never entering the cache of
Travis CI.

See: https://bugs.torproject.org/29036
This commit is contained in:
Alexander Færøy 2019-03-18 15:27:14 +01:00
parent 8bd9b2a6a0
commit 0267c453e2
2 changed files with 10 additions and 3 deletions

View File

@ -155,6 +155,8 @@ script:
## We run `make check` because that's what https://jenkins.torproject.org does. ## We run `make check` because that's what https://jenkins.torproject.org does.
- if [[ "$DISTCHECK" == "" ]]; then make check; fi - if [[ "$DISTCHECK" == "" ]]; then make check; fi
- if [[ "$DISTCHECK" != "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi - if [[ "$DISTCHECK" != "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi
## If this build was one that produced coverage, upload it.
- if [[ "$COVERAGE_OPTIONS" != "" ]]; then coveralls -b . --exclude src/test --exclude src/trunnel --gcov-options '\-p'; fi
after_failure: after_failure:
## configure will leave a log file with more details of config failures. ## configure will leave a log file with more details of config failures.
@ -165,9 +167,9 @@ after_failure:
## `make distcheck` puts it somewhere different. ## `make distcheck` puts it somewhere different.
- if [[ "$DISTCHECK" != "" ]]; then make show-distdir-testlog || echo "make failed"; fi - if [[ "$DISTCHECK" != "" ]]; then make show-distdir-testlog || echo "make failed"; fi
after_success: before_cache:
## If this build was one that produced coverage, upload it. # Delete all .gcda files.
- if [[ "$COVERAGE_OPTIONS" != "" ]]; then coveralls -b . --exclude src/test --exclude src/trunnel --gcov-options '\-p'; fi - if [[ "$COVERAGE_OPTIONS" != "" ]]; then make reset-gcov; fi
notifications: notifications:
irc: irc:

5
changes/bug29036 Normal file
View File

@ -0,0 +1,5 @@
o Minor bugfix (continuous integration):
- Reset coverage state on disk after Travis CI has finished. This is being
done to prevent future gcda file merge errors which causes the test suite
for the process subsystem to fail. Fixes bug 29036; bugfix on 0.4.0.1-alpha.