diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2016-09-26 10:16:01 -0400 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2016-09-26 09:16:01 -0500 |
| commit | 32509aef1fc336a25aad094aad7573fc1d736574 (patch) | |
| tree | 0c90271a503889ffc423ee17481e9b301ce4d495 /.travis/run.sh | |
| parent | f99407e99f55219d1714ecbb34fa7af03d7d3064 (diff) | |
| download | cryptography-32509aef1fc336a25aad094aad7573fc1d736574.tar.gz cryptography-32509aef1fc336a25aad094aad7573fc1d736574.tar.bz2 cryptography-32509aef1fc336a25aad094aad7573fc1d736574.zip | |
Simplify OpenSSL bits in travis (#3172)
* Simplify OpenSSL bits in travis
* more simplify
* missed one
Diffstat (limited to '.travis/run.sh')
| -rwxr-xr-x | .travis/run.sh | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/.travis/run.sh b/.travis/run.sh index 8dd3a0c7..34a9cb54 100755 --- a/.travis/run.sh +++ b/.travis/run.sh @@ -26,14 +26,9 @@ else PATH="$PYENV_ROOT/bin:$PATH" eval "$(pyenv init -)" fi - if [[ "${OPENSSL}" == "1.0.0" ]]; then - OPENSSL_DIR="ossl-100t" - fi - if [[ "${OPENSSL}" == "1.1.0" ]]; then - OPENSSL_DIR="ossl-110a" - fi + if [ -n "${OPENSSL}" ]; then + OPENSSL_DIR="ossl/${OPENSSL}" - if [ -n "$OPENSSL_DIR" ]; then export PATH="$HOME/$OPENSSL_DIR/bin:$PATH" export CFLAGS="-I$HOME/$OPENSSL_DIR/include" # rpath on linux will cause it to use an absolute path so we don't need to do LD_LIBRARY_PATH |