]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Add distcheck support to travis configuration.
authorNick Mathewson <nickm@torproject.org>
Wed, 18 Apr 2018 18:24:54 +0000 (14:24 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 18 Apr 2018 21:33:19 +0000 (17:33 -0400)
Implements 25814.

.travis.yml
changes/travis_distcheck [new file with mode: 0644]

index dc0a8ac67a2198ba996b2cc228a89feaa83998af..6da3027b85fa80f319fa2a00b68a94e2d4bfe526 100644 (file)
@@ -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 (file)
index 0000000..0f278fe
--- /dev/null
@@ -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.