Commit 483e0b1f authored by Steven Fackler's avatar Steven Fackler
Browse files

Clean up build infrastructure

parent 11059e1b
Loading
Loading
Loading
Loading
+2 −13
Original line number Diff line number Diff line
@@ -7,23 +7,12 @@ env:
  - secure: J4i75AV4KMrU/UQrLIzzIh35Xix40Ki0uWjm8j05oxlXVl5aPU2zB30AemDne2QXYzkN4kRG/iRnNORE/8D0lF7YipQNSNxgfiBVoOEfj/NSogvI2BftYX9vlLZJUvt+s/nbE3xa/Pyge1IPv7itDYGO7SMe8RTSqitgqyfE2Eg=
  - FEATURES="tlsv1_1 tlsv1_2 dtlsv1 aes_xts npn"
before_install:
  - DIR=`pwd`
  - (test $TRAVIS_OS_NAME == "osx" || (sudo apt-get install gcc make))
  - (test $TRAVIS_OS_NAME == "osx" || (wget https://openssl.org/source/openssl-1.0.2-latest.tar.gz -O /tmp/openssl-1.0.2-latest.tar.gz))
  - (test $TRAVIS_OS_NAME == "osx" || (cd /tmp && tar xzf openssl-1.0.2-latest.tar.gz))
  - (test $TRAVIS_OS_NAME == "osx" || (cd /tmp/openssl-1.0.2*/ && ./config --prefix=/usr/ shared))
  - (test $TRAVIS_OS_NAME == "osx" || (cd /tmp/openssl-1.0.2*/ && make))
  - (test $TRAVIS_OS_NAME == "osx" || (cd /tmp/openssl-1.0.2*/ && sudo make install))
  - cd ${DIR}
- (test $TRAVIS_OS_NAME == "osx" || ./openssl/test/build.sh)
before_script:
  - openssl version
  - openssl s_server -accept 15418 -www -cert openssl/test/cert.pem -key openssl/test/key.pem >/dev/null 2>&1 &
  - openssl s_server -accept 15419 -www -cert openssl/test/cert.pem -key openssl/test/key.pem -nextprotoneg "http/1.1,spdy/3.1" >/dev/null 2>&1 &
- ./openssl/test/test.sh
script:
- (cd openssl && LD_LIBRARY_PATH=/usr/lib:$LD_LIBRARY_PATH cargo test)
- (test $TRAVIS_OS_NAME == "osx" || (./openssl/test/test.sh &))
- (test $TRAVIS_OS_NAME == "osx" || (cd openssl && LD_LIBRARY_PATH=/usr/lib:$LD_LIBRARY_PATH cargo test --features "$FEATURES"))
- (test $TRAVIS_OS_NAME == "osx" || killall openssl)
- ./.travis/build_docs.sh
after_success:
- test $TRAVIS_PULL_REQUEST == "false" && test $TRAVIS_BRANCH == "master" && ./.travis/update_docs.sh

openssl/test/build.sh

0 → 100755
+10 −0
Original line number Diff line number Diff line
#!/bin/bash
set -e

mkdir /tmp/openssl
cd /tmp/openssl
sudo apt-get install gcc make
curl https://openssl.org/source/openssl-1.0.2-latest.tar.gz | tar --strip-components=1 -xzf -
./config --prefix=/usr/ shared
make
sudo make install
+10 −8
Original line number Diff line number Diff line
#!/bin/bash

cd $(dirname $0)

openssl s_server -accept 15418 -www -cert cert.pem -key key.pem >/dev/null 2>&1 &
openssl s_server -accept 15419 -www -cert cert.pem -key key.pem \
    -nextprotoneg "http/1.1,spdy/3.1" >/dev/null 2>&1 &

if test "$TRAVIS_OS_NAME" == "osx"; then
	return
fi

trap "trap - SIGTERM && kill -- -$$" SIGINT SIGTERM EXIT

openssl s_server -accept 15418 -www -cert openssl/test/cert.pem -key openssl/test/key.pem >/dev/null 2>&1 &

for port in `seq 15411 15430`; do
	echo hello | openssl s_server -accept $port -dtls1 -cert openssl/test/cert.pem \
	  -key openssl/test/key.pem 2>&1 >/dev/null &
    echo hello | openssl s_server -accept $port -dtls1 -cert cert.pem \
        -key key.pem 2>&1 >/dev/null &
done

# the server for the test ssl::tests::test_write_dtlsv1 must wait to receive
# data from the client
yes | openssl s_server -accept 15410 -dtls1 -cert openssl/test/cert.pem \
  -key openssl/test/key.pem 2>&1 >/dev/null
yes | openssl s_server -accept 15410 -dtls1 -cert cert.pem -key key.pem 2>&1 >/dev/null &