commit bf466f55032f4c9f57e532d150cb30fb7d9fb00d
Merge: 44aa586de 612513371
Author: Nick Mathewson <nickm(a)torproject.org>
Date: Wed Apr 18 18:34:28 2018 -0400
Merge branch 'travis_distcheck_029' into travis_distcheck_033
.travis.yml | 5 ++++-
changes/travis_distcheck | 4 ++++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --cc .travis.yml
index 3d61f5a61,6da3027b8..d4587ca9f
--- a/.travis.yml
+++ b/.travis.yml
@@@ -97,11 -89,9 +97,13 @@@ matrix
include:
- compiler: gcc
- compiler: gcc
+ env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true
+ - compiler: gcc
+ 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