From: teor <teor@torproject.org>
Date: Thu, 13 Feb 2020 03:55:55 +0000 (+1000)
Subject: Merge branch 'bug33195_035' into bug33195_041
X-Git-Tag: tor-0.4.1.9~11^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c96cf1494357af5a2fd0309ef3d26aba52105edb;p=thirdparty%2Ftor.git

Merge branch 'bug33195_035' into bug33195_041

Conflicts:
* Keep TOR_TEST_RNG_SEED from maint-0.4.1
* Keep the ordering from bug33195_035
---

c96cf1494357af5a2fd0309ef3d26aba52105edb
diff --cc .travis.yml
index 6cfc4e51fd,6047c4470e..14b0e12c7a
--- a/.travis.yml
+++ b/.travis.yml
@@@ -61,10 -63,18 +63,18 @@@ matrix
      ## 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 check NSS
+     ## Use -std=gnu99 to turn off some newer features, and maybe turn on some
+     ## extra gcc warnings?
+     - env: NSS_OPTIONS="--enable-nss" C_DIALECT_OPTIONS="-std=gnu99"
+ 
+     ## We include a single coverage build with the best options for coverage
 -    - env: COVERAGE_OPTIONS="--enable-coverage" HARDENING_OPTIONS=""
++    - env: COVERAGE_OPTIONS="--enable-coverage" HARDENING_OPTIONS="" TOR_TEST_RNG_SEED="636f766572616765"
+ 
+     ## We clone our stem repo and run `make test-stem`
+     - env: TEST_STEM="yes" SKIP_MAKE_CHECK="yes"
+ 
      ## macOS builds are very slow, and we have a limited number of
      ## concurrent macOS jobs. We're not actively developing Rust, so it is
      ## the lowest priority.