aboutsummaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2019-06-11 14:51:37 +1000
committerteor <teor@torproject.org>2019-06-11 14:51:37 +1000
commita742a80eeaf12e238c5b2e9eb06d8edbc8797c2b (patch)
tree485b39e4e29e9b038fa32b7507d4bc8c00a9c75d /.travis.yml
parent202ccc3930be8d93424303cc13a5c80c58c07817 (diff)
parentbe0a4be276c945e4e90b43ce8f784b5b75bef122 (diff)
downloadtor-a742a80eeaf12e238c5b2e9eb06d8edbc8797c2b.tar.gz
tor-a742a80eeaf12e238c5b2e9eb06d8edbc8797c2b.zip
Merge remote-tracking branch 'tor-github/pr/1091' into maint-0.3.5
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml2
1 files changed, 2 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index 494a6ef475..3c0a3a02a8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -184,6 +184,8 @@ install:
- if [[ "$TEST_STEM" != "" ]]; then pushd stem; python -c "from stem import stem; print(stem.__version__);"; git log -1; popd; fi
script:
+ # Skip test_rebind on macOS
+ - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export TOR_SKIP_TEST_REBIND=true; fi
- ./autogen.sh
- CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $MODULES_OPTIONS $NSS_OPTIONS $OPENSSL_OPTIONS $RUST_OPTIONS --enable-fatal-warnings --disable-silent-rules"
- echo "Configure flags are $CONFIGURE_FLAGS"