diff options
| author | Stuart Cook <Zalathar@users.noreply.github.com> | 2024-12-28 20:32:43 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-28 17:32:43 +0800 |
| commit | dec978fb3b5d8045934a2f95fced2d6816876db2 (patch) | |
| tree | dfd3f4afdd7843844fcf6c46ee6840df8c088d15 /src/doc/rustc-dev-guide | |
| parent | 1289e54d588047e1ce1e22cf0fa7e41de2e6068b (diff) | |
| download | rust-dec978fb3b5d8045934a2f95fced2d6816876db2.tar.gz rust-dec978fb3b5d8045934a2f95fced2d6816876db2.zip | |
Remove the `-test` suffix from normalize directives (#2172)
Diffstat (limited to 'src/doc/rustc-dev-guide')
| -rw-r--r-- | src/doc/rustc-dev-guide/src/tests/directives.md | 4 | ||||
| -rw-r--r-- | src/doc/rustc-dev-guide/src/tests/ui.md | 8 |
2 files changed, 4 insertions, 8 deletions
diff --git a/src/doc/rustc-dev-guide/src/tests/directives.md b/src/doc/rustc-dev-guide/src/tests/directives.md index 20c242fc0e7..b0527da7bf5 100644 --- a/src/doc/rustc-dev-guide/src/tests/directives.md +++ b/src/doc/rustc-dev-guide/src/tests/directives.md @@ -96,8 +96,8 @@ for more details. | `check-stdout` | Check `stdout` against `error-pattern`s from running test binary[^check_stdout] | `ui`, `crashes`, `incremental` | N/A | | `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 | | `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 | -| `normalize-stderr-test` | Normalize actual stderr with a rule `"<raw>" -> "<normalized>"` before comparing against snapshot | `ui`, `incremental` | `"<RAW>" -> "<NORMALIZED>"`, `<RAW>`/`<NORMALIZED>` is regex capture and replace syntax | -| `normalize-stdout-test` | Normalize actual stdout with a rule `"<raw>" -> "<normalized>"` before comparing against snapshot | `ui`, `incremental` | `"<RAW>" -> "<NORMALIZED>"`, `<RAW>`/`<NORMALIZED>` is regex capture and replace syntax | +| `normalize-stderr` | Normalize actual stderr with a rule `"<raw>" -> "<normalized>"` before comparing against snapshot | `ui`, `incremental` | `"<RAW>" -> "<NORMALIZED>"`, `<RAW>`/`<NORMALIZED>` is regex capture and replace syntax | +| `normalize-stdout` | Normalize actual stdout with a rule `"<raw>" -> "<normalized>"` before comparing against snapshot | `ui`, `incremental` | `"<RAW>" -> "<NORMALIZED>"`, `<RAW>`/`<NORMALIZED>` is regex capture and replace syntax | | `dont-check-compiler-stderr` | Don't check actual compiler stderr vs stderr snapshot | `ui` | N/A | | `dont-check-compiler-stdout` | Don't check actual compiler stdout vs stdout snapshot | `ui` | N/A | | `run-rustfix` | Apply all suggestions via `rustfix`, snapshot fixed output, and check fixed output builds | `ui` | N/A | diff --git a/src/doc/rustc-dev-guide/src/tests/ui.md b/src/doc/rustc-dev-guide/src/tests/ui.md index 0516c47fc6d..c8536b0045c 100644 --- a/src/doc/rustc-dev-guide/src/tests/ui.md +++ b/src/doc/rustc-dev-guide/src/tests/ui.md @@ -140,7 +140,8 @@ Sometimes these built-in normalizations are not enough. In such cases, you may provide custom normalization rules using `normalize-*` directives, e.g. ```rust,ignore -//@ normalize-stdout-test: "foo" -> "bar" +//@ normalize-stdout: "foo" -> "bar" +//@ normalize-stderr: "foo" -> "bar" //@ normalize-stderr-32bit: "fn\(\) \(32 bits\)" -> "fn\(\) \($$PTR bits\)" //@ normalize-stderr-64bit: "fn\(\) \(64 bits\)" -> "fn\(\) \($$PTR bits\)" ``` @@ -167,11 +168,6 @@ usage example. [mrs]: https://github.com/rust-lang/rust/blob/master/tests/ui/transmute/main.rs [`main.stderr`]: https://github.com/rust-lang/rust/blob/master/tests/ui/transmute/main.stderr -Besides `normalize-stderr-32bit` and `-64bit`, one may use any target -information or stage supported by [`ignore-X`](directives.md#ignoring-tests) here -as well (e.g. `normalize-stderr-windows` or simply `normalize-stderr-test` for -unconditional replacement). - ## Error annotations Error annotations specify the errors that the compiler is expected to emit. They |