tor

commit 98e28efa8c2558e408313254c161a3ff9b371f27
parent 131ab9d5233a2f452c608bf85a39255903d036c1
Author: Nick Mathewson <nickm@torproject.org>
Date:   Wed, 24 Oct 2018 08:57:22 -0400

Merge branch 'nss-travis' into maint-0.3.5

Diffstat:
M
.travis.yml
 | 
5
++++-
A
changes/ticket27751
 | 
2
++

2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
@@ -57,6 +57,8 @@ matrix:
     ## Check disable module dirauth with and without rust
     - env: MODULES_OPTIONS="--disable-module-dirauth" RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true HARDENING_OPTIONS=""
     - env: MODULES_OPTIONS="--disable-module-dirauth"
+    ## Check NSS
+    - env: NSS_OPTIONS="--enable-nss"
 
   ## Uncomment to allow the build to report success (with non-required
   ## sub-builds continuing to run) if all required sub-builds have
@@ -121,6 +123,7 @@ addons:
       ## Optional dependencies
       - libcap-dev
       - liblzma-dev
+      - libnss3-dev
       - libscrypt-dev
       - libseccomp-dev
       ## zstd doesn't exist in Ubuntu Trusty
@@ -195,7 +198,7 @@ install:
 
 script:
   - ./autogen.sh
-  - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $MODULES_OPTIONS $OPENSSL_OPTIONS $RUST_OPTIONS --enable-fatal-warnings --disable-silent-rules"
+  - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $MODULES_OPTIONS $NSS_OPTIONS $OPENSSL_OPTIONS $RUST_OPTIONS --enable-fatal-warnings --disable-silent-rules"
   - echo "Configure flags are $CONFIGURE_FLAGS"
   - ./configure $CONFIGURE_FLAGS
   ## We run `make check` because that's what https://jenkins.torproject.org does.
diff --git a/changes/ticket27751 b/changes/ticket27751
@@ -0,0 +1,2 @@
+  o Minor features (continuous integration):
+    - Add a Travis CI build for --enable-nss on Linux gcc. Closes ticket 27751.