Unverified Commit 44ea3411 authored by teor's avatar teor
Browse files

Merge remote-tracking branch 'tor-github/pr/879' into maint-0.3.5

parents 4aa02d3c db71bceb

.travis.yml

+11 −4
Original line number Diff line number Diff line
@@ -5,8 +5,10 @@ cache: 
  ## cargo: true

  directories:

    - $HOME/.cargo

    ## caching CARGO_TARGET_DIR actually slows down the build over time,

    ## because old build products are never deleted.

    ## where we point CARGO_TARGET_DIR in all our cargo invocations

    - $TRAVIS_BUILD_DIR/src/rust/target

    #- $TRAVIS_BUILD_DIR/src/rust/target



compiler:

  - gcc
@@ -204,6 +206,8 @@ script: 
  - if [[ "$DISTCHECK" == "" && "$TEST_STEM" == "" ]]; then make check; fi

  - if [[ "$TEST_STEM" != "" ]]; then make src/app/tor test-stem; fi

  - if [[ "$DISTCHECK" != "" && "$TEST_STEM" == "" ]]; 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.
@@ -215,9 +219,12 @@ after_failure: 
  - if [[ "$DISTCHECK" != "" ]]; then make show-distdir-testlog || echo "make failed"; fi

  - if [[ "$DISTCHECK" != "" ]]; then make show-distdir-core || 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

  ## Delete the cargo registry before caching .cargo, because it's cheaper to

  ## download the registry and throw it away, rather than caching it

  - rm -rf $HOME/.cargo/registry



notifications:

  irc:

Makefile.am

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

changes/ticket29962

0 → 100644
+3 −0
Original line number Diff line number Diff line 
  o Minor features (continuous integration):

    - On Travis Rust builds, cleanup Rust registry and refrain from caching

      target/ directory to speed up builds. Resolves issue 29962.