Skip to content

Commit

Permalink
iOS: fixed test build
Browse files Browse the repository at this point in the history
Now it is possible to run tests on a jailbroken device
  • Loading branch information
vhbit committed Jan 9, 2015
1 parent 1fb91dc commit ac0607a
Showing 1 changed file with 21 additions and 8 deletions.
29 changes: 21 additions & 8 deletions src/libstd/io/test.rs
Expand Up @@ -23,23 +23,36 @@ pub fn next_test_port() -> u16 {
base_port() + NEXT_OFFSET.fetch_add(1, Ordering::Relaxed) as u16
}

/// Get a temporary path which could be the location of a unix socket
pub fn next_test_unix() -> Path {
// iOS has a pretty long tmpdir path which causes pipe creation
// to like: invalid argument: path must be smaller than SUN_LEN
fn next_test_unix_socket() -> String {
static COUNT: AtomicUint = ATOMIC_UINT_INIT;
// base port and pid are an attempt to be unique between multiple
// test-runners of different configurations running on one
// buildbot, the count is to be unique within this executable.
let string = format!("rust-test-unix-path-{}-{}-{}",
base_port(),
unsafe {libc::getpid()},
COUNT.fetch_add(1, Ordering::Relaxed));
format!("rust-test-unix-path-{}-{}-{}",
base_port(),
unsafe {libc::getpid()},
COUNT.fetch_add(1, Ordering::Relaxed))
}

/// Get a temporary path which could be the location of a unix socket
#[cfg(not(target_os = "ios"))]
pub fn next_test_unix() -> Path {
let string = next_test_unix_socket();
if cfg!(unix) {
os::tmpdir().join(string)
} else {
Path::new(format!("{}{}", r"\\.\pipe\", string))
}
}

/// Get a temporary path which could be the location of a unix socket
#[cfg(target_os = "ios")]
pub fn next_test_unix() -> Path {
Path::new(format!("/var/tmp/{}", next_test_unix_socket()))
}

/// Get a unique IPv4 localhost:port pair starting at 9600
pub fn next_test_ip4() -> SocketAddr {
SocketAddr { ip: Ipv4Addr(127, 0, 0, 1), port: next_test_port() }
Expand Down Expand Up @@ -99,7 +112,7 @@ pub fn raise_fd_limit() {
/// multithreaded scheduler testing, depending on the number of cores available.
///
/// This fixes issue #7772.
#[cfg(target_os="macos")]
#[cfg(any(target_os = "macos", target_os = "ios"))]
#[allow(non_camel_case_types)]
mod darwin_fd_limit {
use libc;
Expand Down Expand Up @@ -156,7 +169,7 @@ mod darwin_fd_limit {
}
}

#[cfg(not(target_os="macos"))]
#[cfg(not(any(target_os = "macos", target_os = "ios")))]
mod darwin_fd_limit {
pub unsafe fn raise_fd_limit() {}
}

0 comments on commit ac0607a

Please sign in to comment.