diff options
| author | Steven Fackler <[email protected]> | 2015-06-27 15:45:48 -0700 |
|---|---|---|
| committer | Steven Fackler <[email protected]> | 2015-06-27 15:45:48 -0700 |
| commit | 645430602d0f4d56c6ab153b68a11c6be6d8b183 (patch) | |
| tree | 7a2ce581cca5a059bcac14f18d4fe21c4d9fbb84 | |
| parent | Import shim'd HMAC stuff with the original name (diff) | |
| download | rust-openssl-645430602d0f4d56c6ab153b68a11c6be6d8b183.tar.xz rust-openssl-645430602d0f4d56c6ab153b68a11c6be6d8b183.zip | |
Don't build a custom openssl on OSX
I don't believe the bugfix the required this is needed anymore
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rwxr-xr-x | openssl/test/build.sh | 10 |
2 files changed, 1 insertions, 13 deletions
diff --git a/.travis.yml b/.travis.yml index e8bf79e9..2a8eee47 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,10 +6,8 @@ rust: os: - osx - linux -before_install: -- (test $TRAVIS_OS_NAME == "osx" || ./openssl/test/build.sh) before_script: - ./openssl/test/test.sh script: -- (cd openssl && LD_LIBRARY_PATH=/usr/lib:$LD_LIBRARY_PATH cargo test) +- (cd openssl && 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 deleted file mode 100755 index 27def60a..00000000 --- a/openssl/test/build.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/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 |