diff options
| author | teor <teor@torproject.org> | 2019-04-01 14:07:58 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-04-01 14:07:58 +1000 |
| commit | ac28e56ccb402d640f5adde186a765265ce855c7 (patch) | |
| tree | 463ac001ec41d416f66882a32f1a5f7ab23d31cf /.travis.yml | |
| parent | 6d057c56f170a7d72751b9557c78c2f6ee5735b9 (diff) | |
| parent | 57e9fe2bbaa66ee907d68cdf7ebcf2111bd71ac9 (diff) | |
| download | tor-ac28e56ccb402d640f5adde186a765265ce855c7.tar.gz tor-ac28e56ccb402d640f5adde186a765265ce855c7.zip | |
Merge branch 'bug29036-029' into bug29036-29962-034
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 56d7dc0737..87780bb1a6 100644 --- 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: |