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

This commit is contained in:
bors 2014-01-15 03:36:43 -08:00
commit b549b08ca3

View File

@ -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.