auto merge of #4793 : brson/rust/ignore_exclusive_unwrap_conflict, r=brson

bors · bors · commit e72c917f7120 · 2013-02-05T05:21:28.000-08:00
diff --git a/src/libcore/private.rs b/src/libcore/private.rs
@@ -486,7 +486,7 @@ pub mod tests {
         res.recv();
     }
 
-    #[test] #[should_fail] #[ignore(cfg(windows))]
+    #[test] #[should_fail] #[ignore(reason = "random red")]
     pub fn exclusive_unwrap_conflict() {
         let x = exclusive(~~"hello");
         let x2 = ~mut Some(x.clone());

Original file line number	Diff line number	Diff line change
`@@ -486,7 +486,7 @@ pub mod tests {`
`486`	`486`	`res.recv();`
`487`	`487`	`}`
`488`	`488`
`489`		`- #[test] #[should_fail] #[ignore(cfg(windows))]`
	`489`	`+ #[test] #[should_fail] #[ignore(reason = "random red")]`
`490`	`490`	`pub fn exclusive_unwrap_conflict() {`
`491`	`491`	`let x = exclusive(~~"hello");`
`492`	`492`	`let x2 = ~mut Some(x.clone());`