auto merge of #11557 : brson/rust/anotherandroidfix, r=thestinger

bors · bors · commit b549b08ca384 · 2014-01-15T03:36:43.000-08:00
diff --git a/src/libextra/time.rs b/src/libextra/time.rs
@@ -1459,7 +1459,7 @@ mod tests {
     }
 
     #[test]
-    #[ignore(cfg(android))] // FIXME #10958
+    #[ignore(cfg(target_os = "android"))] // FIXME #10958
     fn run_tests() {
         // The tests race on tzset. So instead of having many independent
         // tests, we will just call the functions now.

Original file line number	Diff line number	Diff line change
`@@ -1459,7 +1459,7 @@ mod tests {`
`1459`	`1459`	`}`
`1460`	`1460`
`1461`	`1461`	`#[test]`
`1462`		`- #[ignore(cfg(android))] // FIXME #10958`
	`1462`	`+ #[ignore(cfg(target_os = "android"))] // FIXME #10958`
`1463`	`1463`	`fn run_tests() {`
`1464`	`1464`	`// The tests race on tzset. So instead of having many independent`
`1465`	`1465`	`// tests, we will just call the functions now.`