Skip to content

Relax framework linking test#123410

Merged
bors merged 1 commit into
rust-lang:masterfrom
madsmtm:relax-framework-linking-test
Apr 7, 2024
Merged

Relax framework linking test#123410
bors merged 1 commit into
rust-lang:masterfrom
madsmtm:relax-framework-linking-test

Conversation

@madsmtm

@madsmtm madsmtm commented Apr 3, 2024

Copy link
Copy Markdown
Contributor

This test was introduced by myself in #118644, but was over-specified in that it assumed the path of the linker was always cc, which causes a test failure for Chromium.

@rustbot

rustbot commented Apr 3, 2024

Copy link
Copy Markdown
Collaborator

r? @fmease

rustbot has assigned @fmease.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Apr 3, 2024
@bjorn3

bjorn3 commented Apr 4, 2024

Copy link
Copy Markdown
Member

You can't just omit part of the stderr file. Compiletest tests that the stderr of rustc exactly matches the file. You will have to do normalization to replace part of the stderr with a fixed string. As an example of output normalization see

//@ normalize-stderr-test: "(lib)?crateresolve1-([123])\.[a-z]+" -> "libcrateresolve1-$2.somelib"

@madsmtm

madsmtm commented Apr 4, 2024

Copy link
Copy Markdown
Contributor Author

Yes you can, because of the //@ compare-output-lines-by-subset directive (which in turn is used exactly because this test is so flaky, and because the linker output sometimes contain unrelated warnings).

@bjorn3

bjorn3 commented Apr 4, 2024

Copy link
Copy Markdown
Member

I didn't know that annotation existed.

Comment thread tests/ui/linkage-attr/framework.omit.stderr
@fmease fmease 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-review Status: Awaiting review from the assignee but also interested parties. labels Apr 5, 2024
This test was introduced in rust-lang#118644, but was over-specified in that it assumed the path of the linker was always `cc`.
@madsmtm madsmtm force-pushed the relax-framework-linking-test branch from dfd40be to de21296 Compare April 6, 2024 07:00

@fmease fmease left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thanks!

@fmease

fmease commented Apr 7, 2024

Copy link
Copy Markdown
Member

@bors r+ rollup

@bors

bors commented Apr 7, 2024

Copy link
Copy Markdown
Collaborator

📌 Commit de21296 has been approved by fmease

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 7, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 7, 2024
…iaskrgr

Rollup of 4 pull requests

Successful merges:

 - rust-lang#123410 (Relax framework linking test)
 - rust-lang#123446 (Fix incorrect 'llvm_target' value used on watchOS target)
 - rust-lang#123579 (add some more tests)
 - rust-lang#123581 (Add `f16` and `f128` to rustdoc's `PrimitiveType`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 4eef6e3 into rust-lang:master Apr 7, 2024
@rustbot rustbot added this to the 1.79.0 milestone Apr 7, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Apr 7, 2024
Rollup merge of rust-lang#123410 - madsmtm:relax-framework-linking-test, r=fmease

Relax framework linking test

This test was introduced by myself in rust-lang#118644, but was over-specified in that it assumed the path of the linker was always `cc`, which [causes a test failure for Chromium](https://issues.chromium.org/issues/332562251).
@madsmtm madsmtm deleted the relax-framework-linking-test branch April 16, 2024 17:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants