Unverified Commit e1955a2c authored by teor's avatar teor
Browse files

Merge remote-tracking branch 'tor-github/pr/877' into maint-0.2.9

parents 54e249e2 f0cd8f80

.travis.yml

+5 −3
Original line number Diff line number Diff line
@@ -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:

Makefile.am

+3 −1
Original line number Diff line number Diff line
@@ -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

changes/bug29036

0 → 100644
+5 −0
Original line number Diff line number Diff line 
  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.