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.

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

Some CI setups are much slower then the equipment used by Cargo itself #6596

Merged
merged 4 commits into from
Jan 24, 2019

Conversation

Eh2406
Copy link
Contributor

@Eh2406 Eh2406 commented Jan 24, 2019

This adds a "CARGO_TEST_SLOW_CPU_MULTIPLIER" that increases all the time outs used in the tests, and disables Proptest shrinking on non tty cases.

Closes: #6491
CC: #6490, @infinity0

@rust-highfive
Copy link

r? @dwijnand

(rust_highfive has picked a reviewer for you, use r? to override)

@dwijnand
Copy link
Member

LGTM. I'm not sure if the lazy static is so necessary, and it's unfortunate to not be able to share the impl with the integration tests, but we can forward-fix these down the line.

You need to import std::env though.

r=me

@Eh2406
Copy link
Contributor Author

Eh2406 commented Jan 24, 2019

@bors: r=dwijnand

@bors
Copy link
Collaborator

bors commented Jan 24, 2019

📌 Commit 1c1383c has been approved by dwijnand

// Some CI setups are much slower then the equipment used by Cargo itself.
// Architectures that do not have a modern processor, hardware emulation, ect.
// In the test code we have `slow_cpu_multiplier`, but that is not accessible here.
lazy_static::lazy_static! {
Copy link
Member

Choose a reason for hiding this comment

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

Instead of lazy_static, could this be stored as a field in ResolverProgress?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Does that look better?

@alexcrichton
Copy link
Member

Just one minor nit, but otherwise r=me

@Eh2406
Copy link
Contributor Author

Eh2406 commented Jan 24, 2019

@bors r-

@Eh2406
Copy link
Contributor Author

Eh2406 commented Jan 24, 2019

@bors: r=dwijnand+alexcrichton

@bors
Copy link
Collaborator

bors commented Jan 24, 2019

📌 Commit 7332f67 has been approved by dwijnand+alexcrichton

@bors
Copy link
Collaborator

bors commented Jan 24, 2019

⌛ Testing commit 7332f67 with merge e185111...

bors added a commit that referenced this pull request Jan 24, 2019
Some CI setups are much slower then the equipment used by Cargo itself

This adds a "CARGO_TEST_SLOW_CPU_MULTIPLIER" that increases all the time outs used in the tests, and disables Proptest shrinking on non tty cases.

Closes: #6491
CC: #6490, @infinity0
@bors
Copy link
Collaborator

bors commented Jan 24, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: dwijnand+alexcrichton
Pushing e185111 to master...

@bors bors merged commit 7332f67 into rust-lang:master Jan 24, 2019
@Eh2406 Eh2406 deleted the slow-cpu-test branch January 24, 2019 20:02
@ehuss ehuss added this to the 1.34.0 milestone Feb 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

0.32.0 resolving_with_many_equivalent_backtracking fails on mips
6 participants