auto merge of #5078 : bblum/rust/incoming, r=brson

bors · bors · commit 1bc4e3f6a21c · 2013-02-22T13:39:34.000-08:00
r? @brson
diff --git 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))]

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))]`