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

Teach compiletest to ignore platform triples #67334

Merged
merged 2 commits into from
Dec 29, 2019

Conversation

estebank
Copy link
Contributor

@estebank estebank commented Dec 15, 2019

The UI tests are written assuming --remap-path-prefix is not used (remap-debuginfo in config.toml). The consequence is that the error messages may include paths and snippets into the standard library. When remap-debuginfo is enabled, these messages change in format and structure because rustc will not show paths and snippets into the standard library.

This normally isn't a problem for the "main" platforms (linux/macos/windows), because the CI infrastructure is set up so that the tests run without remap-debuginfo, but the dist artifacts are built separately with remap-debuginfo enabled. However, some of the lower-tier platforms perform both tests and distribution in a single step with remap-debuginfo enabled. This also affects developers and distributors who use remap-debuginfo.

To sidestep this problem, we add a way to ignore tests in specific platform triples, and update the overly broad ignore-x86 rule in affected tests.

Address #46948, #54546, #53081.

@rust-highfive
Copy link
Collaborator

r? @nikomatsakis

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 15, 2019
@estebank
Copy link
Contributor Author

As (I think) we don't have a way to run the entire test suite for all platforms outside of r+ing, we might need a couple of back and forth tweaking the triple ignore list to get this right.

@nikomatsakis
Copy link
Contributor

@bors r+

This seems strictly better than the current situation, though ignoring tests always gives me a bad feeling.

I wonder @estebank if there would be some way to pass a -Z flag to suppress the "remap-path-prefix" sort of behavior? I guess not easily.

@bors
Copy link
Contributor

bors commented Dec 17, 2019

📌 Commit f772d87 has been approved by nikomatsakis

@bors
Copy link
Contributor

bors commented Dec 17, 2019

🌲 The tree is currently closed for pull requests below priority 100, this pull request will be tested once the tree is reopened

@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 17, 2019
@estebank
Copy link
Contributor Author

I believe that turning the remap would actually make things worse, I'm afraid.

Centril added a commit to Centril/rust that referenced this pull request Dec 20, 2019
Teach `compiletest` to ignore platform triples

The UI tests are written assuming `--remap-path-prefix` is *not used* (`remap-debuginfo` in `config.toml`). The consequence is that the error messages may include paths and snippets into the standard library. When `remap-debuginfo` is enabled, these messages change in format and structure because `rustc` will not show paths and snippets into the standard library.

This normally isn't a problem for the "main" platforms (linux/macos/windows), because the CI infrastructure is set up so that the tests run without `remap-debuginfo`, but the `dist` artifacts are built separately with `remap-debuginfo` enabled. However, some of the lower-tier platforms perform both tests and distribution in a single step with `remap-debuginfo` enabled. This also affects developers and distributors who use `remap-debuginfo`.

To sidestep this problem, we add a way to ignore tests in specific platform triples, and update the overly broad `ignore-x86` rule in affected tests.

Address rust-lang#46948, rust-lang#54546, rust-lang#53081.
@Centril
Copy link
Contributor

Centril commented Dec 20, 2019

Failed in #67451 (comment), @bors r- rollup=never p=1

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 20, 2019
@bors
Copy link
Contributor

bors commented Dec 21, 2019

☔ The latest upstream changes (presumably #67464) made this pull request unmergeable. Please resolve the merge conflicts.

@RalfJung
Copy link
Member

#67580 adds another of these ignore-x86.

@estebank
Copy link
Contributor Author

@bors r=nikomatsakis rollup=never

@bors
Copy link
Contributor

bors commented Dec 28, 2019

📌 Commit 894a7da4b0f1c547d286a65a1b934c9335dbd0e6 has been approved by nikomatsakis

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 28, 2019
@bors
Copy link
Contributor

bors commented Dec 28, 2019

🔒 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 ignore-triple (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 ignore-triple --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 src/test/ui/async-await/issues/issue-62009-1.stderr
CONFLICT (content): Merge conflict in src/test/ui/async-await/issues/issue-62009-1.stderr
Automatic merge failed; fix conflicts and then commit the result.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 28, 2019
@bors
Copy link
Contributor

bors commented Dec 28, 2019

☔ The latest upstream changes (presumably #67670) made this pull request unmergeable. Please resolve the merge conflicts.

@estebank
Copy link
Contributor Author

@bors r=nikomatsakis

@bors
Copy link
Contributor

bors commented Dec 28, 2019

📌 Commit 90bf0d2 has been approved by nikomatsakis

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 28, 2019
@bors
Copy link
Contributor

bors commented Dec 28, 2019

⌛ Testing commit 90bf0d2 with merge 00fc203...

bors added a commit that referenced this pull request Dec 28, 2019
Teach `compiletest` to ignore platform triples

The UI tests are written assuming `--remap-path-prefix` is *not used* (`remap-debuginfo` in `config.toml`). The consequence is that the error messages may include paths and snippets into the standard library. When `remap-debuginfo` is enabled, these messages change in format and structure because `rustc` will not show paths and snippets into the standard library.

This normally isn't a problem for the "main" platforms (linux/macos/windows), because the CI infrastructure is set up so that the tests run without `remap-debuginfo`, but the `dist` artifacts are built separately with `remap-debuginfo` enabled. However, some of the lower-tier platforms perform both tests and distribution in a single step with `remap-debuginfo` enabled. This also affects developers and distributors who use `remap-debuginfo`.

To sidestep this problem, we add a way to ignore tests in specific platform triples, and update the overly broad `ignore-x86` rule in affected tests.

Address #46948, #54546, #53081.
@bors
Copy link
Contributor

bors commented Dec 29, 2019

☀️ Test successful - checks-azure
Approved by: nikomatsakis
Pushing 00fc203 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 29, 2019
@bors bors merged commit 90bf0d2 into rust-lang:master Dec 29, 2019
@estebank estebank deleted the ignore-triple branch November 9, 2023 05:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

6 participants