diff options
| author | bors <bors@rust-lang.org> | 2015-10-25 02:12:00 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-10-25 02:12:00 +0000 |
| commit | 1d792a64b61a971b58a85efb34658f350594780f (patch) | |
| tree | d5c6ad3a75fafdd6658de3625be808fa7083f232 /src/libstd | |
| parent | 0be1bcd06a969987dde8da35199f413237ed0c0c (diff) | |
| parent | 2098ff4a3346f104ce3ab8a86fb6093a8ed6bbd0 (diff) | |
Auto merge of #29256 - alexcrichton:less-flaky, r=brson
The new bots we have may conflict with one another on base ports, causing tests to fail. For example the linux-musl-64-opt and linux-64-opt bots are using the same base port right now, causing some spurious failures every now and then.
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/net/test.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/libstd/net/test.rs b/src/libstd/net/test.rs index c6d839d55a8..9665fd72287 100644 --- a/src/libstd/net/test.rs +++ b/src/libstd/net/test.rs @@ -47,7 +47,9 @@ pub fn tsa<A: ToSocketAddrs>(a: A) -> Result<Vec<SocketAddr>, String> { // it is running in and assigns a port range based on it. fn base_port() -> u16 { let cwd = env::current_dir().unwrap(); - let dirs = ["32-opt", "32-nopt", "64-opt", "64-nopt", "64-opt-vg", + let dirs = ["32-opt", "32-nopt", + "musl-64-opt", "cross-opt", + "64-opt", "64-nopt", "64-opt-vg", "64-debug-opt", "all-opt", "snap3", "dist"]; dirs.iter().enumerate().find(|&(_, dir)| { cwd.to_str().unwrap().contains(dir) |