diff options
| author | Steven Fackler <[email protected]> | 2015-06-30 00:07:38 -0700 |
|---|---|---|
| committer | Steven Fackler <[email protected]> | 2015-06-30 00:07:38 -0700 |
| commit | a6ff56209d9558911bd9622d146a2bc1a457f140 (patch) | |
| tree | 2ae9fbbd9ae8d4b24a71790760e0096c1688be63 | |
| parent | Fix backcompat method (diff) | |
| download | rust-openssl-a6ff56209d9558911bd9622d146a2bc1a457f140.tar.xz rust-openssl-a6ff56209d9558911bd9622d146a2bc1a457f140.zip | |
Revert "Don't build a custom openssl on OSX"
This reverts commit 645430602d0f4d56c6ab153b68a11c6be6d8b183.
We actually need 1.0.2 for DTLSv1.2 and ALPN
| -rw-r--r-- | .travis.yml | 6 | ||||
| -rwxr-xr-x | openssl/test/build.sh | 10 |
2 files changed, 14 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index d512112c..8d006d87 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,8 +9,10 @@ os: env: global: - FEATURES="tlsv1_2 tlsv1_1 dtlsv1 dtlsv1_2 sslv2 aes_xts npn alpn" +before_install: +- (test $TRAVIS_OS_NAME == "osx" || ./openssl/test/build.sh) before_script: - ./openssl/test/test.sh script: -- (cd openssl && cargo test) -- (test $TRAVIS_OS_NAME == "osx" || (cd openssl && cargo test --features "$FEATURES")) +- (cd openssl && LD_LIBRARY_PATH=/usr/lib:$LD_LIBRARY_PATH cargo test) +- (test $TRAVIS_OS_NAME == "osx" || (cd openssl && LD_LIBRARY_PATH=/usr/lib:$LD_LIBRARY_PATH cargo test --features "$FEATURES")) diff --git a/openssl/test/build.sh b/openssl/test/build.sh new file mode 100755 index 00000000..27def60a --- /dev/null +++ b/openssl/test/build.sh @@ -0,0 +1,10 @@ +#!/bin/bash +set -e + +mkdir /tmp/openssl +cd /tmp/openssl +sudo apt-get install gcc make +curl https://openssl.org/source/openssl-1.0.2-latest.tar.gz | tar --strip-components=1 -xzf - +./config --prefix=/usr/ shared +make +sudo make install |