Skip to content

ui_test: ensure all worker threads stay around #2207

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

Merged
merged 4 commits into from
Jun 13, 2022

Conversation

RalfJung
Copy link
Member

@RalfJung RalfJung commented Jun 6, 2022

Also organize files such that the by far slowest test (weak_memory/consistency) always starts first. It still finishes last on my system... even after I halved the iteration count.

Fixes #2204

@RalfJung RalfJung force-pushed the ui_test_parallelism branch 2 times, most recently from d8978da to 56a919d Compare June 7, 2022 00:19
@oli-obk
Copy link
Contributor

oli-obk commented Jun 13, 2022

@bors r+

@bors
Copy link
Contributor

bors commented Jun 13, 2022

📌 Commit 2891b55 has been approved by oli-obk

@bors
Copy link
Contributor

bors commented Jun 13, 2022

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

  1. git checkout ui_test_parallelism (switch to your branch)
  2. git fetch upstream master (retrieve the latest master)
  3. git rebase upstream/master -p (rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. git push self ui_test_parallelism --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message
Auto-merging ui_test/src/lib.rs
CONFLICT (rename/delete): tests/pass/weak_memory/consistency.stderr deleted in HEAD and renamed to tests/pass/0weak_memory_consistency.stderr in heads/homu-tmp. Version heads/homu-tmp of tests/pass/0weak_memory_consistency.stderr left in tree.
Automatic merge failed; fix conflicts and then commit the result.

@RalfJung RalfJung force-pushed the ui_test_parallelism branch from 2891b55 to 3965ae8 Compare June 13, 2022 16:07
@RalfJung RalfJung force-pushed the ui_test_parallelism branch from 3965ae8 to c16c453 Compare June 13, 2022 16:08
@RalfJung
Copy link
Member Author

@bors r=oli-obk

@bors
Copy link
Contributor

bors commented Jun 13, 2022

📌 Commit c16c453 has been approved by oli-obk

@bors
Copy link
Contributor

bors commented Jun 13, 2022

⌛ Testing commit c16c453 with merge e7507d6...

@bors
Copy link
Contributor

bors commented Jun 13, 2022

☀️ Test successful - checks-actions
Approved by: oli-obk
Pushing e7507d6 to master...

@bors bors merged commit e7507d6 into rust-lang:master Jun 13, 2022
@RalfJung RalfJung deleted the ui_test_parallelism branch June 16, 2022 17:56
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.

ui_test parallelism does not work as expected
3 participants