Commit | Line | Data |
---|---|---|
6fe73b48 DM |
1 | GDB responds with some overly detailed lines - which makes the tests fail. |
2 | Patch rust to accept those instead. | |
4df3e062 | 3 | See <https://github.com/rust-lang/rust/issues/54178>. |
6fe73b48 DM |
4 | diff -ur orig/rustc-1.25.0-src/src/test/debuginfo/generic-enum-with-different-disr-sizes.rs rustc-1.25.0-src/src/test/debuginfo/generic-enum-with-different-disr-sizes.rs |
5 | --- orig/rustc-1.25.0-src/src/test/debuginfo/generic-enum-with-different-disr-sizes.rs 2018-09-13 10:24:33.775565159 +0200 | |
6 | +++ rustc-1.25.0-src/src/test/debuginfo/generic-enum-with-different-disr-sizes.rs 2018-09-13 10:25:56.322513658 +0200 | |
7 | @@ -19,36 +19,36 @@ | |
8 | ||
9 | // gdb-command:print eight_bytes1 | |
10 | // gdbg-check:$1 = {{RUST$ENUM$DISR = Variant1, __0 = 100}, {RUST$ENUM$DISR = Variant1, __0 = 100}} | |
11 | -// gdbr-check:$1 = generic_enum_with_different_disr_sizes::Enum::Variant1(100) | |
12 | +// gdbr-check:$1 = generic_enum_with_different_disr_sizes::Enum<f64>::Variant1(100) | |
13 | ||
14 | // gdb-command:print four_bytes1 | |
15 | // gdbg-check:$2 = {{RUST$ENUM$DISR = Variant1, __0 = 101}, {RUST$ENUM$DISR = Variant1, __0 = 101}} | |
16 | -// gdbr-check:$2 = generic_enum_with_different_disr_sizes::Enum::Variant1(101) | |
17 | +// gdbr-check:$2 = generic_enum_with_different_disr_sizes::Enum<i32>::Variant1(101) | |
18 | ||
19 | // gdb-command:print two_bytes1 | |
20 | // gdbg-check:$3 = {{RUST$ENUM$DISR = Variant1, __0 = 102}, {RUST$ENUM$DISR = Variant1, __0 = 102}} | |
21 | -// gdbr-check:$3 = generic_enum_with_different_disr_sizes::Enum::Variant1(102) | |
22 | +// gdbr-check:$3 = generic_enum_with_different_disr_sizes::Enum<i16>::Variant1(102) | |
23 | ||
24 | // gdb-command:print one_byte1 | |
25 | // gdbg-check:$4 = {{RUST$ENUM$DISR = Variant1, __0 = 65 'A'}, {RUST$ENUM$DISR = Variant1, __0 = 65 'A'}} | |
26 | -// gdbr-check:$4 = generic_enum_with_different_disr_sizes::Enum::Variant1(65) | |
27 | +// gdbr-check:$4 = generic_enum_with_different_disr_sizes::Enum<u8>::Variant1(65) | |
28 | ||
29 | ||
30 | // gdb-command:print eight_bytes2 | |
31 | // gdbg-check:$5 = {{RUST$ENUM$DISR = Variant2, __0 = 100}, {RUST$ENUM$DISR = Variant2, __0 = 100}} | |
32 | -// gdbr-check:$5 = generic_enum_with_different_disr_sizes::Enum::Variant2(100) | |
33 | +// gdbr-check:$5 = generic_enum_with_different_disr_sizes::Enum<f64>::Variant2(100) | |
34 | ||
35 | // gdb-command:print four_bytes2 | |
36 | // gdbg-check:$6 = {{RUST$ENUM$DISR = Variant2, __0 = 101}, {RUST$ENUM$DISR = Variant2, __0 = 101}} | |
37 | -// gdbr-check:$6 = generic_enum_with_different_disr_sizes::Enum::Variant2(101) | |
38 | +// gdbr-check:$6 = generic_enum_with_different_disr_sizes::Enum<i32>::Variant2(101) | |
39 | ||
40 | // gdb-command:print two_bytes2 | |
41 | // gdbg-check:$7 = {{RUST$ENUM$DISR = Variant2, __0 = 102}, {RUST$ENUM$DISR = Variant2, __0 = 102}} | |
42 | -// gdbr-check:$7 = generic_enum_with_different_disr_sizes::Enum::Variant2(102) | |
43 | +// gdbr-check:$7 = generic_enum_with_different_disr_sizes::Enum<i16>::Variant2(102) | |
44 | ||
45 | // gdb-command:print one_byte2 | |
46 | // gdbg-check:$8 = {{RUST$ENUM$DISR = Variant2, __0 = 65 'A'}, {RUST$ENUM$DISR = Variant2, __0 = 65 'A'}} | |
47 | -// gdbr-check:$8 = generic_enum_with_different_disr_sizes::Enum::Variant2(65) | |
48 | +// gdbr-check:$8 = generic_enum_with_different_disr_sizes::Enum<u8>::Variant2(65) | |
49 | ||
50 | // gdb-command:continue | |
51 | ||
52 | diff -ur orig/rustc-1.25.0-src/src/test/debuginfo/generic-struct-style-enum.rs rustc-1.25.0-src/src/test/debuginfo/generic-struct-style-enum.rs | |
53 | --- orig/rustc-1.25.0-src/src/test/debuginfo/generic-struct-style-enum.rs 2018-09-13 10:24:33.775565159 +0200 | |
54 | +++ rustc-1.25.0-src/src/test/debuginfo/generic-struct-style-enum.rs 2018-09-13 10:27:43.353108111 +0200 | |
55 | @@ -19,15 +19,15 @@ | |
56 | ||
57 | // gdb-command:print case1 | |
58 | // gdbg-check:$1 = {{RUST$ENUM$DISR = Case1, a = 0, b = 31868, c = 31868, d = 31868, e = 31868}, {RUST$ENUM$DISR = Case1, [...]}, {RUST$ENUM$DISR = Case1, [...]}} | |
59 | -// gdbr-check:$1 = generic_struct_style_enum::Regular::Case1{a: 0, b: 31868, c: 31868, d: 31868, e: 31868} | |
60 | +// gdbr-check:$1 = generic_struct_style_enum::Regular<u16, u32, i64>::Case1{a: 0, b: 31868, c: 31868, d: 31868, e: 31868} | |
61 | ||
62 | // gdb-command:print case2 | |
63 | // gdbg-check:$2 = {{RUST$ENUM$DISR = Case2, [...]}, {RUST$ENUM$DISR = Case2, a = 0, b = 286331153, c = 286331153}, {RUST$ENUM$DISR = Case2, [...]}} | |
64 | -// gdbr-check:$2 = generic_struct_style_enum::Regular::Case2{a: 0, b: 286331153, c: 286331153} | |
65 | +// gdbr-check:$2 = generic_struct_style_enum::Regular<i16, u32, i64>::Case2{a: 0, b: 286331153, c: 286331153} | |
66 | ||
67 | // gdb-command:print case3 | |
68 | // gdbg-check:$3 = {{RUST$ENUM$DISR = Case3, [...]}, {RUST$ENUM$DISR = Case3, [...]}, {RUST$ENUM$DISR = Case3, a = 0, b = 6438275382588823897}} | |
69 | -// gdbr-check:$3 = generic_struct_style_enum::Regular::Case3{a: 0, b: 6438275382588823897} | |
70 | +// gdbr-check:$3 = generic_struct_style_enum::Regular<u16, i32, u64>::Case3{a: 0, b: 6438275382588823897} | |
71 | ||
72 | // gdb-command:print univariant | |
73 | // gdbg-check:$4 = {{a = -1}} | |
74 | diff -ur orig/rustc-1.25.0-src/src/test/debuginfo/generic-tuple-style-enum.rs rustc-1.25.0-src/src/test/debuginfo/generic-tuple-style-enum.rs | |
75 | --- orig/rustc-1.25.0-src/src/test/debuginfo/generic-tuple-style-enum.rs 2018-09-13 10:24:33.775565159 +0200 | |
76 | +++ rustc-1.25.0-src/src/test/debuginfo/generic-tuple-style-enum.rs 2018-09-13 10:28:26.328546298 +0200 | |
77 | @@ -21,15 +21,15 @@ | |
78 | ||
79 | // gdb-command:print case1 | |
80 | // gdbg-check:$1 = {{RUST$ENUM$DISR = Case1, __0 = 0, __1 = 31868, __2 = 31868, __3 = 31868, __4 = 31868}, {RUST$ENUM$DISR = Case1, [...]}, {RUST$ENUM$DISR = Case1, [...]}} | |
81 | -// gdbr-check:$1 = generic_tuple_style_enum::Regular::Case1(0, 31868, 31868, 31868, 31868) | |
82 | +// gdbr-check:$1 = generic_tuple_style_enum::Regular<u16, u32, u64>::Case1(0, 31868, 31868, 31868, 31868) | |
83 | ||
84 | // gdb-command:print case2 | |
85 | // gdbg-check:$2 = {{RUST$ENUM$DISR = Case2, [...]}, {RUST$ENUM$DISR = Case2, __0 = 0, __1 = 286331153, __2 = 286331153}, {RUST$ENUM$DISR = Case2, [...]}} | |
86 | -// gdbr-check:$2 = generic_tuple_style_enum::Regular::Case2(0, 286331153, 286331153) | |
87 | +// gdbr-check:$2 = generic_tuple_style_enum::Regular<i16, i32, i64>::Case2(0, 286331153, 286331153) | |
88 | ||
89 | // gdb-command:print case3 | |
90 | // gdbg-check:$3 = {{RUST$ENUM$DISR = Case3, [...]}, {RUST$ENUM$DISR = Case3, [...]}, {RUST$ENUM$DISR = Case3, __0 = 0, __1 = 6438275382588823897}} | |
91 | -// gdbr-check:$3 = generic_tuple_style_enum::Regular::Case3(0, 6438275382588823897) | |
92 | +// gdbr-check:$3 = generic_tuple_style_enum::Regular<i16, i32, i64>::Case3(0, 6438275382588823897) | |
93 | ||
94 | // gdb-command:print univariant | |
95 | // gdbg-check:$4 = {{__0 = -1}} | |
46cb1c97 DM |
96 | --- orig/rustc-1.25.0-src/src/test/debuginfo/nil-enum.rs 2018-09-13 10:24:33.783565071 +0200 |
97 | +++ rustc-1.25.0-src/src/test/debuginfo/nil-enum.rs 2018-10-26 18:19:20.404564587 +0200 | |
98 | @@ -17,11 +17,11 @@ | |
99 | ||
100 | // gdb-command:print first | |
101 | // gdbg-check:$1 = {<No data fields>} | |
102 | -// gdbr-check:$1 = <error reading variable> | |
103 | +// gdbr-check:$1 = nil_enum::ANilEnum | |
104 | ||
105 | // gdb-command:print second | |
106 | // gdbg-check:$2 = {<No data fields>} | |
107 | -// gdbr-check:$2 = <error reading variable> | |
108 | +// gdbr-check:$2 = nil_enum::AnotherNilEnum | |
109 | ||
110 | #![allow(unused_variables)] | |
111 | #![feature(omit_gdb_pretty_printer_section)] |