diff options
| author | teor <teor@torproject.org> | 2019-04-06 09:28:13 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-04-06 09:28:13 +1000 |
| commit | e1955a2c54e2c9ab25252c46f13f0a222828a6ff (patch) | |
| tree | 503002989eb3ef8162cd808a149a0a4f26a1f411 | |
| parent | 54e249e269c63fd5f003dd8c15faa6a13902f8e4 (diff) | |
| parent | f0cd8f804f8152355993acf0493b22b668f500b2 (diff) | |
| download | tor-e1955a2c54e2c9ab25252c46f13f0a222828a6ff.tar.gz tor-e1955a2c54e2c9ab25252c46f13f0a222828a6ff.zip | |
Merge remote-tracking branch 'tor-github/pr/877' into maint-0.2.9
| -rw-r--r-- | .travis.yml | 8 | ||||
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | changes/bug29036 | 5 |
3 files changed, 13 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 939f4f4e90..456b5abc56 100644 --- a/.travis.yml +++ b/.travis.yml @@ -155,6 +155,8 @@ script: ## We run `make check` because that's what https://jenkins.torproject.org does. - if [[ "$DISTCHECK" == "" ]]; then make check; 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' || echo "Coverage failed"; fi after_failure: ## configure will leave a log file with more details of config failures. @@ -165,9 +167,9 @@ after_failure: ## `make distcheck` puts it somewhere different. - if [[ "$DISTCHECK" != "" ]]; then make show-distdir-testlog || echo "make failed"; fi -after_success: - ## 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 +before_cache: + ## Delete all gcov files. + - if [[ "$COVERAGE_OPTIONS" != "" ]]; then make reset-gcov; fi notifications: irc: diff --git a/Makefile.am b/Makefile.am index e4be3f26f9..48d3df2654 100644 --- a/Makefile.am +++ b/Makefile.am @@ -148,8 +148,10 @@ test-full: need-stem-path need-chutney-path check test-network test-stem test-full-online: need-stem-path need-chutney-path check test-network test-stem-full +# We can't delete the gcno files, because they are created when tor is compiled reset-gcov: - rm -f $(top_builddir)/src/*/*.gcda $(top_builddir)/src/*/*/*.gcda + rm -f $(top_builddir)/src/*/*.gcda $(top_builddir)/src/*/*/*.gcda \ + $(top_builddir)/src/*/*.gcov $(top_builddir)/src/*/*/*.gcov HTML_COVER_DIR=$(top_builddir)/coverage_html coverage-html: all diff --git a/changes/bug29036 b/changes/bug29036 new file mode 100644 index 0000000000..8b96c5c8fa --- /dev/null +++ b/changes/bug29036 @@ -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. The process subsystem was introduced + in 0.4.0.1-alpha. Fixes bug 29036; bugfix on 0.2.9.15. |