From: teor <teor@torproject.org>
Date: Thu, 13 Feb 2020 04:01:54 +0000 (+1000)
Subject: Merge branch 'bug33195_042' into bug33195_043
X-Git-Tag: tor-0.4.3.3-alpha~16^2^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3e8e4af1ac09486789f4e094a9bc527cfd41a35d;p=thirdparty%2Ftor.git

Merge branch 'bug33195_042' into bug33195_043

Conflicts:
* Keep disable module relay from maint-0.4.3
* Keep doxygen from maint-0.4.3
* Keep the ordering from bug33195_042
---

3e8e4af1ac09486789f4e094a9bc527cfd41a35d
diff --cc .travis.yml
index af5052682f,c3903fe1e1..d8218c7c0c
--- a/.travis.yml
+++ b/.travis.yml
@@@ -54,21 -55,28 +55,33 @@@ matrix
      ## Chutney is a fast job, clang is slower on Linux, so we do Chutney clang
      - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes"
        compiler: clang
-     ## We check asciidoc with distcheck, to make sure we remove doc products
-     ## We use Linux clang, because there are no other Linux clang jobs
-     - env: DISTCHECK="yes" ASCIIDOC_OPTIONS="" SKIP_MAKE_CHECK="yes"
-       compiler: clang
-     ## We include a single coverage build with the best options for coverage
-     - env: COVERAGE_OPTIONS="--enable-coverage" HARDENING_OPTIONS="" TOR_TEST_RNG_SEED="636f766572616765"
-     ## 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 relay
 +    - env: MODULES_OPTIONS="--disable-module-relay"
      ## We check disable module dirauth
      - env: MODULES_OPTIONS="--disable-module-dirauth"
+ 
+     ## 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 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="" TOR_TEST_RNG_SEED="636f766572616765"
+ 
+     ## We clone our stem repo and run `make test-stem`
+     - env: TEST_STEM="yes" SKIP_MAKE_CHECK="yes"
+ 
++    ## We run `make doxygen` without `make check`.
++    - env: SKIP_MAKE_CHECK="yes" DOXYGEN="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.