Skip to content

Commit 75fba9d

Browse files
reitermarkusreitermarkus
committed
Remove LLDB persistent results in compiletest.
1 parent 36a8dae commit 75fba9d

File tree

90 files changed

+824
-835
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+824
-835
lines changed

‎src/tools/compiletest/src/runtest.rs

-9
Original file line numberDiff line numberDiff line change
@@ -1477,15 +1477,6 @@ impl<'test> TestCx<'test> {
14771477
let rust_pp_module_rel_path = Path::new("./src/etc");
14781478
let rust_pp_module_abs_path = rust_src_root.join(rust_pp_module_rel_path);
14791479

1480-
// In newer versions of lldb, persistent results (the `$N =` part at the start of
1481-
// expressions you have evaluated that let you re-use the result) aren't printed, but lots
1482-
// of rustc's debuginfo tests rely on these, so re-enable this.
1483-
// See <https://reviews.llvm.org/rG385496385476fc9735da5fa4acabc34654e8b30d>.
1484-
script_str.push_str("command unalias print\n");
1485-
script_str.push_str("command alias print expr --\n");
1486-
script_str.push_str("command unalias p\n");
1487-
script_str.push_str("command alias p expr --\n");
1488-
14891480
script_str.push_str(&format!(
14901481
"command script import {}/lldb_lookup.py\n",
14911482
rust_pp_module_abs_path.to_str().unwrap()

‎tests/debuginfo/associated-types.rs

+9-9
Original file line numberDiff line numberDiff line change
@@ -43,41 +43,41 @@
4343
// lldb-command:run
4444

4545
// lldb-command:print arg
46-
// lldbg-check:[...]$0 = { b = -1, b1 = 0 }
46+
// lldbg-check:[...] { b = -1, b1 = 0 }
4747
// lldbr-check:(associated_types::Struct<i32>) arg = { b = -1, b1 = 0 }
4848
// lldb-command:continue
4949

5050
// lldb-command:print inferred
51-
// lldbg-check:[...]$1 = 1
51+
// lldbg-check:[...] 1
5252
// lldbr-check:(i64) inferred = 1
5353
// lldb-command:print explicitly
54-
// lldbg-check:[...]$2 = 1
54+
// lldbg-check:[...] 1
5555
// lldbr-check:(i64) explicitly = 1
5656
// lldb-command:continue
5757

5858
// lldb-command:print arg
59-
// lldbg-check:[...]$3 = 2
59+
// lldbg-check:[...] 2
6060
// lldbr-check:(i64) arg = 2
6161
// lldb-command:continue
6262

6363
// lldb-command:print arg
64-
// lldbg-check:[...]$4 = (4, 5)
64+
// lldbg-check:[...] (4, 5)
6565
// lldbr-check:((i32, i64)) arg = { = 4 = 5 }
6666
// lldb-command:continue
6767

6868
// lldb-command:print a
69-
// lldbg-check:[...]$5 = 6
69+
// lldbg-check:[...] 6
7070
// lldbr-check:(i32) a = 6
7171
// lldb-command:print b
72-
// lldbg-check:[...]$6 = 7
72+
// lldbg-check:[...] 7
7373
// lldbr-check:(i64) b = 7
7474
// lldb-command:continue
7575

7676
// lldb-command:print a
77-
// lldbg-check:[...]$7 = 8
77+
// lldbg-check:[...] 8
7878
// lldbr-check:(i64) a = 8
7979
// lldb-command:print b
80-
// lldbg-check:[...]$8 = 9
80+
// lldbg-check:[...] 9
8181
// lldbr-check:(i32) b = 9
8282
// lldb-command:continue
8383

‎tests/debuginfo/basic-types.rs

+13-13
Original file line numberDiff line numberDiff line change
@@ -51,48 +51,48 @@
5151

5252
// lldb-command:run
5353
// lldb-command:print b
54-
// lldbg-check:[...]$0 = false
54+
// lldbg-check:[...] false
5555
// lldbr-check:(bool) b = false
5656
// lldb-command:print i
57-
// lldbg-check:[...]$1 = -1
57+
// lldbg-check:[...] -1
5858
// lldbr-check:(isize) i = -1
5959

6060
// NOTE: only rust-enabled lldb supports 32bit chars
6161
// lldbr-command:print c
6262
// lldbr-check:(char) c = 'a'
6363

6464
// lldb-command:print i8
65-
// lldbg-check:[...]$2 = 'D'
65+
// lldbg-check:[...] 'D'
6666
// lldbr-check:(i8) i8 = 68
6767
// lldb-command:print i16
68-
// lldbg-check:[...]$3 = -16
68+
// lldbg-check:[...] -16
6969
// lldbr-check:(i16) i16 = -16
7070
// lldb-command:print i32
71-
// lldbg-check:[...]$4 = -32
71+
// lldbg-check:[...] -32
7272
// lldbr-check:(i32) i32 = -32
7373
// lldb-command:print i64
74-
// lldbg-check:[...]$5 = -64
74+
// lldbg-check:[...] -64
7575
// lldbr-check:(i64) i64 = -64
7676
// lldb-command:print u
77-
// lldbg-check:[...]$6 = 1
77+
// lldbg-check:[...] 1
7878
// lldbr-check:(usize) u = 1
7979
// lldb-command:print u8
80-
// lldbg-check:[...]$7 = 'd'
80+
// lldbg-check:[...] 'd'
8181
// lldbr-check:(u8) u8 = 100
8282
// lldb-command:print u16
83-
// lldbg-check:[...]$8 = 16
83+
// lldbg-check:[...] 16
8484
// lldbr-check:(u16) u16 = 16
8585
// lldb-command:print u32
86-
// lldbg-check:[...]$9 = 32
86+
// lldbg-check:[...] 32
8787
// lldbr-check:(u32) u32 = 32
8888
// lldb-command:print u64
89-
// lldbg-check:[...]$10 = 64
89+
// lldbg-check:[...] 64
9090
// lldbr-check:(u64) u64 = 64
9191
// lldb-command:print f32
92-
// lldbg-check:[...]$11 = 2.5
92+
// lldbg-check:[...] 2.5
9393
// lldbr-check:(f32) f32 = 2.5
9494
// lldb-command:print f64
95-
// lldbg-check:[...]$12 = 3.5
95+
// lldbg-check:[...] 3.5
9696
// lldbr-check:(f64) f64 = 3.5
9797

9898
// === CDB TESTS ===================================================================================

‎tests/debuginfo/borrowed-basic.rs

+13-13
Original file line numberDiff line numberDiff line change
@@ -53,59 +53,59 @@
5353

5454
// lldb-command:run
5555
// lldb-command:print *bool_ref
56-
// lldbg-check:[...]$0 = true
56+
// lldbg-check:[...] true
5757
// lldbr-check:(bool) *bool_ref = true
5858

5959
// lldb-command:print *int_ref
60-
// lldbg-check:[...]$1 = -1
60+
// lldbg-check:[...] -1
6161
// lldbr-check:(isize) *int_ref = -1
6262

6363
// NOTE: only rust-enabled lldb supports 32bit chars
6464
// lldbr-command:print *char_ref
6565
// lldbr-check:(char) *char_ref = 'a'
6666

6767
// lldb-command:print *i8_ref
68-
// lldbg-check:[...]$2 = 'D'
68+
// lldbg-check:[...] 'D'
6969
// lldbr-check:(i8) *i8_ref = 68
7070

7171
// lldb-command:print *i16_ref
72-
// lldbg-check:[...]$3 = -16
72+
// lldbg-check:[...] -16
7373
// lldbr-check:(i16) *i16_ref = -16
7474

7575
// lldb-command:print *i32_ref
76-
// lldbg-check:[...]$4 = -32
76+
// lldbg-check:[...] -32
7777
// lldbr-check:(i32) *i32_ref = -32
7878

7979
// lldb-command:print *i64_ref
80-
// lldbg-check:[...]$5 = -64
80+
// lldbg-check:[...] -64
8181
// lldbr-check:(i64) *i64_ref = -64
8282

8383
// lldb-command:print *uint_ref
84-
// lldbg-check:[...]$6 = 1
84+
// lldbg-check:[...] 1
8585
// lldbr-check:(usize) *uint_ref = 1
8686

8787
// lldb-command:print *u8_ref
88-
// lldbg-check:[...]$7 = 'd'
88+
// lldbg-check:[...] 'd'
8989
// lldbr-check:(u8) *u8_ref = 100
9090

9191
// lldb-command:print *u16_ref
92-
// lldbg-check:[...]$8 = 16
92+
// lldbg-check:[...] 16
9393
// lldbr-check:(u16) *u16_ref = 16
9494

9595
// lldb-command:print *u32_ref
96-
// lldbg-check:[...]$9 = 32
96+
// lldbg-check:[...] 32
9797
// lldbr-check:(u32) *u32_ref = 32
9898

9999
// lldb-command:print *u64_ref
100-
// lldbg-check:[...]$10 = 64
100+
// lldbg-check:[...] 64
101101
// lldbr-check:(u64) *u64_ref = 64
102102

103103
// lldb-command:print *f32_ref
104-
// lldbg-check:[...]$11 = 2.5
104+
// lldbg-check:[...] 2.5
105105
// lldbr-check:(f32) *f32_ref = 2.5
106106

107107
// lldb-command:print *f64_ref
108-
// lldbg-check:[...]$12 = 3.5
108+
// lldbg-check:[...] 3.5
109109
// lldbr-check:(f64) *f64_ref = 3.5
110110

111111
#![allow(unused_variables)]

‎tests/debuginfo/borrowed-c-style-enum.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@
2323
// lldb-command:run
2424

2525
// lldb-command:print *the_a_ref
26-
// lldbg-check:[...]$0 = TheA
26+
// lldbg-check:[...] TheA
2727
// lldbr-check:(borrowed_c_style_enum::ABC) *the_a_ref = borrowed_c_style_enum::ABC::TheA
2828

2929
// lldb-command:print *the_b_ref
30-
// lldbg-check:[...]$1 = TheB
30+
// lldbg-check:[...] TheB
3131
// lldbr-check:(borrowed_c_style_enum::ABC) *the_b_ref = borrowed_c_style_enum::ABC::TheB
3232

3333
// lldb-command:print *the_c_ref
34-
// lldbg-check:[...]$2 = TheC
34+
// lldbg-check:[...] TheC
3535
// lldbr-check:(borrowed_c_style_enum::ABC) *the_c_ref = borrowed_c_style_enum::ABC::TheC
3636

3737
#![allow(unused_variables)]

‎tests/debuginfo/borrowed-struct.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -35,31 +35,31 @@
3535
// lldb-command:run
3636

3737
// lldb-command:print *stack_val_ref
38-
// lldbg-check:[...]$0 = { x = 10 y = 23.5 }
38+
// lldbg-check:[...] { x = 10 y = 23.5 }
3939
// lldbr-check:(borrowed_struct::SomeStruct) *stack_val_ref = (x = 10, y = 23.5)
4040

4141
// lldb-command:print *stack_val_interior_ref_1
42-
// lldbg-check:[...]$1 = 10
42+
// lldbg-check:[...] 10
4343
// lldbr-check:(isize) *stack_val_interior_ref_1 = 10
4444

4545
// lldb-command:print *stack_val_interior_ref_2
46-
// lldbg-check:[...]$2 = 23.5
46+
// lldbg-check:[...] 23.5
4747
// lldbr-check:(f64) *stack_val_interior_ref_2 = 23.5
4848

4949
// lldb-command:print *ref_to_unnamed
50-
// lldbg-check:[...]$3 = { x = 11 y = 24.5 }
50+
// lldbg-check:[...] { x = 11 y = 24.5 }
5151
// lldbr-check:(borrowed_struct::SomeStruct) *ref_to_unnamed = (x = 11, y = 24.5)
5252

5353
// lldb-command:print *unique_val_ref
54-
// lldbg-check:[...]$4 = { x = 13 y = 26.5 }
54+
// lldbg-check:[...] { x = 13 y = 26.5 }
5555
// lldbr-check:(borrowed_struct::SomeStruct) *unique_val_ref = (x = 13, y = 26.5)
5656

5757
// lldb-command:print *unique_val_interior_ref_1
58-
// lldbg-check:[...]$5 = 13
58+
// lldbg-check:[...] 13
5959
// lldbr-check:(isize) *unique_val_interior_ref_1 = 13
6060

6161
// lldb-command:print *unique_val_interior_ref_2
62-
// lldbg-check:[...]$6 = 26.5
62+
// lldbg-check:[...] 26.5
6363
// lldbr-check:(f64) *unique_val_interior_ref_2 = 26.5
6464

6565
#![allow(unused_variables)]

‎tests/debuginfo/borrowed-tuple.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@
2424
// lldb-command:run
2525

2626
// lldb-command:print *stack_val_ref
27-
// lldbg-check:[...]$0 = { 0 = -14 1 = -19 }
27+
// lldbg-check:[...] { 0 = -14 1 = -19 }
2828
// lldbr-check:((i16, f32)) *stack_val_ref = { 0 = -14 1 = -19 }
2929

3030
// lldb-command:print *ref_to_unnamed
31-
// lldbg-check:[...]$1 = { 0 = -15 1 = -20 }
31+
// lldbg-check:[...] { 0 = -15 1 = -20 }
3232
// lldbr-check:((i16, f32)) *ref_to_unnamed = { 0 = -15 1 = -20 }
3333

3434
// lldb-command:print *unique_val_ref
35-
// lldbg-check:[...]$2 = { 0 = -17 1 = -22 }
35+
// lldbg-check:[...] { 0 = -17 1 = -22 }
3636
// lldbr-check:((i16, f32)) *unique_val_ref = { 0 = -17 1 = -22 }
3737

3838

‎tests/debuginfo/borrowed-unique-basic.rs

+13-13
Original file line numberDiff line numberDiff line change
@@ -56,59 +56,59 @@
5656
// lldb-command:run
5757

5858
// lldb-command:print *bool_ref
59-
// lldbg-check:[...]$0 = true
59+
// lldbg-check:[...] true
6060
// lldbr-check:(bool) *bool_ref = true
6161

6262
// lldb-command:print *int_ref
63-
// lldbg-check:[...]$1 = -1
63+
// lldbg-check:[...] -1
6464
// lldbr-check:(isize) *int_ref = -1
6565

6666
// NOTE: only rust-enabled lldb supports 32bit chars
6767
// lldbr-command:print *char_ref
6868
// lldbr-check:(char) *char_ref = 97
6969

7070
// lldb-command:print *i8_ref
71-
// lldbg-check:[...]$2 = 68
71+
// lldbg-check:[...] 68
7272
// lldbr-check:(i8) *i8_ref = 68
7373

7474
// lldb-command:print *i16_ref
75-
// lldbg-check:[...]$3 = -16
75+
// lldbg-check:[...] -16
7676
// lldbr-check:(i16) *i16_ref = -16
7777

7878
// lldb-command:print *i32_ref
79-
// lldbg-check:[...]$4 = -32
79+
// lldbg-check:[...] -32
8080
// lldbr-check:(i32) *i32_ref = -32
8181

8282
// lldb-command:print *i64_ref
83-
// lldbg-check:[...]$5 = -64
83+
// lldbg-check:[...] -64
8484
// lldbr-check:(i64) *i64_ref = -64
8585

8686
// lldb-command:print *uint_ref
87-
// lldbg-check:[...]$6 = 1
87+
// lldbg-check:[...] 1
8888
// lldbr-check:(usize) *uint_ref = 1
8989

9090
// lldb-command:print *u8_ref
91-
// lldbg-check:[...]$7 = 100
91+
// lldbg-check:[...] 100
9292
// lldbr-check:(u8) *u8_ref = 100
9393

9494
// lldb-command:print *u16_ref
95-
// lldbg-check:[...]$8 = 16
95+
// lldbg-check:[...] 16
9696
// lldbr-check:(u16) *u16_ref = 16
9797

9898
// lldb-command:print *u32_ref
99-
// lldbg-check:[...]$9 = 32
99+
// lldbg-check:[...] 32
100100
// lldbr-check:(u32) *u32_ref = 32
101101

102102
// lldb-command:print *u64_ref
103-
// lldbg-check:[...]$10 = 64
103+
// lldbg-check:[...] 64
104104
// lldbr-check:(u64) *u64_ref = 64
105105

106106
// lldb-command:print *f32_ref
107-
// lldbg-check:[...]$11 = 2.5
107+
// lldbg-check:[...] 2.5
108108
// lldbr-check:(f32) *f32_ref = 2.5
109109

110110
// lldb-command:print *f64_ref
111-
// lldbg-check:[...]$12 = 3.5
111+
// lldbg-check:[...] 3.5
112112
// lldbr-check:(f64) *f64_ref = 3.5
113113

114114
#![allow(unused_variables)]

‎tests/debuginfo/box.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717

1818
// lldb-command:run
1919
// lldb-command:print *a
20-
// lldbg-check:[...]$0 = 1
20+
// lldbg-check:[...] 1
2121
// lldbr-check:(i32) *a = 1
2222
// lldb-command:print *b
23-
// lldbg-check:[...]$1 = { 0 = 2 1 = 3.5 }
23+
// lldbg-check:[...] { 0 = 2 1 = 3.5 }
2424
// lldbr-check:((i32, f64)) *b = { 0 = 2 1 = 3.5 }
2525

2626
#![allow(unused_variables)]

‎tests/debuginfo/boxed-struct.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
// lldb-command:run
2121

2222
// lldb-command:print *boxed_with_padding
23-
// lldbg-check:[...]$0 = { x = 99 y = 999 z = 9999 w = 99999 }
23+
// lldbg-check:[...] { x = 99 y = 999 z = 9999 w = 99999 }
2424
// lldbr-check:(boxed_struct::StructWithSomePadding) *boxed_with_padding = { x = 99 y = 999 z = 9999 w = 99999 }
2525

2626
// lldb-command:print *boxed_with_dtor
27-
// lldbg-check:[...]$1 = { x = 77 y = 777 z = 7777 w = 77777 }
27+
// lldbg-check:[...] { x = 77 y = 777 z = 7777 w = 77777 }
2828
// lldbr-check:(boxed_struct::StructWithDestructor) *boxed_with_dtor = { x = 77 y = 777 z = 7777 w = 77777 }
2929

3030
#![allow(unused_variables)]

0 commit comments

Comments
 (0)