Travis: Skip a duplicate hardening-off build in Tor 0.2.9

Part of 27252.

diff --git a/.travis.yml b/.travis.yml
index 102b5003084142826ddd5a7944cc53907f6324aa..74a248fda682ed573b32b159e47c985af85360f7 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,7 +36,8 @@ matrix:
     - env: COVERAGE_OPTIONS="--enable-coverage" HARDENING_OPTIONS=""
     ## We only want to check these build option combinations once
     ## (they shouldn't vary by compiler or OS)
-    - env: HARDENING_OPTIONS=""
+    ## We run coverage with hardening off, which seems like enough
+    # - env: HARDENING_OPTIONS=""
     ## We check asciidoc with distcheck, to make sure we remove doc products
     - env: DISTCHECK="yes" ASCIIDOC_OPTIONS=""
 

diff --git a/changes/ticket27252 b/changes/ticket27252
index f0855db1d46fc1f4a010b18cbe9646bb1db8a985..2ee4c8217f0a3dd2f3616dc218ebf16cf84f0970 100644 (file)
--- a/changes/ticket27252
+++ b/changes/ticket27252
@@ -1,3 +1,4 @@
   o Minor features (continuous integration):
     - Skip gcc on OSX in Travis CI, it's rarely used.
+      Skip a duplicate hardening-off build in Travis on Tor 0.2.9.
       Implements ticket 27252.