aboutsummaryrefslogtreecommitdiff
path: root/openssl/test
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2016-01-22 15:57:24 -0800
committerSteven Fackler <[email protected]>2016-01-22 15:57:24 -0800
commit1417ebdd6efdad271026152da63eb0f442fb1c5e (patch)
tree7b480e4ddd427ee67cc912452c78fb087808eace /openssl/test
parentMerge branch 'release-v0.7.4' into release (diff)
parentRelease v0.7.5 (diff)
downloadrust-openssl-0.7.5.tar.xz
rust-openssl-0.7.5.zip
Merge branch 'release-v0.7.5' into releasev0.7.5
Diffstat (limited to 'openssl/test')
-rwxr-xr-xopenssl/test/run.sh4
1 files changed, 4 insertions, 0 deletions
diff --git a/openssl/test/run.sh b/openssl/test/run.sh
index 229d9a1d..63b2b57c 100755
--- a/openssl/test/run.sh
+++ b/openssl/test/run.sh
@@ -7,6 +7,10 @@ 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_RUST_VERSION" == "nightly" ]; then
+ FEATURES="$FEATURES nightly"
+fi
+
if [ "$TRAVIS_OS_NAME" != "osx" ]; then
export OPENSSL_LIB_DIR=$HOME/openssl/lib
export OPENSSL_INCLUDE_DIR=$HOME/openssl/include