From 637e981e77a0fff1469e64e5f7159fb8ca1636de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Sch=C3=B6lling?= Date: Mon, 6 Apr 2015 13:04:46 +0200 Subject: [PATCH] Use latest openssl library (v1.0.2) --- .travis.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index cc4e0425..d9c5f951 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,19 +9,21 @@ env: before_install: - DIR=`pwd` - (test $TRAVIS_OS_NAME == "osx" || (sudo apt-get install gcc make)) - - (test $TRAVIS_OS_NAME == "osx" || (wget http://openssl.org/source/openssl-1.0.2.tar.gz -O /tmp/openssl-1.0.2.tar.gz)) - - (test $TRAVIS_OS_NAME == "osx" || (cd /tmp && tar xzf openssl-1.0.2.tar.gz)) - - (test $TRAVIS_OS_NAME == "osx" || (cd /tmp/openssl-1.0.2/ && ./config --prefix=/usr/ shared)) - - (test $TRAVIS_OS_NAME == "osx" || (cd /tmp/openssl-1.0.2/ && make)) - - (test $TRAVIS_OS_NAME == "osx" || (cd /tmp/openssl-1.0.2/ && sudo make install)) + - (test $TRAVIS_OS_NAME == "osx" || (wget https://openssl.org/source/openssl-1.0.2-latest.tar.gz -O /tmp/openssl-1.0.2-latest.tar.gz)) + - (test $TRAVIS_OS_NAME == "osx" || (cd /tmp && tar xzf openssl-1.0.2-latest.tar.gz)) + - (test $TRAVIS_OS_NAME == "osx" || (cd /tmp/openssl-1.0.2*/ && ./config --prefix=/usr/ shared)) + - (test $TRAVIS_OS_NAME == "osx" || (cd /tmp/openssl-1.0.2*/ && make)) + - (test $TRAVIS_OS_NAME == "osx" || (cd /tmp/openssl-1.0.2*/ && sudo make install)) - cd ${DIR} before_script: - openssl version - openssl s_server -accept 15418 -www -cert openssl/test/cert.pem -key openssl/test/key.pem >/dev/null 2>&1 & + - openssl s_server -accept 15419 -www -cert openssl/test/cert.pem -key openssl/test/key.pem -nextprotoneg "http/1.1,spdy/3.1" >/dev/null 2>&1 & script: - (cd openssl && LD_LIBRARY_PATH=/usr/lib:$LD_LIBRARY_PATH cargo test) - (test $TRAVIS_OS_NAME == "osx" || (./openssl/test/test.sh &)) - (test $TRAVIS_OS_NAME == "osx" || (cd openssl && LD_LIBRARY_PATH=/usr/lib:$LD_LIBRARY_PATH cargo test --features "$FEATURES")) +- (test $TRAVIS_OS_NAME == "osx" || killall openssl) - ./.travis/build_docs.sh after_success: - test $TRAVIS_PULL_REQUEST == "false" && test $TRAVIS_BRANCH == "master" && ./.travis/update_docs.sh