diff options
| author | Ben Blum <bblum@andrew.cmu.edu> | 2013-02-21 19:42:18 -0500 |
|---|---|---|
| committer | Ben Blum <bblum@andrew.cmu.edu> | 2013-02-21 19:42:18 -0500 |
| commit | 9dae4cf1f0f2fd82ee653d89abc46d349b6e6caa (patch) | |
| tree | 356ee959f0b3ab936e577163cb86aca2f70874ee | |
| parent | e0767bf24f7a526430472290825ebd9158cb1dcc (diff) | |
| download | rust-9dae4cf1f0f2fd82ee653d89abc46d349b6e6caa.tar.gz rust-9dae4cf1f0f2fd82ee653d89abc46d349b6e6caa.zip | |
Fix private::exclusive_unwrap_conflict test. Fixes #4689.
| -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 61f2e013aba..b0f7d4a82e2 100644 --- a/src/libcore/private.rs +++ b/src/libcore/private.rs @@ -493,7 +493,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()); @@ -505,7 +505,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))] |