Skip to content

Commit

Permalink
extra: Ignore time tests on android correctly
Browse files Browse the repository at this point in the history
  • Loading branch information
@brson
brson committed Jan 15, 2014
1 parent dd8b011 commit 6232290
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/libextra/time.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

5 comments on commit 6232290

@bors
Copy link
Contributor

@bors bors commented on 6232290 Jan 15, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from thestinger
at brson@6232290

@bors
Copy link
Contributor

@bors bors commented on 6232290 Jan 15, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging brson/rust/anotherandroidfix = 6232290 into auto

@bors
Copy link
Contributor

@bors bors commented on 6232290 Jan 15, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

brson/rust/anotherandroidfix = 6232290 merged ok, testing candidate = b549b08

@bors
Copy link
Contributor

@bors bors commented on 6232290 Jan 15, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

all tests pass:
success: http://buildbot.rust-lang.org/builders/auto-mac-32-opt/builds/3568
success: http://buildbot.rust-lang.org/builders/auto-mac-32-nopt-c/builds/1411
success: http://buildbot.rust-lang.org/builders/auto-mac-32-nopt-t/builds/1413
success: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/3569
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-c/builds/2670
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/2675
success: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/3584
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-c/builds/2672
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/2678
success: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/3586
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-c/builds/2672
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/2677
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android/builds/2746
success: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/3576
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-c/builds/2677
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/2682
success: http://buildbot.rust-lang.org/builders/auto-bsd-64-opt/builds/3347

@bors
Copy link
Contributor

@bors bors commented on 6232290 Jan 15, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = b549b08

Please sign in to comment.