min
/
boring2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Travis fixes

This commit is contained in:
Steven Fackler 2015-12-16 23:47:18 -08:00
parent 2cf65fc68d
commit ccab187f5a
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openssl/test/build.sh
View File

@ -1,17 +1,17 @@
#!/bin/bash #!/bin/bash
set -e set -e
if [ $TRAVIS_OS_NAME == "osx" ]; then if [ "$TRAVIS_OS_NAME" == "osx" ]; then
exit 0 exit 0
fi fi
if [ $TARGET != "" ]; then if [ -n "$TARGET" ]; then
FLAGS="os/compiler=$TARGET-" FLAGS="os/compiler=$TARGET-"
fi fi
mkdir /tmp/openssl mkdir /tmp/openssl
cd /tmp/openssl cd /tmp/openssl
curl https://openssl.org/source/openssl-1.0.2e.tar.gz | tar --strip-components=1 -xzf - 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
make install make install

6
openssl/test/run.sh
View File

@ -3,17 +3,17 @@ set -e
MAIN_TARGETS=https://static.rust-lang.org/dist 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" FEATURES="tlsv1_2 tlsv1_1 dtlsv1 dtlsv1_2 sslv2 sslv3 aes_xts aes_ctr npn alpn rfc5114 ecdh_auto pkcs5_pbkdf2_hmac"
fi fi
if [ $TRAVIS_OS_NAME != "osx" ]; then if [ "$TRAVIS_OS_NAME" != "osx" ]; then
export OPENSSL_LIB_DIR=$HOME/openssl/lib export OPENSSL_LIB_DIR=$HOME/openssl/lib
export OPENSSL_INCLUDE_DIR=$HOME/openssl/include export OPENSSL_INCLUDE_DIR=$HOME/openssl/include
export LD_LIBRARY_PATH=$HOME/openssl/lib:$LD_LIBRARY_PATH export LD_LIBRARY_PATH=$HOME/openssl/lib:$LD_LIBRARY_PATH
fi fi
if [ $TARGET != "" ]; then if [ -n "$TARGET" ]; then
FLAGS="--target=$TARGET" FLAGS="--target=$TARGET"
COMMAND="build" COMMAND="build"