diff options
| author | Steven Fackler <[email protected]> | 2016-12-22 11:59:19 -0500 |
|---|---|---|
| committer | GitHub <[email protected]> | 2016-12-22 11:59:19 -0500 |
| commit | 7e035a7fd1a39a5f5e4d7fa79da544433fa80684 (patch) | |
| tree | eaf669ef88f063ba0872f86d1f4f1100d2946f06 /openssl/test/run.sh | |
| parent | Merge pull request #539 from alexcrichton/zero-write (diff) | |
| parent | Add Travis build against LibreSSL (diff) | |
| download | rust-openssl-7e035a7fd1a39a5f5e4d7fa79da544433fa80684.tar.xz rust-openssl-7e035a7fd1a39a5f5e4d7fa79da544433fa80684.zip | |
Merge pull request #538 from semarie/libressl
Add LibreSSL support
Diffstat (limited to 'openssl/test/run.sh')
| -rwxr-xr-x | openssl/test/run.sh | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/openssl/test/run.sh b/openssl/test/run.sh index 4d3397a6..b07b8e4b 100755 --- a/openssl/test/run.sh +++ b/openssl/test/run.sh @@ -12,15 +12,21 @@ esac echo Using features: $FEATURES -if [ -d "$HOME/openssl/lib" ]; then - export OPENSSL_DIR=$HOME/openssl - export PATH=$HOME/openssl/bin:$PATH +if [ -n "${BUILD_LIBRESSL_VERSION}" -a -d "$HOME/libressl/lib" ]; then + echo "Testing build libressl-${BUILD_LIBRESSL_VERSION}" + export OPENSSL_DIR=${HOME}/libressl + export PATH="${HOME}/libressl/bin:${PATH}" + +elif [ -n "${BUILD_OPENSSL_VERSION}" -a -d "$HOME/openssl/lib" ]; then + echo "Testing build openssl-${BUILD_LIBRESSL_VERSION}" + export OPENSSL_DIR="${HOME}/openssl" + export PATH="${HOME}/openssl/bin:${PATH}" fi if [ "$TARGET" == "arm-unknown-linux-gnueabihf" ]; then FLAGS="--no-run" fi -cargo run --manifest-path systest/Cargo.toml --target $TARGET +cargo run --manifest-path systest/Cargo.toml --target $TARGET -v exec cargo test --manifest-path openssl/Cargo.toml --target $TARGET \ - --features "$FEATURES" $FLAGS + --features "$FEATURES" -v $FLAGS |