summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHynek Schlawack <hs@ox.cx>2015-05-14 16:31:13 +0200
committerHynek Schlawack <hs@ox.cx>2015-05-14 16:31:13 +0200
commit57c2204aaaa50f6397974308f363d890bdd89e55 (patch)
treeb328328d2f0d18d25dc22a6a8e0e45ca66d6b0dc
parentaf2be745e9668aa69b88648d0b49f8c4f275ce43 (diff)
downloadpyopenssl-57c2204aaaa50f6397974308f363d890bdd89e55.tar.gz
Ensure OpenSSL CLI matches lib on homebrew
-rw-r--r--.travis.yml1
-rw-r--r--tox.ini3
2 files changed, 3 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index e49fbf0..b2ab3f2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -87,6 +87,7 @@ script:
export ARCHFLAGS="-arch x86_64"
export LDFLAGS="-L/usr/local/opt/openssl/lib"
export CFLAGS="-I/usr/local/opt/openssl/include"
+ export PATH="/usr/local/opt/openssl/bin"
fi
~/.venv/bin/tox
diff --git a/tox.ini b/tox.ini
index 178cc3e..4a2b679 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,7 +2,7 @@
envlist = {pypy,py26,py27,py33,py34}{,-cryptographyMaster},pypi-readme,check-manifest
[testenv]
-passenv = ARCHFLAGS CFLAGS LC_ALL LDFLAGS
+passenv = ARCHFLAGS CFLAGS LC_ALL LDFLAGS PATH
deps =
setuptools>=7.0 # older setuptools pollute CWD with egg files of dependencies
coverage
@@ -12,6 +12,7 @@ setenv =
# with extra packages.
PYTHONPATH=
commands =
+ openssl version
python -c "import OpenSSL.SSL; print(OpenSSL.SSL.SSLeay_version(OpenSSL.SSL.SSLEAY_VERSION))"
python -c "import cryptography; print(cryptography.__version__)"
coverage run --branch --source=OpenSSL setup.py test