Skip to content

Commit 9d6dcc5

Browse files
authored
Rollup merge of #154751 - Zalathar:rfail, r=wesleywiser
compiletest: Remove `rfail` support from incremental tests Incremental revisions beginning with `rfail` would cause the incremental test runner to build the test program, expecting success, and then run the test program, expecting failure. Expecting incremental tests to fail at runtime is of questionable utility, because in almost all cases an equivalent test program can be made to succeed at runtime instead. Removing `rfail` support is a small step towards cleaning up compiletest's incremental test runner, and its overall handling of pass/fail expectations. There was one existing regression test using `rfail` revisions: `tests/incremental/issue-80691-bad-eval-cache.rs`. The test code is complex, and reverting the fix in rust-lang/rust#83220 does not actually cause the test to fail, suggesting that it is no longer a useful regression test. This PR therefore deletes that test. (An earlier draft of this PR ported the test to run-make, but now it has been removed entirely.)
2 parents 17d8cbf + db5c82c commit 9d6dcc5

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

src/tests/compiletest.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,9 +158,9 @@ then runs the compiler for each revision, reusing the incremental results from p
158158

159159
The revisions should start with:
160160

161-
* `rpass` — the test should compile and run successfully
162-
* `rfail` — the test should compile successfully, but the executable should fail to run
163161
* `cfail` — the test should fail to compile
162+
* `cpass` — the test should compile successully
163+
* `rpass` — the test should compile and run successfully
164164

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

0 commit comments

Comments
 (0)