squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Rollup merge of #107027 - GuillaumeGomez:rm-extra-removal, r=tmiasko

Browse source 
Remove extra removal from test path

I don't know how to describe it shortly so better show what it's doing instead. Currently, there is one extra "rust/" before the test folder when running tests:

```
failures:

---- [rustdoc] rust/tests/rustdoc/redirect.rs stdout ----
```

This is a bit annoying when copying the test path. This is due to the moving of the `tests` folder one level up, meaning we were trimming too much of the `root_path`.

Now it is again displaying the correct path:

```
failures:

---- [rustdoc] tests/rustdoc/redirect.rs stdout ----
```
This commit is contained in:
Guillaume Gomez 2023-01-19 11:19:36 +01:00 committed by GitHub
parent 246daa49ee f46f9231a8
commit d1c879f02e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/tools/compiletest/src/main.rs
View file

@ -775,7 +775,7 @@ fn make_test_name(
) -> test::TestName {
// Print the name of the file, relative to the repository root.
// `src_base` looks like `/path/to/rust/tests/ui`
let root_directory = config.src_base.parent().unwrap().parent().unwrap().parent().unwrap();
let root_directory = config.src_base.parent().unwrap().parent().unwrap();
let path = testpaths.file.strip_prefix(root_directory).unwrap();
let debugger = match config.debugger {
Some(d) => format!("-{}", d),