Skip to content

Commit d575236

Browse files
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.
2 parents 0a867e6 + 95a5ecc commit d575236

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

tests/rustdoc-ui/doctest/relative-path-include-bytes-132203.edition2015.stdout

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ test $DIR/relative-path-include-bytes-132203.rs - (line 18) ... FAILED
55
failures:
66

77
---- $DIR/relative-path-include-bytes-132203.rs - (line 18) stdout ----
8-
error: couldn't read `$DIR/relative-dir-empty-file`: No such file or directory (os error 2)
8+
error: couldn't read `$DIR/relative-dir-empty-file`: $FILE_NOT_FOUND_MSG (os error 2)
99
--> $DIR/relative-path-include-bytes-132203.rs:19:9
1010
|
1111
LL | let x = include_bytes!("relative-dir-empty-file");

tests/rustdoc-ui/doctest/relative-path-include-bytes-132203.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
//@ ignore-windows different error message
21
//@ revisions: edition2015 edition2024
32
//@[edition2015]edition:2015
43
//@[edition2015]check-fail
@@ -7,8 +6,9 @@
76
//@[edition2024]edition:2024
87
//@[edition2024]check-pass
98
//@[edition2024]compile-flags:--test --test-args=--test-threads=1
10-
//@ normalize-stdout: "tests/rustdoc-ui/doctest" -> "$$DIR"
9+
//@ normalize-stdout: "tests.rustdoc-ui.doctest." -> "$$DIR/"
1110
//@ normalize-stdout: "finished in \d+\.\d+s" -> "finished in $$TIME"
11+
//@ normalize-stdout: "`: .* \(os error 2\)" -> "`: $$FILE_NOT_FOUND_MSG (os error 2)"
1212

1313
// https://github.com/rust-lang/rust/issues/132203
1414
// This version, because it's edition2024, passes thanks to the new

0 commit comments

Comments
 (0)