summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.travis.yml9
1 files changed, 6 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index e49fbf0..717c32e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,10 @@ matrix:
include:
- language: generic
os: osx
- env: TOXENV=py27
+ env: TOXENV=py27 OSX_OPENSSL=homebrew
+ - language: generic
+ os: osx
+ env: TOXENV=py27 OSX_OPENSSL=system
- python: "2.6" # these are just to make travis's UI a bit prettier
env: TOXENV=py26
- python: "2.7"
@@ -58,7 +61,7 @@ matrix:
allow_failures:
- language: generic
os: osx
- env: TOXENV=py27
+ env: TOXENV=py27 OSX_OPENSSL=homebrew
- env: TOXENV=py26-cryptographyMaster
- env: TOXENV=py27-cryptographyMaster
- env: TOXENV=py33-cryptographyMaster
@@ -82,7 +85,7 @@ install:
script:
- |
- if [[ "$(uname -s)" == "Darwin" ]]; then
+ if [[ "$(uname -s)" == 'Darwin' && $OSX_OPENSSL == 'homebrew' ]]; then
# set our flags to use homebrew openssl
export ARCHFLAGS="-arch x86_64"
export LDFLAGS="-L/usr/local/opt/openssl/lib"