diff options
| author | Steven Fackler <[email protected]> | 2015-12-16 23:47:18 -0800 |
|---|---|---|
| committer | Steven Fackler <[email protected]> | 2015-12-16 23:51:19 -0800 |
| commit | ccab187f5aa987d1c91bdbdef891e0d841ec1afd (patch) | |
| tree | a2c827e683f51e21ab77a447bfc2e65704eecba4 | |
| parent | Stop using manifest-path for now (diff) | |
| download | rust-openssl-ccab187f5aa987d1c91bdbdef891e0d841ec1afd.tar.xz rust-openssl-ccab187f5aa987d1c91bdbdef891e0d841ec1afd.zip | |
Travis fixes
| -rwxr-xr-x | openssl/test/build.sh | 6 | ||||
| -rwxr-xr-x | openssl/test/run.sh | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/openssl/test/build.sh b/openssl/test/build.sh index b901d29e..a10cd8ad 100755 --- a/openssl/test/build.sh +++ b/openssl/test/build.sh @@ -1,17 +1,17 @@ #!/bin/bash set -e -if [ $TRAVIS_OS_NAME == "osx" ]; then +if [ "$TRAVIS_OS_NAME" == "osx" ]; then exit 0 fi -if [ $TARGET != "" ]; then +if [ -n "$TARGET" ]; then FLAGS="os/compiler=$TARGET-" fi mkdir /tmp/openssl cd /tmp/openssl curl https://openssl.org/source/openssl-1.0.2e.tar.gz | tar --strip-components=1 -xzf - -./config --prefix=$HOME/openssl shared $FLAGS +./Configure --prefix=$HOME/openssl shared $FLAGS make make install diff --git a/openssl/test/run.sh b/openssl/test/run.sh index 43bc45a8..ca029ef2 100755 --- a/openssl/test/run.sh +++ b/openssl/test/run.sh @@ -3,17 +3,17 @@ set -e MAIN_TARGETS=https://static.rust-lang.org/dist -if [ $TEST_FEATURES == "true" ]; then +if [ "$TEST_FEATURES" == "true" ]; then FEATURES="tlsv1_2 tlsv1_1 dtlsv1 dtlsv1_2 sslv2 sslv3 aes_xts aes_ctr npn alpn rfc5114 ecdh_auto pkcs5_pbkdf2_hmac" fi -if [ $TRAVIS_OS_NAME != "osx" ]; then +if [ "$TRAVIS_OS_NAME" != "osx" ]; then export OPENSSL_LIB_DIR=$HOME/openssl/lib export OPENSSL_INCLUDE_DIR=$HOME/openssl/include export LD_LIBRARY_PATH=$HOME/openssl/lib:$LD_LIBRARY_PATH fi -if [ $TARGET != "" ]; then +if [ -n "$TARGET" ]; then FLAGS="--target=$TARGET" COMMAND="build" |