---

yaml
---
r: 52192
b: refs/heads/dist-snap
c: 1f03ba1
h: refs/heads/master
v: v3

Author: graydon

[refs]

@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
 refs/heads/incoming: 44d4d6de762f3f9aae1fedcf454c66b79b3ad58d
-refs/heads/dist-snap: 6644da5805aa6af93bbe1dcba800d9bdaae56b13
+refs/heads/dist-snap: 1f03ba134f25e518abf1d61e5f088bfc3e86586f
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/libstd/net_tcp.rs

@@ -1270,7 +1270,7 @@ type TcpBufferedSocketData = {
 };
 
 //#[cfg(test)]
-mod test {
+pub mod test {
     use net::ip;
     use net::tcp::{GenericListenErr, TcpConnectErrData, TcpListenErrData};
     use net::tcp::{connect, accept, read, listen, TcpSocket, socket_buf};
@@ -1290,13 +1290,14 @@ mod test {
     #[cfg(target_os="win32")]
     #[cfg(target_os="darwin")]
     #[cfg(target_os="linux")]
-    mod tcp_ipv4_server_and_client_test {
+    pub mod tcp_ipv4_server_and_client_test {
         #[cfg(target_arch="x86_64")]
-        mod impl64 {
-            use net::tcp::test::tcp_ipv4_server_and_client_test::*;
+        pub mod impl64 {
+            use net::tcp::test::*;
 
             #[test]
             fn test_gl_tcp_server_and_client_ipv4() unsafe {
+                use net::tcp::test::tcp_ipv4_server_and_client_test::*;
                 impl_gl_tcp_ipv4_server_and_client();
             }
             #[test]
@@ -1325,8 +1326,8 @@ mod test {
             }
         }
         #[cfg(target_arch="x86")]
-        mod impl32 {
-            use net::tcp::test::tcp_ipv4_server_and_client_test::*;
+        pub mod impl32 {
+            use net::tcp::test::*;
 
             #[test]
             #[ignore(cfg(target_os = "linux"))]
@@ -1361,7 +1362,7 @@ mod test {
             }
         }
     }
-    fn impl_gl_tcp_ipv4_server_and_client() {
+    pub fn impl_gl_tcp_ipv4_server_and_client() {
         let hl_loop = uv::global_loop::get();
         let server_ip = ~"127.0.0.1";
         let server_port = 8888u;
@@ -1407,7 +1408,7 @@ mod test {
         assert str::contains(actual_req, expected_req);
         assert str::contains(actual_resp, expected_resp);
     }
-    fn impl_gl_tcp_ipv4_get_peer_addr() {
+    pub fn impl_gl_tcp_ipv4_get_peer_addr() {
         let hl_loop = uv::global_loop::get();
         let server_ip = ~"127.0.0.1";
         let server_port = 8887u;
@@ -1454,7 +1455,7 @@ mod test {
             client_ch.send(str::from_bytes(read_result.get()));
         };
     }
-    fn impl_gl_tcp_ipv4_client_error_connection_refused() {
+    pub fn impl_gl_tcp_ipv4_client_error_connection_refused() {
         let hl_loop = uv::global_loop::get();
         let server_ip = ~"127.0.0.1";
         let server_port = 8889u;
@@ -1474,7 +1475,7 @@ mod test {
           _ => fail ~"unknown error.. expected connection_refused"
         }
     }
-    fn impl_gl_tcp_ipv4_server_address_in_use() {
+    pub fn impl_gl_tcp_ipv4_server_address_in_use() {
         let hl_loop = uv::global_loop::get();
         let server_ip = ~"127.0.0.1";
         let server_port = 8890u;
@@ -1525,7 +1526,7 @@ mod test {
           }
         }
     }
-    fn impl_gl_tcp_ipv4_server_access_denied() {
+    pub fn impl_gl_tcp_ipv4_server_access_denied() {
         let hl_loop = uv::global_loop::get();
         let server_ip = ~"127.0.0.1";
         let server_port = 80u;
@@ -1544,7 +1545,7 @@ mod test {
           }
         }
     }
-    fn impl_gl_tcp_ipv4_server_client_reader_writer() {
+    pub fn impl_gl_tcp_ipv4_server_client_reader_writer() {
         /*
          XXX: Causes an ICE.
 
@@ -1597,7 +1598,7 @@ mod test {
         */
     }
 
-    fn impl_tcp_socket_impl_reader_handles_eof() {
+    pub fn impl_tcp_socket_impl_reader_handles_eof() {
         use core::io::{Reader,ReaderUtil};
 
         let hl_loop = uv::global_loop::get();

branches/dist-snap/src/libstd/uv_ll.rs

@@ -1559,13 +1559,15 @@ pub mod test {
     pub mod tcp_and_server_client_test {
         #[cfg(target_arch="x86_64")]
         pub mod impl64 {
+            use uv_ll::test::*;
             #[test]
             pub fn test_uv_ll_tcp_server_and_request() unsafe {
                 impl_uv_tcp_server_and_request();
             }
         }
         #[cfg(target_arch="x86")]
         pub mod impl32 {
+            use uv_ll::test::*;
             #[test]
             #[ignore(cfg(target_os = "linux"))]
             pub fn test_uv_ll_tcp_server_and_request() unsafe {