From 61251337153448afa1cc2baae252c3f0d6353162 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 18 Apr 2018 14:24:54 -0400
Subject: [PATCH] Add distcheck support to travis configuration.

Implements 25814.
---
 .travis.yml              | 5 ++++-
 changes/travis_distcheck | 4 ++++
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 changes/travis_distcheck

diff --git a/.travis.yml b/.travis.yml
index dc0a8ac67..6da3027b8 100644
--- 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
new file mode 100644
index 000000000..0f278fe7e
--- /dev/null
+++ 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.