tor

commit 34e7dca9c9e902a58fe8942cef666f1d99d06030
parent 9727b4c5d683173888b5a49e8b24c3faa9045521
Author: Nick Mathewson <nickm@torproject.org>
Date:   Tue, 24 Apr 2018 10:38:19 -0400

Merge branch 'travis_distcheck_029' into maint-0.2.9

Diffstat:
M
.travis.yml
 | 
5
++++-
A
changes/travis_distcheck
 | 
4
++++

2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
@@ -90,6 +90,8 @@ matrix:
     - compiler: gcc
     - compiler: gcc
       env: COVERAGE_OPTIONS="--enable-coverage"
+    - compiler: gcc
+      env: DISTCHECK="yes"
     ## The "sudo: required" forces non-containerized builds, working
     ## around a Travis CI environment issue: clang LeakAnalyzer fails
     ## because it requires ptrace and the containerized environment no
@@ -118,7 +120,8 @@ script:
   - ./autogen.sh
   - ./configure $RUST_OPTIONS $COVERAGE_OPTIONS --disable-asciidoc --enable-fatal-warnings --disable-silent-rules --enable-fragile-hardening
   ## We run `make check` because that's what https://jenkins.torproject.org does.
-  - make check
+  - if [[ "$DISTCHECK" == "" ]]; then make check; fi
+  - if [[ "$DISTCHECK" != "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$RUST_OPTIONS $COVERAGE_OPTIONS --disable-asciidoc --enable-fatal-warnings --disable-silent-rules --enable-fragile-hardening"; fi
 
 after_failure:
   ## `make check` will leave a log file with more details of test failures.
diff --git a/changes/travis_distcheck b/changes/travis_distcheck
@@ -0,0 +1,4 @@
+  o Minor features (continuous integration):
+    - Our .travis.yml configuration now includes support for testing
+      the results of "make distcheck". (It's not uncommon for "make check" to
+      pass but "make distcheck" to fail.)  Closes ticket 25814.