Skip to content

Commit 60e809e

Browse files
authored
Rollup merge of rust-lang#53154 - michaelwoerister:reenable-some-debuginfo-tests, r=kennytm
Re-enable a bunch of debuginfo tests. Re-enable some more debuginfo tests that actually seem to work.
2 parents 4393f3a + 4eb52ff commit 60e809e

4 files changed

+8
-11
lines changed

src/test/debuginfo/by-value-non-immediate-argument.rs

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
// except according to those terms.
1010

1111
// ignore-tidy-linelength
12-
// ignore-test // Test temporarily ignored due to debuginfo tests being disabled, see PR 47155
1312
// min-lldb-version: 310
1413

1514
// compile-flags:-g

src/test/debuginfo/function-arg-initialization.rs

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
// except according to those terms.
1010

1111
// ignore-tidy-linelength
12-
// ignore-test // Test temporarily ignored due to debuginfo tests being disabled, see PR 47155
1312
// min-lldb-version: 310
1413

1514
// This test case checks if function arguments already have the correct value

src/test/debuginfo/function-prologue-stepping-regular.rs

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313

1414
// min-lldb-version: 310
1515
// ignore-gdb
16-
// ignore-test // Test temporarily ignored due to debuginfo tests being disabled, see PR 47155
1716
// compile-flags:-g
1817

1918
// lldb-command:breakpoint set --name immediate_args

src/test/debuginfo/pretty-std.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
// ignore-windows failing on win32 bot
1212
// ignore-freebsd: gdb package too new
13-
// ignore-test // Test temporarily ignored due to debuginfo tests being disabled, see PR 47155
1413
// ignore-android: FIXME(#10381)
1514
// compile-flags:-g
1615
// min-gdb-version 7.7
@@ -40,14 +39,15 @@
4039
// gdbr-check:$6 = core::option::Option::None
4140

4241
// gdb-command: print os_string
43-
// gdb-check:$7 = "IAMA OS string 😃"
42+
// gdb-check:$7 = "IAMA OS string"
4443

45-
// gdb-command: print some_string
46-
// gdb-check:$8 = Some = {"IAMA optional string!"}
44+
// Disabled due to https://github.com/rust-lang/rust/issues/53153
45+
// g d b-command: print some_string
46+
// g d b-check:$8 = Some = {"IAMA optional string!"}
4747

48-
// gdb-command: set print length 5
49-
// gdb-command: print some_string
50-
// gdb-check:$8 = Some = {"IAMA "...}
48+
// g d b-command: set print length 5
49+
// g d b-command: print some_string
50+
// g d b-check:$8 = Some = {"IAMA "...}
5151

5252

5353
// === LLDB TESTS ==================================================================================
@@ -92,7 +92,7 @@ fn main() {
9292
let string = "IAMA string!".to_string();
9393

9494
// OsString
95-
let os_string = OsString::from("IAMA OS string \u{1F603}");
95+
let os_string = OsString::from("IAMA OS string");
9696

9797
// Option
9898
let some = Some(8i16);

0 commit comments

Comments
 (0)