Skip to content

Commit cd1d0bc

Browse files
TimNNTimNN
committed
ui tests: Remap test base directory by default.
1 parent 10fe7bf commit cd1d0bc

13 files changed

+52
-53
lines changed

‎src/tools/compiletest/src/header.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,9 @@ impl TestProps {
278278
/// `//[foo]`), then the property is ignored unless `cfg` is
279279
/// `Some("foo")`.
280280
fn load_from(&mut self, testfile: &Path, cfg: Option<&str>, config: &Config) {
281+
// Mode-dependent defaults.
282+
self.remap_src_base = config.mode == Mode::Ui && !config.suite.contains("rustdoc");
283+
281284
let mut has_edition = false;
282285
if !testfile.is_dir() {
283286
let file = File::open(testfile).unwrap();

‎tests/ui-fulldeps/mod_dir_path_canonicalized.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// Testing that a librustc_ast can parse modules with canonicalized base path
33
// ignore-cross-compile
44
// ignore-remote
5+
// no-remap-src-base: Reading `file!()` (expectedly) fails when enabled.
56

67
#![feature(rustc_private)]
78

‎tests/ui/errors/auxiliary/remapped_dep.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
// compile-flags: --remap-path-prefix={{src-base}}/errors/auxiliary=remapped-aux
2+
// no-remap-src-base: Manually remap, so the remapped path remains in .stderr file.
23

34
pub struct SomeStruct {} // This line should be show as part of the error.

‎tests/ui/errors/remap-path-prefix-reverse.local-self.stderr

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
error[E0423]: expected value, found struct `remapped_dep::SomeStruct`
2-
--> $DIR/remap-path-prefix-reverse.rs:22:13
2+
--> $DIR/remap-path-prefix-reverse.rs:16:13
33
|
4-
LL | let _ = remapped_dep::SomeStruct;
4+
LL | let _ = remapped_dep::SomeStruct; // ~ERROR E0423
55
| ^^^^^^^^^^^^^^^^^^^^^^^^ help: use struct literal syntax instead: `remapped_dep::SomeStruct {}`
66
|
7-
::: remapped-aux/remapped_dep.rs:3:1
7+
::: remapped-aux/remapped_dep.rs:4:1
88
|
99
LL | pub struct SomeStruct {} // This line should be show as part of the error.
1010
| --------------------- `remapped_dep::SomeStruct` defined here

‎tests/ui/errors/remap-path-prefix-reverse.remapped-self.stderr

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
error[E0423]: expected value, found struct `remapped_dep::SomeStruct`
2-
--> remapped/errors/remap-path-prefix-reverse.rs:22:13
2+
--> $DIR/remap-path-prefix-reverse.rs:16:13
33
|
4-
LL | let _ = remapped_dep::SomeStruct;
4+
LL | let _ = remapped_dep::SomeStruct; // ~ERROR E0423
55
| ^^^^^^^^^^^^^^^^^^^^^^^^ help: use struct literal syntax instead: `remapped_dep::SomeStruct {}`
66
|
7-
::: remapped-aux/remapped_dep.rs:3:1
7+
::: remapped-aux/remapped_dep.rs:4:1
88
|
99
LL | pub struct SomeStruct {} // This line should be show as part of the error.
1010
| --------------------- `remapped_dep::SomeStruct` defined here

‎tests/ui/errors/remap-path-prefix-reverse.rs

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
11
// aux-build:remapped_dep.rs
22
// compile-flags: --remap-path-prefix={{src-base}}/errors/auxiliary=remapped-aux
33

4-
// The remapped paths are not normalized by compiletest.
5-
// normalize-stderr-test: "\\(errors)" -> "/$1"
6-
74
// revisions: local-self remapped-self
8-
// [remapped-self]compile-flags: --remap-path-prefix={{src-base}}=remapped
9-
10-
// The paths from `remapped-self` aren't recognized by compiletest, so we
11-
// cannot use line-specific patterns for the actual error.
12-
// error-pattern: E0423
5+
// [local-self] no-remap-src-base: The hack should work regardless of remapping.
6+
// [remapped-self] remap-src-base
137

148
// Verify that the expected source code is shown.
159
// error-pattern: pub struct SomeStruct {} // This line should be show
@@ -19,5 +13,5 @@ extern crate remapped_dep;
1913
fn main() {
2014
// The actual error is irrelevant. The important part it that is should show
2115
// a snippet of the dependency's source.
22-
let _ = remapped_dep::SomeStruct;
16+
let _ = remapped_dep::SomeStruct; // ~ERROR E0423
2317
}

‎tests/ui/errors/remap-path-prefix.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// compile-flags: --remap-path-prefix={{src-base}}=remapped
2+
// no-remap-src-base: Manually remap, so the remapped path remains in .stderr file.
23

34
// The remapped paths are not normalized by compiletest.
45
// normalize-stderr-test: "\\(errors)" -> "/$1"

‎tests/ui/errors/remap-path-prefix.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0425]: cannot find value `ferris` in this scope
2-
--> remapped/errors/remap-path-prefix.rs:15:5
2+
--> remapped/errors/remap-path-prefix.rs:16:5
33
|
44
LL | ferris
55
| ^^^^^^ not found in this scope

‎tests/ui/proc-macro/expand-expr.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
// aux-build:expand-expr.rs
2+
// no-remap-src-base: check_expand_expr_file!() fails when enabled.
3+
24
#![feature(concat_bytes)]
35
extern crate expand_expr;
46

@@ -8,7 +10,7 @@ use expand_expr::{
810

911
// Check builtin macros can be expanded.
1012

11-
expand_expr_is!(11u32, line!());
13+
expand_expr_is!(13u32, line!());
1214
expand_expr_is!(24u32, column!());
1315

1416
expand_expr_is!("Hello, World!", concat!("Hello, ", "World", "!"));

‎tests/ui/proc-macro/expand-expr.stderr

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
error: expected one of `.`, `?`, or an operator, found `;`
2-
--> $DIR/expand-expr.rs:106:27
2+
--> $DIR/expand-expr.rs:108:27
33
|
44
LL | expand_expr_fail!("string"; hello);
55
| ^ expected one of `.`, `?`, or an operator
66

77
error: expected expression, found `$`
8-
--> $DIR/expand-expr.rs:109:19
8+
--> $DIR/expand-expr.rs:111:19
99
|
1010
LL | expand_expr_fail!($);
1111
| ^ expected expression
1212

1313
error: expected expression, found `$`
14-
--> $DIR/expand-expr.rs:38:23
14+
--> $DIR/expand-expr.rs:40:23
1515
|
1616
LL | ($($t:tt)*) => { $($t)* };
1717
| ^^^^ expected expression
1818

1919
error: expected expression, found `$`
20-
--> $DIR/expand-expr.rs:111:28
20+
--> $DIR/expand-expr.rs:113:28
2121
|
2222
LL | expand_expr_fail!(echo_pm!($));
2323
| ^ expected expression
2424

2525
error: macro expansion ignores token `hello` and any following
26-
--> $DIR/expand-expr.rs:115:47
26+
--> $DIR/expand-expr.rs:117:47
2727
|
2828
LL | expand_expr_is!("string", echo_tts!("string"; hello));
2929
| --------------------^^^^^- caused by the macro expansion here
@@ -35,7 +35,7 @@ LL | expand_expr_is!("string", echo_tts!("string"; hello););
3535
| +
3636

3737
error: macro expansion ignores token `;` and any following
38-
--> $DIR/expand-expr.rs:116:44
38+
--> $DIR/expand-expr.rs:118:44
3939
|
4040
LL | expand_expr_is!("string", echo_pm!("string"; hello));
4141
| -----------------^------- caused by the macro expansion here
@@ -47,7 +47,7 @@ LL | expand_expr_is!("string", echo_pm!("string"; hello););
4747
| +
4848

4949
error: recursion limit reached while expanding `recursive_expand!`
50-
--> $DIR/expand-expr.rs:124:16
50+
--> $DIR/expand-expr.rs:126:16
5151
|
5252
LL | const _: u32 = recursive_expand!();
5353
| ^^^^^^^^^^^^^^^^^^^

0 commit comments

Comments
 (0)