-
Notifications
You must be signed in to change notification settings - Fork 12.7k
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
Conversation
(rust_highfive has picked a reviewer for you, use r? to override) |
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. |
23d9001
to
f772d87
Compare
📌 Commit f772d87 has been approved by |
🌲 The tree is currently closed for pull requests below priority 100, this pull request will be tested once the tree is reopened |
I believe that turning the remap would actually make things worse, I'm afraid. |
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.
Failed in #67451 (comment), @bors r- rollup=never p=1 |
☔ The latest upstream changes (presumably #67464) made this pull request unmergeable. Please resolve the merge conflicts. |
#67580 adds another of these |
f772d87
to
894a7da
Compare
@bors r=nikomatsakis rollup=never |
📌 Commit 894a7da4b0f1c547d286a65a1b934c9335dbd0e6 has been approved by |
🔒 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
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 Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Error message
|
☔ The latest upstream changes (presumably #67670) made this pull request unmergeable. Please resolve the merge conflicts. |
894a7da
to
90bf0d2
Compare
@bors r=nikomatsakis |
📌 Commit 90bf0d2 has been approved by |
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.
☀️ Test successful - checks-azure |
The UI tests are written assuming
--remap-path-prefix
is not used (remap-debuginfo
inconfig.toml
). The consequence is that the error messages may include paths and snippets into the standard library. Whenremap-debuginfo
is enabled, these messages change in format and structure becauserustc
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 thedist
artifacts are built separately withremap-debuginfo
enabled. However, some of the lower-tier platforms perform both tests and distribution in a single step withremap-debuginfo
enabled. This also affects developers and distributors who useremap-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.