[tor-commits] [tor/maint-0.3.4] Travis: Check disable module dirauth with and without rust

[nickm at torproject.org]

commit 2a33edc595a619d6c2abcb260195f92d97192d6a
Author: teor <teor at torproject.org>
Date:   Fri Aug 10 13:20:48 2018 +1000

    Travis: Check disable module dirauth with and without rust
    
    Part of 24629, also fixes 27088.
---
 .travis.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index f1b89e103..a8f9cc596 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.