about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2015-10-23 10:50:53 -0700
committerAlex Crichton <alex@alexcrichton.com>2015-10-23 10:51:48 -0700
commit2098ff4a3346f104ce3ab8a86fb6093a8ed6bbd0 (patch)
tree56c0abca91fe9847223d7427aa55b09ce4d2d55a
parent9a855668fcc918071ecd1573abdeaccc6a99cbbb (diff)
downloadrust-2098ff4a3346f104ce3ab8a86fb6093a8ed6bbd0.tar.gz
rust-2098ff4a3346f104ce3ab8a86fb6093a8ed6bbd0.zip
std: Add more entries to stdtest base_port
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.
-rw-r--r--src/libstd/net/test.rs4
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)