aboutsummaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2018-08-10 13:20:48 +1000
committerteor <teor@torproject.org>2018-08-10 13:23:58 +1000
commit2a33edc595a619d6c2abcb260195f92d97192d6a (patch)
treef512191f9c2da8c85ce65286f0db8f81447b1ce7 /.travis.yml
parent6e0be81211d7f9251231468c50b696aac2f8c9a1 (diff)
downloadtor-2a33edc595a619d6c2abcb260195f92d97192d6a.tar.gz
tor-2a33edc595a619d6c2abcb260195f92d97192d6a.zip
Travis: Check disable module dirauth with and without rust
Part of 24629, also fixes 27088.
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 f1b89e1030..a8f9cc5964 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -53,6 +53,9 @@ matrix:
## Check rust offline with distcheck, to make sure we remove rust products
## But without hardening (see above)
- env: DISTCHECK="yes" RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true HARDENING_OPTIONS=""
+ ## Check disable module dirauth with rust, and without rust but with distcheck
+ - env: MODULES_OPTIONS="--disable-module-dirauth" RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true HARDENING_OPTIONS=""
+ - env: DISTCHECK="yes" MODULES_OPTIONS="--disable-module-dirauth"
## Uncomment to allow the build to report success (with non-required
## sub-builds continuing to run) if all required sub-builds have
@@ -166,7 +169,7 @@ install:
script:
- ./autogen.sh
- - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $OPENSSL_OPTIONS $RUST_OPTIONS --enable-fatal-warnings --disable-silent-rules"
+ - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $MODULES_OPTIONS $OPENSSL_OPTIONS $RUST_OPTIONS --enable-fatal-warnings --disable-silent-rules"
- echo $CONFIGURE_FLAGS
- ./configure $CONFIGURE_FLAGS
## We run `make check` because that's what https://jenkins.torproject.org does.