diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-01-20 11:46:27 -0800 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-01-20 11:46:27 -0800 |
| commit | 7e33d1ce2f573f3b2b0e8f363879dd4cb19c921b (patch) | |
| tree | 5c42bf387663b9a6d719d0f5b7dd1d06a6beaeca | |
| parent | cd10571261ad24dcd0dc63c9703289faccd841a8 (diff) | |
| parent | 2c511bcc8a37cc68f275e53c1cb75f350067bb3a (diff) | |
| download | cryptography-7e33d1ce2f573f3b2b0e8f363879dd4cb19c921b.tar.gz cryptography-7e33d1ce2f573f3b2b0e8f363879dd4cb19c921b.tar.bz2 cryptography-7e33d1ce2f573f3b2b0e8f363879dd4cb19c921b.zip | |
Merge pull request #489 from reaperhulk/travis-fun
[WIP] Disable duplicate CommonCrypto test runs on Travis
| -rwxr-xr-x | .travis/run.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/.travis/run.sh b/.travis/run.sh index 4c01d67a..6739c886 100755 --- a/.travis/run.sh +++ b/.travis/run.sh @@ -10,7 +10,12 @@ if [[ "$(uname -s)" == "Darwin" ]]; then export ARCHFLAGS="-arch x86_64" export LDFLAGS="-L/usr/local/opt/openssl/lib" export CFLAGS="-I/usr/local/opt/openssl/include" + # The Travis OS X jobs are run for two versions + # of OpenSSL, but we only need to run the + # CommonCrypto backend tests once. Exclude + # CommonCrypto when we test against brew OpenSSL + export TOX_FLAGS="--backend=openssl" fi fi source ~/.venv/bin/activate -tox -e $TOX_ENV +tox -e $TOX_ENV -- $TOX_FLAGS |