aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2015-05-12 20:15:12 -0400
committerAlex Gaynor <alex.gaynor@gmail.com>2015-05-12 20:15:12 -0400
commitc1ae7516c7e2727b926f12692c05461e6471a4b0 (patch)
treefc6d01d47616d8ebc7a28cef0cdfb3c0798daa30
parent75f4118e61a050e3e9f562a4de00a9dd68e1f5c0 (diff)
parentc8ccffb82633922e63b84a2e94cced432935893e (diff)
downloadcryptography-c1ae7516c7e2727b926f12692c05461e6471a4b0.tar.gz
cryptography-c1ae7516c7e2727b926f12692c05461e6471a4b0.tar.bz2
cryptography-c1ae7516c7e2727b926f12692c05461e6471a4b0.zip
Merge pull request #1939 from reaperhulk/tox-update
pass through the env vars we need in tox for alternate OpenSSL builds
-rw-r--r--tox.ini1
1 files changed, 1 insertions, 0 deletions
diff --git a/tox.ini b/tox.ini
index 759345f5..77382ebe 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,6 +9,7 @@ deps =
pretend
pytest
./vectors
+passenv = ARCHFLAGS LDFLAGS CFLAGS INCLUDE LIB LD_LIBRARY_PATH
commands =
# We use parallel mode and then combine here so that coverage.py will take
# the paths like .tox/py34/lib/python3.4/site-packages/cryptography/__init__.py