diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-04-18 18:34:28 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-04-18 18:34:28 -0400 |
| commit | bf466f55032f4c9f57e532d150cb30fb7d9fb00d (patch) | |
| tree | 16cbaa0f12ce72137513b242b3da6e3893687bf9 /.travis.yml | |
| parent | 44aa586dea7d8fb4a7db2d0beae46a0c3ae7589b (diff) | |
| parent | 61251337153448afa1cc2baae252c3f0d6353162 (diff) | |
| download | tor-bf466f55032f4c9f57e532d150cb30fb7d9fb00d.tar.gz tor-bf466f55032f4c9f57e532d150cb30fb7d9fb00d.zip | |
Merge branch 'travis_distcheck_029' into travis_distcheck_033
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 3d61f5a61a..d4587ca9fb 100644 --- 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. |