summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-04-24 10:38:37 -0400
committerNick Mathewson <nickm@torproject.org>2018-04-24 10:38:37 -0400
commit5cc3a0379eba0eb4e9baac97468fcaebcc654437 (patch)
tree497bd0d3e6e50c89a74608f5ebf79f728509e211 /.travis.yml
parente8886340762cbe3be306268dfe0003214b09ac07 (diff)
parent34e7dca9c9e902a58fe8942cef666f1d99d06030 (diff)
downloadtor-5cc3a0379eba0eb4e9baac97468fcaebcc654437.tar.gz
tor-5cc3a0379eba0eb4e9baac97468fcaebcc654437.zip
Merge branch 'maint-0.2.9' into maint-0.3.1
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml5
1 files changed, 4 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index bf55b7756a..3f133782d1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -99,6 +99,8 @@ matrix:
env: RUST_OPTIONS=""
- compiler: gcc
env: COVERAGE_OPTIONS="--enable-coverage"
+ - compiler: gcc
+ env: DISTCHECK="yes"
## The "sudo: required" forces non-containerized builds, working
## around a Travis CI environment issue: clang LeakAnalyzer fails
## because it requires ptrace and the containerized environment no
@@ -138,7 +140,8 @@ script:
- ./autogen.sh
- ./configure $RUST_OPTIONS $COVERAGE_OPTIONS --disable-asciidoc --enable-fatal-warnings --disable-silent-rules --enable-fragile-hardening
## We run `make check` because that's what https://jenkins.torproject.org does.
- - make check
+ - if [[ "$DISTCHECK" == "" ]]; then make check; fi
+ - if [[ "$DISTCHECK" != "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$RUST_OPTIONS $COVERAGE_OPTIONS --disable-asciidoc --enable-fatal-warnings --disable-silent-rules --enable-fragile-hardening"; fi
after_failure:
## `make check` will leave a log file with more details of test failures.