diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-12-22 09:47:26 -0600 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-12-23 09:18:04 -0600 |
| commit | 355174a147e616cf76b02761b6a5ffbe74f90243 (patch) | |
| tree | e8508dbdebbee10424f5c7c5505e4e2caba71d2d /.travis | |
| parent | 7e5c96fcc3773960dcb2c44520954dc14db5d72d (diff) | |
| download | cryptography-355174a147e616cf76b02761b6a5ffbe74f90243.tar.gz cryptography-355174a147e616cf76b02761b6a5ffbe74f90243.tar.bz2 cryptography-355174a147e616cf76b02761b6a5ffbe74f90243.zip | |
remove all mac 0.9.8 tests
This will probably slow down the test infrastructure as we're running
far more CommonCrypto tests than before. We should figure out what to
do there before merging this.
Diffstat (limited to '.travis')
| -rwxr-xr-x | .travis/install.sh | 4 | ||||
| -rwxr-xr-x | .travis/run.sh | 22 |
2 files changed, 8 insertions, 18 deletions
diff --git a/.travis/install.sh b/.travis/install.sh index c5f94596..2003dbed 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -6,9 +6,7 @@ set -x if [[ "$(uname -s)" == 'Darwin' ]]; then brew update || brew update - if [[ "${OPENSSL}" != "0.9.8" ]]; then - brew outdated openssl || brew upgrade openssl - fi + brew outdated openssl || brew upgrade openssl # install pyenv git clone https://github.com/yyuu/pyenv.git ~/.pyenv diff --git a/.travis/run.sh b/.travis/run.sh index bda9b545..178dfc20 100755 --- a/.travis/run.sh +++ b/.travis/run.sh @@ -9,22 +9,14 @@ if [[ "$(uname -s)" == "Darwin" ]]; then PATH="$PYENV_ROOT/bin:$PATH" eval "$(pyenv init -)" - if [[ "${OPENSSL}" != "0.9.8" ]]; then - # set our flags to use homebrew openssl - export ARCHFLAGS="-arch x86_64" - # if the build is static we need different LDFLAGS - if [[ "${CRYPTOGRAPHY_OSX_NO_LINK_FLAGS}" == "1" ]]; then - export LDFLAGS="/usr/local/opt/openssl/lib/libssl.a /usr/local/opt/openssl/lib/libcrypto.a" - else - export LDFLAGS="-L/usr/local/opt/openssl/lib" - fi - 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" + # set our flags to use homebrew openssl + # if the build is static we need different LDFLAGS + if [[ "${CRYPTOGRAPHY_OSX_NO_LINK_FLAGS}" == "1" ]]; then + export LDFLAGS="/usr/local/opt/openssl/lib/libssl.a /usr/local/opt/openssl/lib/libcrypto.a" + else + export LDFLAGS="-L/usr/local/opt/openssl/lib" fi + export CFLAGS="-I/usr/local/opt/openssl/include" else if [[ "${TOXENV}" == "pypy" ]]; then PYENV_ROOT="$HOME/.pyenv" |