From 2531ac9a450842154c8d0a8ae5fdaf3f950ef85c Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Wed, 16 Dec 2015 22:39:50 -0800
Subject: Test overhaul + add an arm cross compile build

The ARM build doesn't do anything yet
---
 openssl/test/run.sh | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100755 openssl/test/run.sh

(limited to 'openssl/test/run.sh')

diff --git a/openssl/test/run.sh b/openssl/test/run.sh
new file mode 100755
index 00000000..91143b77
--- /dev/null
+++ b/openssl/test/run.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+set -e
+
+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_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
+fi
+
+cargo test --manifest-path=openssl/Cargo.toml --features "$FEATURES"
-- 
cgit v1.2.3


From e7744874f46e702a24f1e26e7aeaf54af843c281 Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Wed, 16 Dec 2015 23:25:19 -0800
Subject: Try cross compiling

---
 openssl/test/run.sh | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

(limited to 'openssl/test/run.sh')

diff --git a/openssl/test/run.sh b/openssl/test/run.sh
index 91143b77..aa62308d 100755
--- a/openssl/test/run.sh
+++ b/openssl/test/run.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
 set -e
 
+MAIN_TARGETS=https://static.rust-lang.org/dist
+
 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
@@ -11,4 +13,19 @@ if [ $TRAVIS_OS_NAME != "osx" ]; then
     export LD_LIBRARY_PATH=$HOME/openssl/lib:$LD_LIBRARY_PATH
 fi
 
-cargo test --manifest-path=openssl/Cargo.toml --features "$FEATURES"
+if [ $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"
+fi
+
+cargo $COMMAND --manifest-path=openssl/Cargo.toml $FLAGS --features "$FEATURES"
-- 
cgit v1.2.3


From 2cf65fc68dc5078d27515e99178291e4290ed26e Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Wed, 16 Dec 2015 23:37:18 -0800
Subject: Stop using manifest-path for now

Some ssl tests depend on the working directory being openssl
---
 openssl/test/run.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'openssl/test/run.sh')

diff --git a/openssl/test/run.sh b/openssl/test/run.sh
index aa62308d..43bc45a8 100755
--- a/openssl/test/run.sh
+++ b/openssl/test/run.sh
@@ -28,4 +28,4 @@ else
     COMMAND="test"
 fi
 
-cargo $COMMAND --manifest-path=openssl/Cargo.toml $FLAGS --features "$FEATURES"
+(cd openssl && cargo $COMMAND $FLAGS --features "$FEATURES")
-- 
cgit v1.2.3


From ccab187f5aa987d1c91bdbdef891e0d841ec1afd Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Wed, 16 Dec 2015 23:47:18 -0800
Subject: Travis fixes

---
 openssl/test/run.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'openssl/test/run.sh')

diff --git a/openssl/test/run.sh b/openssl/test/run.sh
index 43bc45a8..ca029ef2 100755
--- a/openssl/test/run.sh
+++ b/openssl/test/run.sh
@@ -3,17 +3,17 @@ set -e
 
 MAIN_TARGETS=https://static.rust-lang.org/dist
 
-if [ $TEST_FEATURES == "true" ]; then
+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_OS_NAME != "osx" ]; then
+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
 fi
 
-if [ $TARGET != "" ]; then
+if [ -n "$TARGET" ]; then
     FLAGS="--target=$TARGET"
     COMMAND="build"
 
-- 
cgit v1.2.3


From e077ed0b4d3c87fb38d2d9536f669cf569b69234 Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Thu, 17 Dec 2015 20:08:44 -0800
Subject: Disable cross compilation for now

---
 openssl/test/run.sh | 1 +
 1 file changed, 1 insertion(+)

(limited to 'openssl/test/run.sh')

diff --git a/openssl/test/run.sh b/openssl/test/run.sh
index ca029ef2..229d9a1d 100755
--- a/openssl/test/run.sh
+++ b/openssl/test/run.sh
@@ -28,4 +28,5 @@ else
     COMMAND="test"
 fi
 
+export PATH=$HOME/openssl/bin:$PATH
 (cd openssl && cargo $COMMAND $FLAGS --features "$FEATURES")
-- 
cgit v1.2.3