diff options
Diffstat (limited to 'openssl/test/run.sh')
| -rwxr-xr-x | openssl/test/run.sh | 40 |
1 files changed, 17 insertions, 23 deletions
diff --git a/openssl/test/run.sh b/openssl/test/run.sh index 2c2473b1..4d3397a6 100755 --- a/openssl/test/run.sh +++ b/openssl/test/run.sh @@ -1,32 +1,26 @@ #!/bin/bash set -e -MAIN_TARGETS=https://static.rust-lang.org/dist +case "$BUILD_OPENSSL_VERSION" in + 1.0.2*) + FEATURES="v102" + ;; + 1.1.0*) + FEATURES="v110" + ;; +esac -if [ "$TEST_FEATURES" == "true" ]; then - FEATURES="tlsv1_2 tlsv1_1 dtlsv1 dtlsv1_2 sslv3 aes_xts aes_ctr npn alpn rfc5114 ecdh_auto pkcs5_pbkdf2_hmac x509_clone ssl_context_clone x509_generator_request hmac hmac_clone dh_from_params x509_expiry" -fi +echo Using features: $FEATURES -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 +if [ -d "$HOME/openssl/lib" ]; then + export OPENSSL_DIR=$HOME/openssl + export PATH=$HOME/openssl/bin:$PATH fi -if [ -n "$TARGET" ]; then - FLAGS="--target=$TARGET" - COMMAND="build" - - # Download the rustlib folder from the relevant portion of main distribution's - # tarballs. - dir=rust-std-$TARGET - pkg=rust-std - curl -s $MAIN_TARGETS/$pkg-$TRAVIS_RUST_VERSION-$TARGET.tar.gz | \ - tar xzf - -C $HOME/rust/lib/rustlib --strip-components=4 \ - $pkg-$TRAVIS_RUST_VERSION-$TARGET/$dir/lib/rustlib/$TARGET -else - COMMAND="test" +if [ "$TARGET" == "arm-unknown-linux-gnueabihf" ]; then + FLAGS="--no-run" fi -export PATH=$HOME/openssl/bin:$PATH -(cd openssl && RUST_BACKTRACE=1 cargo $COMMAND $FLAGS --features "$FEATURES") +cargo run --manifest-path systest/Cargo.toml --target $TARGET +exec cargo test --manifest-path openssl/Cargo.toml --target $TARGET \ + --features "$FEATURES" $FLAGS |