Skip to content

Commit 35c7bdf

Browse files
jhprattjhpratt
authored
Rollup merge of #155589 - Zalathar:cpass, r=jieyouxu
Forbid `check-pass`/`build-pass`/`run-pass` directives in incremental tests - Follow-up to rust-lang/rust#155474 --- This PR forbids the use of `//@ check-pass`, `//@ build-pass`, and `//@ run-pass` directives in incremental tests. Tests that would have used those directives should use a revision name beginning with `cpass`/`bpass`/`rpass` instead. (The `*-fail` directives are already forbidden in incremental tests.) Existing incremental tests that used the `check-pass` and `build-pass` directives have been migrated. To allow migration of the check-pass tests, this PR also adds support for revision names beginning with `cpass`. No incremental tests were using `run-pass`. --- Several of the migrated `build-pass` tests have a FIXME indicating that they could potentially be migrated to `check-pass` instead. This PR does not perform that migration. In the future, I intend to do more cleanup of how compiletest handles pass/fail expectations, but I didn't want to cram too much into one PR. r? jieyouxu
2 parents 619c27b + c4efcbe commit 35c7bdf

2 files changed

Lines changed: 11 additions & 10 deletions

File tree

‎src/tests/compiletest.md‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -156,11 +156,12 @@ series of steps.
156156
Compiletest starts with an empty directory with the `-C incremental` flag, and
157157
then runs the compiler for each revision, reusing the incremental results from previous steps.
158158

159-
The revisions should start with:
159+
Each revision name must start with one of:
160160

161-
* `bfail` — the test should fail to compile
162-
* `bpass` — the test should compile successully
163-
* `rpass` — the test should compile and run successfully
161+
* `cpass` - the test must compile successfully (check build, no codegen)
162+
* `bfail` — the test must fail to compile (full build, with codegen)
163+
* `bpass` — the test must compile successully (full build, with codegen)
164+
* `rpass` — the test must compile and run successfully
164165

165166
To make the revisions unique, you should add a suffix like `rpass1` and `rpass2`.
166167

‎src/tests/directives.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,11 @@ See [Controlling pass/fail expectations](ui.md#controlling-passfail-expectations
7070

7171
| Directive | Explanation | Supported test suites | Possible values |
7272
|-----------------------------|---------------------------------------------|-------------------------------------------|-----------------|
73-
| `check-pass` | Building (no codegen) should pass | `ui`, `crashes`, `incremental` | N/A |
73+
| `check-pass` | Building (no codegen) should pass | `ui`, `crashes` | N/A |
7474
| `check-fail` | Building (no codegen) should fail | `ui`, `crashes` | N/A |
75-
| `build-pass` | Building should pass | `ui`, `crashes`, `codegen`, `incremental` | N/A |
75+
| `build-pass` | Building should pass | `ui`, `crashes`, `codegen` | N/A |
7676
| `build-fail` | Building should fail | `ui`, `crashes` | N/A |
77-
| `run-pass` | Program must exit with code `0` | `ui`, `crashes`, `incremental` | N/A |
77+
| `run-pass` | Program must exit with code `0` | `ui`, `crashes` | N/A |
7878
| `run-fail` | Program must exit with code `1..=127` | `ui`, `crashes` | N/A |
7979
| `run-crash` | Program must crash | `ui` | N/A |
8080
| `run-fail-or-crash` | Program must `run-fail` or `run-crash` | `ui` | N/A |
@@ -90,9 +90,9 @@ comparison](ui.md#output-comparison) and [Rustfix tests](ui.md#rustfix-tests) fo
9090

9191
| Directive | Explanation | Supported test suites | Possible values |
9292
|-----------------------------------|--------------------------------------------------------------------------------------------------------------------------|----------------------------------------------|-----------------------------------------------------------------------------------------|
93-
| `check-run-results` | Check run test binary `run-{pass,fail}` output snapshot | `ui`, `crashes`, `incremental` if `run-pass` | N/A |
94-
| `error-pattern` | Check that output contains a specific string | `ui`, `crashes`, `incremental` if `run-pass` | String |
95-
| `regex-error-pattern` | Check that output contains a regex pattern | `ui`, `crashes`, `incremental` if `run-pass` | Regex |
93+
| `check-run-results` | Check run test binary `run-{pass,fail}` output snapshot | `ui`, `crashes`, `incremental` | N/A |
94+
| `error-pattern` | Check that output contains a specific string | `ui`, `crashes`, `incremental` | String |
95+
| `regex-error-pattern` | Check that output contains a regex pattern | `ui`, `crashes`, `incremental` | Regex |
9696
| `check-stdout` | Check `stdout` against `error-pattern`s from running test binary[^check_stdout] | `ui`, `crashes`, `incremental` | N/A |
9797
| `normalize-stderr-32bit` | Normalize actual stderr (for 32-bit platforms) with a rule `"<raw>" -> "<normalized>"` before comparing against snapshot | `ui`, `incremental` | `"<RAW>" -> "<NORMALIZED>"`, `<RAW>`/`<NORMALIZED>` is regex capture and replace syntax |
9898
| `normalize-stderr-64bit` | Normalize actual stderr (for 64-bit platforms) with a rule `"<raw>" -> "<normalized>"` before comparing against snapshot | `ui`, `incremental` | `"<RAW>" -> "<NORMALIZED>"`, `<RAW>`/`<NORMALIZED>` is regex capture and replace syntax |

0 commit comments

Comments
 (0)