From: teor <teor@torproject.org>
Date: Thu, 28 Nov 2019 02:21:08 +0000 (+1000)
Subject: Merge branch 'ticket32629_029' into ticket32629_035
X-Git-Tag: tor-0.3.5.10~15^2~1^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f2f7491cd9ea8a8c39b576106b44488202aa3c63;p=thirdparty%2Ftor.git

Merge branch 'ticket32629_029' into ticket32629_035

Merge re-enable chutney from ticket32629_029 with
stem from maint-0.3.5.
---

f2f7491cd9ea8a8c39b576106b44488202aa3c63
diff --cc .travis.yml
index 35c3502e87,aad0c3c3e1..21c86ad930
--- a/.travis.yml
+++ b/.travis.yml
@@@ -55,23 -44,9 +55,22 @@@ matrix
        compiler: clang
      ## We include a single coverage build with the best options for coverage
      - env: COVERAGE_OPTIONS="--enable-coverage" HARDENING_OPTIONS=""
 +    ## We run rust on Linux, because it's faster than rust on macOS
 +    ## We check rust offline
 +    - env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true
 +    ## We check asciidoc with distcheck, to make sure we remove doc products
 +    - env: DISTCHECK="yes" ASCIIDOC_OPTIONS="" SKIP_MAKE_CHECK="yes"
 +    ## We check disable module dirauth
 +    - env: MODULES_OPTIONS="--disable-module-dirauth"
 +    ## We run rust on macOS, because we have seen macOS rust failures before
 +    - env: RUST_OPTIONS="--enable-rust --enable-cargo-online-mode"
 +      compiler: clang
 +      os: osx
      ## We run chutney on macOS, because macOS Travis has IPv6
-     # Disabled due to slow Travis macOS builds, see #32177
-     #- env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes"
-     #  os: osx
+     - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes"
+       os: osx
 +    ## We clone our stem repo and run `make test-stem`
 +    - env: TEST_STEM="yes" SKIP_MAKE_CHECK="yes"
  
    ## Allow the build to report success (with non-required sub-builds
    ## continuing to run) if all required sub-builds have succeeded.