summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-04-18 17:35:41 -0400
committerNick Mathewson <nickm@torproject.org>2018-04-18 17:35:41 -0400
commit96bc96ceeb8e30868bbb0c6493ea142dc23af34b (patch)
tree2d1aaef03accf88f2cf5eb454cf152698913207a /.travis.yml
parentce8e7427b9284ef12b69d50d72c8fc315b90e36d (diff)
parent61251337153448afa1cc2baae252c3f0d6353162 (diff)
downloadtor-96bc96ceeb8e30868bbb0c6493ea142dc23af34b.tar.gz
tor-96bc96ceeb8e30868bbb0c6493ea142dc23af34b.zip
Merge branch 'travis_distcheck_029' into travis_distcheck_031
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.