[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [tor/maint-0.4.3] Merge branch 'bug33195_035' into bug33195_041
commit c96cf1494357af5a2fd0309ef3d26aba52105edb
Merge: 5298113da add387c50
Author: teor <teor@xxxxxxxxxxxxxx>
Date: Thu Feb 13 13:55:55 2020 +1000
Merge branch 'bug33195_035' into bug33195_041
Conflicts:
* Keep TOR_TEST_RNG_SEED from maint-0.4.1
* Keep the ordering from bug33195_035
.travis.yml | 57 ++++++++++++++++++++++++++++++++---------------------
changes/ticket33194 | 4 ++++
changes/ticket33195 | 4 ++++
3 files changed, 42 insertions(+), 23 deletions(-)
diff --cc .travis.yml
index 6cfc4e51f,6047c4470..14b0e12c7
--- 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.
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits