tor

commit bf466f55032f4c9f57e532d150cb30fb7d9fb00d
parent 44aa586dea7d8fb4a7db2d0beae46a0c3ae7589b
Author: Nick Mathewson <nickm@torproject.org>
Date:   Wed, 18 Apr 2018 18:34:28 -0400

Merge branch 'travis_distcheck_029' into travis_distcheck_033

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
@@ -102,6 +102,8 @@ matrix:
       env: RUST_OPTIONS=""
     - 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
@@ -148,7 +150,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.