Skip to content

Commit 0da86ba

Browse files
committed
Actually block in a windows cvar
Turns out with an argument of 0 the function always returns immediately! Closes #11003
1 parent aa5d779 commit 0da86ba

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

src/libstd/comm/mod.rs

-3
Original file line numberDiff line numberDiff line change
@@ -1019,7 +1019,6 @@ mod test {
10191019
})
10201020

10211021
#[test]
1022-
#[ignore(cfg(windows))] // FIXME(#11003)
10231022
fn send_from_outside_runtime() {
10241023
let (p, c) = Chan::<int>::new();
10251024
let (p1, c1) = Chan::new();
@@ -1044,7 +1043,6 @@ mod test {
10441043
}
10451044

10461045
#[test]
1047-
#[ignore(cfg(windows))] // FIXME(#11003)
10481046
fn recv_from_outside_runtime() {
10491047
let (p, c) = Chan::<int>::new();
10501048
let (dp, dc) = Chan::new();
@@ -1061,7 +1059,6 @@ mod test {
10611059
}
10621060

10631061
#[test]
1064-
#[ignore(cfg(windows))] // FIXME(#11003)
10651062
fn no_runtime() {
10661063
let (p1, c1) = Chan::<int>::new();
10671064
let (p2, c2) = Chan::<int>::new();

src/libstd/unstable/mutex.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ mod imp {
286286

287287
pub unsafe fn wait(cond: *c_void, m: *c_void) {
288288
unlock(m);
289-
WaitForSingleObject(cond as HANDLE, 0);
289+
WaitForSingleObject(cond as HANDLE, libc::INFINITE);
290290
lock(m);
291291
}
292292

0 commit comments

Comments
 (0)