Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make std time tests more robust for platform differences #59147

Merged
merged 1 commit into from
Mar 16, 2019
Merged

Make std time tests more robust for platform differences #59147

merged 1 commit into from
Mar 16, 2019

Conversation

jethrogb
Copy link
Contributor

@jethrogb jethrogb commented Mar 12, 2019 •
edited

Previously, time::tests::since_epoch and time::tests::system_time_math would fail if the platform represents a SystemTime as unix epoch + u64 nanoseconds.

r? @sfackler

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 12, 2019
jethrogb
jethrogb commented Mar 12, 2019
View reviewed changes
src/libstd/time.rs Outdated
assert_almost_eq!(a - (eighty_years * 10) + (eighty_years * 10), a);
assert_almost_eq!(a + eighty_years - eighty_years, a);
if max_time_diff_years > 800 {
assert_almost_eq!(a + (eighty_years * 10) - (eighty_years * 10), a);
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'm not sure if it's worth keeping these tests considering the cfg kludge...

Copy link
Member

Choose a reason for hiding this comment

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

Yeah this bit of the test seems pretty dubious.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Removed

This was referenced Mar 12, 2019
Merged
Merged
@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-6.0 of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log. 
travis_time:end:216f02f4:start=1552432342480426398,finish=1552432343363857100,duration=883430702
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
$ export GCP_CACHE_BUCKET=rust-lang-ci-cache
Setting environment variables from .travis.yml
---
travis_time:start:test_debuginfo
Check compiletest suite=debuginfo mode=debuginfo-both (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
[01:18:18] 
[01:18:18] running 120 tests
[01:18:42] .iiiii...i.....i..i...i..i.i...i.ii...i.....i..i....i..........iiii..........i...ii...i.......ii.i.i 100/120
[01:18:47] .i......iii.i.....ii
[01:18:47] 
[01:18:47]  finished in 28.706
[01:18:47] travis_fold:end:test_debuginfo

---
[01:34:26] travis_fold:start:test_stage1-std
travis_time:start:test_stage1-std
Testing std stage1 (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
[01:34:26]    Compiling std v0.0.0 (/checkout/src/libstd)
[01:34:38] error[E0369]: binary operation `>` cannot be applied to type `fn() -> u32 {time::tests::system_time_math::max_time_diff_years}`
[01:34:38]    --> src/libstd/time.rs:743:16
[01:34:38]     |
[01:34:38] 743 |             if max_time_diff_years > 800 {
[01:34:38]     |
[01:34:38]     |
[01:34:38]     = note: an implementation of `std::cmp::PartialOrd` might be missing for `fn() -> u32 {time::tests::system_time_math::max_time_diff_years}`
[01:34:38] error[E0308]: mismatched types
[01:34:38]    --> src/libstd/time.rs:743:38
[01:34:38]     |
[01:34:38]     |
[01:34:38] 743 |             if max_time_diff_years > 800 {
[01:34:38]     |                                      ^^^ expected fn item, found integer
[01:34:38]     |
[01:34:38]     = note: expected type `fn() -> u32 {time::tests::system_time_math::max_time_diff_years}`
[01:34:38] 
[01:34:38] error[E0599]: no associated item named `MAX` found for type `u32` in the current scope
[01:34:38]    --> src/libstd/time.rs:722:30
[01:34:38]     |

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@sfackler
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Mar 13, 2019

📌 Commit adbd0a6 has been approved by sfackler

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 13, 2019
@XAMPPRocky XAMPPRocky added C-cleanup Category: PRs that clean code up or issues documenting cleanup. T-libs-api Relevant to the library API team, which will review and decide on the PR/issue. labels Mar 13, 2019
pietroalbini added a commit to pietroalbini/rust that referenced this pull request Mar 13, 2019
@pietroalbini
Rollup merge of rust-lang#59147 - jethrogb:jb/time-tests, r=sfackler
4769f8f 
Make std time tests more robust for platform differences

Previously, `time::tests::since_epoch` and `time::tests::system_time_math` would fail if the platform represents a SystemTime as unix epoch + `u64` nanoseconds.

r? @sfackler
@pietroalbini pietroalbini mentioned this pull request Mar 13, 2019
Closed
Centril added a commit to Centril/rust that referenced this pull request Mar 13, 2019
@Centril
Rollup merge of rust-lang#59147 - jethrogb:jb/time-tests, r=sfackler
353740d 
Make std time tests more robust for platform differences

Previously, `time::tests::since_epoch` and `time::tests::system_time_math` would fail if the platform represents a SystemTime as unix epoch + `u64` nanoseconds.

r? @sfackler
@Centril Centril mentioned this pull request Mar 13, 2019
Closed
Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request Mar 14, 2019
@Mark-Simulacrum
Rollup merge of rust-lang#59147 - jethrogb:jb/time-tests, r=sfackler
935a9cf 
Make std time tests more robust for platform differences

Previously, `time::tests::since_epoch` and `time::tests::system_time_math` would fail if the platform represents a SystemTime as unix epoch + `u64` nanoseconds.

r? @sfackler
@Mark-Simulacrum Mark-Simulacrum mentioned this pull request Mar 14, 2019
Closed
kennytm added a commit to kennytm/rust that referenced this pull request Mar 15, 2019
@kennytm
Rollup merge of rust-lang#59147 - jethrogb:jb/time-tests, r=sfackler
ea3c111 
Make std time tests more robust for platform differences

Previously, `time::tests::since_epoch` and `time::tests::system_time_math` would fail if the platform represents a SystemTime as unix epoch + `u64` nanoseconds.

r? @sfackler
@kennytm kennytm mentioned this pull request Mar 15, 2019
Closed
Centril added a commit to Centril/rust that referenced this pull request Mar 16, 2019
@Centril
Rollup merge of rust-lang#59147 - jethrogb:jb/time-tests, r=sfackler
adf0927 
Make std time tests more robust for platform differences

Previously, `time::tests::since_epoch` and `time::tests::system_time_math` would fail if the platform represents a SystemTime as unix epoch + `u64` nanoseconds.

r? @sfackler
@Centril Centril mentioned this pull request Mar 16, 2019
Closed
@kennytm kennytm mentioned this pull request Mar 16, 2019
Merged
kennytm added a commit to kennytm/rust that referenced this pull request Mar 16, 2019
@kennytm
Rollup merge of rust-lang#59147 - jethrogb:jb/time-tests, r=sfackler
d84e063 
Make std time tests more robust for platform differences

Previously, `time::tests::since_epoch` and `time::tests::system_time_math` would fail if the platform represents a SystemTime as unix epoch + `u64` nanoseconds.

r? @sfackler
bors added a commit that referenced this pull request Mar 16, 2019
@bors
Auto merge of #59226 - kennytm:rollup, r=kennytm
2c8bbf5 
Rollup of 37 pull requests

Successful merges:

 - #58854 (appveyor: Use VS2017 for all our images)
 - #58855 (std: Spin for a global malloc lock on wasm32)
 - #58873 (Fix "Auto-hide item methods documentation" setting)
 - #58901 (Change `std::fs::copy` to use `copyfile` on MacOS and iOS)
 - #58933 (Move alloc::prelude::* to alloc::prelude::v1, make alloc a subset of std)
 - #58938 (core: ensure VaList passes improper_ctypes lint)
 - #58941 (MIPS: add r6 support)
 - #58949 (SGX target: Expose thread id function in os module)
 - #58959 (Add release notes for PR #56243)
 - #58976 (Default to integrated `rust-lld` linker for UEFI targets)
 - #59009 (Fix SGX implementations of read/write_vectored.)
 - #59025 (Fix generic argument lookup for Self)
 - #59036 (Fix ICE in MIR pretty printing)
 - #59037 (Avoid some common false positives in intra doc link checking)
 - #59072 (we can now skip should_panic tests with the libtest harness)
 - #59079 (add suggestions to invalid macro item error)
 - #59082 (A few improvements to comments in user-facing crates)
 - #59102 (Consistent naming for duration_float methods and additional f32 methods)
 - #59118 (rustc: fix ICE when trait alias has bare Self)
 - #59139 (Unregress using scalar unions in constants.)
 - #59146 (Suggest return lifetime when there's only one named lifetime)
 - #59147 (Make std time tests more robust for platform differences)
 - #59152 (Stabilize Range*::contains.)
 - #59156 ([wg-async-await] Add regression test for #55809.)
 - #59158 (Revert "Don't generate minification variable if minification disabled")
 - #59169 (Add `-Z allow_features=...` flag)
 - #59173 (bootstrap: Default to a sensible llvm-suffix.)
 - #59175 (Don't run test launching `echo` since that doesn't exist on Windows)
 - #59180 (Use try blocks in rustc_codegen_ssa)
 - #59185 (No old chestnuts in iter::repeat docs)
 - #59201 (Remove restriction on isize/usize in repr(simd))
 - #59204 (Output diagnostic information for rustdoc)
 - #59206 (Improved test output)
 - #59208 (Reduce a Code Repetition Related to Bit Operation)
 - #59212 (Add x86_64 musl host to the manifest)
 - #59221 (Option and Result: Add references to documentation of as_ref and as_mut)
 - #59231 (Stabilize Option::copied)
@bors bors merged commit adbd0a6 into rust-lang:master Mar 16, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sfackler sfackler sfackler left review comments

Assignees

@sfackler sfackler

Labels
C-cleanup Category: PRs that clean code up or issues documenting cleanup. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-libs-api Relevant to the library API team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@jethrogb @rust-highfive @sfackler @bors @XAMPPRocky