tor

commit ac28e56ccb402d640f5adde186a765265ce855c7
parent 6d057c56f170a7d72751b9557c78c2f6ee5735b9
Author: teor <teor@torproject.org>
Date:   Mon,  1 Apr 2019 14:07:58 +1000

Merge branch 'bug29036-029' into bug29036-29962-034

Diffstat:
M
.travis.yml
 | 
8
+++++---
M
Makefile.am
 | 
4
+++-
A
changes/bug29036
 | 
5
+++++

3 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/.travis.yml b/.travis.yml
@@ -201,6 +201,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.
@@ -211,9 +213,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
@@ -171,7 +171,9 @@ 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
 
 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/*/*.gcno $(top_builddir)/src/*/*/*.gcno \
+	      $(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
@@ -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.