diff options
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/sys/unix/process/process_common.rs | 1 | ||||
| -rw-r--r-- | src/libstd/time/mod.rs | 12 |
2 files changed, 11 insertions, 2 deletions
diff --git a/src/libstd/sys/unix/process/process_common.rs b/src/libstd/sys/unix/process/process_common.rs index 32fcee1e461..839e2d88d6a 100644 --- a/src/libstd/sys/unix/process/process_common.rs +++ b/src/libstd/sys/unix/process/process_common.rs @@ -469,6 +469,7 @@ mod tests { // although the reason isn't very clear as to why. For now this test is // ignored there. #[cfg_attr(target_arch = "arm", ignore)] + #[cfg_attr(target_arch = "aarch64", ignore)] fn test_process_mask() { unsafe { // Test to make sure that a signal mask does not get inherited. diff --git a/src/libstd/time/mod.rs b/src/libstd/time/mod.rs index 4eed336a7a0..40113d164df 100644 --- a/src/libstd/time/mod.rs +++ b/src/libstd/time/mod.rs @@ -533,9 +533,17 @@ mod tests { assert!(b > a); assert_eq!(b - a, Duration::new(1, 0)); - // let's assume that we're all running computers later than 2000 let thirty_years = Duration::new(1, 0) * 60 * 60 * 24 * 365 * 30; - assert!(a > thirty_years); + + // Right now for CI this test is run in an emulator, and apparently the + // aarch64 emulator's sense of time is that we're still living in the + // 70s. + // + // Otherwise let's assume that we're all running computers later than + // 2000. + if !cfg!(target_arch = "aarch64") { + assert!(a > thirty_years); + } // let's assume that we're all running computers earlier than 2090. // Should give us ~70 years to fix this! |