diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-04-24 10:38:37 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-04-24 10:38:37 -0400 |
| commit | 5cc3a0379eba0eb4e9baac97468fcaebcc654437 (patch) | |
| tree | 497bd0d3e6e50c89a74608f5ebf79f728509e211 | |
| parent | e8886340762cbe3be306268dfe0003214b09ac07 (diff) | |
| parent | 34e7dca9c9e902a58fe8942cef666f1d99d06030 (diff) | |
| download | tor-5cc3a0379eba0eb4e9baac97468fcaebcc654437.tar.gz tor-5cc3a0379eba0eb4e9baac97468fcaebcc654437.zip | |
Merge branch 'maint-0.2.9' into maint-0.3.1
| -rw-r--r-- | .travis.yml | 5 | ||||
| -rw-r--r-- | changes/travis_distcheck | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index bf55b7756a..3f133782d1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -99,6 +99,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 @@ -138,7 +140,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 0000000000..0f278fe7ee --- /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. |