aboutsummaryrefslogtreecommitdiff
path: root/openssl/test
diff options
context:
space:
mode:
authorDaniel Albert <[email protected]>2016-01-20 19:59:41 +0000
committerDaniel Albert <[email protected]>2016-01-20 19:59:41 +0000
commit74db7db560ea1a9fc5fd9243e59cc5e5fced5dfd (patch)
tree32c6a4923e3a4aca44e94f7083cb0ed5b30dc631 /openssl/test
parentFix incorrect unsafe declaration (diff)
parentMerge pull request #334 from jmesmon/ssl-context (diff)
downloadrust-openssl-74db7db560ea1a9fc5fd9243e59cc5e5fced5dfd.tar.xz
rust-openssl-74db7db560ea1a9fc5fd9243e59cc5e5fced5dfd.zip
Merge branch 'master' of https://github.com/sfackler/rust-openssl
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