Fix ui-fulldeps --stage=1 with -Zignore-directory-in-diagnostics-source-blocks#116009
Fix ui-fulldeps --stage=1 with -Zignore-directory-in-diagnostics-source-blocks#116009bors merged 2 commits intorust-lang:masterfrom
ui-fulldeps --stage=1 with -Zignore-directory-in-diagnostics-source-blocks#116009Conversation
|
r? @Kobzol (rustbot has picked a reviewer for you, use r? to override) |
Kobzol
left a comment
There was a problem hiding this comment.
Tested that it fixes the issue. One small nit regarding CI, otherwise 👍.
c85d82b to
292588e
Compare
|
(I approved the PR using GH UI out of habit, lol) @bors r+ |
|
☀️ Test successful - checks-actions |
|
Finished benchmarking commit (0a689c1): comparison URL. Overall result: ❌ regressions - ACTION NEEDEDNext Steps: If you can justify the regressions found in this perf run, please indicate this with @rustbot label: +perf-regression Instruction countThis is a highly reliable metric that was used to determine the overall result at the top of this comment.
Max RSS (memory usage)ResultsThis is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.
CyclesThis benchmark run did not return any relevant results for this metric. Binary sizeThis benchmark run did not return any relevant results for this metric. Bootstrap: 631.763s -> 630.991s (-0.12%) |
|
This only modified tests, so this has to be noise. @rustbot label: +perf-regression-triaged |
This removes a separate call in the x86_64-gnu-llvm-21-3 job which runs the ui-fulldeps a second time. ui-fulldeps is already running in the first call (`../x.py --stage 1 test`) as it is a default test suite. This was added in rust-lang#116009, but I think that was a misunderstanding of the problem. The actual problem was fixed in rust-lang#116932 where the actual problem was the use of `&&`. This doesn't really have much of an impact on CI time (only a couple seconds) because all the tests are skipped with `ignored, up-to-date`. I'm mainly doing this to clean up the script itself for clarity.
Don't run ui-fulldeps tests twice in stage 1 This removes a separate call in the x86_64-gnu-llvm-21-3 job which runs the ui-fulldeps a second time. ui-fulldeps is already running in the first call (`../x.py --stage 1 test`) as it is a default test suite. This was added in rust-lang#116009, but I think that was a misunderstanding of the problem. The actual problem was fixed in rust-lang#116932 where the actual problem was the use of `&&`. This doesn't really have much of an impact on CI time (only a couple seconds) because all the tests are skipped with `ignored, up-to-date`. I'm mainly doing this to clean up the script itself for clarity.
Don't run ui-fulldeps tests twice in stage 1 This removes a separate call in the x86_64-gnu-llvm-21-3 job which runs the ui-fulldeps a second time. ui-fulldeps is already running in the first call (`../x.py --stage 1 test`) as it is a default test suite. This was added in rust-lang#116009, but I think that was a misunderstanding of the problem. The actual problem was fixed in rust-lang#116932 where the actual problem was the use of `&&`. This doesn't really have much of an impact on CI time (only a couple seconds) because all the tests are skipped with `ignored, up-to-date`. I'm mainly doing this to clean up the script itself for clarity.
Don't run ui-fulldeps tests twice in stage 1 This removes a separate call in the x86_64-gnu-llvm-21-3 job which runs the ui-fulldeps a second time. ui-fulldeps is already running in the first call (`../x.py --stage 1 test`) as it is a default test suite. This was added in rust-lang#116009, but I think that was a misunderstanding of the problem. The actual problem was fixed in rust-lang#116932 where the actual problem was the use of `&&`. This doesn't really have much of an impact on CI time (only a couple seconds) because all the tests are skipped with `ignored, up-to-date`. I'm mainly doing this to clean up the script itself for clarity.
Fixes #115977
Also makes sure this doesn't happen again by running
ui-fulldeps --stage=1in CI