diff --git a/tests/debuginfo/associated-types.rs b/tests/debuginfo/associated-types.rs
index 54ea047d36c..95e74210472 100644
--- a/tests/debuginfo/associated-types.rs
+++ b/tests/debuginfo/associated-types.rs
@@ -37,33 +37,33 @@
 // lldb-command:run
 
 // lldb-command:v arg
-// lldbg-check:[...] { b = -1, b1 = 0 }
+// lldb-check:[...] { b = -1, b1 = 0 }
 // lldb-command:continue
 
 // lldb-command:v inferred
-// lldbg-check:[...] 1
+// lldb-check:[...] 1
 // lldb-command:v explicitly
-// lldbg-check:[...] 1
+// lldb-check:[...] 1
 // lldb-command:continue
 
 // lldb-command:v arg
-// lldbg-check:[...] 2
+// lldb-check:[...] 2
 // lldb-command:continue
 
 // lldb-command:v arg
-// lldbg-check:[...] (4, 5)
+// lldb-check:[...] (4, 5)
 // lldb-command:continue
 
 // lldb-command:v a
-// lldbg-check:[...] 6
+// lldb-check:[...] 6
 // lldb-command:v b
-// lldbg-check:[...] 7
+// lldb-check:[...] 7
 // lldb-command:continue
 
 // lldb-command:v a
-// lldbg-check:[...] 8
+// lldb-check:[...] 8
 // lldb-command:v b
-// lldbg-check:[...] 9
+// lldb-check:[...] 9
 // lldb-command:continue
 
 #![allow(unused_variables)]
diff --git a/tests/debuginfo/basic-types.rs b/tests/debuginfo/basic-types.rs
index 656c49ee001..fea5262bc41 100644
--- a/tests/debuginfo/basic-types.rs
+++ b/tests/debuginfo/basic-types.rs
@@ -46,32 +46,32 @@
 
 // lldb-command:run
 // lldb-command:v b
-// lldbg-check:[...] false
+// lldb-check:[...] false
 // lldb-command:v i
-// lldbg-check:[...] -1
+// lldb-check:[...] -1
 
 // lldb-command:v i8
-// lldbg-check:[...] 'D'
+// lldb-check:[...] 'D'
 // lldb-command:v i16
-// lldbg-check:[...] -16
+// lldb-check:[...] -16
 // lldb-command:v i32
-// lldbg-check:[...] -32
+// lldb-check:[...] -32
 // lldb-command:v i64
-// lldbg-check:[...] -64
+// lldb-check:[...] -64
 // lldb-command:v u
-// lldbg-check:[...] 1
+// lldb-check:[...] 1
 // lldb-command:v u8
-// lldbg-check:[...] 'd'
+// lldb-check:[...] 'd'
 // lldb-command:v u16
-// lldbg-check:[...] 16
+// lldb-check:[...] 16
 // lldb-command:v u32
-// lldbg-check:[...] 32
+// lldb-check:[...] 32
 // lldb-command:v u64
-// lldbg-check:[...] 64
+// lldb-check:[...] 64
 // lldb-command:v f32
-// lldbg-check:[...] 2.5
+// lldb-check:[...] 2.5
 // lldb-command:v f64
-// lldbg-check:[...] 3.5
+// lldb-check:[...] 3.5
 
 // === CDB TESTS ===================================================================================
 
diff --git a/tests/debuginfo/borrowed-basic.rs b/tests/debuginfo/borrowed-basic.rs
index e51f5912fc2..91de691e78e 100644
--- a/tests/debuginfo/borrowed-basic.rs
+++ b/tests/debuginfo/borrowed-basic.rs
@@ -53,47 +53,47 @@
 
 // lldb-command:run
 // lldb-command:v *bool_ref
-// lldbg-check:[...] true
+// lldb-check:[...] true
 
 // lldb-command:v *int_ref
-// lldbg-check:[...] -1
+// lldb-check:[...] -1
 
 
 // lldb-command:v *i8_ref
-// lldbg-check:[...] 'D'
+// lldb-check:[...] 'D'
 
 // lldb-command:v *i16_ref
-// lldbg-check:[...] -16
+// lldb-check:[...] -16
 
 // lldb-command:v *i32_ref
-// lldbg-check:[...] -32
+// lldb-check:[...] -32
 
 // lldb-command:v *i64_ref
-// lldbg-check:[...] -64
+// lldb-check:[...] -64
 
 // lldb-command:v *uint_ref
-// lldbg-check:[...] 1
+// lldb-check:[...] 1
 
 // lldb-command:v *u8_ref
-// lldbg-check:[...] 'd'
+// lldb-check:[...] 'd'
 
 // lldb-command:v *u16_ref
-// lldbg-check:[...] 16
+// lldb-check:[...] 16
 
 // lldb-command:v *u32_ref
-// lldbg-check:[...] 32
+// lldb-check:[...] 32
 
 // lldb-command:v *u64_ref
-// lldbg-check:[...] 64
+// lldb-check:[...] 64
 
 // lldb-command:v *f16_ref
-// lldbg-check:[...] 1.5
+// lldb-check:[...] 1.5
 
 // lldb-command:v *f32_ref
-// lldbg-check:[...] 2.5
+// lldb-check:[...] 2.5
 
 // lldb-command:v *f64_ref
-// lldbg-check:[...] 3.5
+// lldb-check:[...] 3.5
 
 #![allow(unused_variables)]
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/borrowed-c-style-enum.rs b/tests/debuginfo/borrowed-c-style-enum.rs
index 6d771cf6792..6a91d4f9650 100644
--- a/tests/debuginfo/borrowed-c-style-enum.rs
+++ b/tests/debuginfo/borrowed-c-style-enum.rs
@@ -19,13 +19,13 @@
 // lldb-command:run
 
 // lldb-command:v *the_a_ref
-// lldbg-check:[...] TheA
+// lldb-check:[...] TheA
 
 // lldb-command:v *the_b_ref
-// lldbg-check:[...] TheB
+// lldb-check:[...] TheB
 
 // lldb-command:v *the_c_ref
-// lldbg-check:[...] TheC
+// lldb-check:[...] TheC
 
 #![allow(unused_variables)]
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/borrowed-enum.rs b/tests/debuginfo/borrowed-enum.rs
index 8782e28e4ec..c5a795fdede 100644
--- a/tests/debuginfo/borrowed-enum.rs
+++ b/tests/debuginfo/borrowed-enum.rs
@@ -21,11 +21,11 @@
 // lldb-command:run
 
 // lldb-command:v *the_a_ref
-// lldbg-check:(borrowed_enum::ABC) *the_a_ref = { value = { x = 0 y = 8970181431921507452 } $discr$ = 0 }
+// lldb-check:(borrowed_enum::ABC) *the_a_ref = { value = { x = 0 y = 8970181431921507452 } $discr$ = 0 }
 // lldb-command:v *the_b_ref
-// lldbg-check:(borrowed_enum::ABC) *the_b_ref = { value = { 0 = 0 1 = 286331153 2 = 286331153 } $discr$ = 1 }
+// lldb-check:(borrowed_enum::ABC) *the_b_ref = { value = { 0 = 0 1 = 286331153 2 = 286331153 } $discr$ = 1 }
 // lldb-command:v *univariant_ref
-// lldbg-check:(borrowed_enum::Univariant) *univariant_ref = { value = { 0 = 4820353753753434 } }
+// lldb-check:(borrowed_enum::Univariant) *univariant_ref = { value = { 0 = 4820353753753434 } }
 
 #![allow(unused_variables)]
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/borrowed-struct.rs b/tests/debuginfo/borrowed-struct.rs
index e9b75146562..245af35f505 100644
--- a/tests/debuginfo/borrowed-struct.rs
+++ b/tests/debuginfo/borrowed-struct.rs
@@ -31,25 +31,25 @@
 // lldb-command:run
 
 // lldb-command:v *stack_val_ref
-// lldbg-check:[...] { x = 10 y = 23.5 }
+// lldb-check:[...] { x = 10 y = 23.5 }
 
 // lldb-command:v *stack_val_interior_ref_1
-// lldbg-check:[...] 10
+// lldb-check:[...] 10
 
 // lldb-command:v *stack_val_interior_ref_2
-// lldbg-check:[...] 23.5
+// lldb-check:[...] 23.5
 
 // lldb-command:v *ref_to_unnamed
-// lldbg-check:[...] { x = 11 y = 24.5 }
+// lldb-check:[...] { x = 11 y = 24.5 }
 
 // lldb-command:v *unique_val_ref
-// lldbg-check:[...] { x = 13 y = 26.5 }
+// lldb-check:[...] { x = 13 y = 26.5 }
 
 // lldb-command:v *unique_val_interior_ref_1
-// lldbg-check:[...] 13
+// lldb-check:[...] 13
 
 // lldb-command:v *unique_val_interior_ref_2
-// lldbg-check:[...] 26.5
+// lldb-check:[...] 26.5
 
 #![allow(unused_variables)]
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/borrowed-tuple.rs b/tests/debuginfo/borrowed-tuple.rs
index 720d6048f83..9e4ceec033e 100644
--- a/tests/debuginfo/borrowed-tuple.rs
+++ b/tests/debuginfo/borrowed-tuple.rs
@@ -19,13 +19,13 @@
 // lldb-command:run
 
 // lldb-command:v *stack_val_ref
-// lldbg-check:[...] { 0 = -14 1 = -19 }
+// lldb-check:[...] { 0 = -14 1 = -19 }
 
 // lldb-command:v *ref_to_unnamed
-// lldbg-check:[...] { 0 = -15 1 = -20 }
+// lldb-check:[...] { 0 = -15 1 = -20 }
 
 // lldb-command:v *unique_val_ref
-// lldbg-check:[...] { 0 = -17 1 = -22 }
+// lldb-check:[...] { 0 = -17 1 = -22 }
 
 
 #![allow(unused_variables)]
diff --git a/tests/debuginfo/borrowed-unique-basic.rs b/tests/debuginfo/borrowed-unique-basic.rs
index 8b2690e025b..7a9b4d1df82 100644
--- a/tests/debuginfo/borrowed-unique-basic.rs
+++ b/tests/debuginfo/borrowed-unique-basic.rs
@@ -57,47 +57,47 @@
 // lldb-command:run
 
 // lldb-command:v *bool_ref
-// lldbg-check:[...] true
+// lldb-check:[...] true
 
 // lldb-command:v *int_ref
-// lldbg-check:[...] -1
+// lldb-check:[...] -1
 
 
 // lldb-command:v *i8_ref
-// lldbg-check:[...] 68
+// lldb-check:[...] 68
 
 // lldb-command:v *i16_ref
-// lldbg-check:[...] -16
+// lldb-check:[...] -16
 
 // lldb-command:v *i32_ref
-// lldbg-check:[...] -32
+// lldb-check:[...] -32
 
 // lldb-command:v *i64_ref
-// lldbg-check:[...] -64
+// lldb-check:[...] -64
 
 // lldb-command:v *uint_ref
-// lldbg-check:[...] 1
+// lldb-check:[...] 1
 
 // lldb-command:v *u8_ref
-// lldbg-check:[...] 100
+// lldb-check:[...] 100
 
 // lldb-command:v *u16_ref
-// lldbg-check:[...] 16
+// lldb-check:[...] 16
 
 // lldb-command:v *u32_ref
-// lldbg-check:[...] 32
+// lldb-check:[...] 32
 
 // lldb-command:v *u64_ref
-// lldbg-check:[...] 64
+// lldb-check:[...] 64
 
 // lldb-command:v *f16_ref
-// lldbg-check:[...] 1.5
+// lldb-check:[...] 1.5
 
 // lldb-command:v *f32_ref
-// lldbg-check:[...] 2.5
+// lldb-check:[...] 2.5
 
 // lldb-command:v *f64_ref
-// lldbg-check:[...] 3.5
+// lldb-check:[...] 3.5
 
 #![allow(unused_variables)]
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/box.rs b/tests/debuginfo/box.rs
index 40f0cd52444..d22566c0b17 100644
--- a/tests/debuginfo/box.rs
+++ b/tests/debuginfo/box.rs
@@ -14,9 +14,9 @@
 
 // lldb-command:run
 // lldb-command:v *a
-// lldbg-check:[...] 1
+// lldb-check:[...] 1
 // lldb-command:v *b
-// lldbg-check:[...] { 0 = 2 1 = 3.5 }
+// lldb-check:[...] { 0 = 2 1 = 3.5 }
 
 #![allow(unused_variables)]
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/boxed-struct.rs b/tests/debuginfo/boxed-struct.rs
index b4349122a3a..158609fb2ed 100644
--- a/tests/debuginfo/boxed-struct.rs
+++ b/tests/debuginfo/boxed-struct.rs
@@ -16,10 +16,10 @@
 // lldb-command:run
 
 // lldb-command:v *boxed_with_padding
-// lldbg-check:[...] { x = 99 y = 999 z = 9999 w = 99999 }
+// lldb-check:[...] { x = 99 y = 999 z = 9999 w = 99999 }
 
 // lldb-command:v *boxed_with_dtor
-// lldbg-check:[...] { x = 77 y = 777 z = 7777 w = 77777 }
+// lldb-check:[...] { x = 77 y = 777 z = 7777 w = 77777 }
 
 #![allow(unused_variables)]
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/by-value-self-argument-in-trait-impl.rs b/tests/debuginfo/by-value-self-argument-in-trait-impl.rs
index 69a051b444d..6981fdfc9e1 100644
--- a/tests/debuginfo/by-value-self-argument-in-trait-impl.rs
+++ b/tests/debuginfo/by-value-self-argument-in-trait-impl.rs
@@ -22,15 +22,15 @@
 // lldb-command:run
 
 // lldb-command:v self
-// lldbg-check:[...] 1111
+// lldb-check:[...] 1111
 // lldb-command:continue
 
 // lldb-command:v self
-// lldbg-check:[...] { x = 2222 y = 3333 }
+// lldb-check:[...] { x = 2222 y = 3333 }
 // lldb-command:continue
 
 // lldb-command:v self
-// lldbg-check:[...] { 0 = 4444.5 1 = 5555 2 = 6666 3 = 7777.5 }
+// lldb-check:[...] { 0 = 4444.5 1 = 5555 2 = 6666 3 = 7777.5 }
 // lldb-command:continue
 
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/c-style-enum-in-composite.rs b/tests/debuginfo/c-style-enum-in-composite.rs
index 4cd40c20ceb..642879cf3b6 100644
--- a/tests/debuginfo/c-style-enum-in-composite.rs
+++ b/tests/debuginfo/c-style-enum-in-composite.rs
@@ -30,25 +30,25 @@
 // lldb-command:run
 
 // lldb-command:v tuple_interior_padding
-// lldbg-check:[...] { 0 = 0 1 = OneHundred }
+// lldb-check:[...] { 0 = 0 1 = OneHundred }
 
 // lldb-command:v tuple_padding_at_end
-// lldbg-check:[...] { 0 = { 0 = 1 1 = OneThousand } 1 = 2 }
+// lldb-check:[...] { 0 = { 0 = 1 1 = OneThousand } 1 = 2 }
 
 // lldb-command:v tuple_different_enums
-// lldbg-check:[...] { 0 = OneThousand 1 = MountainView 2 = OneMillion 3 = Vienna }
+// lldb-check:[...] { 0 = OneThousand 1 = MountainView 2 = OneMillion 3 = Vienna }
 
 // lldb-command:v padded_struct
-// lldbg-check:[...] { a = 3 b = OneMillion c = 4 d = Toronto e = 5 }
+// lldb-check:[...] { a = 3 b = OneMillion c = 4 d = Toronto e = 5 }
 
 // lldb-command:v packed_struct
-// lldbg-check:[...] { a = 6 b = OneHundred c = 7 d = Vienna e = 8 }
+// lldb-check:[...] { a = 6 b = OneHundred c = 7 d = Vienna e = 8 }
 
 // lldb-command:v non_padded_struct
-// lldbg-check:[...] { a = OneMillion b = MountainView c = OneThousand d = Toronto }
+// lldb-check:[...] { a = OneMillion b = MountainView c = OneThousand d = Toronto }
 
 // lldb-command:v struct_with_drop
-// lldbg-check:[...] { 0 = { a = OneHundred b = Vienna } 1 = 9 }
+// lldb-check:[...] { 0 = { a = OneHundred b = Vienna } 1 = 9 }
 
 #![allow(unused_variables)]
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/c-style-enum.rs b/tests/debuginfo/c-style-enum.rs
index a148c8d3845..08378f7af18 100644
--- a/tests/debuginfo/c-style-enum.rs
+++ b/tests/debuginfo/c-style-enum.rs
@@ -66,25 +66,25 @@
 // lldb-command:run
 
 // lldb-command:v auto_one
-// lldbg-check:[...] One
+// lldb-check:[...] One
 
 // lldb-command:v auto_two
-// lldbg-check:[...] Two
+// lldb-check:[...] Two
 
 // lldb-command:v auto_three
-// lldbg-check:[...] Three
+// lldb-check:[...] Three
 
 // lldb-command:v manual_one_hundred
-// lldbg-check:[...] OneHundred
+// lldb-check:[...] OneHundred
 
 // lldb-command:v manual_one_thousand
-// lldbg-check:[...] OneThousand
+// lldb-check:[...] OneThousand
 
 // lldb-command:v manual_one_million
-// lldbg-check:[...] OneMillion
+// lldb-check:[...] OneMillion
 
 // lldb-command:v single_variant
-// lldbg-check:[...] TheOnlyVariant
+// lldb-check:[...] TheOnlyVariant
 
 #![allow(unused_variables)]
 #![allow(dead_code)]
diff --git a/tests/debuginfo/captured-fields-1.rs b/tests/debuginfo/captured-fields-1.rs
index 217a1f27b67..69ca3ecd812 100644
--- a/tests/debuginfo/captured-fields-1.rs
+++ b/tests/debuginfo/captured-fields-1.rs
@@ -26,22 +26,22 @@
 
 // lldb-command:run
 // lldb-command:v test
-// lldbg-check:(captured_fields_1::main::{closure_env#0}) test = { _ref__my_ref__my_field1 = 0x[...] }
+// lldb-check:(captured_fields_1::main::{closure_env#0}) test = { _ref__my_ref__my_field1 = 0x[...] }
 // lldb-command:continue
 // lldb-command:v test
-// lldbg-check:(captured_fields_1::main::{closure_env#1}) test = { _ref__my_ref__my_field2 = 0x[...] }
+// lldb-check:(captured_fields_1::main::{closure_env#1}) test = { _ref__my_ref__my_field2 = 0x[...] }
 // lldb-command:continue
 // lldb-command:v test
-// lldbg-check:(captured_fields_1::main::{closure_env#2}) test = { _ref__my_ref = 0x[...] }
+// lldb-check:(captured_fields_1::main::{closure_env#2}) test = { _ref__my_ref = 0x[...] }
 // lldb-command:continue
 // lldb-command:v test
-// lldbg-check:(captured_fields_1::main::{closure_env#3}) test = { my_ref = 0x[...] }
+// lldb-check:(captured_fields_1::main::{closure_env#3}) test = { my_ref = 0x[...] }
 // lldb-command:continue
 // lldb-command:v test
-// lldbg-check:(captured_fields_1::main::{closure_env#4}) test = { my_var__my_field2 = 22 }
+// lldb-check:(captured_fields_1::main::{closure_env#4}) test = { my_var__my_field2 = 22 }
 // lldb-command:continue
 // lldb-command:v test
-// lldbg-check:(captured_fields_1::main::{closure_env#5}) test = { my_var = { my_field1 = 11 my_field2 = 22 } }
+// lldb-check:(captured_fields_1::main::{closure_env#5}) test = { my_var = { my_field1 = 11 my_field2 = 22 } }
 // lldb-command:continue
 
 #![allow(unused)]
diff --git a/tests/debuginfo/captured-fields-2.rs b/tests/debuginfo/captured-fields-2.rs
index 940f07ecacb..24bff1d3f35 100644
--- a/tests/debuginfo/captured-fields-2.rs
+++ b/tests/debuginfo/captured-fields-2.rs
@@ -14,10 +14,10 @@
 
 // lldb-command:run
 // lldb-command:v my_ref__my_field1
-// lldbg-check:(unsigned int) my_ref__my_field1 = 11
+// lldb-check:(unsigned int) my_ref__my_field1 = 11
 // lldb-command:continue
 // lldb-command:v my_var__my_field2
-// lldbg-check:(unsigned int) my_var__my_field2 = 22
+// lldb-check:(unsigned int) my_var__my_field2 = 22
 // lldb-command:continue
 
 #![allow(unused)]
diff --git a/tests/debuginfo/closure-in-generic-function.rs b/tests/debuginfo/closure-in-generic-function.rs
index 2baaf1b79e9..0c6a6fdfca1 100644
--- a/tests/debuginfo/closure-in-generic-function.rs
+++ b/tests/debuginfo/closure-in-generic-function.rs
@@ -22,15 +22,15 @@
 // lldb-command:run
 
 // lldb-command:v x
-// lldbg-check:[...] 0.5
+// lldb-check:[...] 0.5
 // lldb-command:v y
-// lldbg-check:[...] 10
+// lldb-check:[...] 10
 // lldb-command:continue
 
 // lldb-command:v *x
-// lldbg-check:[...] 29
+// lldb-check:[...] 29
 // lldb-command:v *y
-// lldbg-check:[...] 110
+// lldb-check:[...] 110
 // lldb-command:continue
 
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/cross-crate-spans.rs b/tests/debuginfo/cross-crate-spans.rs
index 5e8b27d4d55..e337aaf5a6c 100644
--- a/tests/debuginfo/cross-crate-spans.rs
+++ b/tests/debuginfo/cross-crate-spans.rs
@@ -36,19 +36,19 @@
 // lldb-command:run
 
 // lldb-command:v result
-// lldbg-check:[...] { 0 = 17 1 = 17 }
+// lldb-check:[...] { 0 = 17 1 = 17 }
 // lldb-command:v a_variable
-// lldbg-check:[...] 123456789
+// lldb-check:[...] 123456789
 // lldb-command:v another_variable
-// lldbg-check:[...] 123456789.5
+// lldb-check:[...] 123456789.5
 // lldb-command:continue
 
 // lldb-command:v result
-// lldbg-check:[...] { 0 = 1212 1 = 1212 }
+// lldb-check:[...] { 0 = 1212 1 = 1212 }
 // lldb-command:v a_variable
-// lldbg-check:[...] 123456789
+// lldb-check:[...] 123456789
 // lldb-command:v another_variable
-// lldbg-check:[...] 123456789.5
+// lldb-check:[...] 123456789.5
 // lldb-command:continue
 
 
diff --git a/tests/debuginfo/destructured-fn-argument.rs b/tests/debuginfo/destructured-fn-argument.rs
index aef4e4baae1..37a7bb2b778 100644
--- a/tests/debuginfo/destructured-fn-argument.rs
+++ b/tests/debuginfo/destructured-fn-argument.rs
@@ -154,147 +154,147 @@
 // lldb-command:run
 
 // lldb-command:v a
-// lldbg-check:[...] 1
+// lldb-check:[...] 1
 // lldb-command:v b
-// lldbg-check:[...] false
+// lldb-check:[...] false
 // lldb-command:continue
 
 // lldb-command:v a
-// lldbg-check:[...] 2
+// lldb-check:[...] 2
 // lldb-command:v b
-// lldbg-check:[...] 3
+// lldb-check:[...] 3
 // lldb-command:v c
-// lldbg-check:[...] 4
+// lldb-check:[...] 4
 // lldb-command:continue
 
 // lldb-command:v a
-// lldbg-check:[...] 5
+// lldb-check:[...] 5
 // lldb-command:v b
-// lldbg-check:[...] { 0 = 6 1 = 7 }
+// lldb-check:[...] { 0 = 6 1 = 7 }
 // lldb-command:continue
 
 // lldb-command:v h
-// lldbg-check:[...] 8
+// lldb-check:[...] 8
 // lldb-command:v i
-// lldbg-check:[...] { a = 9 b = 10 }
+// lldb-check:[...] { a = 9 b = 10 }
 // lldb-command:v j
-// lldbg-check:[...] 11
+// lldb-check:[...] 11
 // lldb-command:continue
 
 // lldb-command:v k
-// lldbg-check:[...] 12
+// lldb-check:[...] 12
 // lldb-command:v l
-// lldbg-check:[...] 13
+// lldb-check:[...] 13
 // lldb-command:continue
 
 // lldb-command:v m
-// lldbg-check:[...] 14
+// lldb-check:[...] 14
 // lldb-command:v n
-// lldbg-check:[...] 16
+// lldb-check:[...] 16
 // lldb-command:continue
 
 // lldb-command:v o
-// lldbg-check:[...] 18
+// lldb-check:[...] 18
 // lldb-command:continue
 
 // lldb-command:v p
-// lldbg-check:[...] 19
+// lldb-check:[...] 19
 // lldb-command:v q
-// lldbg-check:[...] 20
+// lldb-check:[...] 20
 // lldb-command:v r
-// lldbg-check:[...] { a = 21 b = 22 }
+// lldb-check:[...] { a = 21 b = 22 }
 // lldb-command:continue
 
 // lldb-command:v s
-// lldbg-check:[...] 24
+// lldb-check:[...] 24
 // lldb-command:v t
-// lldbg-check:[...] 23
+// lldb-check:[...] 23
 // lldb-command:continue
 
 // lldb-command:v u
-// lldbg-check:[...] 25
+// lldb-check:[...] 25
 // lldb-command:v v
-// lldbg-check:[...] 26
+// lldb-check:[...] 26
 // lldb-command:v w
-// lldbg-check:[...] 27
+// lldb-check:[...] 27
 // lldb-command:v x
-// lldbg-check:[...] 28
+// lldb-check:[...] 28
 // lldb-command:v y
-// lldbg-check:[...] 29
+// lldb-check:[...] 29
 // lldb-command:v z
-// lldbg-check:[...] 30
+// lldb-check:[...] 30
 // lldb-command:v ae
-// lldbg-check:[...] 31
+// lldb-check:[...] 31
 // lldb-command:v oe
-// lldbg-check:[...] 32
+// lldb-check:[...] 32
 // lldb-command:v ue
-// lldbg-check:[...] 33
+// lldb-check:[...] 33
 // lldb-command:continue
 
 // lldb-command:v aa
-// lldbg-check:[...] { 0 = 34 1 = 35 }
+// lldb-check:[...] { 0 = 34 1 = 35 }
 // lldb-command:continue
 
 // lldb-command:v bb
-// lldbg-check:[...] { 0 = 36 1 = 37 }
+// lldb-check:[...] { 0 = 36 1 = 37 }
 // lldb-command:continue
 
 // lldb-command:v cc
-// lldbg-check:[...] 38
+// lldb-check:[...] 38
 // lldb-command:continue
 
 // lldb-command:v dd
-// lldbg-check:[...] { 0 = 40 1 = 41 2 = 42 }
+// lldb-check:[...] { 0 = 40 1 = 41 2 = 42 }
 // lldb-command:continue
 
 // lldb-command:v *ee
-// lldbg-check:[...] { 0 = 43 1 = 44 2 = 45 }
+// lldb-check:[...] { 0 = 43 1 = 44 2 = 45 }
 // lldb-command:continue
 
 // lldb-command:v *ff
-// lldbg-check:[...] 46
+// lldb-check:[...] 46
 // lldb-command:v gg
-// lldbg-check:[...] { 0 = 47 1 = 48 }
+// lldb-check:[...] { 0 = 47 1 = 48 }
 // lldb-command:continue
 
 // lldb-command:v *hh
-// lldbg-check:[...] 50
+// lldb-check:[...] 50
 // lldb-command:continue
 
 // lldb-command:v ii
-// lldbg-check:[...] 51
+// lldb-check:[...] 51
 // lldb-command:continue
 
 // lldb-command:v *jj
-// lldbg-check:[...] 52
+// lldb-check:[...] 52
 // lldb-command:continue
 
 // lldb-command:v kk
-// lldbg-check:[...] 53
+// lldb-check:[...] 53
 // lldb-command:v ll
-// lldbg-check:[...] 54
+// lldb-check:[...] 54
 // lldb-command:continue
 
 // lldb-command:v mm
-// lldbg-check:[...] 55
+// lldb-check:[...] 55
 // lldb-command:v *nn
-// lldbg-check:[...] 56
+// lldb-check:[...] 56
 // lldb-command:continue
 
 // lldb-command:v oo
-// lldbg-check:[...] 57
+// lldb-check:[...] 57
 // lldb-command:v pp
-// lldbg-check:[...] 58
+// lldb-check:[...] 58
 // lldb-command:v qq
-// lldbg-check:[...] 59
+// lldb-check:[...] 59
 // lldb-command:continue
 
 // lldb-command:v rr
-// lldbg-check:[...] 60
+// lldb-check:[...] 60
 // lldb-command:v ss
-// lldbg-check:[...] 61
+// lldb-check:[...] 61
 // lldb-command:v tt
-// lldbg-check:[...] 62
+// lldb-check:[...] 62
 // lldb-command:continue
 
 #![allow(unused_variables)]
diff --git a/tests/debuginfo/destructured-for-loop-variable.rs b/tests/debuginfo/destructured-for-loop-variable.rs
index 6a43f8ca199..cc16be1268a 100644
--- a/tests/debuginfo/destructured-for-loop-variable.rs
+++ b/tests/debuginfo/destructured-for-loop-variable.rs
@@ -77,66 +77,66 @@
 
 // DESTRUCTURED STRUCT
 // lldb-command:v x
-// lldbg-check:[...] 400
+// lldb-check:[...] 400
 // lldb-command:v y
-// lldbg-check:[...] 401.5
+// lldb-check:[...] 401.5
 // lldb-command:v z
-// lldbg-check:[...] true
+// lldb-check:[...] true
 // lldb-command:continue
 
 // DESTRUCTURED TUPLE
 // lldb-command:v _i8
-// lldbg-check:[...] 0x6f
+// lldb-check:[...] 0x6f
 // lldb-command:v _u8
-// lldbg-check:[...] 0x70
+// lldb-check:[...] 0x70
 // lldb-command:v _i16
-// lldbg-check:[...] -113
+// lldb-check:[...] -113
 // lldb-command:v _u16
-// lldbg-check:[...] 114
+// lldb-check:[...] 114
 // lldb-command:v _i32
-// lldbg-check:[...] -115
+// lldb-check:[...] -115
 // lldb-command:v _u32
-// lldbg-check:[...] 116
+// lldb-check:[...] 116
 // lldb-command:v _i64
-// lldbg-check:[...] -117
+// lldb-check:[...] -117
 // lldb-command:v _u64
-// lldbg-check:[...] 118
+// lldb-check:[...] 118
 // lldb-command:v _f32
-// lldbg-check:[...] 119.5
+// lldb-check:[...] 119.5
 // lldb-command:v _f64
-// lldbg-check:[...] 120.5
+// lldb-check:[...] 120.5
 // lldb-command:continue
 
 // MORE COMPLEX CASE
 // lldb-command:v v1
-// lldbg-check:[...] 80000
+// lldb-check:[...] 80000
 // lldb-command:v x1
-// lldbg-check:[...] 8000
+// lldb-check:[...] 8000
 // lldb-command:v *y1
-// lldbg-check:[...] 80001.5
+// lldb-check:[...] 80001.5
 // lldb-command:v z1
-// lldbg-check:[...] false
+// lldb-check:[...] false
 // lldb-command:v *x2
-// lldbg-check:[...] -30000
+// lldb-check:[...] -30000
 // lldb-command:v y2
-// lldbg-check:[...] -300001.5
+// lldb-check:[...] -300001.5
 // lldb-command:v *z2
-// lldbg-check:[...] true
+// lldb-check:[...] true
 // lldb-command:v v2
-// lldbg-check:[...] 854237.5
+// lldb-check:[...] 854237.5
 // lldb-command:continue
 
 // SIMPLE IDENTIFIER
 // lldb-command:v i
-// lldbg-check:[...] 1234
+// lldb-check:[...] 1234
 // lldb-command:continue
 
 // lldb-command:v simple_struct_ident
-// lldbg-check:[...] { x = 3537 y = 35437.5 z = true }
+// lldb-check:[...] { x = 3537 y = 35437.5 z = true }
 // lldb-command:continue
 
 // lldb-command:v simple_tuple_ident
-// lldbg-check:[...] { 0 = 34903493 1 = 232323 }
+// lldb-check:[...] { 0 = 34903493 1 = 232323 }
 // lldb-command:continue
 
 #![allow(unused_variables)]
diff --git a/tests/debuginfo/destructured-local.rs b/tests/debuginfo/destructured-local.rs
index b74bf8745ea..fad96ca7d4b 100644
--- a/tests/debuginfo/destructured-local.rs
+++ b/tests/debuginfo/destructured-local.rs
@@ -120,114 +120,114 @@
 // lldb-command:run
 
 // lldb-command:v a
-// lldbg-check:[...] 1
+// lldb-check:[...] 1
 // lldb-command:v b
-// lldbg-check:[...] false
+// lldb-check:[...] false
 
 // lldb-command:v c
-// lldbg-check:[...] 2
+// lldb-check:[...] 2
 // lldb-command:v d
-// lldbg-check:[...] 3
+// lldb-check:[...] 3
 // lldb-command:v e
-// lldbg-check:[...] 4
+// lldb-check:[...] 4
 
 // lldb-command:v f
-// lldbg-check:[...] 5
+// lldb-check:[...] 5
 // lldb-command:v g
-// lldbg-check:[...] { 0 = 6 1 = 7 }
+// lldb-check:[...] { 0 = 6 1 = 7 }
 
 // lldb-command:v h
-// lldbg-check:[...] 8
+// lldb-check:[...] 8
 // lldb-command:v i
-// lldbg-check:[...] { a = 9 b = 10 }
+// lldb-check:[...] { a = 9 b = 10 }
 // lldb-command:v j
-// lldbg-check:[...] 11
+// lldb-check:[...] 11
 
 // lldb-command:v k
-// lldbg-check:[...] 12
+// lldb-check:[...] 12
 // lldb-command:v l
-// lldbg-check:[...] 13
+// lldb-check:[...] 13
 
 // lldb-command:v m
-// lldbg-check:[...] 14
+// lldb-check:[...] 14
 // lldb-command:v n
-// lldbg-check:[...] 16
+// lldb-check:[...] 16
 
 // lldb-command:v o
-// lldbg-check:[...] 18
+// lldb-check:[...] 18
 
 // lldb-command:v p
-// lldbg-check:[...] 19
+// lldb-check:[...] 19
 // lldb-command:v q
-// lldbg-check:[...] 20
+// lldb-check:[...] 20
 // lldb-command:v r
-// lldbg-check:[...] { a = 21 b = 22 }
+// lldb-check:[...] { a = 21 b = 22 }
 
 // lldb-command:v s
-// lldbg-check:[...] 24
+// lldb-check:[...] 24
 // lldb-command:v t
-// lldbg-check:[...] 23
+// lldb-check:[...] 23
 
 // lldb-command:v u
-// lldbg-check:[...] 25
+// lldb-check:[...] 25
 // lldb-command:v v
-// lldbg-check:[...] 26
+// lldb-check:[...] 26
 // lldb-command:v w
-// lldbg-check:[...] 27
+// lldb-check:[...] 27
 // lldb-command:v x
-// lldbg-check:[...] 28
+// lldb-check:[...] 28
 // lldb-command:v y
-// lldbg-check:[...] 29
+// lldb-check:[...] 29
 // lldb-command:v z
-// lldbg-check:[...] 30
+// lldb-check:[...] 30
 // lldb-command:v ae
-// lldbg-check:[...] 31
+// lldb-check:[...] 31
 // lldb-command:v oe
-// lldbg-check:[...] 32
+// lldb-check:[...] 32
 // lldb-command:v ue
-// lldbg-check:[...] 33
+// lldb-check:[...] 33
 
 // lldb-command:v aa
-// lldbg-check:[...] { 0 = 34 1 = 35 }
+// lldb-check:[...] { 0 = 34 1 = 35 }
 
 // lldb-command:v bb
-// lldbg-check:[...] { 0 = 36 1 = 37 }
+// lldb-check:[...] { 0 = 36 1 = 37 }
 
 // lldb-command:v cc
-// lldbg-check:[...] 38
+// lldb-check:[...] 38
 
 // lldb-command:v dd
-// lldbg-check:[...] { 0 = 40 1 = 41 2 = 42 }
+// lldb-check:[...] { 0 = 40 1 = 41 2 = 42 }
 
 // lldb-command:v *ee
-// lldbg-check:[...] { 0 = 43 1 = 44 2 = 45 }
+// lldb-check:[...] { 0 = 43 1 = 44 2 = 45 }
 
 // lldb-command:v *ff
-// lldbg-check:[...] 46
+// lldb-check:[...] 46
 
 // lldb-command:v gg
-// lldbg-check:[...] { 0 = 47 1 = 48 }
+// lldb-check:[...] { 0 = 47 1 = 48 }
 
 // lldb-command:v *hh
-// lldbg-check:[...] 50
+// lldb-check:[...] 50
 
 // lldb-command:v ii
-// lldbg-check:[...] 51
+// lldb-check:[...] 51
 
 // lldb-command:v *jj
-// lldbg-check:[...] 52
+// lldb-check:[...] 52
 
 // lldb-command:v kk
-// lldbg-check:[...] 53
+// lldb-check:[...] 53
 
 // lldb-command:v ll
-// lldbg-check:[...] 54
+// lldb-check:[...] 54
 
 // lldb-command:v mm
-// lldbg-check:[...] 55
+// lldb-check:[...] 55
 
 // lldb-command:v *nn
-// lldbg-check:[...] 56
+// lldb-check:[...] 56
 
 
 #![allow(unused_variables)]
diff --git a/tests/debuginfo/enum-thinlto.rs b/tests/debuginfo/enum-thinlto.rs
index 8c3a20a2da4..af77145c312 100644
--- a/tests/debuginfo/enum-thinlto.rs
+++ b/tests/debuginfo/enum-thinlto.rs
@@ -13,7 +13,7 @@
 // lldb-command:run
 
 // lldb-command:v *abc
-// lldbg-check:(enum_thinlto::ABC) *abc = { value = { x = 0 y = 8970181431921507452 } $discr$ = 0 }
+// lldb-check:(enum_thinlto::ABC) *abc = { value = { x = 0 y = 8970181431921507452 } $discr$ = 0 }
 
 #![allow(unused_variables)]
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/evec-in-struct.rs b/tests/debuginfo/evec-in-struct.rs
index 020c6e7d154..303669cf06c 100644
--- a/tests/debuginfo/evec-in-struct.rs
+++ b/tests/debuginfo/evec-in-struct.rs
@@ -24,18 +24,18 @@
 // lldb-command:run
 
 // lldb-command:v no_padding1
-// lldbg-check:[...] { x = { [0] = 0 [1] = 1 [2] = 2 } y = -3 z = { [0] = 4.5 [1] = 5.5 } }
+// lldb-check:[...] { x = { [0] = 0 [1] = 1 [2] = 2 } y = -3 z = { [0] = 4.5 [1] = 5.5 } }
 // lldb-command:v no_padding2
-// lldbg-check:[...] { x = { [0] = 6 [1] = 7 [2] = 8 } y = { [0] = { [0] = 9 [1] = 10 } [1] = { [0] = 11 [1] = 12 } } }
+// lldb-check:[...] { x = { [0] = 6 [1] = 7 [2] = 8 } y = { [0] = { [0] = 9 [1] = 10 } [1] = { [0] = 11 [1] = 12 } } }
 
 // lldb-command:v struct_internal_padding
-// lldbg-check:[...] { x = { [0] = 13 [1] = 14 } y = { [0] = 15 [1] = 16 } }
+// lldb-check:[...] { x = { [0] = 13 [1] = 14 } y = { [0] = 15 [1] = 16 } }
 
 // lldb-command:v single_vec
-// lldbg-check:[...] { x = { [0] = 17 [1] = 18 [2] = 19 [3] = 20 [4] = 21 } }
+// lldb-check:[...] { x = { [0] = 17 [1] = 18 [2] = 19 [3] = 20 [4] = 21 } }
 
 // lldb-command:v struct_padded_at_end
-// lldbg-check:[...] { x = { [0] = 22 [1] = 23 } y = { [0] = 24 [1] = 25 } }
+// lldb-check:[...] { x = { [0] = 22 [1] = 23 } y = { [0] = 24 [1] = 25 } }
 
 #![allow(unused_variables)]
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/extern-c-fn.rs b/tests/debuginfo/extern-c-fn.rs
index d81ab356c1e..4642073faab 100644
--- a/tests/debuginfo/extern-c-fn.rs
+++ b/tests/debuginfo/extern-c-fn.rs
@@ -20,13 +20,13 @@
 // lldb-command:run
 
 // lldb-command:v len
-// lldbg-check:[...] 20
+// lldb-check:[...] 20
 // lldb-command:v local0
-// lldbg-check:[...] 19
+// lldb-check:[...] 19
 // lldb-command:v local1
-// lldbg-check:[...] true
+// lldb-check:[...] true
 // lldb-command:v local2
-// lldbg-check:[...] 20.5
+// lldb-check:[...] 20.5
 
 // lldb-command:continue
 
diff --git a/tests/debuginfo/function-arguments.rs b/tests/debuginfo/function-arguments.rs
index 9befadf5dc1..21c0c7d859c 100644
--- a/tests/debuginfo/function-arguments.rs
+++ b/tests/debuginfo/function-arguments.rs
@@ -21,15 +21,15 @@
 // lldb-command:run
 
 // lldb-command:v x
-// lldbg-check:[...] 111102
+// lldb-check:[...] 111102
 // lldb-command:v y
-// lldbg-check:[...] true
+// lldb-check:[...] true
 // lldb-command:continue
 
 // lldb-command:v a
-// lldbg-check:[...] 2000
+// lldb-check:[...] 2000
 // lldb-command:v b
-// lldbg-check:[...] 3000
+// lldb-check:[...] 3000
 // lldb-command:continue
 
 
diff --git a/tests/debuginfo/generic-function.rs b/tests/debuginfo/generic-function.rs
index 47f695b8fbe..4be8d5ad45a 100644
--- a/tests/debuginfo/generic-function.rs
+++ b/tests/debuginfo/generic-function.rs
@@ -27,21 +27,21 @@
 // lldb-command:run
 
 // lldb-command:v *t0
-// lldbg-check:[...] 1
+// lldb-check:[...] 1
 // lldb-command:v *t1
-// lldbg-check:[...] 2.5
+// lldb-check:[...] 2.5
 // lldb-command:continue
 
 // lldb-command:v *t0
-// lldbg-check:[...] 3.5
+// lldb-check:[...] 3.5
 // lldb-command:v *t1
-// lldbg-check:[...] 4
+// lldb-check:[...] 4
 // lldb-command:continue
 
 // lldb-command:v *t0
-// lldbg-check:[...] 5
+// lldb-check:[...] 5
 // lldb-command:v *t1
-// lldbg-check:[...] { a = 6 b = 7.5 }
+// lldb-check:[...] { a = 6 b = 7.5 }
 // lldb-command:continue
 
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/generic-functions-nested.rs b/tests/debuginfo/generic-functions-nested.rs
index 500a42f3dc8..7e0c20f8903 100644
--- a/tests/debuginfo/generic-functions-nested.rs
+++ b/tests/debuginfo/generic-functions-nested.rs
@@ -34,27 +34,27 @@
 // lldb-command:run
 
 // lldb-command:v x
-// lldbg-check:[...] -1
+// lldb-check:[...] -1
 // lldb-command:v y
-// lldbg-check:[...] 1
+// lldb-check:[...] 1
 // lldb-command:continue
 
 // lldb-command:v x
-// lldbg-check:[...] -1
+// lldb-check:[...] -1
 // lldb-command:v y
-// lldbg-check:[...] 2.5
+// lldb-check:[...] 2.5
 // lldb-command:continue
 
 // lldb-command:v x
-// lldbg-check:[...] -2.5
+// lldb-check:[...] -2.5
 // lldb-command:v y
-// lldbg-check:[...] 1
+// lldb-check:[...] 1
 // lldb-command:continue
 
 // lldb-command:v x
-// lldbg-check:[...] -2.5
+// lldb-check:[...] -2.5
 // lldb-command:v y
-// lldbg-check:[...] 2.5
+// lldb-check:[...] 2.5
 // lldb-command:continue
 
 
diff --git a/tests/debuginfo/generic-method-on-generic-struct.rs b/tests/debuginfo/generic-method-on-generic-struct.rs
index 071d436b089..a391fbf0826 100644
--- a/tests/debuginfo/generic-method-on-generic-struct.rs
+++ b/tests/debuginfo/generic-method-on-generic-struct.rs
@@ -56,47 +56,47 @@
 
 // STACK BY REF
 // lldb-command:v *self
-// lldbg-check:[...] { x = { 0 = 8888, 1 = -8888 } }
+// lldb-check:[...] { x = { 0 = 8888, 1 = -8888 } }
 // lldb-command:v arg1
-// lldbg-check:[...] -1
+// lldb-check:[...] -1
 // lldb-command:v arg2
-// lldbg-check:[...] 2
+// lldb-check:[...] 2
 // lldb-command:continue
 
 // STACK BY VAL
 // lldb-command:v self
-// lldbg-check:[...] { x = { 0 = 8888, 1 = -8888 } }
+// lldb-check:[...] { x = { 0 = 8888, 1 = -8888 } }
 // lldb-command:v arg1
-// lldbg-check:[...] -3
+// lldb-check:[...] -3
 // lldb-command:v arg2
-// lldbg-check:[...] -4
+// lldb-check:[...] -4
 // lldb-command:continue
 
 // OWNED BY REF
 // lldb-command:v *self
-// lldbg-check:[...] { x = 1234.5 }
+// lldb-check:[...] { x = 1234.5 }
 // lldb-command:v arg1
-// lldbg-check:[...] -5
+// lldb-check:[...] -5
 // lldb-command:v arg2
-// lldbg-check:[...] -6
+// lldb-check:[...] -6
 // lldb-command:continue
 
 // OWNED BY VAL
 // lldb-command:v self
-// lldbg-check:[...] { x = 1234.5 }
+// lldb-check:[...] { x = 1234.5 }
 // lldb-command:v arg1
-// lldbg-check:[...] -7
+// lldb-check:[...] -7
 // lldb-command:v arg2
-// lldbg-check:[...] -8
+// lldb-check:[...] -8
 // lldb-command:continue
 
 // OWNED MOVED
 // lldb-command:v *self
-// lldbg-check:[...] { x = 1234.5 }
+// lldb-check:[...] { x = 1234.5 }
 // lldb-command:v arg1
-// lldbg-check:[...] -9
+// lldb-check:[...] -9
 // lldb-command:v arg2
-// lldbg-check:[...] -10.5
+// lldb-check:[...] -10.5
 // lldb-command:continue
 
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/generic-struct.rs b/tests/debuginfo/generic-struct.rs
index 49ec4ac1c17..09160bc3ba0 100644
--- a/tests/debuginfo/generic-struct.rs
+++ b/tests/debuginfo/generic-struct.rs
@@ -18,14 +18,14 @@
 // lldb-command:run
 
 // lldb-command:v int_int
-// lldbg-check:[...] AGenericStruct<i32, i32> { key: 0, value: 1 }
+// lldb-check:[...] AGenericStruct<i32, i32> { key: 0, value: 1 }
 // lldb-command:v int_float
-// lldbg-check:[...] AGenericStruct<i32, f64> { key: 2, value: 3.5 }
+// lldb-check:[...] AGenericStruct<i32, f64> { key: 2, value: 3.5 }
 // lldb-command:v float_int
-// lldbg-check:[...] AGenericStruct<f64, i32> { key: 4.5, value: 5 }
+// lldb-check:[...] AGenericStruct<f64, i32> { key: 4.5, value: 5 }
 
 // lldb-command:v float_int_float
-// lldbg-check:[...] AGenericStruct<f64, generic_struct::AGenericStruct<i32, f64>> { key: 6.5, value: AGenericStruct<i32, f64> { key: 7, value: 8.5 } }
+// lldb-check:[...] AGenericStruct<f64, generic_struct::AGenericStruct<i32, f64>> { key: 6.5, value: AGenericStruct<i32, f64> { key: 7, value: 8.5 } }
 
 // === CDB TESTS ===================================================================================
 
diff --git a/tests/debuginfo/include_string.rs b/tests/debuginfo/include_string.rs
index 5bf7cb69cc1..704b85e1ac2 100644
--- a/tests/debuginfo/include_string.rs
+++ b/tests/debuginfo/include_string.rs
@@ -17,11 +17,11 @@
 // lldb-command:run
 
 // lldb-command:v string1.length
-// lldbg-check:[...] 48
+// lldb-check:[...] 48
 // lldb-command:v string2.length
-// lldbg-check:[...] 49
+// lldb-check:[...] 49
 // lldb-command:v string3.length
-// lldbg-check:[...] 50
+// lldb-check:[...] 50
 
 // lldb-command:continue
 
diff --git a/tests/debuginfo/issue-22656.rs b/tests/debuginfo/issue-22656.rs
index 5198d34c7b8..eb0b38cfa4d 100644
--- a/tests/debuginfo/issue-22656.rs
+++ b/tests/debuginfo/issue-22656.rs
@@ -10,9 +10,9 @@
 // lldb-command:run
 
 // lldb-command:v v
-// lldbg-check:[...] size=3 { [0] = 1 [1] = 2 [2] = 3 }
+// lldb-check:[...] size=3 { [0] = 1 [1] = 2 [2] = 3 }
 // lldb-command:v zs
-// lldbg-check:[...] { x = y = 123 z = w = 456 }
+// lldb-check:[...] { x = y = 123 z = w = 456 }
 
 #![allow(unused_variables)]
 #![allow(dead_code)]
diff --git a/tests/debuginfo/issue-57822.rs b/tests/debuginfo/issue-57822.rs
index 8a8cf41ab1f..7abac1c14d3 100644
--- a/tests/debuginfo/issue-57822.rs
+++ b/tests/debuginfo/issue-57822.rs
@@ -19,10 +19,10 @@
 // lldb-command:run
 
 // lldb-command:v g
-// lldbg-check:(issue_57822::main::{closure_env#1}) g = { f = { x = 1 } }
+// lldb-check:(issue_57822::main::{closure_env#1}) g = { f = { x = 1 } }
 
 // lldb-command:v b
-// lldbg-check:(issue_57822::main::{coroutine_env#3}) b = { value = { a = { value = { y = 2 } $discr$ = '\x02' } } $discr$ = '\x02' }
+// lldb-check:(issue_57822::main::{coroutine_env#3}) b = { value = { a = { value = { y = 2 } $discr$ = '\x02' } } $discr$ = '\x02' }
 
 #![feature(omit_gdb_pretty_printer_section, coroutines, coroutine_trait, stmt_expr_attributes)]
 #![omit_gdb_pretty_printer_section]
diff --git a/tests/debuginfo/lexical-scope-in-for-loop.rs b/tests/debuginfo/lexical-scope-in-for-loop.rs
index acfddaab89c..08f244f89a0 100644
--- a/tests/debuginfo/lexical-scope-in-for-loop.rs
+++ b/tests/debuginfo/lexical-scope-in-for-loop.rs
@@ -43,34 +43,34 @@
 
 // FIRST ITERATION
 // lldb-command:v x
-// lldbg-check:[...] 1
+// lldb-check:[...] 1
 // lldb-command:continue
 
 // lldb-command:v x
-// lldbg-check:[...] -1
+// lldb-check:[...] -1
 // lldb-command:continue
 
 // SECOND ITERATION
 // lldb-command:v x
-// lldbg-check:[...] 2
+// lldb-check:[...] 2
 // lldb-command:continue
 
 // lldb-command:v x
-// lldbg-check:[...] -2
+// lldb-check:[...] -2
 // lldb-command:continue
 
 // THIRD ITERATION
 // lldb-command:v x
-// lldbg-check:[...] 3
+// lldb-check:[...] 3
 // lldb-command:continue
 
 // lldb-command:v x
-// lldbg-check:[...] -3
+// lldb-check:[...] -3
 // lldb-command:continue
 
 // AFTER LOOP
 // lldb-command:v x
-// lldbg-check:[...] 1000000
+// lldb-check:[...] 1000000
 // lldb-command:continue
 
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/lexical-scope-in-if.rs b/tests/debuginfo/lexical-scope-in-if.rs
index d1c5884843c..c0e1f2f3e05 100644
--- a/tests/debuginfo/lexical-scope-in-if.rs
+++ b/tests/debuginfo/lexical-scope-in-if.rs
@@ -67,58 +67,58 @@
 
 // BEFORE if
 // lldb-command:v x
-// lldbg-check:[...] 999
+// lldb-check:[...] 999
 // lldb-command:v y
-// lldbg-check:[...] -1
+// lldb-check:[...] -1
 // lldb-command:continue
 
 // AT BEGINNING of 'then' block
 // lldb-command:v x
-// lldbg-check:[...] 999
+// lldb-check:[...] 999
 // lldb-command:v y
-// lldbg-check:[...] -1
+// lldb-check:[...] -1
 // lldb-command:continue
 
 // AFTER 1st redeclaration of 'x'
 // lldb-command:v x
-// lldbg-check:[...] 1001
+// lldb-check:[...] 1001
 // lldb-command:v y
-// lldbg-check:[...] -1
+// lldb-check:[...] -1
 // lldb-command:continue
 
 // AFTER 2st redeclaration of 'x'
 // lldb-command:v x
-// lldbg-check:[...] 1002
+// lldb-check:[...] 1002
 // lldb-command:v y
-// lldbg-check:[...] 1003
+// lldb-check:[...] 1003
 // lldb-command:continue
 
 // AFTER 1st if expression
 // lldb-command:v x
-// lldbg-check:[...] 999
+// lldb-check:[...] 999
 // lldb-command:v y
-// lldbg-check:[...] -1
+// lldb-check:[...] -1
 // lldb-command:continue
 
 // BEGINNING of else branch
 // lldb-command:v x
-// lldbg-check:[...] 999
+// lldb-check:[...] 999
 // lldb-command:v y
-// lldbg-check:[...] -1
+// lldb-check:[...] -1
 // lldb-command:continue
 
 // BEGINNING of else branch
 // lldb-command:v x
-// lldbg-check:[...] 1004
+// lldb-check:[...] 1004
 // lldb-command:v y
-// lldbg-check:[...] 1005
+// lldb-check:[...] 1005
 // lldb-command:continue
 
 // BEGINNING of else branch
 // lldb-command:v x
-// lldbg-check:[...] 999
+// lldb-check:[...] 999
 // lldb-command:v y
-// lldbg-check:[...] -1
+// lldb-check:[...] -1
 // lldb-command:continue
 
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/lexical-scope-in-match.rs b/tests/debuginfo/lexical-scope-in-match.rs
index 754616b1a54..9169c19c6a3 100644
--- a/tests/debuginfo/lexical-scope-in-match.rs
+++ b/tests/debuginfo/lexical-scope-in-match.rs
@@ -62,55 +62,55 @@
 // lldb-command:run
 
 // lldb-command:v shadowed
-// lldbg-check:[...] 231
+// lldb-check:[...] 231
 // lldb-command:v not_shadowed
-// lldbg-check:[...] 232
+// lldb-check:[...] 232
 // lldb-command:continue
 
 // lldb-command:v shadowed
-// lldbg-check:[...] 233
+// lldb-check:[...] 233
 // lldb-command:v not_shadowed
-// lldbg-check:[...] 232
+// lldb-check:[...] 232
 // lldb-command:v local_to_arm
-// lldbg-check:[...] 234
+// lldb-check:[...] 234
 // lldb-command:continue
 
 // lldb-command:v shadowed
-// lldbg-check:[...] 236
+// lldb-check:[...] 236
 // lldb-command:v not_shadowed
-// lldbg-check:[...] 232
+// lldb-check:[...] 232
 // lldb-command:continue
 
 // lldb-command:v shadowed
-// lldbg-check:[...] 237
+// lldb-check:[...] 237
 // lldb-command:v not_shadowed
-// lldbg-check:[...] 232
+// lldb-check:[...] 232
 // lldb-command:v local_to_arm
-// lldbg-check:[...] 238
+// lldb-check:[...] 238
 // lldb-command:continue
 
 // lldb-command:v shadowed
-// lldbg-check:[...] 239
+// lldb-check:[...] 239
 // lldb-command:v not_shadowed
-// lldbg-check:[...] 232
+// lldb-check:[...] 232
 // lldb-command:continue
 
 // lldb-command:v shadowed
-// lldbg-check:[...] 241
+// lldb-check:[...] 241
 // lldb-command:v not_shadowed
-// lldbg-check:[...] 232
+// lldb-check:[...] 232
 // lldb-command:continue
 
 // lldb-command:v shadowed
-// lldbg-check:[...] 243
+// lldb-check:[...] 243
 // lldb-command:v *local_to_arm
-// lldbg-check:[...] 244
+// lldb-check:[...] 244
 // lldb-command:continue
 
 // lldb-command:v shadowed
-// lldbg-check:[...] 231
+// lldb-check:[...] 231
 // lldb-command:v not_shadowed
-// lldbg-check:[...] 232
+// lldb-check:[...] 232
 // lldb-command:continue
 
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/lexical-scope-in-stack-closure.rs b/tests/debuginfo/lexical-scope-in-stack-closure.rs
index 301423080e6..d01162c39d6 100644
--- a/tests/debuginfo/lexical-scope-in-stack-closure.rs
+++ b/tests/debuginfo/lexical-scope-in-stack-closure.rs
@@ -34,27 +34,27 @@
 // lldb-command:run
 
 // lldb-command:v x
-// lldbg-check:[...] false
+// lldb-check:[...] false
 // lldb-command:continue
 
 // lldb-command:v x
-// lldbg-check:[...] false
+// lldb-check:[...] false
 // lldb-command:continue
 
 // lldb-command:v x
-// lldbg-check:[...] 1000
+// lldb-check:[...] 1000
 // lldb-command:continue
 
 // lldb-command:v x
-// lldbg-check:[...] 2.5
+// lldb-check:[...] 2.5
 // lldb-command:continue
 
 // lldb-command:v x
-// lldbg-check:[...] true
+// lldb-check:[...] true
 // lldb-command:continue
 
 // lldb-command:v x
-// lldbg-check:[...] false
+// lldb-check:[...] false
 // lldb-command:continue
 
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/lexical-scope-in-unconditional-loop.rs b/tests/debuginfo/lexical-scope-in-unconditional-loop.rs
index 1d111dab5c9..dfec570218f 100644
--- a/tests/debuginfo/lexical-scope-in-unconditional-loop.rs
+++ b/tests/debuginfo/lexical-scope-in-unconditional-loop.rs
@@ -66,57 +66,57 @@
 
 // FIRST ITERATION
 // lldb-command:v x
-// lldbg-check:[...] 0
+// lldb-check:[...] 0
 // lldb-command:continue
 
 // lldb-command:v x
-// lldbg-check:[...] 1
+// lldb-check:[...] 1
 // lldb-command:continue
 
 // lldb-command:v x
-// lldbg-check:[...] 101
+// lldb-check:[...] 101
 // lldb-command:continue
 
 // lldb-command:v x
-// lldbg-check:[...] 101
+// lldb-check:[...] 101
 // lldb-command:continue
 
 // lldb-command:v x
-// lldbg-check:[...] -987
+// lldb-check:[...] -987
 // lldb-command:continue
 
 // lldb-command:v x
-// lldbg-check:[...] 101
+// lldb-check:[...] 101
 // lldb-command:continue
 
 
 // SECOND ITERATION
 // lldb-command:v x
-// lldbg-check:[...] 1
+// lldb-check:[...] 1
 // lldb-command:continue
 
 // lldb-command:v x
-// lldbg-check:[...] 2
+// lldb-check:[...] 2
 // lldb-command:continue
 
 // lldb-command:v x
-// lldbg-check:[...] 102
+// lldb-check:[...] 102
 // lldb-command:continue
 
 // lldb-command:v x
-// lldbg-check:[...] 102
+// lldb-check:[...] 102
 // lldb-command:continue
 
 // lldb-command:v x
-// lldbg-check:[...] -987
+// lldb-check:[...] -987
 // lldb-command:continue
 
 // lldb-command:v x
-// lldbg-check:[...] 102
+// lldb-check:[...] 102
 // lldb-command:continue
 
 // lldb-command:v x
-// lldbg-check:[...] 2
+// lldb-check:[...] 2
 // lldb-command:continue
 
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/lexical-scope-in-unique-closure.rs b/tests/debuginfo/lexical-scope-in-unique-closure.rs
index d6cf39c77ae..db84005121a 100644
--- a/tests/debuginfo/lexical-scope-in-unique-closure.rs
+++ b/tests/debuginfo/lexical-scope-in-unique-closure.rs
@@ -34,27 +34,27 @@
 // lldb-command:run
 
 // lldb-command:v x
-// lldbg-check:[...] false
+// lldb-check:[...] false
 // lldb-command:continue
 
 // lldb-command:v x
-// lldbg-check:[...] false
+// lldb-check:[...] false
 // lldb-command:continue
 
 // lldb-command:v x
-// lldbg-check:[...] 1000
+// lldb-check:[...] 1000
 // lldb-command:continue
 
 // lldb-command:v x
-// lldbg-check:[...] 2.5
+// lldb-check:[...] 2.5
 // lldb-command:continue
 
 // lldb-command:v x
-// lldbg-check:[...] true
+// lldb-check:[...] true
 // lldb-command:continue
 
 // lldb-command:v x
-// lldbg-check:[...] false
+// lldb-check:[...] false
 // lldb-command:continue
 
 
diff --git a/tests/debuginfo/lexical-scope-in-while.rs b/tests/debuginfo/lexical-scope-in-while.rs
index faef8b44a29..d6536d77545 100644
--- a/tests/debuginfo/lexical-scope-in-while.rs
+++ b/tests/debuginfo/lexical-scope-in-while.rs
@@ -66,57 +66,57 @@
 
 // FIRST ITERATION
 // lldb-command:v x
-// lldbg-check:[...] 0
+// lldb-check:[...] 0
 // lldb-command:continue
 
 // lldb-command:v x
-// lldbg-check:[...] 1
+// lldb-check:[...] 1
 // lldb-command:continue
 
 // lldb-command:v x
-// lldbg-check:[...] 101
+// lldb-check:[...] 101
 // lldb-command:continue
 
 // lldb-command:v x
-// lldbg-check:[...] 101
+// lldb-check:[...] 101
 // lldb-command:continue
 
 // lldb-command:v x
-// lldbg-check:[...] -987
+// lldb-check:[...] -987
 // lldb-command:continue
 
 // lldb-command:v x
-// lldbg-check:[...] 101
+// lldb-check:[...] 101
 // lldb-command:continue
 
 
 // SECOND ITERATION
 // lldb-command:v x
-// lldbg-check:[...] 1
+// lldb-check:[...] 1
 // lldb-command:continue
 
 // lldb-command:v x
-// lldbg-check:[...] 2
+// lldb-check:[...] 2
 // lldb-command:continue
 
 // lldb-command:v x
-// lldbg-check:[...] 102
+// lldb-check:[...] 102
 // lldb-command:continue
 
 // lldb-command:v x
-// lldbg-check:[...] 102
+// lldb-check:[...] 102
 // lldb-command:continue
 
 // lldb-command:v x
-// lldbg-check:[...] -987
+// lldb-check:[...] -987
 // lldb-command:continue
 
 // lldb-command:v x
-// lldbg-check:[...] 102
+// lldb-check:[...] 102
 // lldb-command:continue
 
 // lldb-command:v x
-// lldbg-check:[...] 2
+// lldb-check:[...] 2
 // lldb-command:continue
 
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/lexical-scope-with-macro.rs b/tests/debuginfo/lexical-scope-with-macro.rs
index 5f8838c782b..6e8fef201ea 100644
--- a/tests/debuginfo/lexical-scope-with-macro.rs
+++ b/tests/debuginfo/lexical-scope-with-macro.rs
@@ -54,48 +54,48 @@
 // lldb-command:run
 
 // lldb-command:v a
-// lldbg-check:[...] 10
+// lldb-check:[...] 10
 // lldb-command:v b
-// lldbg-check:[...] 34
+// lldb-check:[...] 34
 // lldb-command:continue
 
 // lldb-command:v a
-// lldbg-check:[...] 890242
+// lldb-check:[...] 890242
 // lldb-command:v b
-// lldbg-check:[...] 34
+// lldb-check:[...] 34
 // lldb-command:continue
 
 // lldb-command:v a
-// lldbg-check:[...] 10
+// lldb-check:[...] 10
 // lldb-command:v b
-// lldbg-check:[...] 34
+// lldb-check:[...] 34
 // lldb-command:continue
 
 // lldb-command:v a
-// lldbg-check:[...] 102
+// lldb-check:[...] 102
 // lldb-command:v b
-// lldbg-check:[...] 34
+// lldb-check:[...] 34
 // lldb-command:continue
 
-// lldbg-command:print a
-// lldbg-check:[...] 110
-// lldbg-command:print b
-// lldbg-check:[...] 34
-// lldbg-command:continue
+// lldb-command:print a
+// lldb-check:[...] 110
+// lldb-command:print b
+// lldb-check:[...] 34
+// lldb-command:continue
 
-// lldbg-command:print a
-// lldbg-check:[...] 10
-// lldbg-command:print b
-// lldbg-check:[...] 34
-// lldbg-command:continue
+// lldb-command:print a
+// lldb-check:[...] 10
+// lldb-command:print b
+// lldb-check:[...] 34
+// lldb-command:continue
 
-// lldbg-command:print a
-// lldbg-check:[...] 10
-// lldbg-command:print b
-// lldbg-check:[...] 34
-// lldbg-command:print c
-// lldbg-check:[...] 400
-// lldbg-command:continue
+// lldb-command:print a
+// lldb-check:[...] 10
+// lldb-command:print b
+// lldb-check:[...] 34
+// lldb-command:print c
+// lldb-check:[...] 400
+// lldb-command:continue
 
 #![feature(omit_gdb_pretty_printer_section)]
 #![omit_gdb_pretty_printer_section]
diff --git a/tests/debuginfo/lexical-scopes-in-block-expression.rs b/tests/debuginfo/lexical-scopes-in-block-expression.rs
index f90c3dd327b..cd27c88db58 100644
--- a/tests/debuginfo/lexical-scopes-in-block-expression.rs
+++ b/tests/debuginfo/lexical-scopes-in-block-expression.rs
@@ -183,155 +183,155 @@
 
 // STRUCT EXPRESSION
 // lldb-command:v val
-// lldbg-check:[...] -1
+// lldb-check:[...] -1
 // lldb-command:v ten
-// lldbg-check:[...] 10
+// lldb-check:[...] 10
 // lldb-command:continue
 
 // lldb-command:v val
-// lldbg-check:[...] 11
+// lldb-check:[...] 11
 // lldb-command:v ten
-// lldbg-check:[...] 10
+// lldb-check:[...] 10
 // lldb-command:continue
 
 // lldb-command:v val
-// lldbg-check:[...] -1
+// lldb-check:[...] -1
 // lldb-command:v ten
-// lldbg-check:[...] 10
+// lldb-check:[...] 10
 // lldb-command:continue
 
 // FUNCTION CALL
 // lldb-command:v val
-// lldbg-check:[...] -1
+// lldb-check:[...] -1
 // lldb-command:v ten
-// lldbg-check:[...] 10
+// lldb-check:[...] 10
 // lldb-command:continue
 
 // lldb-command:v val
-// lldbg-check:[...] 12
+// lldb-check:[...] 12
 // lldb-command:v ten
-// lldbg-check:[...] 10
+// lldb-check:[...] 10
 // lldb-command:continue
 
 // lldb-command:v val
-// lldbg-check:[...] -1
+// lldb-check:[...] -1
 // lldb-command:v ten
-// lldbg-check:[...] 10
+// lldb-check:[...] 10
 // lldb-command:continue
 
 // TUPLE EXPRESSION
 // lldb-command:v val
-// lldbg-check:[...] -1
+// lldb-check:[...] -1
 // lldb-command:v ten
-// lldbg-check:[...] 10
+// lldb-check:[...] 10
 // lldb-command:continue
 
 // lldb-command:v val
-// lldbg-check:[...] 13
+// lldb-check:[...] 13
 // lldb-command:v ten
-// lldbg-check:[...] 10
+// lldb-check:[...] 10
 // lldb-command:continue
 
 // lldb-command:v val
-// lldbg-check:[...] -1
+// lldb-check:[...] -1
 // lldb-command:v ten
-// lldbg-check:[...] 10
+// lldb-check:[...] 10
 // lldb-command:continue
 
 // VEC EXPRESSION
 // lldb-command:v val
-// lldbg-check:[...] -1
+// lldb-check:[...] -1
 // lldb-command:v ten
-// lldbg-check:[...] 10
+// lldb-check:[...] 10
 // lldb-command:continue
 
 // lldb-command:v val
-// lldbg-check:[...] 14
+// lldb-check:[...] 14
 // lldb-command:v ten
-// lldbg-check:[...] 10
+// lldb-check:[...] 10
 // lldb-command:continue
 
 // lldb-command:v val
-// lldbg-check:[...] -1
+// lldb-check:[...] -1
 // lldb-command:v ten
-// lldbg-check:[...] 10
+// lldb-check:[...] 10
 // lldb-command:continue
 
 // REPEAT VEC EXPRESSION
 // lldb-command:v val
-// lldbg-check:[...] -1
+// lldb-check:[...] -1
 // lldb-command:v ten
-// lldbg-check:[...] 10
+// lldb-check:[...] 10
 // lldb-command:continue
 
 // lldb-command:v val
-// lldbg-check:[...] 15
+// lldb-check:[...] 15
 // lldb-command:v ten
-// lldbg-check:[...] 10
+// lldb-check:[...] 10
 // lldb-command:continue
 
 // lldb-command:v val
-// lldbg-check:[...] -1
+// lldb-check:[...] -1
 // lldb-command:v ten
-// lldbg-check:[...] 10
+// lldb-check:[...] 10
 // lldb-command:continue
 
 // ASSIGNMENT EXPRESSION
 // lldb-command:v val
-// lldbg-check:[...] -1
+// lldb-check:[...] -1
 // lldb-command:v ten
-// lldbg-check:[...] 10
+// lldb-check:[...] 10
 // lldb-command:continue
 
 // lldb-command:v val
-// lldbg-check:[...] 16
+// lldb-check:[...] 16
 // lldb-command:v ten
-// lldbg-check:[...] 10
+// lldb-check:[...] 10
 // lldb-command:continue
 
 // lldb-command:v val
-// lldbg-check:[...] -1
+// lldb-check:[...] -1
 // lldb-command:v ten
-// lldbg-check:[...] 10
+// lldb-check:[...] 10
 // lldb-command:continue
 
 
 // ARITHMETIC EXPRESSION
 // lldb-command:v val
-// lldbg-check:[...] -1
+// lldb-check:[...] -1
 // lldb-command:v ten
-// lldbg-check:[...] 10
+// lldb-check:[...] 10
 // lldb-command:continue
 
 // lldb-command:v val
-// lldbg-check:[...] 17
+// lldb-check:[...] 17
 // lldb-command:v ten
-// lldbg-check:[...] 10
+// lldb-check:[...] 10
 // lldb-command:continue
 
 // lldb-command:v val
-// lldbg-check:[...] -1
+// lldb-check:[...] -1
 // lldb-command:v ten
-// lldbg-check:[...] 10
+// lldb-check:[...] 10
 // lldb-command:continue
 
 // INDEX EXPRESSION
 // lldb-command:v val
-// lldbg-check:[...] -1
+// lldb-check:[...] -1
 // lldb-command:v ten
-// lldbg-check:[...] 10
+// lldb-check:[...] 10
 // lldb-command:continue
 
 // lldb-command:v val
-// lldbg-check:[...] 18
+// lldb-check:[...] 18
 // lldb-command:v ten
-// lldbg-check:[...] 10
+// lldb-check:[...] 10
 // lldb-command:continue
 
 // lldb-command:v val
-// lldbg-check:[...] -1
+// lldb-check:[...] -1
 // lldb-command:v ten
-// lldbg-check:[...] 10
+// lldb-check:[...] 10
 // lldb-command:continue
 
 #![allow(unused_variables)]
diff --git a/tests/debuginfo/method-on-generic-struct.rs b/tests/debuginfo/method-on-generic-struct.rs
index 27e83cbbe22..23617d46e83 100644
--- a/tests/debuginfo/method-on-generic-struct.rs
+++ b/tests/debuginfo/method-on-generic-struct.rs
@@ -56,47 +56,47 @@
 
 // STACK BY REF
 // lldb-command:v *self
-// lldbg-check:[...] Struct<(u32, i32)> { x: (8888, -8888) }
+// lldb-check:[...] Struct<(u32, i32)> { x: (8888, -8888) }
 // lldb-command:v arg1
-// lldbg-check:[...] -1
+// lldb-check:[...] -1
 // lldb-command:v arg2
-// lldbg-check:[...] -2
+// lldb-check:[...] -2
 // lldb-command:continue
 
 // STACK BY VAL
 // lldb-command:v self
-// lldbg-check:[...] Struct<(u32, i32)> { x: (8888, -8888) }
+// lldb-check:[...] Struct<(u32, i32)> { x: (8888, -8888) }
 // lldb-command:v arg1
-// lldbg-check:[...] -3
+// lldb-check:[...] -3
 // lldb-command:v arg2
-// lldbg-check:[...] -4
+// lldb-check:[...] -4
 // lldb-command:continue
 
 // OWNED BY REF
 // lldb-command:v *self
-// lldbg-check:[...] Struct<f64> { x: 1234.5 }
+// lldb-check:[...] Struct<f64> { x: 1234.5 }
 // lldb-command:v arg1
-// lldbg-check:[...] -5
+// lldb-check:[...] -5
 // lldb-command:v arg2
-// lldbg-check:[...] -6
+// lldb-check:[...] -6
 // lldb-command:continue
 
 // OWNED BY VAL
 // lldb-command:v self
-// lldbg-check:[...] Struct<f64> { x: 1234.5 }
+// lldb-check:[...] Struct<f64> { x: 1234.5 }
 // lldb-command:v arg1
-// lldbg-check:[...] -7
+// lldb-check:[...] -7
 // lldb-command:v arg2
-// lldbg-check:[...] -8
+// lldb-check:[...] -8
 // lldb-command:continue
 
 // OWNED MOVED
 // lldb-command:v *self
-// lldbg-check:[...] Struct<f64> { x: 1234.5 }
+// lldb-check:[...] Struct<f64> { x: 1234.5 }
 // lldb-command:v arg1
-// lldbg-check:[...] -9
+// lldb-check:[...] -9
 // lldb-command:v arg2
-// lldbg-check:[...] -10
+// lldb-check:[...] -10
 // lldb-command:continue
 
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/method-on-struct.rs b/tests/debuginfo/method-on-struct.rs
index 307c6d92d48..91f609365e9 100644
--- a/tests/debuginfo/method-on-struct.rs
+++ b/tests/debuginfo/method-on-struct.rs
@@ -56,47 +56,47 @@
 
 // STACK BY REF
 // lldb-command:v *self
-// lldbg-check:[...] { x = 100 }
+// lldb-check:[...] { x = 100 }
 // lldb-command:v arg1
-// lldbg-check:[...] -1
+// lldb-check:[...] -1
 // lldb-command:v arg2
-// lldbg-check:[...] -2
+// lldb-check:[...] -2
 // lldb-command:continue
 
 // STACK BY VAL
 // lldb-command:v self
-// lldbg-check:[...] { x = 100 }
+// lldb-check:[...] { x = 100 }
 // lldb-command:v arg1
-// lldbg-check:[...] -3
+// lldb-check:[...] -3
 // lldb-command:v arg2
-// lldbg-check:[...] -4
+// lldb-check:[...] -4
 // lldb-command:continue
 
 // OWNED BY REF
 // lldb-command:v *self
-// lldbg-check:[...] { x = 200 }
+// lldb-check:[...] { x = 200 }
 // lldb-command:v arg1
-// lldbg-check:[...] -5
+// lldb-check:[...] -5
 // lldb-command:v arg2
-// lldbg-check:[...] -6
+// lldb-check:[...] -6
 // lldb-command:continue
 
 // OWNED BY VAL
 // lldb-command:v self
-// lldbg-check:[...] { x = 200 }
+// lldb-check:[...] { x = 200 }
 // lldb-command:v arg1
-// lldbg-check:[...] -7
+// lldb-check:[...] -7
 // lldb-command:v arg2
-// lldbg-check:[...] -8
+// lldb-check:[...] -8
 // lldb-command:continue
 
 // OWNED MOVED
 // lldb-command:v *self
-// lldbg-check:[...] { x = 200 }
+// lldb-check:[...] { x = 200 }
 // lldb-command:v arg1
-// lldbg-check:[...] -9
+// lldb-check:[...] -9
 // lldb-command:v arg2
-// lldbg-check:[...] -10
+// lldb-check:[...] -10
 // lldb-command:continue
 
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/method-on-trait.rs b/tests/debuginfo/method-on-trait.rs
index 29087da0e6a..7b95e1f81c7 100644
--- a/tests/debuginfo/method-on-trait.rs
+++ b/tests/debuginfo/method-on-trait.rs
@@ -56,47 +56,47 @@
 
 // STACK BY REF
 // lldb-command:v *self
-// lldbg-check:[...] { x = 100 }
+// lldb-check:[...] { x = 100 }
 // lldb-command:v arg1
-// lldbg-check:[...] -1
+// lldb-check:[...] -1
 // lldb-command:v arg2
-// lldbg-check:[...] -2
+// lldb-check:[...] -2
 // lldb-command:continue
 
 // STACK BY VAL
 // lldb-command:v self
-// lldbg-check:[...] { x = 100 }
+// lldb-check:[...] { x = 100 }
 // lldb-command:v arg1
-// lldbg-check:[...] -3
+// lldb-check:[...] -3
 // lldb-command:v arg2
-// lldbg-check:[...] -4
+// lldb-check:[...] -4
 // lldb-command:continue
 
 // OWNED BY REF
 // lldb-command:v *self
-// lldbg-check:[...] { x = 200 }
+// lldb-check:[...] { x = 200 }
 // lldb-command:v arg1
-// lldbg-check:[...] -5
+// lldb-check:[...] -5
 // lldb-command:v arg2
-// lldbg-check:[...] -6
+// lldb-check:[...] -6
 // lldb-command:continue
 
 // OWNED BY VAL
 // lldb-command:v self
-// lldbg-check:[...] { x = 200 }
+// lldb-check:[...] { x = 200 }
 // lldb-command:v arg1
-// lldbg-check:[...] -7
+// lldb-check:[...] -7
 // lldb-command:v arg2
-// lldbg-check:[...] -8
+// lldb-check:[...] -8
 // lldb-command:continue
 
 // OWNED MOVED
 // lldb-command:v *self
-// lldbg-check:[...] { x = 200 }
+// lldb-check:[...] { x = 200 }
 // lldb-command:v arg1
-// lldbg-check:[...] -9
+// lldb-check:[...] -9
 // lldb-command:v arg2
-// lldbg-check:[...] -10
+// lldb-check:[...] -10
 // lldb-command:continue
 
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/method-on-tuple-struct.rs b/tests/debuginfo/method-on-tuple-struct.rs
index 7b8d30abf63..04c00d88302 100644
--- a/tests/debuginfo/method-on-tuple-struct.rs
+++ b/tests/debuginfo/method-on-tuple-struct.rs
@@ -56,47 +56,47 @@
 
 // STACK BY REF
 // lldb-command:v *self
-// lldbg-check:[...] { 0 = 100 1 = -100.5 }
+// lldb-check:[...] { 0 = 100 1 = -100.5 }
 // lldb-command:v arg1
-// lldbg-check:[...] -1
+// lldb-check:[...] -1
 // lldb-command:v arg2
-// lldbg-check:[...] -2
+// lldb-check:[...] -2
 // lldb-command:continue
 
 // STACK BY VAL
 // lldb-command:v self
-// lldbg-check:[...] { 0 = 100 1 = -100.5 }
+// lldb-check:[...] { 0 = 100 1 = -100.5 }
 // lldb-command:v arg1
-// lldbg-check:[...] -3
+// lldb-check:[...] -3
 // lldb-command:v arg2
-// lldbg-check:[...] -4
+// lldb-check:[...] -4
 // lldb-command:continue
 
 // OWNED BY REF
 // lldb-command:v *self
-// lldbg-check:[...] { 0 = 200 1 = -200.5 }
+// lldb-check:[...] { 0 = 200 1 = -200.5 }
 // lldb-command:v arg1
-// lldbg-check:[...] -5
+// lldb-check:[...] -5
 // lldb-command:v arg2
-// lldbg-check:[...] -6
+// lldb-check:[...] -6
 // lldb-command:continue
 
 // OWNED BY VAL
 // lldb-command:v self
-// lldbg-check:[...] { 0 = 200 1 = -200.5 }
+// lldb-check:[...] { 0 = 200 1 = -200.5 }
 // lldb-command:v arg1
-// lldbg-check:[...] -7
+// lldb-check:[...] -7
 // lldb-command:v arg2
-// lldbg-check:[...] -8
+// lldb-check:[...] -8
 // lldb-command:continue
 
 // OWNED MOVED
 // lldb-command:v *self
-// lldbg-check:[...] { 0 = 200 1 = -200.5 }
+// lldb-check:[...] { 0 = 200 1 = -200.5 }
 // lldb-command:v arg1
-// lldbg-check:[...] -9
+// lldb-check:[...] -9
 // lldb-command:v arg2
-// lldbg-check:[...] -10
+// lldb-check:[...] -10
 // lldb-command:continue
 
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/msvc-pretty-enums.rs b/tests/debuginfo/msvc-pretty-enums.rs
index a2e2b32cfd1..d60a7b81944 100644
--- a/tests/debuginfo/msvc-pretty-enums.rs
+++ b/tests/debuginfo/msvc-pretty-enums.rs
@@ -6,72 +6,72 @@
 // lldb-command:run
 
 // lldb-command:v a
-// lldbg-check:(core::option::Option<msvc_pretty_enums::CStyleEnum>) a = { value = { 0 = Low } }
+// lldb-check:(core::option::Option<msvc_pretty_enums::CStyleEnum>) a = { value = { 0 = Low } }
 
 // lldb-command:v b
-// lldbg-check:(core::option::Option<msvc_pretty_enums::CStyleEnum>) b = { value = $discr$ = '\x01' }
+// lldb-check:(core::option::Option<msvc_pretty_enums::CStyleEnum>) b = { value = $discr$ = '\x01' }
 
 // lldb-command:v c
-// lldbg-check:(msvc_pretty_enums::NicheLayoutEnum) c = { value = $discr$ = '\x11' }
+// lldb-check:(msvc_pretty_enums::NicheLayoutEnum) c = { value = $discr$ = '\x11' }
 
 // lldb-command:v d
-// lldbg-check:(msvc_pretty_enums::NicheLayoutEnum) d = { value = { my_data = High } }
+// lldb-check:(msvc_pretty_enums::NicheLayoutEnum) d = { value = { my_data = High } }
 
 // lldb-command:v e
-// lldbg-check:(msvc_pretty_enums::NicheLayoutEnum) e = { value = $discr$ = '\x13' }
+// lldb-check:(msvc_pretty_enums::NicheLayoutEnum) e = { value = $discr$ = '\x13' }
 
 // lldb-command:v h
-// lldbg-check:(core::option::Option<u32>) h = { value = { 0 = 12 } $discr$ = 1 }
+// lldb-check:(core::option::Option<u32>) h = { value = { 0 = 12 } $discr$ = 1 }
 
 // lldb-command:v i
-// lldbg-check:(core::option::Option<u32>) i = { value = $discr$ = 0 }
+// lldb-check:(core::option::Option<u32>) i = { value = $discr$ = 0 }
 
 // lldb-command:v j
-// lldbg-check:(msvc_pretty_enums::CStyleEnum) j = High
+// lldb-check:(msvc_pretty_enums::CStyleEnum) j = High
 
 // lldb-command:v k
-// lldbg-check:(core::option::Option<alloc::string::String>) k = { value = { 0 = "IAMA optional string!" { vec = size=21 { [0] = 'I' [1] = 'A' [2] = 'M' [3] = 'A' [4] = ' ' [5] = 'o' [6] = 'p' [7] = 't' [8] = 'i' [9] = 'o' [10] = 'n' [11] = 'a' [12] = 'l' [13] = ' ' [14] = 's' [15] = 't' [16] = 'r' [17] = 'i' [18] = 'n' [19] = 'g' [20] = '!' } } } }
+// lldb-check:(core::option::Option<alloc::string::String>) k = { value = { 0 = "IAMA optional string!" { vec = size=21 { [0] = 'I' [1] = 'A' [2] = 'M' [3] = 'A' [4] = ' ' [5] = 'o' [6] = 'p' [7] = 't' [8] = 'i' [9] = 'o' [10] = 'n' [11] = 'a' [12] = 'l' [13] = ' ' [14] = 's' [15] = 't' [16] = 'r' [17] = 'i' [18] = 'n' [19] = 'g' [20] = '!' } } } }
 
 // lldb-command:v l
-// lldbg-check:(core::result::Result<u32, msvc_pretty_enums::Empty>) l = { value = { 0 = {} } }
+// lldb-check:(core::result::Result<u32, msvc_pretty_enums::Empty>) l = { value = { 0 = {} } }
 
 // lldb-command:v niche128_some
-// lldbg-check:(core::option::Option<core::num::nonzero::NonZero<i128>>) niche128_some = { value = $discr$ = 123456 }
+// lldb-check:(core::option::Option<core::num::nonzero::NonZero<i128>>) niche128_some = { value = $discr$ = 123456 }
 
 // lldb-command:v niche128_none
-// lldbg-check:(core::option::Option<core::num::nonzero::NonZero<i128>>) niche128_none = { value = $discr$ = 0 }
+// lldb-check:(core::option::Option<core::num::nonzero::NonZero<i128>>) niche128_none = { value = $discr$ = 0 }
 
 // lldb-command:v wrapping_niche128_untagged
-// lldbg-check:(msvc_pretty_enums::Wrapping128Niche) wrapping_niche128_untagged = { value = { 0 = { 0 = 340282366920938463463374607431768211454 } } }
+// lldb-check:(msvc_pretty_enums::Wrapping128Niche) wrapping_niche128_untagged = { value = { 0 = { 0 = 340282366920938463463374607431768211454 } } }
 
 // lldb-command:v wrapping_niche128_none1
-// lldbg-check:(msvc_pretty_enums::Wrapping128Niche) wrapping_niche128_none1 = { value = { 0 = { 0 = 2 } } }
+// lldb-check:(msvc_pretty_enums::Wrapping128Niche) wrapping_niche128_none1 = { value = { 0 = { 0 = 2 } } }
 
 // lldb-command:v direct_tag_128_a
-// lldbg-check:(msvc_pretty_enums::DirectTag128) direct_tag_128_a = { value = { 0 = 42 } $discr$ = 0 }
+// lldb-check:(msvc_pretty_enums::DirectTag128) direct_tag_128_a = { value = { 0 = 42 } $discr$ = 0 }
 
 // lldb-command:v direct_tag_128_b
-// lldbg-check:(msvc_pretty_enums::DirectTag128) direct_tag_128_b = { value = { 0 = 137 } $discr$ = 1 }
+// lldb-check:(msvc_pretty_enums::DirectTag128) direct_tag_128_b = { value = { 0 = 137 } $discr$ = 1 }
 
 // &u32 is incorrectly formatted and LLDB thinks it's a char* so skipping niche_w_fields_1_some
 
 // lldb-command:v niche_w_fields_1_none
-// lldbg-check:(msvc_pretty_enums::NicheLayoutWithFields1) niche_w_fields_1_none = { value = { 0 = 99 } $discr$ = 1 }
+// lldb-check:(msvc_pretty_enums::NicheLayoutWithFields1) niche_w_fields_1_none = { value = { 0 = 99 } $discr$ = 1 }
 
 // lldb-command:v niche_w_fields_2_some
-// lldbg-check:(msvc_pretty_enums::NicheLayoutWithFields2) niche_w_fields_2_some = { value = { 0 = 800 { __0 = { 0 = 800 } } 1 = 900 } $discr$ = 0 }
+// lldb-check:(msvc_pretty_enums::NicheLayoutWithFields2) niche_w_fields_2_some = { value = { 0 = 800 { __0 = { 0 = 800 } } 1 = 900 } $discr$ = 0 }
 
 // lldb-command:v niche_w_fields_3_some
-// lldbg-check:(msvc_pretty_enums::NicheLayoutWithFields3) niche_w_fields_3_some = { value = { 0 = '\x89' 1 = true } }
+// lldb-check:(msvc_pretty_enums::NicheLayoutWithFields3) niche_w_fields_3_some = { value = { 0 = '\x89' 1 = true } }
 
 // lldb-command:v niche_w_fields_3_niche3
-// lldbg-check:(msvc_pretty_enums::NicheLayoutWithFields3) niche_w_fields_3_niche3 = { value = { 0 = '"' } $discr$ = '\x04' }
+// lldb-check:(msvc_pretty_enums::NicheLayoutWithFields3) niche_w_fields_3_niche3 = { value = { 0 = '"' } $discr$ = '\x04' }
 
 // lldb-command:v arbitrary_discr1
-// lldbg-check:(msvc_pretty_enums::ArbitraryDiscr) arbitrary_discr1 = { value = { 0 = 1234 } $discr$ = 1000 }
+// lldb-check:(msvc_pretty_enums::ArbitraryDiscr) arbitrary_discr1 = { value = { 0 = 1234 } $discr$ = 1000 }
 
 // lldb-command:v arbitrary_discr2
-// lldbg-check:(msvc_pretty_enums::ArbitraryDiscr) arbitrary_discr2 = { value = { 0 = 5678 } $discr$ = 5000000 }
+// lldb-check:(msvc_pretty_enums::ArbitraryDiscr) arbitrary_discr2 = { value = { 0 = 5678 } $discr$ = 5000000 }
 
 // === CDB TESTS ==================================================================================
 
diff --git a/tests/debuginfo/multi-cgu.rs b/tests/debuginfo/multi-cgu.rs
index 81735f2bc09..3bb5269adea 100644
--- a/tests/debuginfo/multi-cgu.rs
+++ b/tests/debuginfo/multi-cgu.rs
@@ -21,11 +21,11 @@
 // lldb-command:run
 
 // lldb-command:v xxx
-// lldbg-check:[...] 12345
+// lldb-check:[...] 12345
 // lldb-command:continue
 
 // lldb-command:v yyy
-// lldbg-check:[...] 67890
+// lldb-check:[...] 67890
 // lldb-command:continue
 
 
diff --git a/tests/debuginfo/multiple-functions-equal-var-names.rs b/tests/debuginfo/multiple-functions-equal-var-names.rs
index cbf513ad0f7..6ae9225d55c 100644
--- a/tests/debuginfo/multiple-functions-equal-var-names.rs
+++ b/tests/debuginfo/multiple-functions-equal-var-names.rs
@@ -21,15 +21,15 @@
 // lldb-command:run
 
 // lldb-command:v abc
-// lldbg-check:[...] 10101
+// lldb-check:[...] 10101
 // lldb-command:continue
 
 // lldb-command:v abc
-// lldbg-check:[...] 20202
+// lldb-check:[...] 20202
 // lldb-command:continue
 
 // lldb-command:v abc
-// lldbg-check:[...] 30303
+// lldb-check:[...] 30303
 
 #![allow(unused_variables)]
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/multiple-functions.rs b/tests/debuginfo/multiple-functions.rs
index a113ce17855..3f7a0ded91b 100644
--- a/tests/debuginfo/multiple-functions.rs
+++ b/tests/debuginfo/multiple-functions.rs
@@ -21,15 +21,15 @@
 // lldb-command:run
 
 // lldb-command:v a
-// lldbg-check:[...] 10101
+// lldb-check:[...] 10101
 // lldb-command:continue
 
 // lldb-command:v b
-// lldbg-check:[...] 20202
+// lldb-check:[...] 20202
 // lldb-command:continue
 
 // lldb-command:v c
-// lldbg-check:[...] 30303
+// lldb-check:[...] 30303
 
 #![allow(unused_variables)]
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/name-shadowing-and-scope-nesting.rs b/tests/debuginfo/name-shadowing-and-scope-nesting.rs
index 9d1accd963b..d3829b60713 100644
--- a/tests/debuginfo/name-shadowing-and-scope-nesting.rs
+++ b/tests/debuginfo/name-shadowing-and-scope-nesting.rs
@@ -46,39 +46,39 @@
 // lldb-command:run
 
 // lldb-command:v x
-// lldbg-check:[...] false
+// lldb-check:[...] false
 // lldb-command:v y
-// lldbg-check:[...] true
+// lldb-check:[...] true
 // lldb-command:continue
 
 // lldb-command:v x
-// lldbg-check:[...] 10
+// lldb-check:[...] 10
 // lldb-command:v y
-// lldbg-check:[...] true
+// lldb-check:[...] true
 // lldb-command:continue
 
 // lldb-command:v x
-// lldbg-check:[...] 10.5
+// lldb-check:[...] 10.5
 // lldb-command:v y
-// lldbg-check:[...] 20
+// lldb-check:[...] 20
 // lldb-command:continue
 
 // lldb-command:v x
-// lldbg-check:[...] true
+// lldb-check:[...] true
 // lldb-command:v y
-// lldbg-check:[...] 2220
+// lldb-check:[...] 2220
 // lldb-command:continue
 
 // lldb-command:v x
-// lldbg-check:[...] 203203.5
+// lldb-check:[...] 203203.5
 // lldb-command:v y
-// lldbg-check:[...] 2220
+// lldb-check:[...] 2220
 // lldb-command:continue
 
 // lldb-command:v x
-// lldbg-check:[...] 10.5
+// lldb-check:[...] 10.5
 // lldb-command:v y
-// lldbg-check:[...] 20
+// lldb-check:[...] 20
 // lldb-command:continue
 
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/packed-struct-with-destructor.rs b/tests/debuginfo/packed-struct-with-destructor.rs
index f715fdaea6f..f923d36953c 100644
--- a/tests/debuginfo/packed-struct-with-destructor.rs
+++ b/tests/debuginfo/packed-struct-with-destructor.rs
@@ -35,28 +35,28 @@
 // lldb-command:run
 
 // lldb-command:v packed
-// lldbg-check:[...] { x = 123 y = 234 z = 345 }
+// lldb-check:[...] { x = 123 y = 234 z = 345 }
 
 // lldb-command:v packedInPacked
-// lldbg-check:[...] { a = 1111 b = { x = 2222 y = 3333 z = 4444 } c = 5555 d = { x = 6666 y = 7777 z = 8888 } }
+// lldb-check:[...] { a = 1111 b = { x = 2222 y = 3333 z = 4444 } c = 5555 d = { x = 6666 y = 7777 z = 8888 } }
 
 // lldb-command:v packedInUnpacked
-// lldbg-check:[...] { a = -1111 b = { x = -2222 y = -3333 z = -4444 } c = -5555 d = { x = -6666 y = -7777 z = -8888 } }
+// lldb-check:[...] { a = -1111 b = { x = -2222 y = -3333 z = -4444 } c = -5555 d = { x = -6666 y = -7777 z = -8888 } }
 
 // lldb-command:v unpackedInPacked
-// lldbg-check:[...] { a = 987 b = { x = 876 y = 765 z = 654 } c = { x = 543 y = 432 z = 321 } d = 210 }
+// lldb-check:[...] { a = 987 b = { x = 876 y = 765 z = 654 } c = { x = 543 y = 432 z = 321 } d = 210 }
 
 // lldb-command:v packedInPackedWithDrop
-// lldbg-check:[...] { a = 11 b = { x = 22 y = 33 z = 44 } c = 55 d = { x = 66 y = 77 z = 88 } }
+// lldb-check:[...] { a = 11 b = { x = 22 y = 33 z = 44 } c = 55 d = { x = 66 y = 77 z = 88 } }
 
 // lldb-command:v packedInUnpackedWithDrop
-// lldbg-check:[...] { a = -11 b = { x = -22 y = -33 z = -44 } c = -55 d = { x = -66 y = -77 z = -88 } }
+// lldb-check:[...] { a = -11 b = { x = -22 y = -33 z = -44 } c = -55 d = { x = -66 y = -77 z = -88 } }
 
 // lldb-command:v unpackedInPackedWithDrop
-// lldbg-check:[...] { a = 98 b = { x = 87 y = 76 z = 65 } c = { x = 54 y = 43 z = 32 } d = 21 }
+// lldb-check:[...] { a = 98 b = { x = 87 y = 76 z = 65 } c = { x = 54 y = 43 z = 32 } d = 21 }
 
 // lldb-command:v deeplyNested
-// lldbg-check:[...] { a = { a = 1 b = { x = 2 y = 3 z = 4 } c = 5 d = { x = 6 y = 7 z = 8 } } b = { a = 9 b = { x = 10 y = 11 z = 12 } c = { x = 13 y = 14 z = 15 } d = 16 } c = { a = 17 b = { x = 18 y = 19 z = 20 } c = 21 d = { x = 22 y = 23 z = 24 } } d = { a = 25 b = { x = 26 y = 27 z = 28 } c = 29 d = { x = 30 y = 31 z = 32 } } e = { a = 33 b = { x = 34 y = 35 z = 36 } c = { x = 37 y = 38 z = 39 } d = 40 } f = { a = 41 b = { x = 42 y = 43 z = 44 } c = 45 d = { x = 46 y = 47 z = 48 } } }
+// lldb-check:[...] { a = { a = 1 b = { x = 2 y = 3 z = 4 } c = 5 d = { x = 6 y = 7 z = 8 } } b = { a = 9 b = { x = 10 y = 11 z = 12 } c = { x = 13 y = 14 z = 15 } d = 16 } c = { a = 17 b = { x = 18 y = 19 z = 20 } c = 21 d = { x = 22 y = 23 z = 24 } } d = { a = 25 b = { x = 26 y = 27 z = 28 } c = 29 d = { x = 30 y = 31 z = 32 } } e = { a = 33 b = { x = 34 y = 35 z = 36 } c = { x = 37 y = 38 z = 39 } d = 40 } f = { a = 41 b = { x = 42 y = 43 z = 44 } c = 45 d = { x = 46 y = 47 z = 48 } } }
 
 
 #![allow(unused_variables)]
diff --git a/tests/debuginfo/packed-struct.rs b/tests/debuginfo/packed-struct.rs
index 5f5233e3732..2b3652fe861 100644
--- a/tests/debuginfo/packed-struct.rs
+++ b/tests/debuginfo/packed-struct.rs
@@ -28,22 +28,22 @@
 // lldb-command:run
 
 // lldb-command:v packed
-// lldbg-check:[...] { x = 123 y = 234 z = 345 }
+// lldb-check:[...] { x = 123 y = 234 z = 345 }
 
 // lldb-command:v packedInPacked
-// lldbg-check:[...] { a = 1111 b = { x = 2222 y = 3333 z = 4444 } c = 5555 d = { x = 6666 y = 7777 z = 8888 } }
+// lldb-check:[...] { a = 1111 b = { x = 2222 y = 3333 z = 4444 } c = 5555 d = { x = 6666 y = 7777 z = 8888 } }
 
 // lldb-command:v packedInUnpacked
-// lldbg-check:[...] { a = -1111 b = { x = -2222 y = -3333 z = -4444 } c = -5555 d = { x = -6666 y = -7777 z = -8888 } }
+// lldb-check:[...] { a = -1111 b = { x = -2222 y = -3333 z = -4444 } c = -5555 d = { x = -6666 y = -7777 z = -8888 } }
 
 // lldb-command:v unpackedInPacked
-// lldbg-check:[...] { a = 987 b = { x = 876 y = 765 z = 654 w = 543 } c = { x = 432 y = 321 z = 210 w = 109 } d = -98 }
+// lldb-check:[...] { a = 987 b = { x = 876 y = 765 z = 654 w = 543 } c = { x = 432 y = 321 z = 210 w = 109 } d = -98 }
 
 // lldb-command:expr sizeof(packed)
-// lldbg-check:[...] 14
+// lldb-check:[...] 14
 
 // lldb-command:expr sizeof(packedInPacked)
-// lldbg-check:[...] 40
+// lldb-check:[...] 40
 
 #![allow(unused_variables)]
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/pretty-std-collections.rs b/tests/debuginfo/pretty-std-collections.rs
index 2489d6d4136..5e133ee718e 100644
--- a/tests/debuginfo/pretty-std-collections.rs
+++ b/tests/debuginfo/pretty-std-collections.rs
@@ -52,16 +52,16 @@
 // lldb-command:run
 
 // lldb-command:v vec_deque
-// lldbg-check:[...] size=3 { [0] = 5 [1] = 3 [2] = 7 }
+// lldb-check:[...] size=3 { [0] = 5 [1] = 3 [2] = 7 }
 
 // lldb-command:v vec_deque2
-// lldbg-check:[...] size=7 { [0] = 2 [1] = 3 [2] = 4 [3] = 5 [4] = 6 [5] = 7 [6] = 8 }
+// lldb-check:[...] size=7 { [0] = 2 [1] = 3 [2] = 4 [3] = 5 [4] = 6 [5] = 7 [6] = 8 }
 
 // lldb-command:v hash_map
-// lldbg-check:[...] size=4 { [0] = { 0 = 1 1 = 10 } [1] = { 0 = 2 1 = 20 } [2] = { 0 = 3 1 = 30 } [3] = { 0 = 4 1 = 40 } }
+// lldb-check:[...] size=4 { [0] = { 0 = 1 1 = 10 } [1] = { 0 = 2 1 = 20 } [2] = { 0 = 3 1 = 30 } [3] = { 0 = 4 1 = 40 } }
 
 // lldb-command:v hash_set
-// lldbg-check:[...] size=4 { [0] = 1 [1] = 2 [2] = 3 [3] = 4 }
+// lldb-check:[...] size=4 { [0] = 1 [1] = 2 [2] = 3 [3] = 4 }
 
 #![allow(unused_variables)]
 use std::collections::BTreeMap;
diff --git a/tests/debuginfo/reference-debuginfo.rs b/tests/debuginfo/reference-debuginfo.rs
index 3889c1f5ba8..773c3ae4bc3 100644
--- a/tests/debuginfo/reference-debuginfo.rs
+++ b/tests/debuginfo/reference-debuginfo.rs
@@ -60,50 +60,50 @@
 
 // lldb-command:run
 // lldb-command:v *bool_ref
-// lldbg-check:[...] true
+// lldb-check:[...] true
 
 // lldb-command:v *int_ref
-// lldbg-check:[...] -1
+// lldb-check:[...] -1
 
 
 // lldb-command:v *i8_ref
-// lldbg-check:[...] 'D'
+// lldb-check:[...] 'D'
 
 // lldb-command:v *i16_ref
-// lldbg-check:[...] -16
+// lldb-check:[...] -16
 
 // lldb-command:v *i32_ref
-// lldbg-check:[...] -32
+// lldb-check:[...] -32
 
 // lldb-command:v *i64_ref
-// lldbg-check:[...] -64
+// lldb-check:[...] -64
 
 // lldb-command:v *uint_ref
-// lldbg-check:[...] 1
+// lldb-check:[...] 1
 
 // lldb-command:v *u8_ref
-// lldbg-check:[...] 'd'
+// lldb-check:[...] 'd'
 
 // lldb-command:v *u16_ref
-// lldbg-check:[...] 16
+// lldb-check:[...] 16
 
 // lldb-command:v *u32_ref
-// lldbg-check:[...] 32
+// lldb-check:[...] 32
 
 // lldb-command:v *u64_ref
-// lldbg-check:[...] 64
+// lldb-check:[...] 64
 
 // lldb-command:v *f16_ref
-// lldbg-check:[...] 1.5
+// lldb-check:[...] 1.5
 
 // lldb-command:v *f32_ref
-// lldbg-check:[...] 2.5
+// lldb-check:[...] 2.5
 
 // lldb-command:v *f64_ref
-// lldbg-check:[...] 3.5
+// lldb-check:[...] 3.5
 
 // lldb-command:v *f64_double_ref
-// lldbg-check:[...] 3.5
+// lldb-check:[...] 3.5
 
 #![allow(unused_variables)]
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/regression-bad-location-list-67992.rs b/tests/debuginfo/regression-bad-location-list-67992.rs
index 6502cce3700..0ec474b5b5a 100644
--- a/tests/debuginfo/regression-bad-location-list-67992.rs
+++ b/tests/debuginfo/regression-bad-location-list-67992.rs
@@ -11,7 +11,7 @@
 
 // lldb-command:run
 // lldb-command:v a
-// lldbg-check:(regression_bad_location_list_67992::Foo) [...]
+// lldb-check:(regression_bad_location_list_67992::Foo) [...]
 
 const ARRAY_SIZE: usize = 1024;
 
diff --git a/tests/debuginfo/self-in-default-method.rs b/tests/debuginfo/self-in-default-method.rs
index 8c607d01210..02fc01d96eb 100644
--- a/tests/debuginfo/self-in-default-method.rs
+++ b/tests/debuginfo/self-in-default-method.rs
@@ -56,47 +56,47 @@
 
 // STACK BY REF
 // lldb-command:v *self
-// lldbg-check:[...] { x = 100 }
+// lldb-check:[...] { x = 100 }
 // lldb-command:v arg1
-// lldbg-check:[...] -1
+// lldb-check:[...] -1
 // lldb-command:v arg2
-// lldbg-check:[...] -2
+// lldb-check:[...] -2
 // lldb-command:continue
 
 // STACK BY VAL
 // lldb-command:v self
-// lldbg-check:[...] { x = 100 }
+// lldb-check:[...] { x = 100 }
 // lldb-command:v arg1
-// lldbg-check:[...] -3
+// lldb-check:[...] -3
 // lldb-command:v arg2
-// lldbg-check:[...] -4
+// lldb-check:[...] -4
 // lldb-command:continue
 
 // OWNED BY REF
 // lldb-command:v *self
-// lldbg-check:[...] { x = 200 }
+// lldb-check:[...] { x = 200 }
 // lldb-command:v arg1
-// lldbg-check:[...] -5
+// lldb-check:[...] -5
 // lldb-command:v arg2
-// lldbg-check:[...] -6
+// lldb-check:[...] -6
 // lldb-command:continue
 
 // OWNED BY VAL
 // lldb-command:v self
-// lldbg-check:[...] { x = 200 }
+// lldb-check:[...] { x = 200 }
 // lldb-command:v arg1
-// lldbg-check:[...] -7
+// lldb-check:[...] -7
 // lldb-command:v arg2
-// lldbg-check:[...] -8
+// lldb-check:[...] -8
 // lldb-command:continue
 
 // OWNED MOVED
 // lldb-command:v *self
-// lldbg-check:[...] { x = 200 }
+// lldb-check:[...] { x = 200 }
 // lldb-command:v arg1
-// lldbg-check:[...] -9
+// lldb-check:[...] -9
 // lldb-command:v arg2
-// lldbg-check:[...] -10
+// lldb-check:[...] -10
 // lldb-command:continue
 
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/self-in-generic-default-method.rs b/tests/debuginfo/self-in-generic-default-method.rs
index 71d1f2d52d2..65018e549ee 100644
--- a/tests/debuginfo/self-in-generic-default-method.rs
+++ b/tests/debuginfo/self-in-generic-default-method.rs
@@ -56,47 +56,47 @@
 
 // STACK BY REF
 // lldb-command:v *self
-// lldbg-check:[...] { x = 987 }
+// lldb-check:[...] { x = 987 }
 // lldb-command:v arg1
-// lldbg-check:[...] -1
+// lldb-check:[...] -1
 // lldb-command:v arg2
-// lldbg-check:[...] 2
+// lldb-check:[...] 2
 // lldb-command:continue
 
 // STACK BY VAL
 // lldb-command:v self
-// lldbg-check:[...] { x = 987 }
+// lldb-check:[...] { x = 987 }
 // lldb-command:v arg1
-// lldbg-check:[...] -3
+// lldb-check:[...] -3
 // lldb-command:v arg2
-// lldbg-check:[...] -4
+// lldb-check:[...] -4
 // lldb-command:continue
 
 // OWNED BY REF
 // lldb-command:v *self
-// lldbg-check:[...] { x = 879 }
+// lldb-check:[...] { x = 879 }
 // lldb-command:v arg1
-// lldbg-check:[...] -5
+// lldb-check:[...] -5
 // lldb-command:v arg2
-// lldbg-check:[...] -6
+// lldb-check:[...] -6
 // lldb-command:continue
 
 // OWNED BY VAL
 // lldb-command:v self
-// lldbg-check:[...] { x = 879 }
+// lldb-check:[...] { x = 879 }
 // lldb-command:v arg1
-// lldbg-check:[...] -7
+// lldb-check:[...] -7
 // lldb-command:v arg2
-// lldbg-check:[...] -8
+// lldb-check:[...] -8
 // lldb-command:continue
 
 // OWNED MOVED
 // lldb-command:v *self
-// lldbg-check:[...] { x = 879 }
+// lldb-check:[...] { x = 879 }
 // lldb-command:v arg1
-// lldbg-check:[...] -9
+// lldb-check:[...] -9
 // lldb-command:v arg2
-// lldbg-check:[...] -10.5
+// lldb-check:[...] -10.5
 // lldb-command:continue
 
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/shadowed-argument.rs b/tests/debuginfo/shadowed-argument.rs
index b4da794ef95..3a575b4addf 100644
--- a/tests/debuginfo/shadowed-argument.rs
+++ b/tests/debuginfo/shadowed-argument.rs
@@ -28,21 +28,21 @@
 // lldb-command:run
 
 // lldb-command:v x
-// lldbg-check:[...] false
+// lldb-check:[...] false
 // lldb-command:v y
-// lldbg-check:[...] true
+// lldb-check:[...] true
 // lldb-command:continue
 
 // lldb-command:v x
-// lldbg-check:[...] 10
+// lldb-check:[...] 10
 // lldb-command:v y
-// lldbg-check:[...] true
+// lldb-check:[...] true
 // lldb-command:continue
 
 // lldb-command:v x
-// lldbg-check:[...] 10.5
+// lldb-check:[...] 10.5
 // lldb-command:v y
-// lldbg-check:[...] 20
+// lldb-check:[...] 20
 // lldb-command:continue
 
 
diff --git a/tests/debuginfo/shadowed-variable.rs b/tests/debuginfo/shadowed-variable.rs
index cbbad4c2b7c..752e4c233f1 100644
--- a/tests/debuginfo/shadowed-variable.rs
+++ b/tests/debuginfo/shadowed-variable.rs
@@ -39,33 +39,33 @@
 // lldb-command:run
 
 // lldb-command:v x
-// lldbg-check:[...] false
+// lldb-check:[...] false
 // lldb-command:v y
-// lldbg-check:[...] true
+// lldb-check:[...] true
 // lldb-command:continue
 
 // lldb-command:v x
-// lldbg-check:[...] 10
+// lldb-check:[...] 10
 // lldb-command:v y
-// lldbg-check:[...] true
+// lldb-check:[...] true
 // lldb-command:continue
 
 // lldb-command:v x
-// lldbg-check:[...] 10.5
+// lldb-check:[...] 10.5
 // lldb-command:v y
-// lldbg-check:[...] 20
+// lldb-check:[...] 20
 // lldb-command:continue
 
 // lldb-command:v x
-// lldbg-check:[...] 10.5
+// lldb-check:[...] 10.5
 // lldb-command:v y
-// lldbg-check:[...] 20
+// lldb-check:[...] 20
 // lldb-command:continue
 
 // lldb-command:v x
-// lldbg-check:[...] 11.5
+// lldb-check:[...] 11.5
 // lldb-command:v y
-// lldbg-check:[...] 20
+// lldb-check:[...] 20
 // lldb-command:continue
 
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/simple-lexical-scope.rs b/tests/debuginfo/simple-lexical-scope.rs
index 82737b04b64..6008489bd65 100644
--- a/tests/debuginfo/simple-lexical-scope.rs
+++ b/tests/debuginfo/simple-lexical-scope.rs
@@ -38,31 +38,31 @@
 // lldb-command:run
 
 // lldb-command:v x
-// lldbg-check:[...] false
+// lldb-check:[...] false
 // lldb-command:continue
 
 // lldb-command:v x
-// lldbg-check:[...] false
+// lldb-check:[...] false
 // lldb-command:continue
 
 // lldb-command:v x
-// lldbg-check:[...] 10
+// lldb-check:[...] 10
 // lldb-command:continue
 
 // lldb-command:v x
-// lldbg-check:[...] 10
+// lldb-check:[...] 10
 // lldb-command:continue
 
 // lldb-command:v x
-// lldbg-check:[...] 10.5
+// lldb-check:[...] 10.5
 // lldb-command:continue
 
 // lldb-command:v x
-// lldbg-check:[...] 10
+// lldb-check:[...] 10
 // lldb-command:continue
 
 // lldb-command:v x
-// lldbg-check:[...] false
+// lldb-check:[...] false
 // lldb-command:continue
 
 
diff --git a/tests/debuginfo/simple-struct.rs b/tests/debuginfo/simple-struct.rs
index 9fe4d3c8d3f..bb6b2b79810 100644
--- a/tests/debuginfo/simple-struct.rs
+++ b/tests/debuginfo/simple-struct.rs
@@ -65,22 +65,22 @@
 // lldb-command:run
 
 // lldb-command:v no_padding16
-// lldbg-check:[...] { x = 10000 y = -10001 }
+// lldb-check:[...] { x = 10000 y = -10001 }
 
 // lldb-command:v no_padding32
-// lldbg-check:[...] { x = -10002 y = -10003.5 z = 10004 }
+// lldb-check:[...] { x = -10002 y = -10003.5 z = 10004 }
 
 // lldb-command:v no_padding64
-// lldbg-check:[...] { x = -10005.5 y = 10006 z = 10007 }
+// lldb-check:[...] { x = -10005.5 y = 10006 z = 10007 }
 
 // lldb-command:v no_padding163264
-// lldbg-check:[...] { a = -10008 b = 10009 c = 10010 d = 10011 }
+// lldb-check:[...] { a = -10008 b = 10009 c = 10010 d = 10011 }
 
 // lldb-command:v internal_padding
-// lldbg-check:[...] { x = 10012 y = -10013 }
+// lldb-check:[...] { x = 10012 y = -10013 }
 
 // lldb-command:v padding_at_end
-// lldbg-check:[...] { x = -10014 y = 10015 }
+// lldb-check:[...] { x = -10014 y = 10015 }
 
 #![allow(unused_variables)]
 #![allow(dead_code)]
diff --git a/tests/debuginfo/simple-tuple.rs b/tests/debuginfo/simple-tuple.rs
index f267fc7d8d9..82467ef3bcf 100644
--- a/tests/debuginfo/simple-tuple.rs
+++ b/tests/debuginfo/simple-tuple.rs
@@ -61,21 +61,21 @@
 // lldb-command:run
 
 // lldb-command:v/d noPadding8
-// lldbg-check:[...] { 0 = -100 1 = 100 }
+// lldb-check:[...] { 0 = -100 1 = 100 }
 // lldb-command:v noPadding16
-// lldbg-check:[...] { 0 = 0 1 = 1 2 = 2 }
+// lldb-check:[...] { 0 = 0 1 = 1 2 = 2 }
 // lldb-command:v noPadding32
-// lldbg-check:[...] { 0 = 3 1 = 4.5 2 = 5 }
+// lldb-check:[...] { 0 = 3 1 = 4.5 2 = 5 }
 // lldb-command:v noPadding64
-// lldbg-check:[...] { 0 = 6 1 = 7.5 2 = 8 }
+// lldb-check:[...] { 0 = 6 1 = 7.5 2 = 8 }
 
 // lldb-command:v internalPadding1
-// lldbg-check:[...] { 0 = 9 1 = 10 }
+// lldb-check:[...] { 0 = 9 1 = 10 }
 // lldb-command:v internalPadding2
-// lldbg-check:[...] { 0 = 11 1 = 12 2 = 13 3 = 14 }
+// lldb-check:[...] { 0 = 11 1 = 12 2 = 13 3 = 14 }
 
 // lldb-command:v paddingAtEnd
-// lldbg-check:[...] { 0 = 15 1 = 16 }
+// lldb-check:[...] { 0 = 15 1 = 16 }
 
 
 // === CDB TESTS ==================================================================================
diff --git a/tests/debuginfo/static-method-on-struct-and-enum.rs b/tests/debuginfo/static-method-on-struct-and-enum.rs
index 5d2932e378d..b487512a52f 100644
--- a/tests/debuginfo/static-method-on-struct-and-enum.rs
+++ b/tests/debuginfo/static-method-on-struct-and-enum.rs
@@ -27,18 +27,18 @@
 
 // STRUCT
 // lldb-command:v arg1
-// lldbg-check:[...] 1
+// lldb-check:[...] 1
 // lldb-command:v arg2
-// lldbg-check:[...] 2
+// lldb-check:[...] 2
 // lldb-command:continue
 
 // ENUM
 // lldb-command:v arg1
-// lldbg-check:[...] -3
+// lldb-check:[...] -3
 // lldb-command:v arg2
-// lldbg-check:[...] 4.5
+// lldb-check:[...] 4.5
 // lldb-command:v arg3
-// lldbg-check:[...] 5
+// lldb-check:[...] 5
 // lldb-command:continue
 
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/strings-and-strs.rs b/tests/debuginfo/strings-and-strs.rs
index c109b402300..b7ee3312d13 100644
--- a/tests/debuginfo/strings-and-strs.rs
+++ b/tests/debuginfo/strings-and-strs.rs
@@ -25,19 +25,19 @@
 // === LLDB TESTS ==================================================================================
 // lldb-command:run
 // lldb-command:v plain_string
-// lldbg-check:(alloc::string::String) plain_string = "Hello" { vec = size=5 { [0] = 'H' [1] = 'e' [2] = 'l' [3] = 'l' [4] = 'o' } }
+// lldb-check:(alloc::string::String) plain_string = "Hello" { vec = size=5 { [0] = 'H' [1] = 'e' [2] = 'l' [3] = 'l' [4] = 'o' } }
 
 // lldb-command:v plain_str
-// lldbg-check:(&str) plain_str = "Hello" { [0] = 'H' [1] = 'e' [2] = 'l' [3] = 'l' [4] = 'o' }
+// lldb-check:(&str) plain_str = "Hello" { [0] = 'H' [1] = 'e' [2] = 'l' [3] = 'l' [4] = 'o' }
 
 // lldb-command:v str_in_struct
-// lldbg-check:((&str, &str)) str_in_tuple = { 0 = "Hello" { [0] = 'H' [1] = 'e' [2] = 'l' [3] = 'l' [4] = 'o' } 1 = "World" { [0] = 'W' [1] = 'o' [2] = 'r' [3] = 'l' [4] = 'd' } }
+// lldb-check:((&str, &str)) str_in_tuple = { 0 = "Hello" { [0] = 'H' [1] = 'e' [2] = 'l' [3] = 'l' [4] = 'o' } 1 = "World" { [0] = 'W' [1] = 'o' [2] = 'r' [3] = 'l' [4] = 'd' } }
 
 // lldb-command:v str_in_tuple
-// lldbg-check:((&str, &str)) str_in_tuple = { 0 = "Hello" { [0] = 'H' [1] = 'e' [2] = 'l' [3] = 'l' [4] = 'o' } 1 = "World" { [0] = 'W' [1] = 'o' [2] = 'r' [3] = 'l' [4] = 'd' } }
+// lldb-check:((&str, &str)) str_in_tuple = { 0 = "Hello" { [0] = 'H' [1] = 'e' [2] = 'l' [3] = 'l' [4] = 'o' } 1 = "World" { [0] = 'W' [1] = 'o' [2] = 'r' [3] = 'l' [4] = 'd' } }
 
 // lldb-command:v str_in_rc
-// lldbg-check:(alloc::rc::Rc<&str, alloc::alloc::Global>) str_in_rc = strong=1, weak=0 { value = "Hello" { [0] = 'H' [1] = 'e' [2] = 'l' [3] = 'l' [4] = 'o' } }
+// lldb-check:(alloc::rc::Rc<&str, alloc::alloc::Global>) str_in_rc = strong=1, weak=0 { value = "Hello" { [0] = 'H' [1] = 'e' [2] = 'l' [3] = 'l' [4] = 'o' } }
 
 
 #![allow(unused_variables)]
diff --git a/tests/debuginfo/struct-in-struct.rs b/tests/debuginfo/struct-in-struct.rs
index 5dde8079f9a..3cf48470391 100644
--- a/tests/debuginfo/struct-in-struct.rs
+++ b/tests/debuginfo/struct-in-struct.rs
@@ -19,28 +19,28 @@
 // lldb-command:run
 
 // lldb-command:v three_simple_structs
-// lldbg-check:[...] { x = { x = 1 } y = { x = 2 } z = { x = 3 } }
+// lldb-check:[...] { x = { x = 1 } y = { x = 2 } z = { x = 3 } }
 
 // lldb-command:v internal_padding_parent
-// lldbg-check:[...] { x = { x = 4 y = 5 } y = { x = 6 y = 7 } z = { x = 8 y = 9 } }
+// lldb-check:[...] { x = { x = 4 y = 5 } y = { x = 6 y = 7 } z = { x = 8 y = 9 } }
 
 // lldb-command:v padding_at_end_parent
-// lldbg-check:[...] { x = { x = 10 y = 11 } y = { x = 12 y = 13 } z = { x = 14 y = 15 } }
+// lldb-check:[...] { x = { x = 10 y = 11 } y = { x = 12 y = 13 } z = { x = 14 y = 15 } }
 
 // lldb-command:v mixed
-// lldbg-check:[...] { x = { x = 16 y = 17 } y = { x = 18 y = 19 } z = { x = 20 } w = 21 }
+// lldb-check:[...] { x = { x = 16 y = 17 } y = { x = 18 y = 19 } z = { x = 20 } w = 21 }
 
 // lldb-command:v bag
-// lldbg-check:[...] { x = { x = 22 } }
+// lldb-check:[...] { x = { x = 22 } }
 
 // lldb-command:v bag_in_bag
-// lldbg-check:[...] { x = { x = { x = 23 } } }
+// lldb-check:[...] { x = { x = { x = 23 } } }
 
 // lldb-command:v tjo
-// lldbg-check:[...] { x = { x = { x = { x = 24 } } } }
+// lldb-check:[...] { x = { x = { x = { x = 24 } } } }
 
 // lldb-command:v tree
-// lldbg-check:[...] { x = { x = 25 } y = { x = { x = 26 y = 27 } y = { x = 28 y = 29 } z = { x = 30 y = 31 } } z = { x = { x = { x = 32 } } } }
+// lldb-check:[...] { x = { x = 25 } y = { x = { x = 26 y = 27 } y = { x = 28 y = 29 } z = { x = 30 y = 31 } } z = { x = { x = { x = 32 } } } }
 
 #![allow(unused_variables)]
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/struct-namespace.rs b/tests/debuginfo/struct-namespace.rs
index aacc1d3825d..95788419100 100644
--- a/tests/debuginfo/struct-namespace.rs
+++ b/tests/debuginfo/struct-namespace.rs
@@ -5,14 +5,14 @@
 
 // lldb-command:run
 // lldb-command:v struct1
-// lldbg-check:(struct_namespace::Struct1)[...]
+// lldb-check:(struct_namespace::Struct1)[...]
 // lldb-command:v struct2
-// lldbg-check:(struct_namespace::Struct2)[...]
+// lldb-check:(struct_namespace::Struct2)[...]
 
 // lldb-command:v mod1_struct1
-// lldbg-check:(struct_namespace::mod1::Struct1)[...]
+// lldb-check:(struct_namespace::mod1::Struct1)[...]
 // lldb-command:v mod1_struct2
-// lldbg-check:(struct_namespace::mod1::Struct2)[...]
+// lldb-check:(struct_namespace::mod1::Struct2)[...]
 
 #![allow(unused_variables)]
 #![allow(dead_code)]
diff --git a/tests/debuginfo/struct-style-enum.rs b/tests/debuginfo/struct-style-enum.rs
index c2f7fb688ed..cea9f3def8b 100644
--- a/tests/debuginfo/struct-style-enum.rs
+++ b/tests/debuginfo/struct-style-enum.rs
@@ -24,16 +24,16 @@
 // lldb-command:run
 
 // lldb-command:v case1
-// lldbg-check:(struct_style_enum::Regular) case1 = { value = { a = 0 b = 31868 c = 31868 d = 31868 e = 31868 } $discr$ = 0 }
+// lldb-check:(struct_style_enum::Regular) case1 = { value = { a = 0 b = 31868 c = 31868 d = 31868 e = 31868 } $discr$ = 0 }
 
 // lldb-command:v case2
-// lldbg-check:(struct_style_enum::Regular) case2 = { value = { a = 0 b = 286331153 c = 286331153 } $discr$ = 1 }
+// lldb-check:(struct_style_enum::Regular) case2 = { value = { a = 0 b = 286331153 c = 286331153 } $discr$ = 1 }
 
 // lldb-command:v case3
-// lldbg-check:(struct_style_enum::Regular) case3 = { value = { a = 0 b = 6438275382588823897 } $discr$ = 2 }
+// lldb-check:(struct_style_enum::Regular) case3 = { value = { a = 0 b = 6438275382588823897 } $discr$ = 2 }
 
 // lldb-command:v univariant
-// lldbg-check:(struct_style_enum::Univariant) univariant = { value = { a = -1 } }
+// lldb-check:(struct_style_enum::Univariant) univariant = { value = { a = -1 } }
 
 #![allow(unused_variables)]
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/struct-with-destructor.rs b/tests/debuginfo/struct-with-destructor.rs
index 654a574ebb5..c159824980a 100644
--- a/tests/debuginfo/struct-with-destructor.rs
+++ b/tests/debuginfo/struct-with-destructor.rs
@@ -20,16 +20,16 @@
 
 // lldb-command:run
 // lldb-command:v simple
-// lldbg-check:[...] { x = 10 y = 20 }
+// lldb-check:[...] { x = 10 y = 20 }
 
 // lldb-command:v noDestructor
-// lldbg-check:[...] { a = { x = 10 y = 20 } guard = -1 }
+// lldb-check:[...] { a = { x = 10 y = 20 } guard = -1 }
 
 // lldb-command:v withDestructor
-// lldbg-check:[...] { a = { x = 10 y = 20 } guard = -1 }
+// lldb-check:[...] { a = { x = 10 y = 20 } guard = -1 }
 
 // lldb-command:v nested
-// lldbg-check:[...] { a = { a = { x = 7890 y = 9870 } } }
+// lldb-check:[...] { a = { a = { x = 7890 y = 9870 } } }
 
 #![allow(unused_variables)]
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/tuple-in-tuple.rs b/tests/debuginfo/tuple-in-tuple.rs
index 74ccaf14d00..d4388095ad7 100644
--- a/tests/debuginfo/tuple-in-tuple.rs
+++ b/tests/debuginfo/tuple-in-tuple.rs
@@ -27,21 +27,21 @@
 // lldb-command:run
 
 // lldb-command:v no_padding1
-// lldbg-check:[...] { 0 = { 0 = 0 1 = 1 } 1 = 2 2 = 3 }
+// lldb-check:[...] { 0 = { 0 = 0 1 = 1 } 1 = 2 2 = 3 }
 // lldb-command:v no_padding2
-// lldbg-check:[...] { 0 = 4 1 = { 0 = 5 1 = 6 } 2 = 7 }
+// lldb-check:[...] { 0 = 4 1 = { 0 = 5 1 = 6 } 2 = 7 }
 // lldb-command:v no_padding3
-// lldbg-check:[...] { 0 = 8 1 = 9 2 = { 0 = 10 1 = 11 } }
+// lldb-check:[...] { 0 = 8 1 = 9 2 = { 0 = 10 1 = 11 } }
 
 // lldb-command:v internal_padding1
-// lldbg-check:[...] { 0 = 12 1 = { 0 = 13 1 = 14 } }
+// lldb-check:[...] { 0 = 12 1 = { 0 = 13 1 = 14 } }
 // lldb-command:v internal_padding2
-// lldbg-check:[...] { 0 = 15 1 = { 0 = 16 1 = 17 } }
+// lldb-check:[...] { 0 = 15 1 = { 0 = 16 1 = 17 } }
 
 // lldb-command:v padding_at_end1
-// lldbg-check:[...] { 0 = 18 1 = { 0 = 19 1 = 20 } }
+// lldb-check:[...] { 0 = 18 1 = { 0 = 19 1 = 20 } }
 // lldb-command:v padding_at_end2
-// lldbg-check:[...] { 0 = { 0 = 21 1 = 22 } 1 = 23 }
+// lldb-check:[...] { 0 = { 0 = 21 1 = 22 } 1 = 23 }
 
 
 // === CDB TESTS ==================================================================================
diff --git a/tests/debuginfo/tuple-struct.rs b/tests/debuginfo/tuple-struct.rs
index f9755a8a0d5..0110203a7c7 100644
--- a/tests/debuginfo/tuple-struct.rs
+++ b/tests/debuginfo/tuple-struct.rs
@@ -28,22 +28,22 @@
 // lldb-command:run
 
 // lldb-command:v no_padding16
-// lldbg-check:[...] { 0 = 10000 1 = -10001 }
+// lldb-check:[...] { 0 = 10000 1 = -10001 }
 
 // lldb-command:v no_padding32
-// lldbg-check:[...] { 0 = -10002 1 = -10003.5 2 = 10004 }
+// lldb-check:[...] { 0 = -10002 1 = -10003.5 2 = 10004 }
 
 // lldb-command:v no_padding64
-// lldbg-check:[...] { 0 = -10005.5 1 = 10006 2 = 10007 }
+// lldb-check:[...] { 0 = -10005.5 1 = 10006 2 = 10007 }
 
 // lldb-command:v no_padding163264
-// lldbg-check:[...] { 0 = -10008 1 = 10009 2 = 10010 3 = 10011 }
+// lldb-check:[...] { 0 = -10008 1 = 10009 2 = 10010 3 = 10011 }
 
 // lldb-command:v internal_padding
-// lldbg-check:[...] { 0 = 10012 1 = -10013 }
+// lldb-check:[...] { 0 = 10012 1 = -10013 }
 
 // lldb-command:v padding_at_end
-// lldbg-check:[...] { 0 = -10014 1 = 10015 }
+// lldb-check:[...] { 0 = -10014 1 = 10015 }
 
 // This test case mainly makes sure that no field names are generated for tuple structs (as opposed
 // to all fields having the name "<unnamed_field>"). Otherwise they are handled the same a normal
diff --git a/tests/debuginfo/tuple-style-enum.rs b/tests/debuginfo/tuple-style-enum.rs
index efdf8c6970e..a759ad61c05 100644
--- a/tests/debuginfo/tuple-style-enum.rs
+++ b/tests/debuginfo/tuple-style-enum.rs
@@ -25,16 +25,16 @@
 // lldb-command:run
 
 // lldb-command:v case1
-// lldbg-check:(tuple_style_enum::Regular) case1 = { value = { 0 = 0 1 = 31868 2 = 31868 3 = 31868 4 = 31868 } $discr$ = 0 }
+// lldb-check:(tuple_style_enum::Regular) case1 = { value = { 0 = 0 1 = 31868 2 = 31868 3 = 31868 4 = 31868 } $discr$ = 0 }
 
 // lldb-command:v case2
-// lldbg-check:(tuple_style_enum::Regular) case2 = { value = { 0 = 0 1 = 286331153 2 = 286331153 } $discr$ = 1 }
+// lldb-check:(tuple_style_enum::Regular) case2 = { value = { 0 = 0 1 = 286331153 2 = 286331153 } $discr$ = 1 }
 
 // lldb-command:v case3
-// lldbg-check:(tuple_style_enum::Regular) case3 = { value = { 0 = 0 1 = 6438275382588823897 } $discr$ = 2 }
+// lldb-check:(tuple_style_enum::Regular) case3 = { value = { 0 = 0 1 = 6438275382588823897 } $discr$ = 2 }
 
 // lldb-command:v univariant
-// lldbg-check:(tuple_style_enum::Univariant) univariant = { value = { 0 = -1 } }
+// lldb-check:(tuple_style_enum::Univariant) univariant = { value = { 0 = -1 } }
 
 #![allow(unused_variables)]
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/union-smoke.rs b/tests/debuginfo/union-smoke.rs
index 73617df10b1..6043240069e 100644
--- a/tests/debuginfo/union-smoke.rs
+++ b/tests/debuginfo/union-smoke.rs
@@ -12,10 +12,10 @@
 
 // lldb-command:run
 // lldb-command:v u
-// lldbg-check:[...] { a = { 0 = '\x02' 1 = '\x02' } b = 514 }
+// lldb-check:[...] { a = { 0 = '\x02' 1 = '\x02' } b = 514 }
 
-// lldbg-command:print union_smoke::SU
-// lldbg-check:[...] { a = { 0 = '\x01' 1 = '\x01' } b = 257 }
+// lldb-command:print union_smoke::SU
+// lldb-check:[...] { a = { 0 = '\x01' 1 = '\x01' } b = 257 }
 
 #![allow(unused)]
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/unique-enum.rs b/tests/debuginfo/unique-enum.rs
index b9ee480c851..230429278aa 100644
--- a/tests/debuginfo/unique-enum.rs
+++ b/tests/debuginfo/unique-enum.rs
@@ -21,13 +21,13 @@
 // lldb-command:run
 
 // lldb-command:v *the_a
-// lldbg-check:(unique_enum::ABC) *the_a = { value = { x = 0 y = 8970181431921507452 } $discr$ = 0 }
+// lldb-check:(unique_enum::ABC) *the_a = { value = { x = 0 y = 8970181431921507452 } $discr$ = 0 }
 
 // lldb-command:v *the_b
-// lldbg-check:(unique_enum::ABC) *the_b = { value = { 0 = 0 1 = 286331153 2 = 286331153 } $discr$ = 1 }
+// lldb-check:(unique_enum::ABC) *the_b = { value = { 0 = 0 1 = 286331153 2 = 286331153 } $discr$ = 1 }
 
 // lldb-command:v *univariant
-// lldbg-check:(unique_enum::Univariant) *univariant = { value = { 0 = 123234 } }
+// lldb-check:(unique_enum::Univariant) *univariant = { value = { 0 = 123234 } }
 
 #![allow(unused_variables)]
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/var-captured-in-nested-closure.rs b/tests/debuginfo/var-captured-in-nested-closure.rs
index 0f544c24b5b..4e8700015ba 100644
--- a/tests/debuginfo/var-captured-in-nested-closure.rs
+++ b/tests/debuginfo/var-captured-in-nested-closure.rs
@@ -38,31 +38,31 @@
 // lldb-command:run
 
 // lldb-command:v variable
-// lldbg-check:[...] 1
+// lldb-check:[...] 1
 // lldb-command:v constant
-// lldbg-check:[...] 2
+// lldb-check:[...] 2
 // lldb-command:v a_struct
-// lldbg-check:[...] { a = -3 b = 4.5 c = 5 }
+// lldb-check:[...] { a = -3 b = 4.5 c = 5 }
 // lldb-command:v *struct_ref
-// lldbg-check:[...] { a = -3 b = 4.5 c = 5 }
+// lldb-check:[...] { a = -3 b = 4.5 c = 5 }
 // lldb-command:v *owned
-// lldbg-check:[...] 6
+// lldb-check:[...] 6
 // lldb-command:v closure_local
-// lldbg-check:[...] 8
+// lldb-check:[...] 8
 // lldb-command:continue
 
 // lldb-command:v variable
-// lldbg-check:[...] 1
+// lldb-check:[...] 1
 // lldb-command:v constant
-// lldbg-check:[...] 2
+// lldb-check:[...] 2
 // lldb-command:v a_struct
-// lldbg-check:[...] { a = -3 b = 4.5 c = 5 }
+// lldb-check:[...] { a = -3 b = 4.5 c = 5 }
 // lldb-command:v *struct_ref
-// lldbg-check:[...] { a = -3 b = 4.5 c = 5 }
+// lldb-check:[...] { a = -3 b = 4.5 c = 5 }
 // lldb-command:v *owned
-// lldbg-check:[...] 6
+// lldb-check:[...] 6
 // lldb-command:v closure_local
-// lldbg-check:[...] 8
+// lldb-check:[...] 8
 // lldb-command:continue
 
 
diff --git a/tests/debuginfo/var-captured-in-sendable-closure.rs b/tests/debuginfo/var-captured-in-sendable-closure.rs
index 2d9e6074473..cbb09daeb5f 100644
--- a/tests/debuginfo/var-captured-in-sendable-closure.rs
+++ b/tests/debuginfo/var-captured-in-sendable-closure.rs
@@ -21,11 +21,11 @@
 // lldb-command:run
 
 // lldb-command:v constant
-// lldbg-check:[...] 1
+// lldb-check:[...] 1
 // lldb-command:v a_struct
-// lldbg-check:[...] { a = -2 b = 3.5 c = 4 }
+// lldb-check:[...] { a = -2 b = 3.5 c = 4 }
 // lldb-command:v *owned
-// lldbg-check:[...] 5
+// lldb-check:[...] 5
 
 #![allow(unused_variables)]
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/var-captured-in-stack-closure.rs b/tests/debuginfo/var-captured-in-stack-closure.rs
index d6c4b11b5f2..0f84ea57b00 100644
--- a/tests/debuginfo/var-captured-in-stack-closure.rs
+++ b/tests/debuginfo/var-captured-in-stack-closure.rs
@@ -34,28 +34,28 @@
 // lldb-command:run
 
 // lldb-command:v variable
-// lldbg-check:[...] 1
+// lldb-check:[...] 1
 // lldb-command:v constant
-// lldbg-check:[...] 2
+// lldb-check:[...] 2
 // lldb-command:v a_struct
-// lldbg-check:[...] { a = -3 b = 4.5 c = 5 }
+// lldb-check:[...] { a = -3 b = 4.5 c = 5 }
 // lldb-command:v *struct_ref
-// lldbg-check:[...] { a = -3 b = 4.5 c = 5 }
+// lldb-check:[...] { a = -3 b = 4.5 c = 5 }
 // lldb-command:v *owned
-// lldbg-check:[...] 6
+// lldb-check:[...] 6
 
 // lldb-command:continue
 
 // lldb-command:v variable
-// lldbg-check:[...] 2
+// lldb-check:[...] 2
 // lldb-command:v constant
-// lldbg-check:[...] 2
+// lldb-check:[...] 2
 // lldb-command:v a_struct
-// lldbg-check:[...] { a = -3 b = 4.5 c = 5 }
+// lldb-check:[...] { a = -3 b = 4.5 c = 5 }
 // lldb-command:v *struct_ref
-// lldbg-check:[...] { a = -3 b = 4.5 c = 5 }
+// lldb-check:[...] { a = -3 b = 4.5 c = 5 }
 // lldb-command:v *owned
-// lldbg-check:[...] 6
+// lldb-check:[...] 6
 
 
 // === CDB TESTS ===================================================================================
diff --git a/tests/debuginfo/vec-slices.rs b/tests/debuginfo/vec-slices.rs
index 77d7b90ca0b..2b4d624976a 100644
--- a/tests/debuginfo/vec-slices.rs
+++ b/tests/debuginfo/vec-slices.rs
@@ -53,22 +53,22 @@
 // lldb-command:run
 
 // lldb-command:v empty
-// lldbg-check:[...] size=0
+// lldb-check:[...] size=0
 
 // lldb-command:v singleton
-// lldbg-check:[...] size=1 { [0] = 1 }
+// lldb-check:[...] size=1 { [0] = 1 }
 
 // lldb-command:v multiple
-// lldbg-check:[...] size=4 { [0] = 2 [1] = 3 [2] = 4 [3] = 5 }
+// lldb-check:[...] size=4 { [0] = 2 [1] = 3 [2] = 4 [3] = 5 }
 
 // lldb-command:v slice_of_slice
-// lldbg-check:[...] size=2 { [0] = 3 [1] = 4 }
+// lldb-check:[...] size=2 { [0] = 3 [1] = 4 }
 
 // lldb-command:v padded_tuple
-// lldbg-check:[...] size=2 { [0] = { 0 = 6 1 = 7 } [1] = { 0 = 8 1 = 9 } }
+// lldb-check:[...] size=2 { [0] = { 0 = 6 1 = 7 } [1] = { 0 = 8 1 = 9 } }
 
 // lldb-command:v padded_struct
-// lldbg-check:[...] size=2 { [0] = { x = 10 y = 11 z = 12 } [1] = { x = 13 y = 14 z = 15 } }
+// lldb-check:[...] size=2 { [0] = { x = 10 y = 11 z = 12 } [1] = { x = 13 y = 14 z = 15 } }
 
 #![allow(dead_code, unused_variables)]
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/tests/debuginfo/vec.rs b/tests/debuginfo/vec.rs
index 3bb84d48573..1093e38d878 100644
--- a/tests/debuginfo/vec.rs
+++ b/tests/debuginfo/vec.rs
@@ -13,7 +13,7 @@
 
 // lldb-command:run
 // lldb-command:v a
-// lldbg-check:[...] { [0] = 1 [1] = 2 [2] = 3 }
+// lldb-check:[...] { [0] = 1 [1] = 2 [2] = 3 }
 
 #![allow(unused_variables)]
 #![feature(omit_gdb_pretty_printer_section)]