Skip to content

Commit 8e58746

Browse files
committed
ci: Begin running ui tests with rust.debuginfo-level-tests=1
To reduce risk of regressing on generating debuginfo e.g. in the form of ICE:s. This will also ensure that future ui tests support different debuginfo levels. When I looked at run time for different CI jobs, **x86_64-gnu-debug** was far from the bottle neck, so it should be fine to make it perform more work.
1 parent f32b232 commit 8e58746

File tree

9 files changed

+20
-3
lines changed

9 files changed

+20
-3
lines changed

src/ci/docker/host-x86_64/x86_64-gnu-debug/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,5 @@ ENV RUST_CONFIGURE_ARGS \
5151

5252
ENV SCRIPT \
5353
python3 ../x.py --stage 2 build && \
54+
python3 ../x.py --stage 2 test tests/ui --set rust.debuginfo-level-tests=1 && \
5455
python3 ../x.py --stage 2 test tests/run-make
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
//@ check-pass
22
//@ ignore-windows
33
//@ compile-flags: -Cremark=foo --error-format=human --color=always
4+
5+
// FIXME(#61117): Respect debuginfo-level-tests, do not force debuginfo-level=0
6+
//@ compile-flags: -Cdebuginfo=0
7+
48
fn main() {}

tests/ui/issues/issue-29466.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
//
33
//@ run-pass
44

5+
// FIXME(#61117): Respect debuginfo-level-tests, do not force debuginfo-level=0
6+
//@ compile-flags: -Cdebuginfo=0
7+
58
#![allow(unused_variables)]
69

710
macro_rules! m(

tests/ui/limits/huge-enum.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
//@ normalize-stderr: "std::option::Option<\[u32; \d+\]>" -> "TYPE"
33
//@ normalize-stderr: "\[u32; \d+\]" -> "TYPE"
44

5+
// FIXME(#61117): Respect debuginfo-level-tests, do not force debuginfo-level=0
6+
//@ compile-flags: -Cdebuginfo=0
7+
58
#[cfg(target_pointer_width = "32")]
69
type BIG = Option<[u32; (1<<29)-1]>;
710

tests/ui/limits/huge-enum.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: values of the type `Option<TYPE>` are too big for the target architecture
2-
--> $DIR/huge-enum.rs:12:9
2+
--> $DIR/huge-enum.rs:15:9
33
|
44
LL | let big: BIG = None;
55
| ^^^

tests/ui/panics/issue-47429-short-backtraces.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
//@ check-run-results
77
//@ exec-env:RUST_BACKTRACE=1
88

9+
// FIXME(#61117): Respect debuginfo-level-tests, do not force debuginfo-level=0
10+
//@ compile-flags: -Cdebuginfo=0
11+
912
// This is needed to avoid test output differences across std being built with v0 symbols vs legacy
1013
// symbols.
1114
//@ normalize-stderr: "begin_panic::<&str>" -> "begin_panic"

tests/ui/panics/issue-47429-short-backtraces.run.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
thread 'main' panicked at $DIR/issue-47429-short-backtraces.rs:24:5:
2+
thread 'main' panicked at $DIR/issue-47429-short-backtraces.rs:27:5:
33
explicit panic
44
stack backtrace:
55
0: std::panicking::begin_panic

tests/ui/panics/runtime-switch.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
//@ check-run-results
77
//@ exec-env:RUST_BACKTRACE=0
88

9+
// FIXME(#61117): Respect debuginfo-level-tests, do not force debuginfo-level=0
10+
//@ compile-flags: -Cdebuginfo=0
11+
912
// This is needed to avoid test output differences across std being built with v0 symbols vs legacy
1013
// symbols.
1114
//@ normalize-stderr: "begin_panic::<&str>" -> "begin_panic"

tests/ui/panics/runtime-switch.run.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
thread 'main' panicked at $DIR/runtime-switch.rs:28:5:
2+
thread 'main' panicked at $DIR/runtime-switch.rs:31:5:
33
explicit panic
44
stack backtrace:
55
0: std::panicking::begin_panic

0 commit comments

Comments
 (0)