2 files changed, 42 insertions, 33 deletions
diff --git a/openssl/test/build.sh b/openssl/test/build.sh
index 2c38f3a3..106a38d3 100755
--- a/openssl/test/build.sh
+++ b/openssl/test/build.sh
@@ -1,33 +1,48 @@
 #!/bin/bash
-set -e
+
+set -ex
 
 MAX_REDIRECTS=5
-OPENSSL=openssl-1.0.2h.tar.gz
+OPENSSL=openssl-$BUILD_OPENSSL_VERSION.tar.gz
 OUT=/tmp/$OPENSSL
-SHA1="577585f5f5d299c44dd3c993d3c0ac7a219e4949"
+
+me=$0
+myname=`basename $me`
+
+cmp --silent $me $HOME/openssl/$myname && exit 0 || echo "cache is busted"
+
+rm -rf $HOME/openssl
 
 if [ "$TRAVIS_OS_NAME" == "osx" ]; then
     exit 0
 fi
 
-if [ "$TARGET" == "arm-unknown-linux-gnueabihf" ]; then
-    export C_INCLUDE_PATH=/usr/arm-linux-gnueabihf/include
-    CROSS=arm-linux-gnueabihf-
+if [ "$BUILD_OPENSSL_VERSION" == "" ]; then
+    exit 0
+fi
+
+if [ "$TARGET" == "i686-unknown-linux-gnu" ]; then
+    OS_COMPILER=linux-elf
+    OS_FLAGS=-m32
+elif [ "$TARGET" == "arm-unknown-linux-gnueabihf" ]; then
     OS_COMPILER=linux-armv4
+    export AR=arm-linux-gnueabihf-ar
+    export CC=arm-linux-gnueabihf-gcc
 else
     OS_COMPILER=linux-x86_64
 fi
 
 mkdir -p /tmp/openssl
+cp $me /tmp/openssl/$myname
 cd /tmp/openssl
 
 curl -o $OUT -L --max-redirs $MAX_REDIRECTS https://openssl.org/source/$OPENSSL \
   || curl -o $OUT -L --max-redirs ${MAX_REDIRECTS} http://mirrors.ibiblio.org/openssl/source/$OPENSSL
 
-echo "$SHA1  $OUT" | sha1sum -c -
-
 tar --strip-components=1 -xzf $OUT
 
-./Configure --prefix=$HOME/openssl shared --cross-compile-prefix=$CROSS $OS_COMPILER
-make
+./Configure --prefix=$HOME/openssl $OS_COMPILER -fPIC $OS_FLAGS
+
+make -j$(nproc)
 make install
+cp $myname $HOME/openssl/$myname
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