summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-04-18 18:37:59 -0400
committerNick Mathewson <nickm@torproject.org>2018-04-18 18:37:59 -0400
commitd5d312884f7d8d9a0212b12e954270b8b9f72258 (patch)
tree66a614bc168ad7076b496adf57916f94e6b74115
parentbf466f55032f4c9f57e532d150cb30fb7d9fb00d (diff)
parentf32ac2aaf5a3ae420cf4dae0081418664e048206 (diff)
downloadtor-d5d312884f7d8d9a0212b12e954270b8b9f72258.tar.gz
tor-d5d312884f7d8d9a0212b12e954270b8b9f72258.zip
Merge branch 'travis_distcheck_031' into travis_distcheck_033
-rw-r--r--.travis.yml4
1 files changed, 3 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index d4587ca9fb..18c5b5bdd5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -103,7 +103,9 @@ matrix:
- compiler: gcc
env: COVERAGE_OPTIONS="--enable-coverage"
- compiler: gcc
- env: DISTCHECK="yes"
+ env: DISTCHECK="yes" RUST_OPTIONS=""
+ - compiler: gcc
+ env: DISTCHECK="yes" RUST_OPTIONS="--enable-rust --enable-cargo-online-mode"
## 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