aboutsummaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2019-06-10 18:33:26 -0400
committerNick Mathewson <nickm@torproject.org>2019-06-10 18:33:26 -0400
commit6a72cc25983850fb23bd21adb181b38c0ead2c5a (patch)
tree92c102567211f1f0f511612c67b7f59dd1db7525 /.travis.yml
parentc0285320df4e52530129ca515de08245d035c889 (diff)
parent430dd2da6e97c7186b03caabbbac95d74c3d8b82 (diff)
downloadtor-6a72cc25983850fb23bd21adb181b38c0ead2c5a.tar.gz
tor-6a72cc25983850fb23bd21adb181b38c0ead2c5a.zip
Merge branch 'maint-0.4.0' into maint-0.4.1
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 330388aa47..c2e6f19640 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -189,6 +189,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"