Files
rust/tests/ui
Matthias Krüger cfb7a56676 Rollup merge of #134528 - jieyouxu:fix-rustc-bootstrap-test, r=Kobzol
opt-dist: propagate channel info to bootstrap

Fixes #133503.

Previously, `tests/ui/bootstrap/rustc_bootstap.rs` [sic] failed during [beta bump](https://github.com/rust-lang/rust/pull/133447#issuecomment-2501298794) in opt-dist tests. This is because:

- `opt-dist` tried to run `./x test` against beta-channel dist `rustc` through `bootstrap`.
- The dist build produced during the beta bump produces a `rustc` which correctly thinks that it is a beta compiler based on `src/ci/channel` info.
- `opt-dist` tries to run `./x test` on the beta `rustc` from the dist build, but without specifying channel through a synthetic `config.toml`, so `bootstrap` tells `compiletest` that we're on the `nightly` channel (by default).
- Now there's a channel mismatch: `compiletest` believes the `rustc` under test is a *nightly* rustc, but the `rustc` under test actually considers itself a *beta* rustc. This means that `//@ only-nightly` will be satisfied yet the test will fail as the *beta* rustc is not a *nightly* rustc.

This PR:

- Fixes the test failure during beta bump (i.e. #133503) by having `opt-dist` faithfully report the channel of the dist `rustc` being tested (i.e. "beta" in a beta bump PR). This will properly make the test be ignored during beta bump as the `rustc` under test is not a *nightly* rustc.
- Fixes the test name `rustc_bootstap.rs` -> `rustc_bootstrap.rs`. No more stapping.
- Slightly adjusts the doc comment in the test to make it more clear.

I ran a try-job against the beta branch (explicitly running the opt-dist tests by modifying the job definition) with these changes in #134131, and it appears that the try-job was [successful](https://github.com/rust-lang/rust/pull/134131#issuecomment-2555492215). The two commits in this PR are cherry-picked from #134131, with the test commit slightly modified (to also adjust the test comments).

r? `@Kobzol` (or compiler or bootstrap or infra I guess?)
2024-12-23 14:44:21 +01:00
..
2024-12-12 23:36:27 +00:00
2024-07-18 00:00:04 +00:00
2024-12-18 16:05:44 +01:00
2024-12-15 19:36:35 -08:00
2024-12-10 11:20:19 +08:00
2024-12-12 23:36:27 +00:00
2024-12-18 16:35:06 +01:00
2024-12-21 17:01:36 +01:00
2024-12-12 23:36:27 +00:00
2024-12-12 23:36:27 +00:00
2024-12-12 23:36:27 +00:00
2024-11-03 18:59:31 +00:00
2024-09-05 06:37:38 -04:00
2024-12-16 14:59:10 -05:00
2024-10-30 16:47:47 -07:00
2024-12-13 00:04:56 +00:00
2024-12-13 14:18:41 -08:00
2024-10-30 16:47:47 -07:00
2024-12-12 23:36:27 +00:00
2024-12-12 23:36:27 +00:00
2024-12-13 00:04:56 +00:00
2024-11-16 20:03:31 +00:00
2024-12-12 23:36:27 +00:00
2024-08-18 19:46:53 +02:00
2024-12-21 03:02:07 +00:00
2024-08-03 07:57:31 -04:00
2024-12-10 11:34:13 +08:00
2024-12-08 20:21:46 +00:00
2024-12-13 00:04:56 +00:00
2024-12-12 23:36:27 +00:00
2024-12-17 15:17:28 +11:00
2024-11-07 18:18:34 -08:00
2024-11-02 03:08:04 +00:00
2024-12-16 14:59:10 -05:00
2024-12-07 22:18:51 +00:00
2024-12-12 16:29:40 +00:00
2024-12-06 16:42:09 -05:00
2024-12-12 23:36:27 +00:00
2024-10-28 14:20:28 +11:00
2024-10-28 14:20:28 +11:00
2024-12-02 03:43:50 -07:00
2024-06-25 18:06:22 +02:00
2024-10-30 16:47:47 -07:00

UI Tests

This folder contains rustc's UI tests.

Test Directives (Headers)

Typically, a UI test will have some test directives / headers which are special comments that tell compiletest how to build and interpret a test.

As part of an ongoing effort to rewrite compiletest (see https://github.com/rust-lang/compiler-team/issues/536), a major change proposal to change legacy compiletest-style headers // <directive> to ui_test-style headers //@ <directive> was accepted (see https://github.com/rust-lang/compiler-team/issues/512.

An example directive is ignore-test. In legacy compiletest style, the header would be written as

// ignore-test

but in ui_test style, the header would be written as

//@ ignore-test

compiletest is changed to accept only //@ directives for UI tests (currently), and will reject and report an error if it encounters any comments // <content> that may be parsed as a legacy compiletest-style test header. To fix this, you should migrate to the ui_test-style header //@ <content>.