aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManuel Schölling <[email protected]>2015-03-15 16:09:33 +0100
committerManuel Schölling <[email protected]>2015-04-06 12:23:11 +0200
commit362a7dfc935bcace9d4d249e2bed853c315e256d (patch)
treea41adb232f948219a762e1d81d650da879d7a1fb
parentPostpone custom openssl build (diff)
downloadrust-openssl-362a7dfc935bcace9d4d249e2bed853c315e256d.tar.xz
rust-openssl-362a7dfc935bcace9d4d249e2bed853c315e256d.zip
Debug halteproblem with tests
-rw-r--r--openssl/src/ssl/tests.rs4
-rwxr-xr-xopenssl/test/test.sh5
2 files changed, 6 insertions, 3 deletions
diff --git a/openssl/src/ssl/tests.rs b/openssl/src/ssl/tests.rs
index d1a91500..b9442010 100644
--- a/openssl/src/ssl/tests.rs
+++ b/openssl/src/ssl/tests.rs
@@ -119,7 +119,7 @@ run_test!(verify_trusted, |method, stream| {
Err(err) => panic!("Expected success, got {:?}", err)
}
});
-
+/*
run_test!(verify_untrusted_callback_override_ok, |method, stream| {
fn callback(_preverify_ok: bool, _x509_ctx: &X509StoreContext) -> bool {
true
@@ -288,7 +288,7 @@ run_test!(clear_ctx_options, |method, _| {
let opts = ctx.clear_options(ssl::SSL_OP_ALL);
assert!(!opts.contains(ssl::SSL_OP_ALL));
});
-
+*/
#[test]
fn test_write() {
let stream = TcpStream::connect("127.0.0.1:15418").unwrap();
diff --git a/openssl/test/test.sh b/openssl/test/test.sh
index 3d035905..c0a0b855 100755
--- a/openssl/test/test.sh
+++ b/openssl/test/test.sh
@@ -7,7 +7,10 @@ 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 &
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
+ -key openssl/test/key.pem 2>&1 >/dev/null </tmp/rust_openssl_test_pipe