Correct feature selection in tests

This commit is contained in:
Steven Fackler 2016-10-13 19:21:12 -07:00
parent b610e01793
commit 1883590c61
2 changed files with 12 additions and 4 deletions

View File

@ -17,9 +17,10 @@ rfc5114 = []
aes_xts = [] aes_xts = []
aes_ctr = [] aes_ctr = []
alpn = [] alpn = []
ecdh_auto = []
openssl-102 = [] openssl-102 = []
ecdh_auto = [] openssl-110 = ["openssl-102"]
[dependencies] [dependencies]
bitflags = "0.7" bitflags = "0.7"

View File

@ -1,9 +1,16 @@
#!/bin/bash #!/bin/bash
set -e set -e
if [ "$BUILD_OPENSSL_VERSION" != "" ]; then case "$BUILD_OPENSSL_VERSION" in
FEATURES="aes_xts aes_ctr alpn rfc5114 ecdh_auto openssl-102" 1.0.2*)
fi FEATURES="openssl-102"
;;
1.1.0*)
FEATURES="openssl-110"
;;
esac
echo Using features: $FEATURES
if [ -d "$HOME/openssl/lib" ]; then if [ -d "$HOME/openssl/lib" ]; then
export OPENSSL_DIR=$HOME/openssl export OPENSSL_DIR=$HOME/openssl