Commit 0267c453 authored by Alexander Færøy's avatar Alexander Færøy 🍍
Browse files

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
parent 8bd9b2a6
...@@ -155,6 +155,8 @@ script: ...@@ -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: ...@@ -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:
......
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.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment