Skip to content

Migrate stable-specific run-make tests to UI tests - #164802

Open
Kobzol wants to merge 5 commits into
rust-lang:mainfrom
Kobzol:stable-ui-tests
Open

Kobzol wants to merge 5 commits into
rust-lang:mainfrom
Kobzol:stable-ui-tests

Conversation

@Kobzol

@Kobzol Kobzol commented Oct 23, 2026 •

Copy link
Copy Markdown
Member

View all comments

Enabled by #163664.

I still kept the stable_bare_rustc function, as it could be genuinely useful (just not in the way it was used in run-make tests so far).

Should help unblock #162848.

Note that the comment for the unstable target feature test was wrong (#163428 (comment)).

r? jieyouxu

@rustbot rustbot added A-run-make Area: port run-make Makefiles to rmake.rs 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 Oct 23, 2026
@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

//@ needs-target-std
//@ ignore-backends: gcc

//@ normalize-stderr: "dev release channel" -> "nightly release channel"

@jieyouxu jieyouxu Oct 25, 2026 •

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.

Wait, do we actually need this normalization rule? That seems strange?

I don't think we need this for ui tests, run-make tests may have had to do their own channel normalizations, but ui tests should already have this done at a test suite level?

EDIT: apparently we do, I thought this was already normalized but it wasn't, which is curious 🤔

View changes since the review

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.

Oh, it's because only https://doc.rust-lang.org/error_codes/E0554.html mentions the actual channel in the diagnostics, intriguing.

@jieyouxu jieyouxu 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, you can r=me after addressing #164802 (comment).

View changes since this review

@jieyouxu

Copy link
Copy Markdown
Member

@bors r+ rollup

@rust-bors

rust-bors Bot commented Oct 25, 2026

Copy link
Copy Markdown
Contributor

📌 Commit ababbd4 has been approved by jieyouxu

It is now in the queue for this repository.

@rust-bors rust-bors Bot 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 Oct 25, 2026
jieyouxu added a commit to jieyouxu/rust that referenced this pull request Oct 25, 2026
Migrate stable-specific run-make tests to UI tests

Enabled by rust-lang#163664.

I still kept the `stable_bare_rustc` function, as it could be genuinely useful (just not in the way it was used in run-make tests so far).

Should help unblock rust-lang#162848.

Note that the comment for the unstable target feature test was wrong (rust-lang#163428 (comment)).

r? jieyouxu
rust-bors Bot pushed a commit that referenced this pull request Oct 25, 2026
Rollup of 12 pull requests

Successful merges:

 - #164834 (miri subtree update)
 - #164869 (rustc_codegen_gcc subtree update)
 - #157123 (library: optimize truncate method)
 - #159916 (Optimize `str.escape_default().to_string()`)
 - #164508 (ping me for layout invariant changes)
 - #164758 (Update dependency jinja2 to v3.1.6 [SECURITY])
 - #164802 (Migrate stable-specific run-make tests to UI tests)
 - #164836 (Add regression test for #162109)
 - #164857 (Do not checkout Cargo for bootstrap tests)
 - #164868 (Fix skipping library build with `--keep-stage[-std]`)
 - #164872 (cg_llvm: clarify Send / Sync story for modules)
 - #164881 (Add FIXME comments to `from_ascii_bytes_radix_impl`)
@jieyouxu

Copy link
Copy Markdown
Member

Hm, tests/ui/traits/const-traits/const-supertrait-unstable.rs#stable-enabled failed in #164885 (comment) because

10	LL | trait Bar: [const] Foo {}
11	   | ^^^^^^^^^^^^^^^^^^^^^^^^^
12	
-	error[E0554]: `#![feature]` may not be used on the nightly release channel
+	error[E0554]: `#![feature]` may not be used on the stable release channel
14	  --> $DIR/const-supertrait-unstable.rs:18:30
15	   |
16	LL | #![cfg_attr(feature_enabled, feature(const_trait_impl))]

LL | trait Bar: [const] Foo {}
| ^^^^^^^^^^^^^^^^^^^^^^^^^

error[E0554]: `#![feature]` may not be used on the nightly release channel

@jieyouxu jieyouxu Oct 25, 2026 •

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.

This would be wrong / produce the diff as nightly because we pipe the release channel to the diagnostics 🤔 In some sense it's orthogonal to whether #![feature] can be used when we //@ act-as-stable

View changes since the review

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Yeah, you can still have "stable-like" behavior, even though the actual channel string is whatever.

@jieyouxu

Copy link
Copy Markdown
Member

@bors r-

@rust-bors rust-bors Bot 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 Oct 25, 2026
@rust-bors

rust-bors Bot commented Oct 25, 2026

Copy link
Copy Markdown
Contributor

This pull request was unapproved.

View changes since this unapproval

@Kobzol

Kobzol commented Oct 25, 2026

Copy link
Copy Markdown
Member Author

@bors try jobs=test-x86_64-gnu-stable

@rust-bors

This comment has been minimized.

rust-bors Bot pushed a commit that referenced this pull request Oct 25, 2026
Migrate stable-specific run-make tests to UI tests


try-job: test-x86_64-gnu-stable
@rust-log-analyzer

This comment has been minimized.

@rust-bors

rust-bors Bot commented Oct 25, 2026

Copy link
Copy Markdown
Contributor

💔 Test for 106dc8e failed: CI. Failed job:

@rust-log-analyzer

This comment has been minimized.

@Kobzol

Kobzol commented Oct 25, 2026

Copy link
Copy Markdown
Member Author

@bors try jobs=test-x86_64-gnu-stable

@rust-bors

This comment has been minimized.

rust-bors Bot pushed a commit that referenced this pull request Oct 25, 2026
Migrate stable-specific run-make tests to UI tests


try-job: test-x86_64-gnu-stable
@rust-bors

rust-bors Bot commented Oct 25, 2026

Copy link
Copy Markdown
Contributor

☀️ Try build successful (CI)
Build commit: c2114dd (c2114ddd52e91d424130ca9501e2b9511f3798bb)
Base parent: dc44e7f (dc44e7f2c436b6041742e138b9c2176f093196d5)

@Kobzol

Kobzol commented Oct 25, 2026

Copy link
Copy Markdown
Member Author

The channel is hardcoded into the compiler binary, so unless we add some testing only dynamic override, we likely can't normalize much better than just turning stable and dev into nightly.. So I think that's good enough for now.

@bors r=jieyouxu

@rust-bors

rust-bors Bot commented Oct 25, 2026

Copy link
Copy Markdown
Contributor

📌 Commit cbdd3f3 has been approved by jieyouxu

It is now in the queue for this repository.

🌲 The tree is currently closed for pull requests below priority 5. This pull request will be tested once the tree is reopened.

Reason for tree closure: test-aarch64-apple-macos-26-2 out of disk space

@rust-bors rust-bors Bot 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 Oct 25, 2026
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Oct 25, 2026
Migrate stable-specific run-make tests to UI tests

Enabled by rust-lang#163664.

I still kept the `stable_bare_rustc` function, as it could be genuinely useful (just not in the way it was used in run-make tests so far).

Should help unblock rust-lang#162848.

Note that the comment for the unstable target feature test was wrong (rust-lang#163428 (comment)).

r? jieyouxu
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Oct 25, 2026
Migrate stable-specific run-make tests to UI tests

Enabled by rust-lang#163664.

I still kept the `stable_bare_rustc` function, as it could be genuinely useful (just not in the way it was used in run-make tests so far).

Should help unblock rust-lang#162848.

Note that the comment for the unstable target feature test was wrong (rust-lang#163428 (comment)).

r? jieyouxu
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Oct 25, 2026
Migrate stable-specific run-make tests to UI tests

Enabled by rust-lang#163664.

I still kept the `stable_bare_rustc` function, as it could be genuinely useful (just not in the way it was used in run-make tests so far).

Should help unblock rust-lang#162848.

Note that the comment for the unstable target feature test was wrong (rust-lang#163428 (comment)).

r? jieyouxu

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-run-make Area: port run-make Makefiles to rmake.rs 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.

4 participants