tor

commit d44753b0e8a710468171ad24a1be85c921923e76
parent 7e7b052b2a114900b5e6575fd5375dc00c09d5db
Author: Nick Mathewson <nickm@torproject.org>
Date:   Tue, 24 Apr 2018 10:38:34 -0400

Merge branch 'travis_distcheck_033' into maint-0.3.3

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

2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
@@ -102,6 +102,10 @@ matrix:
       env: RUST_OPTIONS=""
     - compiler: gcc
       env: COVERAGE_OPTIONS="--enable-coverage"
+    - compiler: gcc
+      env: DISTCHECK="yes" RUST_OPTIONS=""
+    - compiler: gcc
+      env: DISTCHECK="yes" RUST_OPTIONS="--enable-rust --enable-cargo-online-mode"
     ## 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 +152,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.