Commit ccab187f authored by Steven Fackler's avatar Steven Fackler
Browse files

Travis fixes

parent 2cf65fc6

openssl/test/build.sh

+3 −3
Original line number Diff line number Diff line 
#!/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

openssl/test/run.sh

+3 −3
Original line number Diff line number Diff line
@@ -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"