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

Take revision into account in non-incremental-mode // incremental tests #106053

Merged
merged 1 commit into from
Dec 23, 2022

Conversation

compiler-errors
Copy link
Member

A UI test I added in #105983 confusingly failed in a merge because two different revisions raced with each other for the same incremental directory for a (non-incremental-mode, i.e. src/test/ui) UI test.

Let's take the revision name into account when generating an incremental directory so that other UI tests that combine // incremental and // revisions won't race and cause possible flakiness in CI.

@rustbot
Copy link
Collaborator

rustbot commented Dec 22, 2022

r? @Mark-Simulacrum

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

@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 22, 2022
@Mark-Simulacrum
Copy link
Member

@bors r+ rollup=iffy

@bors
Copy link
Contributor

bors commented Dec 23, 2022

📌 Commit f38bf53 has been approved by Mark-Simulacrum

It is now in the queue for this repository.

@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 Dec 23, 2022
@bors
Copy link
Contributor

bors commented Dec 23, 2022

⌛ Testing commit f38bf53 with merge 62cc869...

@bors
Copy link
Contributor

bors commented Dec 23, 2022

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing 62cc869 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 23, 2022
@bors bors merged commit 62cc869 into rust-lang:master Dec 23, 2022
@rustbot rustbot added this to the 1.68.0 milestone Dec 23, 2022
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (62cc869): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

This benchmark run did not return any relevant results for this metric.

Cycles

This benchmark run did not return any relevant results for this metric.

Aaron1011 pushed a commit to Aaron1011/rust that referenced this pull request Jan 6, 2023
…r=Mark-Simulacrum

Take revision into account in non-incremental-mode `// incremental` tests

A UI test I added in rust-lang#105983 confusingly [failed](rust-lang#106031 (comment)) in a merge because two different revisions raced with each other for the same incremental directory for a (non-incremental-mode, i.e. `src/test/ui`) UI test.

Let's take the revision name into account when generating an incremental directory so that other UI tests that combine `// incremental` and `// revisions` won't race and cause possible flakiness in CI.
@compiler-errors compiler-errors deleted the incr-test-revision branch August 11, 2023 20:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants