---

bors · bors · commit 05b88f1c134f · 2013-02-22T13:39:34.000-08:00
yaml --- r: 44691 b: refs/heads/master c: 1bc4e3f h: refs/heads/master i: 44689: 1ccf778 44687: d315980 v: v3
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: c316189d155e233ea04241116b11956626c8e7a3
+refs/heads/master: 1bc4e3f6a21c3c5d92873f490b646358ea395f9e
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d9689399d091c3265f00434a69c551a61c28dc
 refs/heads/try: ef355f6332f83371e4acf04fc4eb940ab41d78d3
diff --git a/trunk/src/libcore/private.rs b/trunk/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))]

Original file line number	Diff line number	Diff line change
`@@ -495,7 +495,7 @@ pub mod tests {`
`495`	`495`	`res.recv();`
`496`	`496`	`}`
`497`	`497`
`498`		`- #[test] #[should_fail] #[ignore(reason = "random red")]`
	`498`	`+ #[test] #[should_fail] #[ignore(cfg(windows))]`
`499`	`499`	`pub fn exclusive_unwrap_conflict() {`
`500`	`500`	`let x = exclusive(~~"hello");`
`501`	`501`	`let x2 = ~mut Some(x.clone());`
`@@ -507,7 +507,8 @@ pub mod tests {`
`507`	`507`	`}`
`508`	`508`	`assert unwrap_exclusive(x) == ~~"hello";`
`509`	`509`	`let res = option::swap_unwrap(&mut res);`
`510`		`- res.recv();`
	`510`	`+ // See #4689 for why this can't be just "res.recv()".`
	`511`	`+ assert res.recv() == task::Success;`
`511`	`512`	`}`
`512`	`513`
`513`	`514`	`#[test] #[ignore(cfg(windows))]`