diff options
| author | Manuel Schölling <[email protected]> | 2015-03-17 18:13:50 +0100 |
|---|---|---|
| committer | Manuel Schölling <[email protected]> | 2015-04-06 12:23:11 +0200 |
| commit | 62b19e87e87579c98e3b092f345624f76ca907fe (patch) | |
| tree | dea0d108e5f3f677c981b35d3009c214bd9d3f1b | |
| parent | Debug halteproblem with tests (diff) | |
| download | rust-openssl-62b19e87e87579c98e3b092f345624f76ca907fe.tar.xz rust-openssl-62b19e87e87579c98e3b092f345624f76ca907fe.zip | |
Fix preemtively exiting openssl dtls server for tests
| -rwxr-xr-x | openssl/test/test.sh | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/openssl/test/test.sh b/openssl/test/test.sh index c0a0b855..c61511fd 100755 --- a/openssl/test/test.sh +++ b/openssl/test/test.sh @@ -1,4 +1,8 @@ #!/bin/bash +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 & @@ -8,9 +12,7 @@ for port in `seq 15411 15430`; do -key openssl/test/key.pem 2>&1 >/dev/null & done -rm -f /tmp/rust_openssl_test_pipe -mkfifo /tmp/rust_openssl_test_pipe # the server for the test ssl::tests::test_write_dtlsv1 must wait to receive # data from the client -openssl s_server -accept 15410 -dtls1 -cert openssl/test/cert.pem \ - -key openssl/test/key.pem 2>&1 >/dev/null </tmp/rust_openssl_test_pipe +yes | openssl s_server -accept 15410 -dtls1 -cert openssl/test/cert.pem \ + -key openssl/test/key.pem 2>&1 >/dev/null |