From 32509aef1fc336a25aad094aad7573fc1d736574 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Mon, 26 Sep 2016 10:16:01 -0400 Subject: Simplify OpenSSL bits in travis (#3172) * Simplify OpenSSL bits in travis * more simplify * missed one --- .travis/run.sh | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to '.travis/run.sh') 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 -- cgit v1.2.3