aboutsummaryrefslogtreecommitdiff
path: root/openssl/src/lib.rs
diff options
context:
space:
mode:
authorAlex Crichton <[email protected]>2015-09-22 11:29:47 -0700
committerAlex Crichton <[email protected]>2015-09-22 17:37:21 -0700
commita91b6bf3bd216c13f0dafdbbf9ef33f15dd103bf (patch)
tree50ba9b6227951d0d7167a4f4134929a5c93a6a20 /openssl/src/lib.rs
parentMerge pull request #266 from jmesmon/alpn (diff)
downloadrust-openssl-a91b6bf3bd216c13f0dafdbbf9ef33f15dd103bf.tar.xz
rust-openssl-a91b6bf3bd216c13f0dafdbbf9ef33f15dd103bf.zip
Enable testing on Windows via AppVeyor
This abolishes the test.sh script which spawns a bunch of `openssl` instances to instead run/manage the binary in-process (providing more isolation to boot). The tests have been updated accordingly and the `connected_socket` dependency was also dropped in favor of `net2` as it the former doesn't work on Windows.
Diffstat (limited to 'openssl/src/lib.rs')
-rw-r--r--openssl/src/lib.rs3
1 files changed, 1 insertions, 2 deletions
diff --git a/openssl/src/lib.rs b/openssl/src/lib.rs
index cc74726f..49a7fd4a 100644
--- a/openssl/src/lib.rs
+++ b/openssl/src/lib.rs
@@ -11,8 +11,7 @@ extern crate openssl_sys as ffi;
extern crate rustc_serialize as serialize;
#[cfg(test)]
-#[cfg(any(feature="dtlsv1", feature="dtlsv1_2"))]
-extern crate connected_socket;
+extern crate net2;
mod macros;