diff options
| author | bors <bors@rust-lang.org> | 2013-02-22 13:39:34 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-02-22 13:39:34 -0800 |
| commit | 1bc4e3f6a21c3c5d92873f490b646358ea395f9e (patch) | |
| tree | 630edd8aee6b5badd0a89f1a3ec465cf0c882601 | |
| parent | c316189d155e233ea04241116b11956626c8e7a3 (diff) | |
| parent | 9dae4cf1f0f2fd82ee653d89abc46d349b6e6caa (diff) | |
| download | rust-1bc4e3f6a21c3c5d92873f490b646358ea395f9e.tar.gz rust-1bc4e3f6a21c3c5d92873f490b646358ea395f9e.zip | |
auto merge of #5078 : bblum/rust/incoming, r=brson
r? @brson
| -rw-r--r-- | src/libcore/private.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/libcore/private.rs b/src/libcore/private.rs index 2738e5564fc..280eb14b172 100644 --- a/src/libcore/private.rs +++ b/src/libcore/private.rs @@ -495,7 +495,7 @@ pub mod tests { res.recv(); } - #[test] #[should_fail] #[ignore(reason = "random red")] + #[test] #[should_fail] #[ignore(cfg(windows))] pub fn exclusive_unwrap_conflict() { let x = exclusive(~~"hello"); let x2 = ~mut Some(x.clone()); @@ -507,7 +507,8 @@ pub mod tests { } assert unwrap_exclusive(x) == ~~"hello"; let res = option::swap_unwrap(&mut res); - res.recv(); + // See #4689 for why this can't be just "res.recv()". + assert res.recv() == task::Success; } #[test] #[ignore(cfg(windows))] |