diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2025-02-17 06:38:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-02-17 06:38:15 +0100 |
| commit | 7cae8e1f5090b37ba8a0fb09799bfc8a993ea6c9 (patch) | |
| tree | 931b4f9b2158ff7efac42f85e4da58c4b84a3351 | |
| parent | fae72a07dd43775e39d94698c165f9a007115172 (diff) | |
| parent | 95a5ecc995f031478708c6c654a196197e71ba20 (diff) | |
| download | rust-7cae8e1f5090b37ba8a0fb09799bfc8a993ea6c9.tar.gz rust-7cae8e1f5090b37ba8a0fb09799bfc8a993ea6c9.zip | |
Rollup merge of #137120 - ChrisDenton:its-all-relative, r=GuillaumeGomez
Enable `relative-path-include-bytes-132203` rustdoc-ui test on Windows The problem with the error message on Windows is: - The path separators are different - The OS error message string is different Normalizing those two things makes the test pass on Windows.
| -rw-r--r-- | tests/rustdoc-ui/doctest/relative-path-include-bytes-132203.edition2015.stdout | 2 | ||||
| -rw-r--r-- | tests/rustdoc-ui/doctest/relative-path-include-bytes-132203.rs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/rustdoc-ui/doctest/relative-path-include-bytes-132203.edition2015.stdout b/tests/rustdoc-ui/doctest/relative-path-include-bytes-132203.edition2015.stdout index ca6e7750264..13e142df837 100644 --- a/tests/rustdoc-ui/doctest/relative-path-include-bytes-132203.edition2015.stdout +++ b/tests/rustdoc-ui/doctest/relative-path-include-bytes-132203.edition2015.stdout @@ -5,7 +5,7 @@ test $DIR/relative-path-include-bytes-132203.rs - (line 18) ... FAILED failures: ---- $DIR/relative-path-include-bytes-132203.rs - (line 18) stdout ---- -error: couldn't read `$DIR/relative-dir-empty-file`: No such file or directory (os error 2) +error: couldn't read `$DIR/relative-dir-empty-file`: $FILE_NOT_FOUND_MSG (os error 2) --> $DIR/relative-path-include-bytes-132203.rs:19:9 | LL | let x = include_bytes!("relative-dir-empty-file"); diff --git a/tests/rustdoc-ui/doctest/relative-path-include-bytes-132203.rs b/tests/rustdoc-ui/doctest/relative-path-include-bytes-132203.rs index 6fddaa49fac..ceacd69a5fd 100644 --- a/tests/rustdoc-ui/doctest/relative-path-include-bytes-132203.rs +++ b/tests/rustdoc-ui/doctest/relative-path-include-bytes-132203.rs @@ -1,4 +1,3 @@ -//@ ignore-windows different error message //@ revisions: edition2015 edition2024 //@[edition2015]edition:2015 //@[edition2015]check-fail @@ -7,8 +6,9 @@ //@[edition2024]edition:2024 //@[edition2024]check-pass //@[edition2024]compile-flags:--test --test-args=--test-threads=1 -//@ normalize-stdout: "tests/rustdoc-ui/doctest" -> "$$DIR" +//@ normalize-stdout: "tests.rustdoc-ui.doctest." -> "$$DIR/" //@ normalize-stdout: "finished in \d+\.\d+s" -> "finished in $$TIME" +//@ normalize-stdout: "`: .* \(os error 2\)" -> "`: $$FILE_NOT_FOUND_MSG (os error 2)" // https://github.com/rust-lang/rust/issues/132203 // This version, because it's edition2024, passes thanks to the new |