---

alexcrichton · alexcrichton · commit a9964c1dc7a2 · 2014-02-24T12:33:06.000-08:00
yaml --- r: 104491 b: refs/heads/try c: 13a8fcd h: refs/heads/master i: 104489: b28ddc4 104487: 044f656 v: v3
diff --git a/[refs] b/[refs]
@@ -2,7 +2,7 @@
 refs/heads/master: 62f1d68439dcfd509eaca29887afa97f22938373
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 6e7f170fedd3c526a643c0b2d13863acd982be02
-refs/heads/try: c0e767b00b325576b4d09b624a47382133db6163
+refs/heads/try: 13a8fcd3e9cfc49e8cc1d50d132188ded311f9db
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
diff --git a/branches/try/src/libstd/io/process.rs b/branches/try/src/libstd/io/process.rs
@@ -814,7 +814,10 @@ mod tests {
     }
     #[cfg(windows)]
     pub fn sleeper() -> Process {
-        Process::new("timeout", [~"1000"]).unwrap()
+        // There's a `timeout` command on windows, but it doesn't like having
+        // its output piped, so instead just ping ourselves a few times with
+        // gaps inbetweeen so we're sure this process is alive for awhile
+        Process::new("ping", [~"127.0.0.1", ~"-n", ~"1000"]).unwrap()
     }
 
     iotest!(fn test_kill() {
@@ -828,5 +831,5 @@ mod tests {
         assert!(Process::kill(p.id(), 0).is_ok());
         p.signal_kill().unwrap();
         assert!(!p.wait().success());
-    } #[ignore(cfg(windows))]) // FIXME(#12516)
+    })
 }

Original file line number	Diff line number	Diff line change
`@@ -814,7 +814,10 @@ mod tests {`
`814`	`814`	`}`
`815`	`815`	`#[cfg(windows)]`
`816`	`816`	`pub fn sleeper() -> Process {`
`817`		`- Process::new("timeout", [~"1000"]).unwrap()`
	`817`	+ // There's a `timeout` command on windows, but it doesn't like having
	`818`	`+ // its output piped, so instead just ping ourselves a few times with`
	`819`	`+ // gaps inbetweeen so we're sure this process is alive for awhile`
	`820`	`+ Process::new("ping", [~"127.0.0.1", ~"-n", ~"1000"]).unwrap()`
`818`	`821`	`}`
`819`	`822`
`820`	`823`	`iotest!(fn test_kill() {`
`@@ -828,5 +831,5 @@ mod tests {`
`828`	`831`	`assert!(Process::kill(p.id(), 0).is_ok());`
`829`	`832`	`p.signal_kill().unwrap();`
`830`	`833`	`assert!(!p.wait().success());`
`831`		`- } #[ignore(cfg(windows))]) // FIXME(#12516)`
	`834`	`+ })`
`832`	`835`	`}`