diff options
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rwxr-xr-x | .travis/install.sh | 12 | ||||
| -rwxr-xr-x | .travis/run.sh | 8 |
3 files changed, 11 insertions, 11 deletions
diff --git a/.travis.yml b/.travis.yml index 8abca060..4ded04d8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ language: python cache: directories: - $HOME/.cache/pip - - $HOME/ossl-098 + - $HOME/ossl-098l matrix: include: diff --git a/.travis/install.sh b/.travis/install.sh index 9c34d60b..e8525860 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -66,7 +66,7 @@ else # This is 0.9.8l rather than zh because we have some branches for handling # < 0.9.8m that won't be exercised with a newer OpenSSL. (RHEL5 is 0.9.8e with # patches, but while that's in jenkins we don't get coverage data from it) - if [[ ! -f "$HOME/ossl-098/bin/openssl" ]]; then + if [[ ! -f "$HOME/ossl-098l/bin/openssl" ]]; then curl -O https://www.openssl.org/source/openssl-0.9.8l.tar.gz tar zxvf openssl-0.9.8l.tar.gz cd openssl-0.9.8l @@ -74,14 +74,14 @@ else global: *; };" > openssl.ld - ./config no-asm no-ssl2 -Wl,--version-script=openssl.ld -Wl,-Bsymbolic-functions -fPIC shared --prefix=$HOME/ossl-098 + ./config no-asm no-ssl2 -Wl,--version-script=openssl.ld -Wl,-Bsymbolic-functions -fPIC shared --prefix=$HOME/ossl-098l make depend make install fi - export PATH="$HOME/ossl-098/bin:$PATH" - export CFLAGS="-I$HOME/ossl-098/include" - export LDFLAGS="-L$HOME/ossl-098/lib" - export LD_LIBRARY_PATH="$HOME/ossl-098/lib" + export PATH="$HOME/ossl-098l/bin:$PATH" + export CFLAGS="-I$HOME/ossl-098l/include" + export LDFLAGS="-L$HOME/ossl-098l/lib" + export LD_LIBRARY_PATH="$HOME/ossl-098l/lib" fi pip install virtualenv fi diff --git a/.travis/run.sh b/.travis/run.sh index e0fb24e6..23b9e89e 100755 --- a/.travis/run.sh +++ b/.travis/run.sh @@ -24,10 +24,10 @@ else eval "$(pyenv init -)" fi if [[ "${OPENSSL}" == "0.9.8" ]]; then - export PATH="$HOME/ossl-098/bin:$PATH" - export CFLAGS="-I$HOME/ossl-098/include" - export LDFLAGS="-L$HOME/ossl-098/lib" - export LD_LIBRARY_PATH="$HOME/ossl-098/lib" + export PATH="$HOME/ossl-098l/bin:$PATH" + export CFLAGS="-I$HOME/ossl-098l/include" + export LDFLAGS="-L$HOME/ossl-098l/lib" + export LD_LIBRARY_PATH="$HOME/ossl-098l/lib" fi fi source ~/.venv/bin/activate |