From 96431e4b822ff82268bf3f2bbbb7aacf2abc5761 Mon Sep 17 00:00:00 2001 From: Markus Reiter Date: Fri, 15 Mar 2024 15:05:57 +0100 Subject: [PATCH] Use explicit LLDB commands instead of `print`/`p` aliases. --- tests/debuginfo/associated-types.rs | 18 ++-- tests/debuginfo/basic-types.rs | 26 ++--- tests/debuginfo/borrowed-basic.rs | 26 ++--- tests/debuginfo/borrowed-c-style-enum.rs | 6 +- tests/debuginfo/borrowed-enum.rs | 6 +- tests/debuginfo/borrowed-struct.rs | 14 +-- tests/debuginfo/borrowed-tuple.rs | 6 +- tests/debuginfo/borrowed-unique-basic.rs | 26 ++--- tests/debuginfo/box.rs | 4 +- tests/debuginfo/boxed-struct.rs | 4 +- .../by-value-non-immediate-argument.rs | 14 +-- .../by-value-self-argument-in-trait-impl.rs | 6 +- tests/debuginfo/c-style-enum-in-composite.rs | 14 +-- tests/debuginfo/c-style-enum.rs | 14 +-- tests/debuginfo/captured-fields-1.rs | 24 ++--- tests/debuginfo/captured-fields-2.rs | 8 +- .../debuginfo/closure-in-generic-function.rs | 8 +- tests/debuginfo/coroutine-locals.rs | 40 +++----- tests/debuginfo/coroutine-objects.rs | 16 +-- tests/debuginfo/cross-crate-spans.rs | 12 +-- tests/debuginfo/destructured-fn-argument.rs | 98 +++++++++---------- .../destructured-for-loop-variable.rs | 48 ++++----- tests/debuginfo/destructured-local.rs | 86 ++++++++-------- tests/debuginfo/enum-thinlto.rs | 4 +- tests/debuginfo/evec-in-struct.rs | 10 +- tests/debuginfo/extern-c-fn.rs | 8 +- .../debuginfo/function-arg-initialization.rs | 64 ++++++------ tests/debuginfo/function-arguments.rs | 8 +- .../function-prologue-stepping-regular.rs | 64 ++++++------ .../generic-enum-with-different-disr-sizes.rs | 16 +-- tests/debuginfo/generic-function.rs | 12 +-- tests/debuginfo/generic-functions-nested.rs | 16 +-- .../generic-method-on-generic-struct.rs | 30 +++--- tests/debuginfo/generic-struct.rs | 8 +- tests/debuginfo/generic-tuple-style-enum.rs | 8 +- tests/debuginfo/include_string.rs | 6 +- tests/debuginfo/issue-22656.rs | 4 +- tests/debuginfo/issue-57822.rs | 8 +- tests/debuginfo/lexical-scope-in-for-loop.rs | 14 +-- tests/debuginfo/lexical-scope-in-if.rs | 32 +++--- tests/debuginfo/lexical-scope-in-match.rs | 36 +++---- .../lexical-scope-in-stack-closure.rs | 12 +-- .../lexical-scope-in-unconditional-loop.rs | 26 ++--- .../lexical-scope-in-unique-closure.rs | 12 +-- tests/debuginfo/lexical-scope-in-while.rs | 26 ++--- tests/debuginfo/lexical-scope-with-macro.rs | 16 +-- .../lexical-scopes-in-block-expression.rs | 96 +++++++++--------- tests/debuginfo/method-on-enum.rs | 30 +++--- tests/debuginfo/method-on-generic-struct.rs | 30 +++--- tests/debuginfo/method-on-struct.rs | 30 +++--- tests/debuginfo/method-on-trait.rs | 30 +++--- tests/debuginfo/method-on-tuple-struct.rs | 30 +++--- tests/debuginfo/multi-cgu.rs | 4 +- .../multiple-functions-equal-var-names.rs | 6 +- tests/debuginfo/multiple-functions.rs | 6 +- .../name-shadowing-and-scope-nesting.rs | 24 ++--- tests/debuginfo/no_mangle-info.rs | 8 +- tests/debuginfo/numeric-types.rs | 24 ++--- tests/debuginfo/option-like-enum.rs | 20 ++-- .../packed-struct-with-destructor.rs | 16 +-- tests/debuginfo/packed-struct.rs | 12 +-- tests/debuginfo/pretty-std-collections.rs | 8 +- tests/debuginfo/rc_arc.rs | 4 +- tests/debuginfo/reference-debuginfo.rs | 28 +++--- .../regression-bad-location-list-67992.rs | 2 +- tests/debuginfo/self-in-default-method.rs | 30 +++--- .../self-in-generic-default-method.rs | 30 +++--- tests/debuginfo/shadowed-argument.rs | 12 +-- tests/debuginfo/shadowed-variable.rs | 20 ++-- tests/debuginfo/should-fail.rs | 2 +- tests/debuginfo/simple-lexical-scope.rs | 14 +-- tests/debuginfo/simple-struct.rs | 12 +-- tests/debuginfo/simple-tuple.rs | 14 +-- .../static-method-on-struct-and-enum.rs | 10 +- tests/debuginfo/struct-in-enum.rs | 6 +- tests/debuginfo/struct-in-struct.rs | 16 +-- tests/debuginfo/struct-namespace.rs | 8 +- tests/debuginfo/struct-style-enum.rs | 8 +- tests/debuginfo/struct-with-destructor.rs | 8 +- tests/debuginfo/tuple-in-tuple.rs | 14 +-- tests/debuginfo/tuple-struct.rs | 12 +-- tests/debuginfo/tuple-style-enum.rs | 8 +- tests/debuginfo/union-smoke.rs | 2 +- tests/debuginfo/unique-enum.rs | 6 +- .../var-captured-in-nested-closure.rs | 24 ++--- .../var-captured-in-sendable-closure.rs | 6 +- .../var-captured-in-stack-closure.rs | 20 ++-- tests/debuginfo/vec-slices.rs | 12 +-- tests/debuginfo/vec.rs | 2 +- 89 files changed, 830 insertions(+), 838 deletions(-) diff --git a/tests/debuginfo/associated-types.rs b/tests/debuginfo/associated-types.rs index 182541b038a..d1d4e320b05 100644 --- a/tests/debuginfo/associated-types.rs +++ b/tests/debuginfo/associated-types.rs @@ -42,41 +42,41 @@ // === LLDB TESTS ================================================================================== // lldb-command:run -// lldb-command:print arg +// lldb-command:v arg // lldbg-check:[...] { b = -1, b1 = 0 } // lldbr-check:(associated_types::Struct) arg = { b = -1, b1 = 0 } // lldb-command:continue -// lldb-command:print inferred +// lldb-command:v inferred // lldbg-check:[...] 1 // lldbr-check:(i64) inferred = 1 -// lldb-command:print explicitly +// lldb-command:v explicitly // lldbg-check:[...] 1 // lldbr-check:(i64) explicitly = 1 // lldb-command:continue -// lldb-command:print arg +// lldb-command:v arg // lldbg-check:[...] 2 // lldbr-check:(i64) arg = 2 // lldb-command:continue -// lldb-command:print arg +// lldb-command:v arg // lldbg-check:[...] (4, 5) // lldbr-check:((i32, i64)) arg = { = 4 = 5 } // lldb-command:continue -// lldb-command:print a +// lldb-command:v a // lldbg-check:[...] 6 // lldbr-check:(i32) a = 6 -// lldb-command:print b +// lldb-command:v b // lldbg-check:[...] 7 // lldbr-check:(i64) b = 7 // lldb-command:continue -// lldb-command:print a +// lldb-command:v a // lldbg-check:[...] 8 // lldbr-check:(i64) a = 8 -// lldb-command:print b +// lldb-command:v b // lldbg-check:[...] 9 // lldbr-check:(i32) b = 9 // lldb-command:continue diff --git a/tests/debuginfo/basic-types.rs b/tests/debuginfo/basic-types.rs index 3a023a890f3..13d85d326ee 100644 --- a/tests/debuginfo/basic-types.rs +++ b/tests/debuginfo/basic-types.rs @@ -50,10 +50,10 @@ // === LLDB TESTS ================================================================================== // lldb-command:run -// lldb-command:print b +// lldb-command:v b // lldbg-check:[...] false // lldbr-check:(bool) b = false -// lldb-command:print i +// lldb-command:v i // lldbg-check:[...] -1 // lldbr-check:(isize) i = -1 @@ -61,37 +61,37 @@ // lldbr-command:print c // lldbr-check:(char) c = 'a' -// lldb-command:print i8 +// lldb-command:v i8 // lldbg-check:[...] 'D' // lldbr-check:(i8) i8 = 68 -// lldb-command:print i16 +// lldb-command:v i16 // lldbg-check:[...] -16 // lldbr-check:(i16) i16 = -16 -// lldb-command:print i32 +// lldb-command:v i32 // lldbg-check:[...] -32 // lldbr-check:(i32) i32 = -32 -// lldb-command:print i64 +// lldb-command:v i64 // lldbg-check:[...] -64 // lldbr-check:(i64) i64 = -64 -// lldb-command:print u +// lldb-command:v u // lldbg-check:[...] 1 // lldbr-check:(usize) u = 1 -// lldb-command:print u8 +// lldb-command:v u8 // lldbg-check:[...] 'd' // lldbr-check:(u8) u8 = 100 -// lldb-command:print u16 +// lldb-command:v u16 // lldbg-check:[...] 16 // lldbr-check:(u16) u16 = 16 -// lldb-command:print u32 +// lldb-command:v u32 // lldbg-check:[...] 32 // lldbr-check:(u32) u32 = 32 -// lldb-command:print u64 +// lldb-command:v u64 // lldbg-check:[...] 64 // lldbr-check:(u64) u64 = 64 -// lldb-command:print f32 +// lldb-command:v f32 // lldbg-check:[...] 2.5 // lldbr-check:(f32) f32 = 2.5 -// lldb-command:print f64 +// lldb-command:v f64 // lldbg-check:[...] 3.5 // lldbr-check:(f64) f64 = 3.5 diff --git a/tests/debuginfo/borrowed-basic.rs b/tests/debuginfo/borrowed-basic.rs index e30131190af..e48e3dd055e 100644 --- a/tests/debuginfo/borrowed-basic.rs +++ b/tests/debuginfo/borrowed-basic.rs @@ -52,11 +52,11 @@ // === LLDB TESTS ================================================================================== // lldb-command:run -// lldb-command:print *bool_ref +// lldb-command:v *bool_ref // lldbg-check:[...] true // lldbr-check:(bool) *bool_ref = true -// lldb-command:print *int_ref +// lldb-command:v *int_ref // lldbg-check:[...] -1 // lldbr-check:(isize) *int_ref = -1 @@ -64,47 +64,47 @@ // lldbr-command:print *char_ref // lldbr-check:(char) *char_ref = 'a' -// lldb-command:print *i8_ref +// lldb-command:v *i8_ref // lldbg-check:[...] 'D' // lldbr-check:(i8) *i8_ref = 68 -// lldb-command:print *i16_ref +// lldb-command:v *i16_ref // lldbg-check:[...] -16 // lldbr-check:(i16) *i16_ref = -16 -// lldb-command:print *i32_ref +// lldb-command:v *i32_ref // lldbg-check:[...] -32 // lldbr-check:(i32) *i32_ref = -32 -// lldb-command:print *i64_ref +// lldb-command:v *i64_ref // lldbg-check:[...] -64 // lldbr-check:(i64) *i64_ref = -64 -// lldb-command:print *uint_ref +// lldb-command:v *uint_ref // lldbg-check:[...] 1 // lldbr-check:(usize) *uint_ref = 1 -// lldb-command:print *u8_ref +// lldb-command:v *u8_ref // lldbg-check:[...] 'd' // lldbr-check:(u8) *u8_ref = 100 -// lldb-command:print *u16_ref +// lldb-command:v *u16_ref // lldbg-check:[...] 16 // lldbr-check:(u16) *u16_ref = 16 -// lldb-command:print *u32_ref +// lldb-command:v *u32_ref // lldbg-check:[...] 32 // lldbr-check:(u32) *u32_ref = 32 -// lldb-command:print *u64_ref +// lldb-command:v *u64_ref // lldbg-check:[...] 64 // lldbr-check:(u64) *u64_ref = 64 -// lldb-command:print *f32_ref +// lldb-command:v *f32_ref // lldbg-check:[...] 2.5 // lldbr-check:(f32) *f32_ref = 2.5 -// lldb-command:print *f64_ref +// lldb-command:v *f64_ref // lldbg-check:[...] 3.5 // lldbr-check:(f64) *f64_ref = 3.5 diff --git a/tests/debuginfo/borrowed-c-style-enum.rs b/tests/debuginfo/borrowed-c-style-enum.rs index c6a8bf95386..1a582e8a6d9 100644 --- a/tests/debuginfo/borrowed-c-style-enum.rs +++ b/tests/debuginfo/borrowed-c-style-enum.rs @@ -22,15 +22,15 @@ // lldb-command:run -// lldb-command:print *the_a_ref +// lldb-command:v *the_a_ref // lldbg-check:[...] TheA // lldbr-check:(borrowed_c_style_enum::ABC) *the_a_ref = borrowed_c_style_enum::ABC::TheA -// lldb-command:print *the_b_ref +// lldb-command:v *the_b_ref // lldbg-check:[...] TheB // lldbr-check:(borrowed_c_style_enum::ABC) *the_b_ref = borrowed_c_style_enum::ABC::TheB -// lldb-command:print *the_c_ref +// lldb-command:v *the_c_ref // lldbg-check:[...] TheC // lldbr-check:(borrowed_c_style_enum::ABC) *the_c_ref = borrowed_c_style_enum::ABC::TheC diff --git a/tests/debuginfo/borrowed-enum.rs b/tests/debuginfo/borrowed-enum.rs index aee4631a8b3..39883ffd0b6 100644 --- a/tests/debuginfo/borrowed-enum.rs +++ b/tests/debuginfo/borrowed-enum.rs @@ -22,11 +22,11 @@ // lldb-command:run -// lldb-command:print *the_a_ref +// lldb-command:v *the_a_ref // lldbr-check:(borrowed_enum::ABC::TheA) *the_a_ref = TheA { TheA: 0, TheB: 8970181431921507452 } -// lldb-command:print *the_b_ref +// lldb-command:v *the_b_ref // lldbr-check:(borrowed_enum::ABC::TheB) *the_b_ref = { = 0 = 286331153 = 286331153 } -// lldb-command:print *univariant_ref +// lldb-command:v *univariant_ref // lldbr-check:(borrowed_enum::Univariant) *univariant_ref = { TheOnlyCase = { = 4820353753753434 } } #![allow(unused_variables)] diff --git a/tests/debuginfo/borrowed-struct.rs b/tests/debuginfo/borrowed-struct.rs index 96ceec42ab5..d108a29592b 100644 --- a/tests/debuginfo/borrowed-struct.rs +++ b/tests/debuginfo/borrowed-struct.rs @@ -34,31 +34,31 @@ // lldb-command:run -// lldb-command:print *stack_val_ref +// lldb-command:v *stack_val_ref // lldbg-check:[...] { x = 10 y = 23.5 } // lldbr-check:(borrowed_struct::SomeStruct) *stack_val_ref = (x = 10, y = 23.5) -// lldb-command:print *stack_val_interior_ref_1 +// lldb-command:v *stack_val_interior_ref_1 // lldbg-check:[...] 10 // lldbr-check:(isize) *stack_val_interior_ref_1 = 10 -// lldb-command:print *stack_val_interior_ref_2 +// lldb-command:v *stack_val_interior_ref_2 // lldbg-check:[...] 23.5 // lldbr-check:(f64) *stack_val_interior_ref_2 = 23.5 -// lldb-command:print *ref_to_unnamed +// lldb-command:v *ref_to_unnamed // lldbg-check:[...] { x = 11 y = 24.5 } // lldbr-check:(borrowed_struct::SomeStruct) *ref_to_unnamed = (x = 11, y = 24.5) -// lldb-command:print *unique_val_ref +// lldb-command:v *unique_val_ref // lldbg-check:[...] { x = 13 y = 26.5 } // lldbr-check:(borrowed_struct::SomeStruct) *unique_val_ref = (x = 13, y = 26.5) -// lldb-command:print *unique_val_interior_ref_1 +// lldb-command:v *unique_val_interior_ref_1 // lldbg-check:[...] 13 // lldbr-check:(isize) *unique_val_interior_ref_1 = 13 -// lldb-command:print *unique_val_interior_ref_2 +// lldb-command:v *unique_val_interior_ref_2 // lldbg-check:[...] 26.5 // lldbr-check:(f64) *unique_val_interior_ref_2 = 26.5 diff --git a/tests/debuginfo/borrowed-tuple.rs b/tests/debuginfo/borrowed-tuple.rs index 8d9c5e9fd2d..4c5643deb9d 100644 --- a/tests/debuginfo/borrowed-tuple.rs +++ b/tests/debuginfo/borrowed-tuple.rs @@ -23,15 +23,15 @@ // lldb-command:run -// lldb-command:print *stack_val_ref +// lldb-command:v *stack_val_ref // lldbg-check:[...] { 0 = -14 1 = -19 } // lldbr-check:((i16, f32)) *stack_val_ref = { 0 = -14 1 = -19 } -// lldb-command:print *ref_to_unnamed +// lldb-command:v *ref_to_unnamed // lldbg-check:[...] { 0 = -15 1 = -20 } // lldbr-check:((i16, f32)) *ref_to_unnamed = { 0 = -15 1 = -20 } -// lldb-command:print *unique_val_ref +// lldb-command:v *unique_val_ref // lldbg-check:[...] { 0 = -17 1 = -22 } // lldbr-check:((i16, f32)) *unique_val_ref = { 0 = -17 1 = -22 } diff --git a/tests/debuginfo/borrowed-unique-basic.rs b/tests/debuginfo/borrowed-unique-basic.rs index 38e6ce0a6ae..d6948a12851 100644 --- a/tests/debuginfo/borrowed-unique-basic.rs +++ b/tests/debuginfo/borrowed-unique-basic.rs @@ -55,11 +55,11 @@ // lldb-command:type format add -f decimal 'unsigned char' // lldb-command:run -// lldb-command:print *bool_ref +// lldb-command:v *bool_ref // lldbg-check:[...] true // lldbr-check:(bool) *bool_ref = true -// lldb-command:print *int_ref +// lldb-command:v *int_ref // lldbg-check:[...] -1 // lldbr-check:(isize) *int_ref = -1 @@ -67,47 +67,47 @@ // lldbr-command:print *char_ref // lldbr-check:(char) *char_ref = 97 -// lldb-command:print *i8_ref +// lldb-command:v *i8_ref // lldbg-check:[...] 68 // lldbr-check:(i8) *i8_ref = 68 -// lldb-command:print *i16_ref +// lldb-command:v *i16_ref // lldbg-check:[...] -16 // lldbr-check:(i16) *i16_ref = -16 -// lldb-command:print *i32_ref +// lldb-command:v *i32_ref // lldbg-check:[...] -32 // lldbr-check:(i32) *i32_ref = -32 -// lldb-command:print *i64_ref +// lldb-command:v *i64_ref // lldbg-check:[...] -64 // lldbr-check:(i64) *i64_ref = -64 -// lldb-command:print *uint_ref +// lldb-command:v *uint_ref // lldbg-check:[...] 1 // lldbr-check:(usize) *uint_ref = 1 -// lldb-command:print *u8_ref +// lldb-command:v *u8_ref // lldbg-check:[...] 100 // lldbr-check:(u8) *u8_ref = 100 -// lldb-command:print *u16_ref +// lldb-command:v *u16_ref // lldbg-check:[...] 16 // lldbr-check:(u16) *u16_ref = 16 -// lldb-command:print *u32_ref +// lldb-command:v *u32_ref // lldbg-check:[...] 32 // lldbr-check:(u32) *u32_ref = 32 -// lldb-command:print *u64_ref +// lldb-command:v *u64_ref // lldbg-check:[...] 64 // lldbr-check:(u64) *u64_ref = 64 -// lldb-command:print *f32_ref +// lldb-command:v *f32_ref // lldbg-check:[...] 2.5 // lldbr-check:(f32) *f32_ref = 2.5 -// lldb-command:print *f64_ref +// lldb-command:v *f64_ref // lldbg-check:[...] 3.5 // lldbr-check:(f64) *f64_ref = 3.5 diff --git a/tests/debuginfo/box.rs b/tests/debuginfo/box.rs index 2c309a4eb28..46019bcb1a7 100644 --- a/tests/debuginfo/box.rs +++ b/tests/debuginfo/box.rs @@ -16,10 +16,10 @@ // === LLDB TESTS ================================================================================== // lldb-command:run -// lldb-command:print *a +// lldb-command:v *a // lldbg-check:[...] 1 // lldbr-check:(i32) *a = 1 -// lldb-command:print *b +// lldb-command:v *b // lldbg-check:[...] { 0 = 2 1 = 3.5 } // lldbr-check:((i32, f64)) *b = { 0 = 2 1 = 3.5 } diff --git a/tests/debuginfo/boxed-struct.rs b/tests/debuginfo/boxed-struct.rs index be2f1a7a867..1ee639690ea 100644 --- a/tests/debuginfo/boxed-struct.rs +++ b/tests/debuginfo/boxed-struct.rs @@ -19,11 +19,11 @@ // lldb-command:run -// lldb-command:print *boxed_with_padding +// lldb-command:v *boxed_with_padding // lldbg-check:[...] { x = 99 y = 999 z = 9999 w = 99999 } // lldbr-check:(boxed_struct::StructWithSomePadding) *boxed_with_padding = { x = 99 y = 999 z = 9999 w = 99999 } -// lldb-command:print *boxed_with_dtor +// lldb-command:v *boxed_with_dtor // lldbg-check:[...] { x = 77 y = 777 z = 7777 w = 77777 } // lldbr-check:(boxed_struct::StructWithDestructor) *boxed_with_dtor = { x = 77 y = 777 z = 7777 w = 77777 } diff --git a/tests/debuginfo/by-value-non-immediate-argument.rs b/tests/debuginfo/by-value-non-immediate-argument.rs index 413eefa3f2d..e0ae4458d03 100644 --- a/tests/debuginfo/by-value-non-immediate-argument.rs +++ b/tests/debuginfo/by-value-non-immediate-argument.rs @@ -41,27 +41,27 @@ // lldb-command:run -// lldb-command:print s +// lldb-command:v s // lldb-check:[...] Struct { a: 1, b: 2.5 } // lldb-command:continue -// lldb-command:print x +// lldb-command:v x // lldb-check:[...] Struct { a: 3, b: 4.5 } -// lldb-command:print y +// lldb-command:v y // lldb-check:[...] 5 -// lldb-command:print z +// lldb-command:v z // lldb-check:[...] 6.5 // lldb-command:continue -// lldb-command:print a +// lldb-command:v a // lldb-check:[...] (7, 8, 9.5, 10.5) // lldb-command:continue -// lldb-command:print a +// lldb-command:v a // lldb-check:[...] Newtype(11.5, 12.5, 13, 14) // lldb-command:continue -// lldb-command:print x +// lldb-command:v x // lldb-check:[...] Case1 { x: 0, y: 8970181431921507452 } // lldb-command:continue 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 7b52d054b32..5276ec82733 100644 --- a/tests/debuginfo/by-value-self-argument-in-trait-impl.rs +++ b/tests/debuginfo/by-value-self-argument-in-trait-impl.rs @@ -25,17 +25,17 @@ // lldb-command:run -// lldb-command:print self +// lldb-command:v self // lldbg-check:[...] 1111 // lldbr-check:(isize) self = 1111 // lldb-command:continue -// lldb-command:print self +// lldb-command:v self // lldbg-check:[...] { x = 2222 y = 3333 } // lldbr-check:(by_value_self_argument_in_trait_impl::Struct) self = { x = 2222 y = 3333 } // lldb-command:continue -// lldb-command:print self +// lldb-command:v self // lldbg-check:[...] { 0 = 4444.5 1 = 5555 2 = 6666 3 = 7777.5 } // lldbr-check:((f64, isize, isize, f64)) self = { 0 = 4444.5 1 = 5555 2 = 6666 3 = 7777.5 } // lldb-command:continue diff --git a/tests/debuginfo/c-style-enum-in-composite.rs b/tests/debuginfo/c-style-enum-in-composite.rs index 82d38038eaf..ec11d5f4655 100644 --- a/tests/debuginfo/c-style-enum-in-composite.rs +++ b/tests/debuginfo/c-style-enum-in-composite.rs @@ -38,31 +38,31 @@ // lldb-command:run -// lldb-command:print tuple_interior_padding +// lldb-command:v tuple_interior_padding // lldbg-check:[...] { 0 = 0 1 = OneHundred } // lldbr-check:((i16, c_style_enum_in_composite::AnEnum)) tuple_interior_padding = { 0 = 0 1 = OneHundred } -// lldb-command:print tuple_padding_at_end +// lldb-command:v tuple_padding_at_end // lldbg-check:[...] { 0 = { 0 = 1 1 = OneThousand } 1 = 2 } // lldbr-check:(((u64, c_style_enum_in_composite::AnEnum), u64)) tuple_padding_at_end = { 0 = { 0 = 1 1 = OneThousand } 1 = 2 } -// lldb-command:print tuple_different_enums +// lldb-command:v tuple_different_enums // lldbg-check:[...] { 0 = OneThousand 1 = MountainView 2 = OneMillion 3 = Vienna } // lldbr-check:((c_style_enum_in_composite::AnEnum, c_style_enum_in_composite::AnotherEnum, c_style_enum_in_composite::AnEnum, c_style_enum_in_composite::AnotherEnum)) tuple_different_enums = { 0 = c_style_enum_in_composite::AnEnum::OneThousand 1 = c_style_enum_in_composite::AnotherEnum::MountainView 2 = c_style_enum_in_composite::AnEnum::OneMillion 3 = c_style_enum_in_composite::AnotherEnum::Vienna } -// lldb-command:print padded_struct +// lldb-command:v padded_struct // lldbg-check:[...] { a = 3 b = OneMillion c = 4 d = Toronto e = 5 } // lldbr-check:(c_style_enum_in_composite::PaddedStruct) padded_struct = { a = 3 b = c_style_enum_in_composite::AnEnum::OneMillion c = 4 d = Toronto e = 5 } -// lldb-command:print packed_struct +// lldb-command:v packed_struct // lldbg-check:[...] { a = 6 b = OneHundred c = 7 d = Vienna e = 8 } // lldbr-check:(c_style_enum_in_composite::PackedStruct) packed_struct = { a = 6 b = c_style_enum_in_composite::AnEnum::OneHundred c = 7 d = Vienna e = 8 } -// lldb-command:print non_padded_struct +// lldb-command:v non_padded_struct // lldbg-check:[...] { a = OneMillion b = MountainView c = OneThousand d = Toronto } // lldbr-check:(c_style_enum_in_composite::NonPaddedStruct) non_padded_struct = { a = c_style_enum_in_composite::AnEnum::OneMillion, b = c_style_enum_in_composite::AnotherEnum::MountainView, c = c_style_enum_in_composite::AnEnum::OneThousand, d = c_style_enum_in_composite::AnotherEnum::Toronto } -// lldb-command:print struct_with_drop +// lldb-command:v struct_with_drop // lldbg-check:[...] { 0 = { a = OneHundred b = Vienna } 1 = 9 } // lldbr-check:((c_style_enum_in_composite::StructWithDrop, i64)) struct_with_drop = { 0 = { a = c_style_enum_in_composite::AnEnum::OneHundred b = c_style_enum_in_composite::AnotherEnum::Vienna } 1 = 9 } diff --git a/tests/debuginfo/c-style-enum.rs b/tests/debuginfo/c-style-enum.rs index 4d84324df2c..395b94c59a4 100644 --- a/tests/debuginfo/c-style-enum.rs +++ b/tests/debuginfo/c-style-enum.rs @@ -96,31 +96,31 @@ // lldb-command:run -// lldb-command:print auto_one +// lldb-command:v auto_one // lldbg-check:[...] One // lldbr-check:(c_style_enum::AutoDiscriminant) auto_one = c_style_enum::AutoDiscriminant::One -// lldb-command:print auto_two +// lldb-command:v auto_two // lldbg-check:[...] Two // lldbr-check:(c_style_enum::AutoDiscriminant) auto_two = c_style_enum::AutoDiscriminant::Two -// lldb-command:print auto_three +// lldb-command:v auto_three // lldbg-check:[...] Three // lldbr-check:(c_style_enum::AutoDiscriminant) auto_three = c_style_enum::AutoDiscriminant::Three -// lldb-command:print manual_one_hundred +// lldb-command:v manual_one_hundred // lldbg-check:[...] OneHundred // lldbr-check:(c_style_enum::ManualDiscriminant) manual_one_hundred = c_style_enum::ManualDiscriminant::OneHundred -// lldb-command:print manual_one_thousand +// lldb-command:v manual_one_thousand // lldbg-check:[...] OneThousand // lldbr-check:(c_style_enum::ManualDiscriminant) manual_one_thousand = c_style_enum::ManualDiscriminant::OneThousand -// lldb-command:print manual_one_million +// lldb-command:v manual_one_million // lldbg-check:[...] OneMillion // lldbr-check:(c_style_enum::ManualDiscriminant) manual_one_million = c_style_enum::ManualDiscriminant::OneMillion -// lldb-command:print single_variant +// lldb-command:v single_variant // lldbg-check:[...] TheOnlyVariant // lldbr-check:(c_style_enum::SingleVariant) single_variant = c_style_enum::SingleVariant::TheOnlyVariant diff --git a/tests/debuginfo/captured-fields-1.rs b/tests/debuginfo/captured-fields-1.rs index bcc5a179687..d96f2590570 100644 --- a/tests/debuginfo/captured-fields-1.rs +++ b/tests/debuginfo/captured-fields-1.rs @@ -25,23 +25,23 @@ // === LLDB TESTS ================================================================================== // lldb-command:run -// lldb-command:print test -// lldbg-check:(captured_fields_1::main::{closure_env#0}) { _ref__my_ref__my_field1 = 0x[...] } +// lldb-command:v test +// lldbg-check:(captured_fields_1::main::{closure_env#0}) test = { _ref__my_ref__my_field1 = 0x[...] } // lldb-command:continue -// lldb-command:print test -// lldbg-check:(captured_fields_1::main::{closure_env#1}) { _ref__my_ref__my_field2 = 0x[...] } +// lldb-command:v test +// lldbg-check:(captured_fields_1::main::{closure_env#1}) test = { _ref__my_ref__my_field2 = 0x[...] } // lldb-command:continue -// lldb-command:print test -// lldbg-check:(captured_fields_1::main::{closure_env#2}) { _ref__my_ref = 0x[...] } +// lldb-command:v test +// lldbg-check:(captured_fields_1::main::{closure_env#2}) test = { _ref__my_ref = 0x[...] } // lldb-command:continue -// lldb-command:print test -// lldbg-check:(captured_fields_1::main::{closure_env#3}) { my_ref = 0x[...] } +// lldb-command:v test +// lldbg-check:(captured_fields_1::main::{closure_env#3}) test = { my_ref = 0x[...] } // lldb-command:continue -// lldb-command:print test -// lldbg-check:(captured_fields_1::main::{closure_env#4}) { my_var__my_field2 = 22 } +// lldb-command:v test +// lldbg-check:(captured_fields_1::main::{closure_env#4}) test = { my_var__my_field2 = 22 } // lldb-command:continue -// lldb-command:print test -// lldbg-check:(captured_fields_1::main::{closure_env#5}) { my_var = { my_field1 = 11 my_field2 = 22 } } +// lldb-command:v test +// lldbg-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 7191d3f84d2..446c5c70fef 100644 --- a/tests/debuginfo/captured-fields-2.rs +++ b/tests/debuginfo/captured-fields-2.rs @@ -13,11 +13,11 @@ // === LLDB TESTS ================================================================================== // lldb-command:run -// lldb-command:print my_ref__my_field1 -// lldbg-check:(unsigned int) 11 +// lldb-command:v my_ref__my_field1 +// lldbg-check:(unsigned int) my_ref__my_field1 = 11 // lldb-command:continue -// lldb-command:print my_var__my_field2 -// lldbg-check:(unsigned int) 22 +// lldb-command:v my_var__my_field2 +// lldbg-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 c48858e4a0a..ef0f2b0b464 100644 --- a/tests/debuginfo/closure-in-generic-function.rs +++ b/tests/debuginfo/closure-in-generic-function.rs @@ -23,18 +23,18 @@ // lldb-command:run -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] 0.5 // lldbr-check:(f64) x = 0.5 -// lldb-command:print y +// lldb-command:v y // lldbg-check:[...] 10 // lldbr-check:(i32) y = 10 // lldb-command:continue -// lldb-command:print *x +// lldb-command:v *x // lldbg-check:[...] 29 // lldbr-check:(i32) *x = 29 -// lldb-command:print *y +// lldb-command:v *y // lldbg-check:[...] 110 // lldbr-check:(i32) *y = 110 // lldb-command:continue diff --git a/tests/debuginfo/coroutine-locals.rs b/tests/debuginfo/coroutine-locals.rs index 80a68434dab..54b5cd577c8 100644 --- a/tests/debuginfo/coroutine-locals.rs +++ b/tests/debuginfo/coroutine-locals.rs @@ -27,32 +27,24 @@ // === LLDB TESTS ================================================================================== // lldb-command:run -// lldb-command:print a -// lldbg-check:(int) 5 -// lldbr-check:(int) a = 5 -// lldb-command:print c -// lldbg-check:(int) 6 -// lldbr-check:(int) c = 6 -// lldb-command:print d -// lldbg-check:(int) 7 -// lldbr-check:(int) d = 7 +// lldb-command:v a +// lldb-check:(int) a = 5 +// lldb-command:v c +// lldb-check:(int) c = 6 +// lldb-command:v d +// lldb-check:(int) d = 7 // lldb-command:continue -// lldb-command:print a -// lldbg-check:(int) 7 -// lldbr-check:(int) a = 7 -// lldb-command:print c -// lldbg-check:(int) 6 -// lldbr-check:(int) c = 6 -// lldb-command:print e -// lldbg-check:(int) 8 -// lldbr-check:(int) e = 8 +// lldb-command:v a +// lldb-check:(int) a = 7 +// lldb-command:v c +// lldb-check:(int) c = 6 +// lldb-command:v e +// lldb-check:(int) e = 8 // lldb-command:continue -// lldb-command:print a -// lldbg-check:(int) 8 -// lldbr-check:(int) a = 8 -// lldb-command:print c -// lldbg-check:(int) 6 -// lldbr-check:(int) c = 6 +// lldb-command:v a +// lldb-check:(int) a = 8 +// lldb-command:v c +// lldb-check:(int) c = 6 #![feature(omit_gdb_pretty_printer_section, coroutines, coroutine_trait)] #![omit_gdb_pretty_printer_section] diff --git a/tests/debuginfo/coroutine-objects.rs b/tests/debuginfo/coroutine-objects.rs index 9f14cb3f8ec..9e1bd5d62e7 100644 --- a/tests/debuginfo/coroutine-objects.rs +++ b/tests/debuginfo/coroutine-objects.rs @@ -25,17 +25,17 @@ // === LLDB TESTS ================================================================================== // lldb-command:run -// lldb-command:print b -// lldbg-check:(coroutine_objects::main::{coroutine_env#0}) +// lldb-command:v b +// lldbg-check:(coroutine_objects::main::{coroutine_env#0}) b = // lldb-command:continue -// lldb-command:print b -// lldbg-check:(coroutine_objects::main::{coroutine_env#0}) +// lldb-command:v b +// lldbg-check:(coroutine_objects::main::{coroutine_env#0}) b = // lldb-command:continue -// lldb-command:print b -// lldbg-check:(coroutine_objects::main::{coroutine_env#0}) +// lldb-command:v b +// lldbg-check:(coroutine_objects::main::{coroutine_env#0}) b = // lldb-command:continue -// lldb-command:print b -// lldbg-check:(coroutine_objects::main::{coroutine_env#0}) +// lldb-command:v b +// lldbg-check:(coroutine_objects::main::{coroutine_env#0}) b = // === CDB TESTS =================================================================================== diff --git a/tests/debuginfo/cross-crate-spans.rs b/tests/debuginfo/cross-crate-spans.rs index 9f3538c4e1d..cf3f8e1eadf 100644 --- a/tests/debuginfo/cross-crate-spans.rs +++ b/tests/debuginfo/cross-crate-spans.rs @@ -43,24 +43,24 @@ extern crate cross_crate_spans; // lldb-command:b cross_crate_spans.rs:14 // lldb-command:run -// lldb-command:print result +// lldb-command:v result // lldbg-check:[...] { 0 = 17 1 = 17 } // lldbr-check:((u32, u32)) result = { 0 = 17 1 = 17 } -// lldb-command:print a_variable +// lldb-command:v a_variable // lldbg-check:[...] 123456789 // lldbr-check:(u32) a_variable = 123456789 -// lldb-command:print another_variable +// lldb-command:v another_variable // lldbg-check:[...] 123456789.5 // lldbr-check:(f64) another_variable = 123456789.5 // lldb-command:continue -// lldb-command:print result +// lldb-command:v result // lldbg-check:[...] { 0 = 1212 1 = 1212 } // lldbr-check:((i16, i16)) result = { 0 = 1212 1 = 1212 } -// lldb-command:print a_variable +// lldb-command:v a_variable // lldbg-check:[...] 123456789 // lldbr-check:(u32) a_variable = 123456789 -// lldb-command:print another_variable +// lldb-command:v another_variable // lldbg-check:[...] 123456789.5 // lldbr-check:(f64) another_variable = 123456789.5 // lldb-command:continue diff --git a/tests/debuginfo/destructured-fn-argument.rs b/tests/debuginfo/destructured-fn-argument.rs index 2748bdb08b9..74e18a594d7 100644 --- a/tests/debuginfo/destructured-fn-argument.rs +++ b/tests/debuginfo/destructured-fn-argument.rs @@ -163,195 +163,195 @@ // lldb-command:run -// lldb-command:print a +// lldb-command:v a // lldbg-check:[...] 1 // lldbr-check:(isize) a = 1 -// lldb-command:print b +// lldb-command:v b // lldbg-check:[...] false // lldbr-check:(bool) b = false // lldb-command:continue -// lldb-command:print a +// lldb-command:v a // lldbg-check:[...] 2 // lldbr-check:(isize) a = 2 -// lldb-command:print b +// lldb-command:v b // lldbg-check:[...] 3 // lldbr-check:(u16) b = 3 -// lldb-command:print c +// lldb-command:v c // lldbg-check:[...] 4 // lldbr-check:(u16) c = 4 // lldb-command:continue -// lldb-command:print a +// lldb-command:v a // lldbg-check:[...] 5 // lldbr-check:(isize) a = 5 -// lldb-command:print b +// lldb-command:v b // lldbg-check:[...] { 0 = 6 1 = 7 } // lldbr-check:((u32, u32)) b = { 0 = 6 1 = 7 } // lldb-command:continue -// lldb-command:print h +// lldb-command:v h // lldbg-check:[...] 8 // lldbr-check:(i16) h = 8 -// lldb-command:print i +// lldb-command:v i // lldbg-check:[...] { a = 9 b = 10 } // lldbr-check:(destructured_fn_argument::Struct) i = { a = 9 b = 10 } -// lldb-command:print j +// lldb-command:v j // lldbg-check:[...] 11 // lldbr-check:(i16) j = 11 // lldb-command:continue -// lldb-command:print k +// lldb-command:v k // lldbg-check:[...] 12 // lldbr-check:(i64) k = 12 -// lldb-command:print l +// lldb-command:v l // lldbg-check:[...] 13 // lldbr-check:(i32) l = 13 // lldb-command:continue -// lldb-command:print m +// lldb-command:v m // lldbg-check:[...] 14 // lldbr-check:(isize) m = 14 -// lldb-command:print n +// lldb-command:v n // lldbg-check:[...] 16 // lldbr-check:(i32) n = 16 // lldb-command:continue -// lldb-command:print o +// lldb-command:v o // lldbg-check:[...] 18 // lldbr-check:(i32) o = 18 // lldb-command:continue -// lldb-command:print p +// lldb-command:v p // lldbg-check:[...] 19 // lldbr-check:(i64) p = 19 -// lldb-command:print q +// lldb-command:v q // lldbg-check:[...] 20 // lldbr-check:(i32) q = 20 -// lldb-command:print r +// lldb-command:v r // lldbg-check:[...] { a = 21 b = 22 } // lldbr-check:(destructured_fn_argument::Struct) r = { a = 21, b = 22 } // lldb-command:continue -// lldb-command:print s +// lldb-command:v s // lldbg-check:[...] 24 // lldbr-check:(i32) s = 24 -// lldb-command:print t +// lldb-command:v t // lldbg-check:[...] 23 // lldbr-check:(i64) t = 23 // lldb-command:continue -// lldb-command:print u +// lldb-command:v u // lldbg-check:[...] 25 // lldbr-check:(i16) u = 25 -// lldb-command:print v +// lldb-command:v v // lldbg-check:[...] 26 // lldbr-check:(i32) v = 26 -// lldb-command:print w +// lldb-command:v w // lldbg-check:[...] 27 // lldbr-check:(i64) w = 27 -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] 28 // lldbr-check:(i32) x = 28 -// lldb-command:print y +// lldb-command:v y // lldbg-check:[...] 29 // lldbr-check:(i64) y = 29 -// lldb-command:print z +// lldb-command:v z // lldbg-check:[...] 30 // lldbr-check:(i32) z = 30 -// lldb-command:print ae +// lldb-command:v ae // lldbg-check:[...] 31 // lldbr-check:(i64) ae = 31 -// lldb-command:print oe +// lldb-command:v oe // lldbg-check:[...] 32 // lldbr-check:(i32) oe = 32 -// lldb-command:print ue +// lldb-command:v ue // lldbg-check:[...] 33 // lldbr-check:(u16) ue = 33 // lldb-command:continue -// lldb-command:print aa +// lldb-command:v aa // lldbg-check:[...] { 0 = 34 1 = 35 } // lldbr-check:((isize, isize)) aa = { 0 = 34 1 = 35 } // lldb-command:continue -// lldb-command:print bb +// lldb-command:v bb // lldbg-check:[...] { 0 = 36 1 = 37 } // lldbr-check:((isize, isize)) bb = { 0 = 36 1 = 37 } // lldb-command:continue -// lldb-command:print cc +// lldb-command:v cc // lldbg-check:[...] 38 // lldbr-check:(isize) cc = 38 // lldb-command:continue -// lldb-command:print dd +// lldb-command:v dd // lldbg-check:[...] { 0 = 40 1 = 41 2 = 42 } // lldbr-check:((isize, isize, isize)) dd = { 0 = 40 1 = 41 2 = 42 } // lldb-command:continue -// lldb-command:print *ee +// lldb-command:v *ee // lldbg-check:[...] { 0 = 43 1 = 44 2 = 45 } // lldbr-check:((isize, isize, isize)) *ee = { 0 = 43 1 = 44 2 = 45 } // lldb-command:continue -// lldb-command:print *ff +// lldb-command:v *ff // lldbg-check:[...] 46 // lldbr-check:(isize) *ff = 46 -// lldb-command:print gg +// lldb-command:v gg // lldbg-check:[...] { 0 = 47 1 = 48 } // lldbr-check:((isize, isize)) gg = { 0 = 47 1 = 48 } // lldb-command:continue -// lldb-command:print *hh +// lldb-command:v *hh // lldbg-check:[...] 50 // lldbr-check:(i32) *hh = 50 // lldb-command:continue -// lldb-command:print ii +// lldb-command:v ii // lldbg-check:[...] 51 // lldbr-check:(i32) ii = 51 // lldb-command:continue -// lldb-command:print *jj +// lldb-command:v *jj // lldbg-check:[...] 52 // lldbr-check:(i32) *jj = 52 // lldb-command:continue -// lldb-command:print kk +// lldb-command:v kk // lldbg-check:[...] 53 // lldbr-check:(f64) kk = 53 -// lldb-command:print ll +// lldb-command:v ll // lldbg-check:[...] 54 // lldbr-check:(isize) ll = 54 // lldb-command:continue -// lldb-command:print mm +// lldb-command:v mm // lldbg-check:[...] 55 // lldbr-check:(f64) mm = 55 -// lldb-command:print *nn +// lldb-command:v *nn // lldbg-check:[...] 56 // lldbr-check:(isize) *nn = 56 // lldb-command:continue -// lldb-command:print oo +// lldb-command:v oo // lldbg-check:[...] 57 // lldbr-check:(isize) oo = 57 -// lldb-command:print pp +// lldb-command:v pp // lldbg-check:[...] 58 // lldbr-check:(isize) pp = 58 -// lldb-command:print qq +// lldb-command:v qq // lldbg-check:[...] 59 // lldbr-check:(isize) qq = 59 // lldb-command:continue -// lldb-command:print rr +// lldb-command:v rr // lldbg-check:[...] 60 // lldbr-check:(isize) rr = 60 -// lldb-command:print ss +// lldb-command:v ss // lldbg-check:[...] 61 // lldbr-check:(isize) ss = 61 -// lldb-command:print tt +// lldb-command:v tt // lldbg-check:[...] 62 // lldbr-check:(isize) tt = 62 // lldb-command:continue diff --git a/tests/debuginfo/destructured-for-loop-variable.rs b/tests/debuginfo/destructured-for-loop-variable.rs index e583804cb1e..1cad8bcfacb 100644 --- a/tests/debuginfo/destructured-for-loop-variable.rs +++ b/tests/debuginfo/destructured-for-loop-variable.rs @@ -84,89 +84,89 @@ // lldb-command:run // DESTRUCTURED STRUCT -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] 400 // lldbr-check:(i16) x = 400 -// lldb-command:print y +// lldb-command:v y // lldbg-check:[...] 401.5 // lldbr-check:(f32) y = 401.5 -// lldb-command:print z +// lldb-command:v z // lldbg-check:[...] true // lldbr-check:(bool) z = true // lldb-command:continue // DESTRUCTURED TUPLE -// lldb-command:print _i8 +// lldb-command:v _i8 // lldbg-check:[...] 0x6f // lldbr-check:(i8) _i8 = 111 -// lldb-command:print _u8 +// lldb-command:v _u8 // lldbg-check:[...] 0x70 // lldbr-check:(u8) _u8 = 112 -// lldb-command:print _i16 +// lldb-command:v _i16 // lldbg-check:[...] -113 // lldbr-check:(i16) _i16 = -113 -// lldb-command:print _u16 +// lldb-command:v _u16 // lldbg-check:[...] 114 // lldbr-check:(u16) _u16 = 114 -// lldb-command:print _i32 +// lldb-command:v _i32 // lldbg-check:[...] -115 // lldbr-check:(i32) _i32 = -115 -// lldb-command:print _u32 +// lldb-command:v _u32 // lldbg-check:[...] 116 // lldbr-check:(u32) _u32 = 116 -// lldb-command:print _i64 +// lldb-command:v _i64 // lldbg-check:[...] -117 // lldbr-check:(i64) _i64 = -117 -// lldb-command:print _u64 +// lldb-command:v _u64 // lldbg-check:[...] 118 // lldbr-check:(u64) _u64 = 118 -// lldb-command:print _f32 +// lldb-command:v _f32 // lldbg-check:[...] 119.5 // lldbr-check:(f32) _f32 = 119.5 -// lldb-command:print _f64 +// lldb-command:v _f64 // lldbg-check:[...] 120.5 // lldbr-check:(f64) _f64 = 120.5 // lldb-command:continue // MORE COMPLEX CASE -// lldb-command:print v1 +// lldb-command:v v1 // lldbg-check:[...] 80000 // lldbr-check:(i32) v1 = 80000 -// lldb-command:print x1 +// lldb-command:v x1 // lldbg-check:[...] 8000 // lldbr-check:(i16) x1 = 8000 -// lldb-command:print *y1 +// lldb-command:v *y1 // lldbg-check:[...] 80001.5 // lldbr-check:(f32) *y1 = 80001.5 -// lldb-command:print z1 +// lldb-command:v z1 // lldbg-check:[...] false // lldbr-check:(bool) z1 = false -// lldb-command:print *x2 +// lldb-command:v *x2 // lldbg-check:[...] -30000 // lldbr-check:(i16) *x2 = -30000 -// lldb-command:print y2 +// lldb-command:v y2 // lldbg-check:[...] -300001.5 // lldbr-check:(f32) y2 = -300001.5 -// lldb-command:print *z2 +// lldb-command:v *z2 // lldbg-check:[...] true // lldbr-check:(bool) *z2 = true -// lldb-command:print v2 +// lldb-command:v v2 // lldbg-check:[...] 854237.5 // lldbr-check:(f64) v2 = 854237.5 // lldb-command:continue // SIMPLE IDENTIFIER -// lldb-command:print i +// lldb-command:v i // lldbg-check:[...] 1234 // lldbr-check:(i32) i = 1234 // lldb-command:continue -// lldb-command:print simple_struct_ident +// lldb-command:v simple_struct_ident // lldbg-check:[...] { x = 3537 y = 35437.5 z = true } // lldbr-check:(destructured_for_loop_variable::Struct) simple_struct_ident = { x = 3537 y = 35437.5 z = true } // lldb-command:continue -// lldb-command:print simple_tuple_ident +// lldb-command:v simple_tuple_ident // lldbg-check:[...] { 0 = 34903493 1 = 232323 } // lldbr-check:((u32, i64)) simple_tuple_ident = { 0 = 34903493 1 = 232323 } // lldb-command:continue diff --git a/tests/debuginfo/destructured-local.rs b/tests/debuginfo/destructured-local.rs index 9993407815e..8d62fe5db03 100644 --- a/tests/debuginfo/destructured-local.rs +++ b/tests/debuginfo/destructured-local.rs @@ -129,156 +129,156 @@ // lldb-command:run -// lldb-command:print a +// lldb-command:v a // lldbg-check:[...] 1 // lldbr-check:(isize) a = 1 -// lldb-command:print b +// lldb-command:v b // lldbg-check:[...] false // lldbr-check:(bool) b = false -// lldb-command:print c +// lldb-command:v c // lldbg-check:[...] 2 // lldbr-check:(isize) c = 2 -// lldb-command:print d +// lldb-command:v d // lldbg-check:[...] 3 // lldbr-check:(u16) d = 3 -// lldb-command:print e +// lldb-command:v e // lldbg-check:[...] 4 // lldbr-check:(u16) e = 4 -// lldb-command:print f +// lldb-command:v f // lldbg-check:[...] 5 // lldbr-check:(isize) f = 5 -// lldb-command:print g +// lldb-command:v g // lldbg-check:[...] { 0 = 6 1 = 7 } // lldbr-check:((u32, u32)) g = { 0 = 6 1 = 7 } -// lldb-command:print h +// lldb-command:v h // lldbg-check:[...] 8 // lldbr-check:(i16) h = 8 -// lldb-command:print i +// lldb-command:v i // lldbg-check:[...] { a = 9 b = 10 } // lldbr-check:(destructured_local::Struct) i = { a = 9 b = 10 } -// lldb-command:print j +// lldb-command:v j // lldbg-check:[...] 11 // lldbr-check:(i16) j = 11 -// lldb-command:print k +// lldb-command:v k // lldbg-check:[...] 12 // lldbr-check:(i64) k = 12 -// lldb-command:print l +// lldb-command:v l // lldbg-check:[...] 13 // lldbr-check:(i32) l = 13 -// lldb-command:print m +// lldb-command:v m // lldbg-check:[...] 14 // lldbr-check:(i32) m = 14 -// lldb-command:print n +// lldb-command:v n // lldbg-check:[...] 16 // lldbr-check:(i32) n = 16 -// lldb-command:print o +// lldb-command:v o // lldbg-check:[...] 18 // lldbr-check:(i32) o = 18 -// lldb-command:print p +// lldb-command:v p // lldbg-check:[...] 19 // lldbr-check:(i64) p = 19 -// lldb-command:print q +// lldb-command:v q // lldbg-check:[...] 20 // lldbr-check:(i32) q = 20 -// lldb-command:print r +// lldb-command:v r // lldbg-check:[...] { a = 21 b = 22 } // lldbr-check:(destructured_local::Struct) r = { a = 21 b = 22 } -// lldb-command:print s +// lldb-command:v s // lldbg-check:[...] 24 // lldbr-check:(i32) s = 24 -// lldb-command:print t +// lldb-command:v t // lldbg-check:[...] 23 // lldbr-check:(i64) t = 23 -// lldb-command:print u +// lldb-command:v u // lldbg-check:[...] 25 // lldbr-check:(i32) u = 25 -// lldb-command:print v +// lldb-command:v v // lldbg-check:[...] 26 // lldbr-check:(i32) v = 26 -// lldb-command:print w +// lldb-command:v w // lldbg-check:[...] 27 // lldbr-check:(i32) w = 27 -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] 28 // lldbr-check:(i32) x = 28 -// lldb-command:print y +// lldb-command:v y // lldbg-check:[...] 29 // lldbr-check:(i64) y = 29 -// lldb-command:print z +// lldb-command:v z // lldbg-check:[...] 30 // lldbr-check:(i32) z = 30 -// lldb-command:print ae +// lldb-command:v ae // lldbg-check:[...] 31 // lldbr-check:(i64) ae = 31 -// lldb-command:print oe +// lldb-command:v oe // lldbg-check:[...] 32 // lldbr-check:(i32) oe = 32 -// lldb-command:print ue +// lldb-command:v ue // lldbg-check:[...] 33 // lldbr-check:(i32) ue = 33 -// lldb-command:print aa +// lldb-command:v aa // lldbg-check:[...] { 0 = 34 1 = 35 } // lldbr-check:((i32, i32)) aa = { 0 = 34 1 = 35 } -// lldb-command:print bb +// lldb-command:v bb // lldbg-check:[...] { 0 = 36 1 = 37 } // lldbr-check:((i32, i32)) bb = { 0 = 36 1 = 37 } -// lldb-command:print cc +// lldb-command:v cc // lldbg-check:[...] 38 // lldbr-check:(i32) cc = 38 -// lldb-command:print dd +// lldb-command:v dd // lldbg-check:[...] { 0 = 40 1 = 41 2 = 42 } // lldbr-check:((i32, i32, i32)) dd = { 0 = 40 1 = 41 2 = 42} -// lldb-command:print *ee +// lldb-command:v *ee // lldbg-check:[...] { 0 = 43 1 = 44 2 = 45 } // lldbr-check:((i32, i32, i32)) *ee = { 0 = 43 1 = 44 2 = 45} -// lldb-command:print *ff +// lldb-command:v *ff // lldbg-check:[...] 46 // lldbr-check:(i32) *ff = 46 -// lldb-command:print gg +// lldb-command:v gg // lldbg-check:[...] { 0 = 47 1 = 48 } // lldbr-check:((i32, i32)) gg = { 0 = 47 1 = 48 } -// lldb-command:print *hh +// lldb-command:v *hh // lldbg-check:[...] 50 // lldbr-check:(i32) *hh = 50 -// lldb-command:print ii +// lldb-command:v ii // lldbg-check:[...] 51 // lldbr-check:(i32) ii = 51 -// lldb-command:print *jj +// lldb-command:v *jj // lldbg-check:[...] 52 // lldbr-check:(i32) *jj = 52 -// lldb-command:print kk +// lldb-command:v kk // lldbg-check:[...] 53 // lldbr-check:(f64) kk = 53 -// lldb-command:print ll +// lldb-command:v ll // lldbg-check:[...] 54 // lldbr-check:(isize) ll = 54 -// lldb-command:print mm +// lldb-command:v mm // lldbg-check:[...] 55 // lldbr-check:(f64) mm = 55 -// lldb-command:print *nn +// lldb-command:v *nn // lldbg-check:[...] 56 // lldbr-check:(isize) *nn = 56 diff --git a/tests/debuginfo/enum-thinlto.rs b/tests/debuginfo/enum-thinlto.rs index 2e541663147..f3f17758931 100644 --- a/tests/debuginfo/enum-thinlto.rs +++ b/tests/debuginfo/enum-thinlto.rs @@ -14,8 +14,8 @@ // lldb-command:run -// lldb-command:print *abc -// lldbg-check:(enum_thinlto::ABC) +// lldb-command:v *abc +// lldbg-check:(enum_thinlto::ABC) *abc = // lldbr-check:(enum_thinlto::ABC) *abc = (x = 0, y = 8970181431921507452) #![allow(unused_variables)] diff --git a/tests/debuginfo/evec-in-struct.rs b/tests/debuginfo/evec-in-struct.rs index 0e6565830a9..2283e96c0ad 100644 --- a/tests/debuginfo/evec-in-struct.rs +++ b/tests/debuginfo/evec-in-struct.rs @@ -30,22 +30,22 @@ // lldb-command:run -// lldb-command:print no_padding1 +// lldb-command:v no_padding1 // lldbg-check:[...] { x = { [0] = 0 [1] = 1 [2] = 2 } y = -3 z = { [0] = 4.5 [1] = 5.5 } } // lldbr-check:(evec_in_struct::NoPadding1) no_padding1 = { x = { [0] = 0 [1] = 1 [2] = 2 } y = -3 z = { [0] = 4.5 [1] = 5.5 } } -// lldb-command:print no_padding2 +// 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 } } } // lldbr-check:(evec_in_struct::NoPadding2) no_padding2 = { x = { [0] = 6 [1] = 7 [2] = 8 } y = { [0] = { [0] = 9 [1] = 10 } [1] = { [0] = 11 [1] = 12 } } } -// lldb-command:print struct_internal_padding +// lldb-command:v struct_internal_padding // lldbg-check:[...] { x = { [0] = 13 [1] = 14 } y = { [0] = 15 [1] = 16 } } // lldbr-check:(evec_in_struct::StructInternalPadding) struct_internal_padding = { x = { [0] = 13 [1] = 14 } y = { [0] = 15 [1] = 16 } } -// lldb-command:print single_vec +// lldb-command:v single_vec // lldbg-check:[...] { x = { [0] = 17 [1] = 18 [2] = 19 [3] = 20 [4] = 21 } } // lldbr-check:(evec_in_struct::SingleVec) single_vec = { x = { [0] = 17 [1] = 18 [2] = 19 [3] = 20 [4] = 21 } } -// lldb-command:print struct_padded_at_end +// lldb-command:v struct_padded_at_end // lldbg-check:[...] { x = { [0] = 22 [1] = 23 } y = { [0] = 24 [1] = 25 } } // lldbr-check:(evec_in_struct::StructPaddedAtEnd) struct_padded_at_end = { x = { [0] = 22 [1] = 23 } y = { [0] = 24 [1] = 25 } } diff --git a/tests/debuginfo/extern-c-fn.rs b/tests/debuginfo/extern-c-fn.rs index 0d2eb9e6daf..b45a073ed05 100644 --- a/tests/debuginfo/extern-c-fn.rs +++ b/tests/debuginfo/extern-c-fn.rs @@ -21,16 +21,16 @@ // === LLDB TESTS ================================================================================== // lldb-command:run -// lldb-command:print len +// lldb-command:v len // lldbg-check:[...] 20 // lldbr-check:(i32) len = 20 -// lldb-command:print local0 +// lldb-command:v local0 // lldbg-check:[...] 19 // lldbr-check:(i32) local0 = 19 -// lldb-command:print local1 +// lldb-command:v local1 // lldbg-check:[...] true // lldbr-check:(bool) local1 = true -// lldb-command:print local2 +// lldb-command:v local2 // lldbg-check:[...] 20.5 // lldbr-check:(f64) local2 = 20.5 diff --git a/tests/debuginfo/function-arg-initialization.rs b/tests/debuginfo/function-arg-initialization.rs index 5288aa2e6f1..05935c30bea 100644 --- a/tests/debuginfo/function-arg-initialization.rs +++ b/tests/debuginfo/function-arg-initialization.rs @@ -119,99 +119,99 @@ // lldb-command:run // IMMEDIATE ARGS -// lldb-command:print a +// lldb-command:v a // lldb-check:[...] 1 -// lldb-command:print b +// lldb-command:v b // lldb-check:[...] true -// lldb-command:print c +// lldb-command:v c // lldb-check:[...] 2.5 // lldb-command:continue // NON IMMEDIATE ARGS -// lldb-command:print a +// lldb-command:v a // lldb-check:[...] BigStruct { a: 3, b: 4, c: 5, d: 6, e: 7, f: 8, g: 9, h: 10 } -// lldb-command:print b +// lldb-command:v b // lldb-check:[...] BigStruct { a: 11, b: 12, c: 13, d: 14, e: 15, f: 16, g: 17, h: 18 } // lldb-command:continue // BINDING -// lldb-command:print a +// lldb-command:v a // lldb-check:[...] 19 -// lldb-command:print b +// lldb-command:v b // lldb-check:[...] 20 -// lldb-command:print c +// lldb-command:v c // lldb-check:[...] 21.5 // lldb-command:continue // ASSIGNMENT -// lldb-command:print a +// lldb-command:v a // lldb-check:[...] 22 -// lldb-command:print b +// lldb-command:v b // lldb-check:[...] 23 -// lldb-command:print c +// lldb-command:v c // lldb-check:[...] 24.5 // lldb-command:continue // FUNCTION CALL -// lldb-command:print x +// lldb-command:v x // lldb-check:[...] 25 -// lldb-command:print y +// lldb-command:v y // lldb-check:[...] 26 -// lldb-command:print z +// lldb-command:v z // lldb-check:[...] 27.5 // lldb-command:continue // EXPR -// lldb-command:print x +// lldb-command:v x // lldb-check:[...] 28 -// lldb-command:print y +// lldb-command:v y // lldb-check:[...] 29 -// lldb-command:print z +// lldb-command:v z // lldb-check:[...] 30.5 // lldb-command:continue // RETURN EXPR -// lldb-command:print x +// lldb-command:v x // lldb-check:[...] 31 -// lldb-command:print y +// lldb-command:v y // lldb-check:[...] 32 -// lldb-command:print z +// lldb-command:v z // lldb-check:[...] 33.5 // lldb-command:continue // ARITHMETIC EXPR -// lldb-command:print x +// lldb-command:v x // lldb-check:[...] 34 -// lldb-command:print y +// lldb-command:v y // lldb-check:[...] 35 -// lldb-command:print z +// lldb-command:v z // lldb-check:[...] 36.5 // lldb-command:continue // IF EXPR -// lldb-command:print x +// lldb-command:v x // lldb-check:[...] 37 -// lldb-command:print y +// lldb-command:v y // lldb-check:[...] 38 -// lldb-command:print z +// lldb-command:v z // lldb-check:[...] 39.5 // lldb-command:continue // WHILE EXPR -// lldb-command:print x +// lldb-command:v x // lldb-check:[...] 40 -// lldb-command:print y +// lldb-command:v y // lldb-check:[...] 41 -// lldb-command:print z +// lldb-command:v z // lldb-check:[...] 42 // lldb-command:continue // LOOP EXPR -// lldb-command:print x +// lldb-command:v x // lldb-check:[...] 43 -// lldb-command:print y +// lldb-command:v y // lldb-check:[...] 44 -// lldb-command:print z +// lldb-command:v z // lldb-check:[...] 45 // lldb-command:continue diff --git a/tests/debuginfo/function-arguments.rs b/tests/debuginfo/function-arguments.rs index 84271d07b38..b0afa1d0772 100644 --- a/tests/debuginfo/function-arguments.rs +++ b/tests/debuginfo/function-arguments.rs @@ -22,18 +22,18 @@ // lldb-command:run -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] 111102 // lldbr-check:(isize) x = 111102 -// lldb-command:print y +// lldb-command:v y // lldbg-check:[...] true // lldbr-check:(bool) y = true // lldb-command:continue -// lldb-command:print a +// lldb-command:v a // lldbg-check:[...] 2000 // lldbr-check:(i32) a = 2000 -// lldb-command:print b +// lldb-command:v b // lldbg-check:[...] 3000 // lldbr-check:(i64) b = 3000 // lldb-command:continue diff --git a/tests/debuginfo/function-prologue-stepping-regular.rs b/tests/debuginfo/function-prologue-stepping-regular.rs index 02567fd013e..a1f44105bb9 100644 --- a/tests/debuginfo/function-prologue-stepping-regular.rs +++ b/tests/debuginfo/function-prologue-stepping-regular.rs @@ -20,99 +20,99 @@ // lldb-command:run // IMMEDIATE ARGS -// lldb-command:print a +// lldb-command:v a // lldb-check:[...] 1 -// lldb-command:print b +// lldb-command:v b // lldb-check:[...] true -// lldb-command:print c +// lldb-command:v c // lldb-check:[...] 2.5 // lldb-command:continue // NON IMMEDIATE ARGS -// lldb-command:print a +// lldb-command:v a // lldb-check:[...] { a = 3, b = 4, c = 5, d = 6, e = 7, f = 8, g = 9, h = 10 } -// lldb-command:print b +// lldb-command:v b // lldb-check:[...] { a = 11, b = 12, c = 13, d = 14, e = 15, f = 16, g = 17, h = 18 } // lldb-command:continue // BINDING -// lldb-command:print a +// lldb-command:v a // lldb-check:[...] 19 -// lldb-command:print b +// lldb-command:v b // lldb-check:[...] 20 -// lldb-command:print c +// lldb-command:v c // lldb-check:[...] 21.5 // lldb-command:continue // ASSIGNMENT -// lldb-command:print a +// lldb-command:v a // lldb-check:[...] 22 -// lldb-command:print b +// lldb-command:v b // lldb-check:[...] 23 -// lldb-command:print c +// lldb-command:v c // lldb-check:[...] 24.5 // lldb-command:continue // FUNCTION CALL -// lldb-command:print x +// lldb-command:v x // lldb-check:[...] 25 -// lldb-command:print y +// lldb-command:v y // lldb-check:[...] 26 -// lldb-command:print z +// lldb-command:v z // lldb-check:[...] 27.5 // lldb-command:continue // EXPR -// lldb-command:print x +// lldb-command:v x // lldb-check:[...] 28 -// lldb-command:print y +// lldb-command:v y // lldb-check:[...] 29 -// lldb-command:print z +// lldb-command:v z // lldb-check:[...] 30.5 // lldb-command:continue // RETURN EXPR -// lldb-command:print x +// lldb-command:v x // lldb-check:[...] 31 -// lldb-command:print y +// lldb-command:v y // lldb-check:[...] 32 -// lldb-command:print z +// lldb-command:v z // lldb-check:[...] 33.5 // lldb-command:continue // ARITHMETIC EXPR -// lldb-command:print x +// lldb-command:v x // lldb-check:[...] 34 -// lldb-command:print y +// lldb-command:v y // lldb-check:[...] 35 -// lldb-command:print z +// lldb-command:v z // lldb-check:[...] 36.5 // lldb-command:continue // IF EXPR -// lldb-command:print x +// lldb-command:v x // lldb-check:[...] 37 -// lldb-command:print y +// lldb-command:v y // lldb-check:[...] 38 -// lldb-command:print z +// lldb-command:v z // lldb-check:[...] 39.5 // lldb-command:continue // WHILE EXPR -// lldb-command:print x +// lldb-command:v x // lldb-check:[...] 40 -// lldb-command:print y +// lldb-command:v y // lldb-check:[...] 41 -// lldb-command:print z +// lldb-command:v z // lldb-check:[...] 42 // lldb-command:continue // LOOP EXPR -// lldb-command:print x +// lldb-command:v x // lldb-check:[...] 43 -// lldb-command:print y +// lldb-command:v y // lldb-check:[...] 44 -// lldb-command:print z +// lldb-command:v z // lldb-check:[...] 45 // lldb-command:continue diff --git a/tests/debuginfo/generic-enum-with-different-disr-sizes.rs b/tests/debuginfo/generic-enum-with-different-disr-sizes.rs index a7e97194e5d..7b23221213a 100644 --- a/tests/debuginfo/generic-enum-with-different-disr-sizes.rs +++ b/tests/debuginfo/generic-enum-with-different-disr-sizes.rs @@ -39,22 +39,22 @@ // === LLDB TESTS ================================================================================== // lldb-command:run -// lldb-command:print eight_bytes1 +// lldb-command:v eight_bytes1 // lldb-check:[...] Variant1(100) -// lldb-command:print four_bytes1 +// lldb-command:v four_bytes1 // lldb-check:[...] Variant1(101) -// lldb-command:print two_bytes1 +// lldb-command:v two_bytes1 // lldb-check:[...] Variant1(102) -// lldb-command:print one_byte1 +// lldb-command:v one_byte1 // lldb-check:[...] Variant1('A') -// lldb-command:print eight_bytes2 +// lldb-command:v eight_bytes2 // lldb-check:[...] Variant2(100) -// lldb-command:print four_bytes2 +// lldb-command:v four_bytes2 // lldb-check:[...] Variant2(101) -// lldb-command:print two_bytes2 +// lldb-command:v two_bytes2 // lldb-check:[...] Variant2(102) -// lldb-command:print one_byte2 +// lldb-command:v one_byte2 // lldb-check:[...] Variant2('A') // lldb-command:continue diff --git a/tests/debuginfo/generic-function.rs b/tests/debuginfo/generic-function.rs index 5c33d0d8520..e131ebfa306 100644 --- a/tests/debuginfo/generic-function.rs +++ b/tests/debuginfo/generic-function.rs @@ -29,26 +29,26 @@ // lldb-command:run -// lldb-command:print *t0 +// lldb-command:v *t0 // lldbg-check:[...] 1 // lldbr-check:(i32) *t0 = 1 -// lldb-command:print *t1 +// lldb-command:v *t1 // lldbg-check:[...] 2.5 // lldbr-check:(f64) *t1 = 2.5 // lldb-command:continue -// lldb-command:print *t0 +// lldb-command:v *t0 // lldbg-check:[...] 3.5 // lldbr-check:(f64) *t0 = 3.5 -// lldb-command:print *t1 +// lldb-command:v *t1 // lldbg-check:[...] 4 // lldbr-check:(u16) *t1 = 4 // lldb-command:continue -// lldb-command:print *t0 +// lldb-command:v *t0 // lldbg-check:[...] 5 // lldbr-check:(i32) *t0 = 5 -// lldb-command:print *t1 +// lldb-command:v *t1 // lldbg-check:[...] { a = 6 b = 7.5 } // lldbr-check:(generic_function::Struct) *t1 = { a = 6 b = 7.5 } // lldb-command:continue diff --git a/tests/debuginfo/generic-functions-nested.rs b/tests/debuginfo/generic-functions-nested.rs index 4be0ab80f65..eee0c151182 100644 --- a/tests/debuginfo/generic-functions-nested.rs +++ b/tests/debuginfo/generic-functions-nested.rs @@ -35,34 +35,34 @@ // lldb-command:run -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] -1 // lldbr-check:(i32) x = -1 -// lldb-command:print y +// lldb-command:v y // lldbg-check:[...] 1 // lldbr-check:(i32) y = 1 // lldb-command:continue -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] -1 // lldbr-check:(i32) x = -1 -// lldb-command:print y +// lldb-command:v y // lldbg-check:[...] 2.5 // lldbr-check:(f64) y = 2.5 // lldb-command:continue -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] -2.5 // lldbr-check:(f64) x = -2.5 -// lldb-command:print y +// lldb-command:v y // lldbg-check:[...] 1 // lldbr-check:(i32) y = 1 // lldb-command:continue -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] -2.5 // lldbr-check:(f64) x = -2.5 -// lldb-command:print y +// lldb-command:v y // lldbg-check:[...] 2.5 // lldbr-check:(f64) y = 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 dea1c17ad41..0f706740410 100644 --- a/tests/debuginfo/generic-method-on-generic-struct.rs +++ b/tests/debuginfo/generic-method-on-generic-struct.rs @@ -64,61 +64,61 @@ // lldb-command:run // STACK BY REF -// lldb-command:print *self +// lldb-command:v *self // lldbg-check:[...] { x = { 0 = 8888, 1 = -8888 } } // lldbr-check:(generic_method_on_generic_struct::Struct<(u32, i32)>) *self = { x = { 0 = 8888 1 = -8888 } } -// lldb-command:print arg1 +// lldb-command:v arg1 // lldbg-check:[...] -1 // lldbr-check:(isize) arg1 = -1 -// lldb-command:print arg2 +// lldb-command:v arg2 // lldbg-check:[...] 2 // lldbr-check:(u16) arg2 = 2 // lldb-command:continue // STACK BY VAL -// lldb-command:print self +// lldb-command:v self // lldbg-check:[...] { x = { 0 = 8888, 1 = -8888 } } // lldbr-check:(generic_method_on_generic_struct::Struct<(u32, i32)>) self = { x = { 0 = 8888, 1 = -8888 } } -// lldb-command:print arg1 +// lldb-command:v arg1 // lldbg-check:[...] -3 // lldbr-check:(isize) arg1 = -3 -// lldb-command:print arg2 +// lldb-command:v arg2 // lldbg-check:[...] -4 // lldbr-check:(i16) arg2 = -4 // lldb-command:continue // OWNED BY REF -// lldb-command:print *self +// lldb-command:v *self // lldbg-check:[...] { x = 1234.5 } // lldbr-check:(generic_method_on_generic_struct::Struct) *self = { x = 1234.5 } -// lldb-command:print arg1 +// lldb-command:v arg1 // lldbg-check:[...] -5 // lldbr-check:(isize) arg1 = -5 -// lldb-command:print arg2 +// lldb-command:v arg2 // lldbg-check:[...] -6 // lldbr-check:(i32) arg2 = -6 // lldb-command:continue // OWNED BY VAL -// lldb-command:print self +// lldb-command:v self // lldbg-check:[...] { x = 1234.5 } // lldbr-check:(generic_method_on_generic_struct::Struct) self = { x = 1234.5 } -// lldb-command:print arg1 +// lldb-command:v arg1 // lldbg-check:[...] -7 // lldbr-check:(isize) arg1 = -7 -// lldb-command:print arg2 +// lldb-command:v arg2 // lldbg-check:[...] -8 // lldbr-check:(i64) arg2 = -8 // lldb-command:continue // OWNED MOVED -// lldb-command:print *self +// lldb-command:v *self // lldbg-check:[...] { x = 1234.5 } // lldbr-check:(generic_method_on_generic_struct::Struct) *self = { x = 1234.5 } -// lldb-command:print arg1 +// lldb-command:v arg1 // lldbg-check:[...] -9 // lldbr-check:(isize) arg1 = -9 -// lldb-command:print arg2 +// lldb-command:v arg2 // lldbg-check:[...] -10.5 // lldbr-check:(f32) arg2 = -10.5 // lldb-command:continue diff --git a/tests/debuginfo/generic-struct.rs b/tests/debuginfo/generic-struct.rs index 4c442feec6a..8c74aa42d2c 100644 --- a/tests/debuginfo/generic-struct.rs +++ b/tests/debuginfo/generic-struct.rs @@ -25,17 +25,17 @@ // lldb-command:run -// lldb-command:print int_int +// lldb-command:v int_int // lldbg-check:[...] AGenericStruct { key: 0, value: 1 } // lldbr-check:(generic_struct::AGenericStruct) int_int = AGenericStruct { key: 0, value: 1 } -// lldb-command:print int_float +// lldb-command:v int_float // lldbg-check:[...] AGenericStruct { key: 2, value: 3.5 } // lldbr-check:(generic_struct::AGenericStruct) int_float = AGenericStruct { key: 2, value: 3.5 } -// lldb-command:print float_int +// lldb-command:v float_int // lldbg-check:[...] AGenericStruct { key: 4.5, value: 5 } // lldbr-check:(generic_struct::AGenericStruct) float_int = AGenericStruct { key: 4.5, value: 5 } -// lldb-command:print float_int_float +// lldb-command:v float_int_float // lldbg-check:[...] AGenericStruct> { key: 6.5, value: AGenericStruct { key: 7, value: 8.5 } } // lldbr-check:(generic_struct::AGenericStruct>) float_int_float = AGenericStruct> { key: 6.5, value: AGenericStruct { key: 7, value: 8.5 } } diff --git a/tests/debuginfo/generic-tuple-style-enum.rs b/tests/debuginfo/generic-tuple-style-enum.rs index fb5deb9b198..af90c6ce30e 100644 --- a/tests/debuginfo/generic-tuple-style-enum.rs +++ b/tests/debuginfo/generic-tuple-style-enum.rs @@ -26,16 +26,16 @@ // lldb-command:run -// lldb-command:print case1 +// lldb-command:v case1 // lldbr-check:(generic_tuple_style_enum::Regular::Case1) case1 = { __0 = 0 __1 = 31868 __2 = 31868 __3 = 31868 __4 = 31868 } -// lldb-command:print case2 +// lldb-command:v case2 // lldbr-check:(generic_tuple_style_enum::Regular::Case2) case2 = Regular::Case2 { Case1: 0, Case2: 286331153, Case3: 286331153 } -// lldb-command:print case3 +// lldb-command:v case3 // lldbr-check:(generic_tuple_style_enum::Regular::Case3) case3 = Regular::Case3 { Case1: 0, Case2: 6438275382588823897 } -// lldb-command:print univariant +// lldb-command:v univariant // lldbr-check:(generic_tuple_style_enum::Univariant) univariant = Univariant { TheOnlyCase: Univariant::TheOnlyCase(-1) } #![feature(omit_gdb_pretty_printer_section)] diff --git a/tests/debuginfo/include_string.rs b/tests/debuginfo/include_string.rs index 77b2d7dec5f..75013ab5274 100644 --- a/tests/debuginfo/include_string.rs +++ b/tests/debuginfo/include_string.rs @@ -15,13 +15,13 @@ // lldb-command:run -// lldb-command:print string1.length +// lldb-command:v string1.length // lldbg-check:[...] 48 // lldbr-check:(usize) length = 48 -// lldb-command:print string2.length +// lldb-command:v string2.length // lldbg-check:[...] 49 // lldbr-check:(usize) length = 49 -// lldb-command:print string3.length +// lldb-command:v string3.length // lldbg-check:[...] 50 // lldbr-check:(usize) length = 50 diff --git a/tests/debuginfo/issue-22656.rs b/tests/debuginfo/issue-22656.rs index 375967f2072..5a5442acd95 100644 --- a/tests/debuginfo/issue-22656.rs +++ b/tests/debuginfo/issue-22656.rs @@ -10,10 +10,10 @@ // === LLDB TESTS ================================================================================== // lldb-command:run -// lldb-command:print v +// lldb-command:v v // lldbg-check:[...] size=3 { [0] = 1 [1] = 2 [2] = 3 } // lldbr-check:(alloc::vec::Vec) v = size=3 { [0] = 1 [1] = 2 [2] = 3 } -// lldb-command:print zs +// lldb-command:v zs // lldbg-check:[...] { x = y = 123 z = w = 456 } // lldbr-check:(issue_22656::StructWithZeroSizedField) zs = { x = y = 123 z = w = 456 } // lldbr-command:continue diff --git a/tests/debuginfo/issue-57822.rs b/tests/debuginfo/issue-57822.rs index 5d0973c1d6b..93e1a2558f6 100644 --- a/tests/debuginfo/issue-57822.rs +++ b/tests/debuginfo/issue-57822.rs @@ -20,11 +20,11 @@ // lldb-command:run -// lldb-command:print g -// lldbg-check:(issue_57822::main::{closure_env#1}) { f = { x = 1 } } +// lldb-command:v g +// lldbg-check:(issue_57822::main::{closure_env#1}) g = { f = { x = 1 } } -// lldb-command:print b -// lldbg-check:(issue_57822::main::{coroutine_env#3}) +// lldb-command:v b +// lldbg-check:(issue_57822::main::{coroutine_env#3}) b = #![feature(omit_gdb_pretty_printer_section, coroutines, coroutine_trait)] #![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 6d8ff2970ef..1b1f106fece 100644 --- a/tests/debuginfo/lexical-scope-in-for-loop.rs +++ b/tests/debuginfo/lexical-scope-in-for-loop.rs @@ -44,40 +44,40 @@ // lldb-command:run // FIRST ITERATION -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] 1 // lldbr-check:(i32) x = 1 // lldb-command:continue -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] -1 // lldbr-check:(i32) x = -1 // lldb-command:continue // SECOND ITERATION -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] 2 // lldbr-check:(i32) x = 2 // lldb-command:continue -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] -2 // lldbr-check:(i32) x = -2 // lldb-command:continue // THIRD ITERATION -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] 3 // lldbr-check:(i32) x = 3 // lldb-command:continue -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] -3 // lldbr-check:(i32) x = -3 // lldb-command:continue // AFTER LOOP -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] 1000000 // lldbr-check:(i32) x = 1000000 // lldb-command:continue diff --git a/tests/debuginfo/lexical-scope-in-if.rs b/tests/debuginfo/lexical-scope-in-if.rs index 3e473acbda2..d472a50f697 100644 --- a/tests/debuginfo/lexical-scope-in-if.rs +++ b/tests/debuginfo/lexical-scope-in-if.rs @@ -68,73 +68,73 @@ // lldb-command:run // BEFORE if -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] 999 // lldbr-check:(i32) x = 999 -// lldb-command:print y +// lldb-command:v y // lldbg-check:[...] -1 // lldbr-check:(i32) y = -1 // lldb-command:continue // AT BEGINNING of 'then' block -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] 999 // lldbr-check:(i32) x = 999 -// lldb-command:print y +// lldb-command:v y // lldbg-check:[...] -1 // lldbr-check:(i32) y = -1 // lldb-command:continue // AFTER 1st redeclaration of 'x' -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] 1001 // lldbr-check:(i32) x = 1001 -// lldb-command:print y +// lldb-command:v y // lldbg-check:[...] -1 // lldbr-check:(i32) y = -1 // lldb-command:continue // AFTER 2st redeclaration of 'x' -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] 1002 // lldbr-check:(i32) x = 1002 -// lldb-command:print y +// lldb-command:v y // lldbg-check:[...] 1003 // lldbr-check:(i32) y = 1003 // lldb-command:continue // AFTER 1st if expression -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] 999 // lldbr-check:(i32) x = 999 -// lldb-command:print y +// lldb-command:v y // lldbg-check:[...] -1 // lldbr-check:(i32) y = -1 // lldb-command:continue // BEGINNING of else branch -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] 999 // lldbr-check:(i32) x = 999 -// lldb-command:print y +// lldb-command:v y // lldbg-check:[...] -1 // lldbr-check:(i32) y = -1 // lldb-command:continue // BEGINNING of else branch -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] 1004 // lldbr-check:(i32) x = 1004 -// lldb-command:print y +// lldb-command:v y // lldbg-check:[...] 1005 // lldbr-check:(i32) y = 1005 // lldb-command:continue // BEGINNING of else branch -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] 999 // lldbr-check:(i32) x = 999 -// lldb-command:print y +// lldb-command:v y // lldbg-check:[...] -1 // lldbr-check:(i32) y = -1 // lldb-command:continue diff --git a/tests/debuginfo/lexical-scope-in-match.rs b/tests/debuginfo/lexical-scope-in-match.rs index 0959f020ca3..d5f0fcbe892 100644 --- a/tests/debuginfo/lexical-scope-in-match.rs +++ b/tests/debuginfo/lexical-scope-in-match.rs @@ -63,72 +63,72 @@ // lldb-command:run -// lldb-command:print shadowed +// lldb-command:v shadowed // lldbg-check:[...] 231 // lldbr-check:(i32) shadowed = 231 -// lldb-command:print not_shadowed +// lldb-command:v not_shadowed // lldbg-check:[...] 232 // lldbr-check:(i32) not_shadowed = 232 // lldb-command:continue -// lldb-command:print shadowed +// lldb-command:v shadowed // lldbg-check:[...] 233 // lldbr-check:(i32) shadowed = 233 -// lldb-command:print not_shadowed +// lldb-command:v not_shadowed // lldbg-check:[...] 232 // lldbr-check:(i32) not_shadowed = 232 -// lldb-command:print local_to_arm +// lldb-command:v local_to_arm // lldbg-check:[...] 234 // lldbr-check:(i32) local_to_arm = 234 // lldb-command:continue -// lldb-command:print shadowed +// lldb-command:v shadowed // lldbg-check:[...] 236 // lldbr-check:(i32) shadowed = 236 -// lldb-command:print not_shadowed +// lldb-command:v not_shadowed // lldbg-check:[...] 232 // lldbr-check:(i32) not_shadowed = 232 // lldb-command:continue -// lldb-command:print shadowed +// lldb-command:v shadowed // lldbg-check:[...] 237 // lldbr-check:(isize) shadowed = 237 -// lldb-command:print not_shadowed +// lldb-command:v not_shadowed // lldbg-check:[...] 232 // lldbr-check:(i32) not_shadowed = 232 -// lldb-command:print local_to_arm +// lldb-command:v local_to_arm // lldbg-check:[...] 238 // lldbr-check:(isize) local_to_arm = 238 // lldb-command:continue -// lldb-command:print shadowed +// lldb-command:v shadowed // lldbg-check:[...] 239 // lldbr-check:(isize) shadowed = 239 -// lldb-command:print not_shadowed +// lldb-command:v not_shadowed // lldbg-check:[...] 232 // lldbr-check:(i32) not_shadowed = 232 // lldb-command:continue -// lldb-command:print shadowed +// lldb-command:v shadowed // lldbg-check:[...] 241 // lldbr-check:(isize) shadowed = 241 -// lldb-command:print not_shadowed +// lldb-command:v not_shadowed // lldbg-check:[...] 232 // lldbr-check:(i32) not_shadowed = 232 // lldb-command:continue -// lldb-command:print shadowed +// lldb-command:v shadowed // lldbg-check:[...] 243 // lldbr-check:(i32) shadowed = 243 -// lldb-command:print *local_to_arm +// lldb-command:v *local_to_arm // lldbg-check:[...] 244 // lldbr-check:(i32) *local_to_arm = 244 // lldb-command:continue -// lldb-command:print shadowed +// lldb-command:v shadowed // lldbg-check:[...] 231 // lldbr-check:(i32) shadowed = 231 -// lldb-command:print not_shadowed +// lldb-command:v not_shadowed // lldbg-check:[...] 232 // lldbr-check:(i32) not_shadowed = 232 // lldb-command:continue diff --git a/tests/debuginfo/lexical-scope-in-stack-closure.rs b/tests/debuginfo/lexical-scope-in-stack-closure.rs index 4d26b2f5c9a..92582e10c42 100644 --- a/tests/debuginfo/lexical-scope-in-stack-closure.rs +++ b/tests/debuginfo/lexical-scope-in-stack-closure.rs @@ -35,32 +35,32 @@ // lldb-command:run -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] false // lldbr-check:(bool) x = false // lldb-command:continue -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] false // lldbr-check:(bool) x = false // lldb-command:continue -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] 1000 // lldbr-check:(isize) x = 1000 // lldb-command:continue -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] 2.5 // lldbr-check:(f64) x = 2.5 // lldb-command:continue -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] true // lldbr-check:(bool) x = true // lldb-command:continue -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] false // lldbr-check:(bool) x = false // lldb-command:continue diff --git a/tests/debuginfo/lexical-scope-in-unconditional-loop.rs b/tests/debuginfo/lexical-scope-in-unconditional-loop.rs index cf908b1a510..b1af018f3eb 100644 --- a/tests/debuginfo/lexical-scope-in-unconditional-loop.rs +++ b/tests/debuginfo/lexical-scope-in-unconditional-loop.rs @@ -67,69 +67,69 @@ // lldb-command:run // FIRST ITERATION -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] 0 // lldbr-check:(i32) x = 0 // lldb-command:continue -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] 1 // lldbr-check:(i32) x = 1 // lldb-command:continue -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] 101 // lldbr-check:(i32) x = 101 // lldb-command:continue -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] 101 // lldbr-check:(i32) x = 101 // lldb-command:continue -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] -987 // lldbr-check:(i32) x = -987 // lldb-command:continue -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] 101 // lldbr-check:(i32) x = 101 // lldb-command:continue // SECOND ITERATION -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] 1 // lldbr-check:(i32) x = 1 // lldb-command:continue -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] 2 // lldbr-check:(i32) x = 2 // lldb-command:continue -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] 102 // lldbr-check:(i32) x = 102 // lldb-command:continue -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] 102 // lldbr-check:(i32) x = 102 // lldb-command:continue -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] -987 // lldbr-check:(i32) x = -987 // lldb-command:continue -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] 102 // lldbr-check:(i32) x = 102 // lldb-command:continue -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] 2 // lldbr-check:(i32) x = 2 // lldb-command:continue diff --git a/tests/debuginfo/lexical-scope-in-unique-closure.rs b/tests/debuginfo/lexical-scope-in-unique-closure.rs index df8c2598e38..a08c2af05cc 100644 --- a/tests/debuginfo/lexical-scope-in-unique-closure.rs +++ b/tests/debuginfo/lexical-scope-in-unique-closure.rs @@ -35,32 +35,32 @@ // lldb-command:run -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] false // lldbr-check:(bool) x = false // lldb-command:continue -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] false // lldbr-check:(bool) x = false // lldb-command:continue -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] 1000 // lldbr-check:(isize) x = 1000 // lldb-command:continue -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] 2.5 // lldbr-check:(f64) x = 2.5 // lldb-command:continue -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] true // lldbr-check:(bool) x = true // lldb-command:continue -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] false // lldbr-check:(bool) x = false // lldb-command:continue diff --git a/tests/debuginfo/lexical-scope-in-while.rs b/tests/debuginfo/lexical-scope-in-while.rs index 98c580e479c..bd885b5b10c 100644 --- a/tests/debuginfo/lexical-scope-in-while.rs +++ b/tests/debuginfo/lexical-scope-in-while.rs @@ -67,69 +67,69 @@ // lldb-command:run // FIRST ITERATION -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] 0 // lldbr-check:(i32) x = 0 // lldb-command:continue -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] 1 // lldbr-check:(i32) x = 1 // lldb-command:continue -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] 101 // lldbr-check:(i32) x = 101 // lldb-command:continue -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] 101 // lldbr-check:(i32) x = 101 // lldb-command:continue -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] -987 // lldbr-check:(i32) x = -987 // lldb-command:continue -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] 101 // lldbr-check:(i32) x = 101 // lldb-command:continue // SECOND ITERATION -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] 1 // lldbr-check:(i32) x = 1 // lldb-command:continue -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] 2 // lldbr-check:(i32) x = 2 // lldb-command:continue -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] 102 // lldbr-check:(i32) x = 102 // lldb-command:continue -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] 102 // lldbr-check:(i32) x = 102 // lldb-command:continue -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] -987 // lldbr-check:(i32) x = -987 // lldb-command:continue -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] 102 // lldbr-check:(i32) x = 102 // lldb-command:continue -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] 2 // lldbr-check:(i32) x = 2 // lldb-command:continue diff --git a/tests/debuginfo/lexical-scope-with-macro.rs b/tests/debuginfo/lexical-scope-with-macro.rs index a38aba8b16a..76c923524fb 100644 --- a/tests/debuginfo/lexical-scope-with-macro.rs +++ b/tests/debuginfo/lexical-scope-with-macro.rs @@ -56,34 +56,34 @@ // lldb-command:run -// lldb-command:print a +// lldb-command:v a // lldbg-check:[...] 10 // lldbr-check:(i32) a = 10 -// lldb-command:print b +// lldb-command:v b // lldbg-check:[...] 34 // lldbr-check:(i32) b = 34 // lldb-command:continue -// lldb-command:print a +// lldb-command:v a // lldbg-check:[...] 890242 // lldbr-check:(i32) a = 10 -// lldb-command:print b +// lldb-command:v b // lldbg-check:[...] 34 // lldbr-check:(i32) b = 34 // lldb-command:continue -// lldb-command:print a +// lldb-command:v a // lldbg-check:[...] 10 // lldbr-check:(i32) a = 10 -// lldb-command:print b +// lldb-command:v b // lldbg-check:[...] 34 // lldbr-check:(i32) b = 34 // lldb-command:continue -// lldb-command:print a +// lldb-command:v a // lldbg-check:[...] 102 // lldbr-check:(i32) a = 10 -// lldb-command:print b +// lldb-command:v b // lldbg-check:[...] 34 // lldbr-check:(i32) b = 34 // lldb-command:continue diff --git a/tests/debuginfo/lexical-scopes-in-block-expression.rs b/tests/debuginfo/lexical-scopes-in-block-expression.rs index 5a82dc6e3f3..5ff70270ea6 100644 --- a/tests/debuginfo/lexical-scopes-in-block-expression.rs +++ b/tests/debuginfo/lexical-scopes-in-block-expression.rs @@ -194,202 +194,202 @@ // lldb-command:run // STRUCT EXPRESSION -// lldb-command:print val +// lldb-command:v val // lldbg-check:[...] -1 // lldbr-check:(i32) val = -1 -// lldb-command:print ten +// lldb-command:v ten // lldbg-check:[...] 10 // lldbr-check:(isize) ten = 10 // lldb-command:continue -// lldb-command:print val +// lldb-command:v val // lldbg-check:[...] 11 // lldbr-check:(isize) val = 11 -// lldb-command:print ten +// lldb-command:v ten // lldbg-check:[...] 10 // lldbr-check:(isize) ten = 10 // lldb-command:continue -// lldb-command:print val +// lldb-command:v val // lldbg-check:[...] -1 // lldbr-check:(i32) val = -1 -// lldb-command:print ten +// lldb-command:v ten // lldbg-check:[...] 10 // lldbr-check:(isize) ten = 10 // lldb-command:continue // FUNCTION CALL -// lldb-command:print val +// lldb-command:v val // lldbg-check:[...] -1 // lldbr-check:(i32) val = -1 -// lldb-command:print ten +// lldb-command:v ten // lldbg-check:[...] 10 // lldbr-check:(isize) ten = 10 // lldb-command:continue -// lldb-command:print val +// lldb-command:v val // lldbg-check:[...] 12 // lldbr-check:(isize) val = 12 -// lldb-command:print ten +// lldb-command:v ten // lldbg-check:[...] 10 // lldbr-check:(isize) ten = 10 // lldb-command:continue -// lldb-command:print val +// lldb-command:v val // lldbg-check:[...] -1 // lldbr-check:(i32) val = -1 -// lldb-command:print ten +// lldb-command:v ten // lldbg-check:[...] 10 // lldbr-check:(isize) ten = 10 // lldb-command:continue // TUPLE EXPRESSION -// lldb-command:print val +// lldb-command:v val // lldbg-check:[...] -1 // lldbr-check:(i32) val = -1 -// lldb-command:print ten +// lldb-command:v ten // lldbg-check:[...] 10 // lldbr-check:(isize) ten = 10 // lldb-command:continue -// lldb-command:print val +// lldb-command:v val // lldbg-check:[...] 13 // lldbr-check:(isize) val = 13 -// lldb-command:print ten +// lldb-command:v ten // lldbg-check:[...] 10 // lldbr-check:(isize) ten = 10 // lldb-command:continue -// lldb-command:print val +// lldb-command:v val // lldbg-check:[...] -1 // lldbr-check:(i32) val = -1 -// lldb-command:print ten +// lldb-command:v ten // lldbg-check:[...] 10 // lldbr-check:(isize) ten = 10 // lldb-command:continue // VEC EXPRESSION -// lldb-command:print val +// lldb-command:v val // lldbg-check:[...] -1 // lldbr-check:(i32) val = -1 -// lldb-command:print ten +// lldb-command:v ten // lldbg-check:[...] 10 // lldbr-check:(isize) ten = 10 // lldb-command:continue -// lldb-command:print val +// lldb-command:v val // lldbg-check:[...] 14 // lldbr-check:(isize) val = 14 -// lldb-command:print ten +// lldb-command:v ten // lldbg-check:[...] 10 // lldbr-check:(isize) ten = 10 // lldb-command:continue -// lldb-command:print val +// lldb-command:v val // lldbg-check:[...] -1 // lldbr-check:(i32) val = -1 -// lldb-command:print ten +// lldb-command:v ten // lldbg-check:[...] 10 // lldbr-check:(isize) ten = 10 // lldb-command:continue // REPEAT VEC EXPRESSION -// lldb-command:print val +// lldb-command:v val // lldbg-check:[...] -1 // lldbr-check:(i32) val = -1 -// lldb-command:print ten +// lldb-command:v ten // lldbg-check:[...] 10 // lldbr-check:(isize) ten = 10 // lldb-command:continue -// lldb-command:print val +// lldb-command:v val // lldbg-check:[...] 15 // lldbr-check:(isize) val = 15 -// lldb-command:print ten +// lldb-command:v ten // lldbg-check:[...] 10 // lldbr-check:(isize) ten = 10 // lldb-command:continue -// lldb-command:print val +// lldb-command:v val // lldbg-check:[...] -1 // lldbr-check:(i32) val = -1 -// lldb-command:print ten +// lldb-command:v ten // lldbg-check:[...] 10 // lldbr-check:(isize) ten = 10 // lldb-command:continue // ASSIGNMENT EXPRESSION -// lldb-command:print val +// lldb-command:v val // lldbg-check:[...] -1 // lldbr-check:(i32) val = -1 -// lldb-command:print ten +// lldb-command:v ten // lldbg-check:[...] 10 // lldbr-check:(isize) ten = 10 // lldb-command:continue -// lldb-command:print val +// lldb-command:v val // lldbg-check:[...] 16 // lldbr-check:(isize) val = 16 -// lldb-command:print ten +// lldb-command:v ten // lldbg-check:[...] 10 // lldbr-check:(isize) ten = 10 // lldb-command:continue -// lldb-command:print val +// lldb-command:v val // lldbg-check:[...] -1 // lldbr-check:(i32) val = -1 -// lldb-command:print ten +// lldb-command:v ten // lldbg-check:[...] 10 // lldbr-check:(isize) ten = 10 // lldb-command:continue // ARITHMETIC EXPRESSION -// lldb-command:print val +// lldb-command:v val // lldbg-check:[...] -1 // lldbr-check:(i32) val = -1 -// lldb-command:print ten +// lldb-command:v ten // lldbg-check:[...] 10 // lldbr-check:(isize) ten = 10 // lldb-command:continue -// lldb-command:print val +// lldb-command:v val // lldbg-check:[...] 17 // lldbr-check:(isize) val = 17 -// lldb-command:print ten +// lldb-command:v ten // lldbg-check:[...] 10 // lldbr-check:(isize) ten = 10 // lldb-command:continue -// lldb-command:print val +// lldb-command:v val // lldbg-check:[...] -1 // lldbr-check:(i32) val = -1 -// lldb-command:print ten +// lldb-command:v ten // lldbg-check:[...] 10 // lldbr-check:(isize) ten = 10 // lldb-command:continue // INDEX EXPRESSION -// lldb-command:print val +// lldb-command:v val // lldbg-check:[...] -1 // lldbr-check:(i32) val = -1 -// lldb-command:print ten +// lldb-command:v ten // lldbg-check:[...] 10 // lldbr-check:(isize) ten = 10 // lldb-command:continue -// lldb-command:print val +// lldb-command:v val // lldbg-check:[...] 18 // lldbr-check:(isize) val = 18 -// lldb-command:print ten +// lldb-command:v ten // lldbg-check:[...] 10 // lldbr-check:(isize) ten = 10 // lldb-command:continue -// lldb-command:print val +// lldb-command:v val // lldbg-check:[...] -1 // lldbr-check:(i32) val = -1 -// lldb-command:print ten +// lldb-command:v ten // lldbg-check:[...] 10 // lldbr-check:(isize) ten = 10 // lldb-command:continue diff --git a/tests/debuginfo/method-on-enum.rs b/tests/debuginfo/method-on-enum.rs index f947ba350e7..8a57060717e 100644 --- a/tests/debuginfo/method-on-enum.rs +++ b/tests/debuginfo/method-on-enum.rs @@ -63,47 +63,47 @@ // lldb-command:run // STACK BY REF -// lldb-command:print *self +// lldb-command:v *self // lldb-check:[...] Variant2(117901063) -// lldb-command:print arg1 +// lldb-command:v arg1 // lldb-check:[...] -1 -// lldb-command:print arg2 +// lldb-command:v arg2 // lldb-check:[...] -2 // lldb-command:continue // STACK BY VAL -// lldb-command:print self +// lldb-command:v self // lldb-check:[...] Variant2(117901063) -// lldb-command:print arg1 +// lldb-command:v arg1 // lldb-check:[...] -3 -// lldb-command:print arg2 +// lldb-command:v arg2 // lldb-check:[...] -4 // lldb-command:continue // OWNED BY REF -// lldb-command:print *self +// lldb-command:v *self // lldb-check:[...] Variant1 { x: 1799, y: 1799 } -// lldb-command:print arg1 +// lldb-command:v arg1 // lldb-check:[...] -5 -// lldb-command:print arg2 +// lldb-command:v arg2 // lldb-check:[...] -6 // lldb-command:continue // OWNED BY VAL -// lldb-command:print self +// lldb-command:v self // lldb-check:[...] Variant1 { x: 1799, y: 1799 } -// lldb-command:print arg1 +// lldb-command:v arg1 // lldb-check:[...] -7 -// lldb-command:print arg2 +// lldb-command:v arg2 // lldb-check:[...] -8 // lldb-command:continue // OWNED MOVED -// lldb-command:print *self +// lldb-command:v *self // lldb-check:[...] Variant1 { x: 1799, y: 1799 } -// lldb-command:print arg1 +// lldb-command:v arg1 // lldb-check:[...] -9 -// lldb-command:print arg2 +// lldb-command:v arg2 // lldb-check:[...] -10 // lldb-command:continue diff --git a/tests/debuginfo/method-on-generic-struct.rs b/tests/debuginfo/method-on-generic-struct.rs index 16793fb9bc6..64ef0e6bb0c 100644 --- a/tests/debuginfo/method-on-generic-struct.rs +++ b/tests/debuginfo/method-on-generic-struct.rs @@ -64,61 +64,61 @@ // lldb-command:run // STACK BY REF -// lldb-command:print *self +// lldb-command:v *self // lldbg-check:[...] Struct<(u32, i32)> { x: (8888, -8888) } // lldbr-check:(method_on_generic_struct::Struct<(u32, i32)>) *self = { x = { = 8888 = -8888 } } -// lldb-command:print arg1 +// lldb-command:v arg1 // lldbg-check:[...] -1 // lldbr-check:(isize) arg1 = -1 -// lldb-command:print arg2 +// lldb-command:v arg2 // lldbg-check:[...] -2 // lldbr-check:(isize) arg2 = -2 // lldb-command:continue // STACK BY VAL -// lldb-command:print self +// lldb-command:v self // lldbg-check:[...] Struct<(u32, i32)> { x: (8888, -8888) } // lldbr-check:(method_on_generic_struct::Struct<(u32, i32)>) self = { x = { = 8888 = -8888 } } -// lldb-command:print arg1 +// lldb-command:v arg1 // lldbg-check:[...] -3 // lldbr-check:(isize) arg1 = -3 -// lldb-command:print arg2 +// lldb-command:v arg2 // lldbg-check:[...] -4 // lldbr-check:(isize) arg2 = -4 // lldb-command:continue // OWNED BY REF -// lldb-command:print *self +// lldb-command:v *self // lldbg-check:[...] Struct { x: 1234.5 } // lldbr-check:(method_on_generic_struct::Struct) *self = Struct { x: 1234.5 } -// lldb-command:print arg1 +// lldb-command:v arg1 // lldbg-check:[...] -5 // lldbr-check:(isize) arg1 = -5 -// lldb-command:print arg2 +// lldb-command:v arg2 // lldbg-check:[...] -6 // lldbr-check:(isize) arg2 = -6 // lldb-command:continue // OWNED BY VAL -// lldb-command:print self +// lldb-command:v self // lldbg-check:[...] Struct { x: 1234.5 } // lldbr-check:(method_on_generic_struct::Struct) self = Struct { x: 1234.5 } -// lldb-command:print arg1 +// lldb-command:v arg1 // lldbg-check:[...] -7 // lldbr-check:(isize) arg1 = -7 -// lldb-command:print arg2 +// lldb-command:v arg2 // lldbg-check:[...] -8 // lldbr-check:(isize) arg2 = -8 // lldb-command:continue // OWNED MOVED -// lldb-command:print *self +// lldb-command:v *self // lldbg-check:[...] Struct { x: 1234.5 } // lldbr-check:(method_on_generic_struct::Struct) *self = Struct { x: 1234.5 } -// lldb-command:print arg1 +// lldb-command:v arg1 // lldbg-check:[...] -9 // lldbr-check:(isize) arg1 = -9 -// lldb-command:print arg2 +// lldb-command:v arg2 // lldbg-check:[...] -10 // lldbr-check:(isize) arg2 = -10 // lldb-command:continue diff --git a/tests/debuginfo/method-on-struct.rs b/tests/debuginfo/method-on-struct.rs index 56bcb462cb3..a4129af5429 100644 --- a/tests/debuginfo/method-on-struct.rs +++ b/tests/debuginfo/method-on-struct.rs @@ -62,61 +62,61 @@ // lldb-command:run // STACK BY REF -// lldb-command:print *self +// lldb-command:v *self // lldbg-check:[...] { x = 100 } // lldbr-check:(method_on_struct::Struct) *self = Struct { x: 100 } -// lldb-command:print arg1 +// lldb-command:v arg1 // lldbg-check:[...] -1 // lldbr-check:(isize) arg1 = -1 -// lldb-command:print arg2 +// lldb-command:v arg2 // lldbg-check:[...] -2 // lldbr-check:(isize) arg2 = -2 // lldb-command:continue // STACK BY VAL -// lldb-command:print self +// lldb-command:v self // lldbg-check:[...] { x = 100 } // lldbr-check:(method_on_struct::Struct) self = Struct { x: 100 } -// lldb-command:print arg1 +// lldb-command:v arg1 // lldbg-check:[...] -3 // lldbr-check:(isize) arg1 = -3 -// lldb-command:print arg2 +// lldb-command:v arg2 // lldbg-check:[...] -4 // lldbr-check:(isize) arg2 = -4 // lldb-command:continue // OWNED BY REF -// lldb-command:print *self +// lldb-command:v *self // lldbg-check:[...] { x = 200 } // lldbr-check:(method_on_struct::Struct) *self = Struct { x: 200 } -// lldb-command:print arg1 +// lldb-command:v arg1 // lldbg-check:[...] -5 // lldbr-check:(isize) arg1 = -5 -// lldb-command:print arg2 +// lldb-command:v arg2 // lldbg-check:[...] -6 // lldbr-check:(isize) arg2 = -6 // lldb-command:continue // OWNED BY VAL -// lldb-command:print self +// lldb-command:v self // lldbg-check:[...] { x = 200 } // lldbr-check:(method_on_struct::Struct) self = Struct { x: 200 } -// lldb-command:print arg1 +// lldb-command:v arg1 // lldbg-check:[...] -7 // lldbr-check:(isize) arg1 = -7 -// lldb-command:print arg2 +// lldb-command:v arg2 // lldbg-check:[...] -8 // lldbr-check:(isize) arg2 = -8 // lldb-command:continue // OWNED MOVED -// lldb-command:print *self +// lldb-command:v *self // lldbg-check:[...] { x = 200 } // lldbr-check:(method_on_struct::Struct) *self = Struct { x: 200 } -// lldb-command:print arg1 +// lldb-command:v arg1 // lldbg-check:[...] -9 // lldbr-check:(isize) arg1 = -9 -// lldb-command:print arg2 +// lldb-command:v arg2 // lldbg-check:[...] -10 // lldbr-check:(isize) arg2 = -10 // lldb-command:continue diff --git a/tests/debuginfo/method-on-trait.rs b/tests/debuginfo/method-on-trait.rs index 0264ff68d1b..0934c267ab1 100644 --- a/tests/debuginfo/method-on-trait.rs +++ b/tests/debuginfo/method-on-trait.rs @@ -62,61 +62,61 @@ // lldb-command:run // STACK BY REF -// lldb-command:print *self +// lldb-command:v *self // lldbg-check:[...] { x = 100 } // lldbr-check:(method_on_trait::Struct) *self = { x = 100 } -// lldb-command:print arg1 +// lldb-command:v arg1 // lldbg-check:[...] -1 // lldbr-check:(isize) arg1 = -1 -// lldb-command:print arg2 +// lldb-command:v arg2 // lldbg-check:[...] -2 // lldbr-check:(isize) arg2 = -2 // lldb-command:continue // STACK BY VAL -// lldb-command:print self +// lldb-command:v self // lldbg-check:[...] { x = 100 } // lldbr-check:(method_on_trait::Struct) self = { x = 100 } -// lldb-command:print arg1 +// lldb-command:v arg1 // lldbg-check:[...] -3 // lldbr-check:(isize) arg1 = -3 -// lldb-command:print arg2 +// lldb-command:v arg2 // lldbg-check:[...] -4 // lldbr-check:(isize) arg2 = -4 // lldb-command:continue // OWNED BY REF -// lldb-command:print *self +// lldb-command:v *self // lldbg-check:[...] { x = 200 } // lldbr-check:(method_on_trait::Struct) *self = { x = 200 } -// lldb-command:print arg1 +// lldb-command:v arg1 // lldbg-check:[...] -5 // lldbr-check:(isize) arg1 = -5 -// lldb-command:print arg2 +// lldb-command:v arg2 // lldbg-check:[...] -6 // lldbr-check:(isize) arg2 = -6 // lldb-command:continue // OWNED BY VAL -// lldb-command:print self +// lldb-command:v self // lldbg-check:[...] { x = 200 } // lldbr-check:(method_on_trait::Struct) self = { x = 200 } -// lldb-command:print arg1 +// lldb-command:v arg1 // lldbg-check:[...] -7 // lldbr-check:(isize) arg1 = -7 -// lldb-command:print arg2 +// lldb-command:v arg2 // lldbg-check:[...] -8 // lldbr-check:(isize) arg2 = -8 // lldb-command:continue // OWNED MOVED -// lldb-command:print *self +// lldb-command:v *self // lldbg-check:[...] { x = 200 } // lldbr-check:(method_on_trait::Struct) *self = { x = 200 } -// lldb-command:print arg1 +// lldb-command:v arg1 // lldbg-check:[...] -9 // lldbr-check:(isize) arg1 = -9 -// lldb-command:print arg2 +// lldb-command:v arg2 // lldbg-check:[...] -10 // lldbr-check:(isize) arg2 = -10 // lldb-command:continue diff --git a/tests/debuginfo/method-on-tuple-struct.rs b/tests/debuginfo/method-on-tuple-struct.rs index 872f6ea57c2..9cf9c6d7fba 100644 --- a/tests/debuginfo/method-on-tuple-struct.rs +++ b/tests/debuginfo/method-on-tuple-struct.rs @@ -62,61 +62,61 @@ // lldb-command:run // STACK BY REF -// lldb-command:print *self +// lldb-command:v *self // lldbg-check:[...] { 0 = 100 1 = -100.5 } // lldbr-check:(method_on_tuple_struct::TupleStruct) *self = { 0 = 100 1 = -100.5 } -// lldb-command:print arg1 +// lldb-command:v arg1 // lldbg-check:[...] -1 // lldbr-check:(isize) arg1 = -1 -// lldb-command:print arg2 +// lldb-command:v arg2 // lldbg-check:[...] -2 // lldbr-check:(isize) arg2 = -2 // lldb-command:continue // STACK BY VAL -// lldb-command:print self +// lldb-command:v self // lldbg-check:[...] { 0 = 100 1 = -100.5 } // lldbr-check:(method_on_tuple_struct::TupleStruct) self = { 0 = 100 1 = -100.5 } -// lldb-command:print arg1 +// lldb-command:v arg1 // lldbg-check:[...] -3 // lldbr-check:(isize) arg1 = -3 -// lldb-command:print arg2 +// lldb-command:v arg2 // lldbg-check:[...] -4 // lldbr-check:(isize) arg2 = -4 // lldb-command:continue // OWNED BY REF -// lldb-command:print *self +// lldb-command:v *self // lldbg-check:[...] { 0 = 200 1 = -200.5 } // lldbr-check:(method_on_tuple_struct::TupleStruct) *self = { 0 = 200 1 = -200.5 } -// lldb-command:print arg1 +// lldb-command:v arg1 // lldbg-check:[...] -5 // lldbr-check:(isize) arg1 = -5 -// lldb-command:print arg2 +// lldb-command:v arg2 // lldbg-check:[...] -6 // lldbr-check:(isize) arg2 = -6 // lldb-command:continue // OWNED BY VAL -// lldb-command:print self +// lldb-command:v self // lldbg-check:[...] { 0 = 200 1 = -200.5 } // lldbr-check:(method_on_tuple_struct::TupleStruct) self = { 0 = 200 1 = -200.5 } -// lldb-command:print arg1 +// lldb-command:v arg1 // lldbg-check:[...] -7 // lldbr-check:(isize) arg1 = -7 -// lldb-command:print arg2 +// lldb-command:v arg2 // lldbg-check:[...] -8 // lldbr-check:(isize) arg2 = -8 // lldb-command:continue // OWNED MOVED -// lldb-command:print *self +// lldb-command:v *self // lldbg-check:[...] { 0 = 200 1 = -200.5 } // lldbr-check:(method_on_tuple_struct::TupleStruct) *self = { 0 = 200 1 = -200.5 } -// lldb-command:print arg1 +// lldb-command:v arg1 // lldbg-check:[...] -9 // lldbr-check:(isize) arg1 = -9 -// lldb-command:print arg2 +// lldb-command:v arg2 // lldbg-check:[...] -10 // lldbr-check:(isize) arg2 = -10 // lldb-command:continue diff --git a/tests/debuginfo/multi-cgu.rs b/tests/debuginfo/multi-cgu.rs index 42aa25c1421..32fd6895877 100644 --- a/tests/debuginfo/multi-cgu.rs +++ b/tests/debuginfo/multi-cgu.rs @@ -23,12 +23,12 @@ // lldb-command:run -// lldb-command:print xxx +// lldb-command:v xxx // lldbg-check:[...] 12345 // lldbr-check:(u32) xxx = 12345 // lldb-command:continue -// lldb-command:print yyy +// lldb-command:v yyy // lldbg-check:[...] 67890 // lldbr-check:(u64) yyy = 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 113eac29256..2d9caf75290 100644 --- a/tests/debuginfo/multiple-functions-equal-var-names.rs +++ b/tests/debuginfo/multiple-functions-equal-var-names.rs @@ -22,17 +22,17 @@ // lldb-command:run -// lldb-command:print abc +// lldb-command:v abc // lldbg-check:[...] 10101 // lldbr-check:(i32) abc = 10101 // lldb-command:continue -// lldb-command:print abc +// lldb-command:v abc // lldbg-check:[...] 20202 // lldbr-check:(i32) abc = 20202 // lldb-command:continue -// lldb-command:print abc +// lldb-command:v abc // lldbg-check:[...] 30303 // lldbr-check:(i32) abc = 30303 diff --git a/tests/debuginfo/multiple-functions.rs b/tests/debuginfo/multiple-functions.rs index 81fdc4f3d40..5c01a427051 100644 --- a/tests/debuginfo/multiple-functions.rs +++ b/tests/debuginfo/multiple-functions.rs @@ -22,17 +22,17 @@ // lldb-command:run -// lldb-command:print a +// lldb-command:v a // lldbg-check:[...] 10101 // lldbr-check:(i32) a = 10101 // lldb-command:continue -// lldb-command:print b +// lldb-command:v b // lldbg-check:[...] 20202 // lldbr-check:(i32) b = 20202 // lldb-command:continue -// lldb-command:print c +// lldb-command:v c // lldbg-check:[...] 30303 // lldbr-check:(i32) c = 30303 diff --git a/tests/debuginfo/name-shadowing-and-scope-nesting.rs b/tests/debuginfo/name-shadowing-and-scope-nesting.rs index 42df9666810..8813793e59e 100644 --- a/tests/debuginfo/name-shadowing-and-scope-nesting.rs +++ b/tests/debuginfo/name-shadowing-and-scope-nesting.rs @@ -47,50 +47,50 @@ // lldb-command:run -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] false // lldbr-check:(bool) x = false -// lldb-command:print y +// lldb-command:v y // lldbg-check:[...] true // lldbr-check:(bool) y = true // lldb-command:continue -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] 10 // lldbr-check:(i32) x = 10 -// lldb-command:print y +// lldb-command:v y // lldbg-check:[...] true // lldbr-check:(bool) y = true // lldb-command:continue -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] 10.5 // lldbr-check:(f64) x = 10.5 -// lldb-command:print y +// lldb-command:v y // lldbg-check:[...] 20 // lldbr-check:(i32) y = 20 // lldb-command:continue -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] true // lldbr-check:(bool) x = true -// lldb-command:print y +// lldb-command:v y // lldbg-check:[...] 2220 // lldbr-check:(i32) y = 2220 // lldb-command:continue -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] 203203.5 // lldbr-check:(f64) x = 203203.5 -// lldb-command:print y +// lldb-command:v y // lldbg-check:[...] 2220 // lldbr-check:(i32) y = 2220 // lldb-command:continue -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] 10.5 // lldbr-check:(f64) x = 10.5 -// lldb-command:print y +// lldb-command:v y // lldbg-check:[...] 20 // lldbr-check:(i32) y = 20 // lldb-command:continue diff --git a/tests/debuginfo/no_mangle-info.rs b/tests/debuginfo/no_mangle-info.rs index 9cb42656f2a..11b49029528 100644 --- a/tests/debuginfo/no_mangle-info.rs +++ b/tests/debuginfo/no_mangle-info.rs @@ -10,10 +10,10 @@ // === LLDB TESTS ================================================================================== // lldb-command:run -// lldb-command:p TEST -// lldb-check: (unsigned long) 3735928559 -// lldb-command:p OTHER_TEST -// lldb-check: (unsigned long) 42 +// lldb-command:v TEST +// lldb-check: (unsigned long) TEST = 3735928559 +// lldb-command:v OTHER_TEST +// lldb-check: (unsigned long) no_mangle_info::namespace::OTHER_TEST::[...] = 42 // === CDB TESTS ================================================================================== // cdb-command: g diff --git a/tests/debuginfo/numeric-types.rs b/tests/debuginfo/numeric-types.rs index 615f365173f..1ff72d34fbd 100644 --- a/tests/debuginfo/numeric-types.rs +++ b/tests/debuginfo/numeric-types.rs @@ -202,40 +202,40 @@ // lldb-command:run -// lldb-command:print/d nz_i8 +// lldb-command:v/d nz_i8 // lldb-check:[...] 11 { __0 = { 0 = 11 } } -// lldb-command:print nz_i16 +// lldb-command:v nz_i16 // lldb-check:[...] 22 { __0 = { 0 = 22 } } -// lldb-command:print nz_i32 +// lldb-command:v nz_i32 // lldb-check:[...] 33 { __0 = { 0 = 33 } } -// lldb-command:print nz_i64 +// lldb-command:v nz_i64 // lldb-check:[...] 44 { __0 = { 0 = 44 } } -// lldb-command:print nz_i128 +// lldb-command:v nz_i128 // lldb-check:[...] 55 { __0 = { 0 = 55 } } -// lldb-command:print nz_isize +// lldb-command:v nz_isize // lldb-check:[...] 66 { __0 = { 0 = 66 } } -// lldb-command:print/d nz_u8 +// lldb-command:v/d nz_u8 // lldb-check:[...] 77 { __0 = { 0 = 77 } } -// lldb-command:print nz_u16 +// lldb-command:v nz_u16 // lldb-check:[...] 88 { __0 = { 0 = 88 } } -// lldb-command:print nz_u32 +// lldb-command:v nz_u32 // lldb-check:[...] 99 { __0 = { 0 = 99 } } -// lldb-command:print nz_u64 +// lldb-command:v nz_u64 // lldb-check:[...] 100 { __0 = { 0 = 100 } } -// lldb-command:print nz_u128 +// lldb-command:v nz_u128 // lldb-check:[...] 111 { __0 = { 0 = 111 } } -// lldb-command:print nz_usize +// lldb-command:v nz_usize // lldb-check:[...] 122 { __0 = { 0 = 122 } } #![feature(generic_nonzero)] diff --git a/tests/debuginfo/option-like-enum.rs b/tests/debuginfo/option-like-enum.rs index 03646c99f64..c782796f473 100644 --- a/tests/debuginfo/option-like-enum.rs +++ b/tests/debuginfo/option-like-enum.rs @@ -47,34 +47,34 @@ // lldb-command:run -// lldb-command:print some +// lldb-command:v some // lldb-check:[...] Some(&0x12345678) -// lldb-command:print none +// lldb-command:v none // lldb-check:[...] None -// lldb-command:print full +// lldb-command:v full // lldb-check:[...] Full(454545, &0x87654321, 9988) -// lldb-command:print empty +// lldb-command:v empty // lldb-check:[...] Empty -// lldb-command:print droid +// lldb-command:v droid // lldb-check:[...] Droid { id: 675675, range: 10000001, internals: &0x43218765 } -// lldb-command:print void_droid +// lldb-command:v void_droid // lldb-check:[...] Void -// lldb-command:print some_str +// lldb-command:v some_str // lldb-check:[...] Some("abc") -// lldb-command:print none_str +// lldb-command:v none_str // lldb-check:[...] None -// lldb-command:print nested_non_zero_yep +// lldb-command:v nested_non_zero_yep // lldb-check:[...] Yep(10.5, NestedNonZeroField { a: 10, b: 20, c: &[...] }) -// lldb-command:print nested_non_zero_nope +// lldb-command:v nested_non_zero_nope // lldb-check:[...] Nope diff --git a/tests/debuginfo/packed-struct-with-destructor.rs b/tests/debuginfo/packed-struct-with-destructor.rs index b1f237db814..f9bac844376 100644 --- a/tests/debuginfo/packed-struct-with-destructor.rs +++ b/tests/debuginfo/packed-struct-with-destructor.rs @@ -44,35 +44,35 @@ // lldb-command:run -// lldb-command:print packed +// lldb-command:v packed // lldbg-check:[...] { x = 123 y = 234 z = 345 } // lldbr-check:(packed_struct_with_destructor::Packed) packed = { x = 123 y = 234 z = 345 } -// lldb-command:print packedInPacked +// lldb-command:v packedInPacked // lldbg-check:[...] { a = 1111 b = { x = 2222 y = 3333 z = 4444 } c = 5555 d = { x = 6666 y = 7777 z = 8888 } } // lldbr-check:(packed_struct_with_destructor::PackedInPacked) packedInPacked = { a = 1111 b = { x = 2222 y = 3333 z = 4444 } c = 5555 d = { x = 6666 y = 7777 z = 8888 } } -// lldb-command:print packedInUnpacked +// lldb-command:v packedInUnpacked // lldbg-check:[...] { a = -1111 b = { x = -2222 y = -3333 z = -4444 } c = -5555 d = { x = -6666 y = -7777 z = -8888 } } // lldbr-check:(packed_struct_with_destructor::PackedInUnpacked) packedInUnpacked = { a = -1111 b = { x = -2222 y = -3333 z = -4444 } c = -5555 d = { x = -6666 y = -7777 z = -8888 } } -// lldb-command:print unpackedInPacked +// lldb-command:v unpackedInPacked // lldbg-check:[...] { a = 987 b = { x = 876 y = 765 z = 654 } c = { x = 543 y = 432 z = 321 } d = 210 } // lldbr-check:(packed_struct_with_destructor::UnpackedInPacked) unpackedInPacked = { a = 987 b = { x = 876 y = 765 z = 654 } c = { x = 543 y = 432 z = 321 } d = 210 } -// lldb-command:print packedInPackedWithDrop +// lldb-command:v packedInPackedWithDrop // lldbg-check:[...] { a = 11 b = { x = 22 y = 33 z = 44 } c = 55 d = { x = 66 y = 77 z = 88 } } // lldbr-check:(packed_struct_with_destructor::PackedInPackedWithDrop) packedInPackedWithDrop = { a = 11 b = { x = 22 y = 33 z = 44 } c = 55 d = { x = 66 y = 77 z = 88 } } -// lldb-command:print packedInUnpackedWithDrop +// lldb-command:v packedInUnpackedWithDrop // lldbg-check:[...] { a = -11 b = { x = -22 y = -33 z = -44 } c = -55 d = { x = -66 y = -77 z = -88 } } // lldbr-check:(packed_struct_with_destructor::PackedInUnpackedWithDrop) packedInUnpackedWithDrop = { a = -11 b = { x = -22 y = -33 z = -44 } c = -55 d = { x = -66 y = -77 z = -88 } } -// lldb-command:print unpackedInPackedWithDrop +// lldb-command:v unpackedInPackedWithDrop // lldbg-check:[...] { a = 98 b = { x = 87 y = 76 z = 65 } c = { x = 54 y = 43 z = 32 } d = 21 } // lldbr-check:(packed_struct_with_destructor::UnpackedInPackedWithDrop) unpackedInPackedWithDrop = { a = 98 b = { x = 87 y = 76 z = 65 } c = { x = 54 y = 43 z = 32 } d = 21 } -// lldb-command:print deeplyNested +// 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 } } } // lldbr-check:(packed_struct_with_destructor::DeeplyNested) deeplyNested = { 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 } } } diff --git a/tests/debuginfo/packed-struct.rs b/tests/debuginfo/packed-struct.rs index b61da041243..2eb5be875bc 100644 --- a/tests/debuginfo/packed-struct.rs +++ b/tests/debuginfo/packed-struct.rs @@ -34,27 +34,27 @@ // lldb-command:run -// lldb-command:print packed +// lldb-command:v packed // lldbg-check:[...] { x = 123 y = 234 z = 345 } // lldbr-check:(packed_struct::Packed) packed = { x = 123 y = 234 z = 345 } -// lldb-command:print packedInPacked +// lldb-command:v packedInPacked // lldbg-check:[...] { a = 1111 b = { x = 2222 y = 3333 z = 4444 } c = 5555 d = { x = 6666 y = 7777 z = 8888 } } // lldbr-check:(packed_struct::PackedInPacked) packedInPacked = { a = 1111 b = { x = 2222 y = 3333 z = 4444 } c = 5555 d = { x = 6666 y = 7777 z = 8888 } } -// lldb-command:print packedInUnpacked +// lldb-command:v packedInUnpacked // lldbg-check:[...] { a = -1111 b = { x = -2222 y = -3333 z = -4444 } c = -5555 d = { x = -6666 y = -7777 z = -8888 } } // lldbr-check:(packed_struct::PackedInUnpacked) packedInUnpacked = { a = -1111 b = { x = -2222 y = -3333 z = -4444 } c = -5555 d = { x = -6666 y = -7777 z = -8888 } } -// lldb-command:print unpackedInPacked +// 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 } // lldbr-check:(packed_struct::UnpackedInPacked) unpackedInPacked = { a = 987 b = { x = 876 y = 765 z = 654 w = 543 } c = { x = 432 y = 321 z = 210 w = 109 } d = -98 } -// lldb-command:print sizeof(packed) +// lldb-command:dwim-print sizeof(packed) // lldbg-check:[...] 14 // lldbr-check:(usize) = 14 -// lldb-command:print sizeof(packedInPacked) +// lldb-command:dwim-print sizeof(packedInPacked) // lldbg-check:[...] 40 // lldbr-check:(usize) = 40 diff --git a/tests/debuginfo/pretty-std-collections.rs b/tests/debuginfo/pretty-std-collections.rs index 903a9f9a272..e9c2c4f2a1d 100644 --- a/tests/debuginfo/pretty-std-collections.rs +++ b/tests/debuginfo/pretty-std-collections.rs @@ -58,19 +58,19 @@ // lldb-command:run -// lldb-command:print vec_deque +// lldb-command:v vec_deque // lldbg-check:[...] size=3 { [0] = 5 [1] = 3 [2] = 7 } // lldbr-check:(alloc::collections::vec_deque::VecDeque) vec_deque = size=3 = { [0] = 5 [1] = 3 [2] = 7 } -// lldb-command:print vec_deque2 +// lldb-command:v vec_deque2 // lldbg-check:[...] size=7 { [0] = 2 [1] = 3 [2] = 4 [3] = 5 [4] = 6 [5] = 7 [6] = 8 } // lldbr-check:(alloc::collections::vec_deque::VecDeque) vec_deque2 = size=7 = { [0] = 2 [1] = 3 [2] = 4 [3] = 5 [4] = 6 [5] = 7 [6] = 8 } -// lldb-command:print hash_map +// 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 } } // lldbr-check:(std::collections::hash::map::HashMap) hash_map = size=4 size=4 { [0] = { 0 = 1 1 = 10 } [1] = { 0 = 2 1 = 20 } [2] = { 0 = 3 1 = 30 } [3] = { 0 = 4 1 = 40 } } -// lldb-command:print hash_set +// lldb-command:v hash_set // lldbg-check:[...] size=4 { [0] = 1 [1] = 2 [2] = 3 [3] = 4 } // lldbr-check:(std::collections::hash::set::HashSet) hash_set = size=4 { [0] = 1 [1] = 2 [2] = 3 [3] = 4 } diff --git a/tests/debuginfo/rc_arc.rs b/tests/debuginfo/rc_arc.rs index e340fe85e1d..ca0feb1f465 100644 --- a/tests/debuginfo/rc_arc.rs +++ b/tests/debuginfo/rc_arc.rs @@ -17,9 +17,9 @@ // lldb-command:run -// lldb-command:print rc +// lldb-command:v rc // lldb-check:[...] strong=11, weak=1 { value = 111 } -// lldb-command:print arc +// lldb-command:v arc // lldb-check:[...] strong=21, weak=1 { data = 222 } // === CDB TESTS ================================================================================== diff --git a/tests/debuginfo/reference-debuginfo.rs b/tests/debuginfo/reference-debuginfo.rs index b1a6aef50cb..339839f07cc 100644 --- a/tests/debuginfo/reference-debuginfo.rs +++ b/tests/debuginfo/reference-debuginfo.rs @@ -59,11 +59,11 @@ // === LLDB TESTS ================================================================================== // lldb-command:run -// lldb-command:print *bool_ref +// lldb-command:v *bool_ref // lldbg-check:[...] true // lldbr-check:(bool) *bool_ref = true -// lldb-command:print *int_ref +// lldb-command:v *int_ref // lldbg-check:[...] -1 // lldbr-check:(isize) *int_ref = -1 @@ -71,51 +71,51 @@ // lldbr-command:print *char_ref // lldbr-check:(char) *char_ref = 'a' -// lldb-command:print *i8_ref +// lldb-command:v *i8_ref // lldbg-check:[...] 'D' // lldbr-check:(i8) *i8_ref = 68 -// lldb-command:print *i16_ref +// lldb-command:v *i16_ref // lldbg-check:[...] -16 // lldbr-check:(i16) *i16_ref = -16 -// lldb-command:print *i32_ref +// lldb-command:v *i32_ref // lldbg-check:[...] -32 // lldbr-check:(i32) *i32_ref = -32 -// lldb-command:print *i64_ref +// lldb-command:v *i64_ref // lldbg-check:[...] -64 // lldbr-check:(i64) *i64_ref = -64 -// lldb-command:print *uint_ref +// lldb-command:v *uint_ref // lldbg-check:[...] 1 // lldbr-check:(usize) *uint_ref = 1 -// lldb-command:print *u8_ref +// lldb-command:v *u8_ref // lldbg-check:[...] 'd' // lldbr-check:(u8) *u8_ref = 100 -// lldb-command:print *u16_ref +// lldb-command:v *u16_ref // lldbg-check:[...] 16 // lldbr-check:(u16) *u16_ref = 16 -// lldb-command:print *u32_ref +// lldb-command:v *u32_ref // lldbg-check:[...] 32 // lldbr-check:(u32) *u32_ref = 32 -// lldb-command:print *u64_ref +// lldb-command:v *u64_ref // lldbg-check:[...] 64 // lldbr-check:(u64) *u64_ref = 64 -// lldb-command:print *f32_ref +// lldb-command:v *f32_ref // lldbg-check:[...] 2.5 // lldbr-check:(f32) *f32_ref = 2.5 -// lldb-command:print *f64_ref +// lldb-command:v *f64_ref // lldbg-check:[...] 3.5 // lldbr-check:(f64) *f64_ref = 3.5 -// lldb-command:print *f64_double_ref +// lldb-command:v *f64_double_ref // lldbg-check:[...] 3.5 // lldbr-check:(f64) **f64_double_ref = 3.5 diff --git a/tests/debuginfo/regression-bad-location-list-67992.rs b/tests/debuginfo/regression-bad-location-list-67992.rs index df1e9fb26fc..fe410942d51 100644 --- a/tests/debuginfo/regression-bad-location-list-67992.rs +++ b/tests/debuginfo/regression-bad-location-list-67992.rs @@ -10,7 +10,7 @@ // === LLDB TESTS ================================================================================== // lldb-command:run -// lldb-command:print a +// lldb-command:v a // lldbg-check:(regression_bad_location_list_67992::Foo) [...] // lldbr-check:(regression_bad_location_list_67992::Foo) a = [...] diff --git a/tests/debuginfo/self-in-default-method.rs b/tests/debuginfo/self-in-default-method.rs index 9a4ecee4bf6..374951475fc 100644 --- a/tests/debuginfo/self-in-default-method.rs +++ b/tests/debuginfo/self-in-default-method.rs @@ -62,61 +62,61 @@ // lldb-command:run // STACK BY REF -// lldb-command:print *self +// lldb-command:v *self // lldbg-check:[...] { x = 100 } // lldbr-check:(self_in_default_method::Struct) *self = Struct { x: 100 } -// lldb-command:print arg1 +// lldb-command:v arg1 // lldbg-check:[...] -1 // lldbr-check:(isize) arg1 = -1 -// lldb-command:print arg2 +// lldb-command:v arg2 // lldbg-check:[...] -2 // lldbr-check:(isize) arg2 = -2 // lldb-command:continue // STACK BY VAL -// lldb-command:print self +// lldb-command:v self // lldbg-check:[...] { x = 100 } // lldbr-check:(self_in_default_method::Struct) self = Struct { x: 100 } -// lldb-command:print arg1 +// lldb-command:v arg1 // lldbg-check:[...] -3 // lldbr-check:(isize) arg1 = -3 -// lldb-command:print arg2 +// lldb-command:v arg2 // lldbg-check:[...] -4 // lldbr-check:(isize) arg2 = -4 // lldb-command:continue // OWNED BY REF -// lldb-command:print *self +// lldb-command:v *self // lldbg-check:[...] { x = 200 } // lldbr-check:(self_in_default_method::Struct) *self = Struct { x: 200 } -// lldb-command:print arg1 +// lldb-command:v arg1 // lldbg-check:[...] -5 // lldbr-check:(isize) arg1 = -5 -// lldb-command:print arg2 +// lldb-command:v arg2 // lldbg-check:[...] -6 // lldbr-check:(isize) arg2 = -6 // lldb-command:continue // OWNED BY VAL -// lldb-command:print self +// lldb-command:v self // lldbg-check:[...] { x = 200 } // lldbr-check:(self_in_default_method::Struct) self = Struct { x: 200 } -// lldb-command:print arg1 +// lldb-command:v arg1 // lldbg-check:[...] -7 // lldbr-check:(isize) arg1 = -7 -// lldb-command:print arg2 +// lldb-command:v arg2 // lldbg-check:[...] -8 // lldbr-check:(isize) arg2 = -8 // lldb-command:continue // OWNED MOVED -// lldb-command:print *self +// lldb-command:v *self // lldbg-check:[...] { x = 200 } // lldbr-check:(self_in_default_method::Struct) *self = Struct { x: 200 } -// lldb-command:print arg1 +// lldb-command:v arg1 // lldbg-check:[...] -9 // lldbr-check:(isize) arg1 = -9 -// lldb-command:print arg2 +// lldb-command:v arg2 // lldbg-check:[...] -10 // lldbr-check:(isize) arg2 = -10 // lldb-command:continue diff --git a/tests/debuginfo/self-in-generic-default-method.rs b/tests/debuginfo/self-in-generic-default-method.rs index a21280620b5..4759ca3ecdc 100644 --- a/tests/debuginfo/self-in-generic-default-method.rs +++ b/tests/debuginfo/self-in-generic-default-method.rs @@ -62,61 +62,61 @@ // lldb-command:run // STACK BY REF -// lldb-command:print *self +// lldb-command:v *self // lldbg-check:[...] { x = 987 } // lldbr-check:(self_in_generic_default_method::Struct) *self = Struct { x: 987 } -// lldb-command:print arg1 +// lldb-command:v arg1 // lldbg-check:[...] -1 // lldbr-check:(isize) arg1 = -1 -// lldb-command:print arg2 +// lldb-command:v arg2 // lldbg-check:[...] 2 // lldbr-check:(u16) arg2 = 2 // lldb-command:continue // STACK BY VAL -// lldb-command:print self +// lldb-command:v self // lldbg-check:[...] { x = 987 } // lldbr-check:(self_in_generic_default_method::Struct) self = Struct { x: 987 } -// lldb-command:print arg1 +// lldb-command:v arg1 // lldbg-check:[...] -3 // lldbr-check:(isize) arg1 = -3 -// lldb-command:print arg2 +// lldb-command:v arg2 // lldbg-check:[...] -4 // lldbr-check:(i16) arg2 = -4 // lldb-command:continue // OWNED BY REF -// lldb-command:print *self +// lldb-command:v *self // lldbg-check:[...] { x = 879 } // lldbr-check:(self_in_generic_default_method::Struct) *self = Struct { x: 879 } -// lldb-command:print arg1 +// lldb-command:v arg1 // lldbg-check:[...] -5 // lldbr-check:(isize) arg1 = -5 -// lldb-command:print arg2 +// lldb-command:v arg2 // lldbg-check:[...] -6 // lldbr-check:(i32) arg2 = -6 // lldb-command:continue // OWNED BY VAL -// lldb-command:print self +// lldb-command:v self // lldbg-check:[...] { x = 879 } // lldbr-check:(self_in_generic_default_method::Struct) self = Struct { x: 879 } -// lldb-command:print arg1 +// lldb-command:v arg1 // lldbg-check:[...] -7 // lldbr-check:(isize) arg1 = -7 -// lldb-command:print arg2 +// lldb-command:v arg2 // lldbg-check:[...] -8 // lldbr-check:(i64) arg2 = -8 // lldb-command:continue // OWNED MOVED -// lldb-command:print *self +// lldb-command:v *self // lldbg-check:[...] { x = 879 } // lldbr-check:(self_in_generic_default_method::Struct) *self = Struct { x: 879 } -// lldb-command:print arg1 +// lldb-command:v arg1 // lldbg-check:[...] -9 // lldbr-check:(isize) arg1 = -9 -// lldb-command:print arg2 +// lldb-command:v arg2 // lldbg-check:[...] -10.5 // lldbr-check:(f32) arg2 = -10.5 // lldb-command:continue diff --git a/tests/debuginfo/shadowed-argument.rs b/tests/debuginfo/shadowed-argument.rs index 2be8cbbdfeb..e7bc731336e 100644 --- a/tests/debuginfo/shadowed-argument.rs +++ b/tests/debuginfo/shadowed-argument.rs @@ -29,26 +29,26 @@ // lldb-command:run -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] false // lldbr-check:(bool) x = false -// lldb-command:print y +// lldb-command:v y // lldbg-check:[...] true // lldbr-check:(bool) y = true // lldb-command:continue -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] 10 // lldbr-check:(i32) x = 10 -// lldb-command:print y +// lldb-command:v y // lldbg-check:[...] true // lldbr-check:(bool) y = true // lldb-command:continue -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] 10.5 // lldbr-check:(f64) x = 10.5 -// lldb-command:print y +// lldb-command:v y // lldbg-check:[...] 20 // lldbr-check:(i32) y = 20 // lldb-command:continue diff --git a/tests/debuginfo/shadowed-variable.rs b/tests/debuginfo/shadowed-variable.rs index 66cadf2913b..3cc5fe14cb2 100644 --- a/tests/debuginfo/shadowed-variable.rs +++ b/tests/debuginfo/shadowed-variable.rs @@ -39,42 +39,42 @@ // lldb-command:run -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] false // lldbr-check:(bool) x = false -// lldb-command:print y +// lldb-command:v y // lldbg-check:[...] true // lldbr-check:(bool) y = true // lldb-command:continue -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] 10 // lldbr-check:(i32) x = 10 -// lldb-command:print y +// lldb-command:v y // lldbg-check:[...] true // lldbr-check:(bool) y = true // lldb-command:continue -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] 10.5 // lldbr-check:(f64) x = 10.5 -// lldb-command:print y +// lldb-command:v y // lldbg-check:[...] 20 // lldbr-check:(i32) y = 20 // lldb-command:continue -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] 10.5 // lldbr-check:(f64) x = 10.5 -// lldb-command:print y +// lldb-command:v y // lldbg-check:[...] 20 // lldbr-check:(i32) y = 20 // lldb-command:continue -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] 11.5 // lldbr-check:(f64) x = 11.5 -// lldb-command:print y +// lldb-command:v y // lldbg-check:[...] 20 // lldbr-check:(i32) y = 20 // lldb-command:continue diff --git a/tests/debuginfo/should-fail.rs b/tests/debuginfo/should-fail.rs index 4211baeee22..0f153394a44 100644 --- a/tests/debuginfo/should-fail.rs +++ b/tests/debuginfo/should-fail.rs @@ -16,7 +16,7 @@ // lldb-command:run -// lldb-command:print x +// lldb-command:v x // lldb-check:[...] 5 // === CDB TESTS ================================================================================== diff --git a/tests/debuginfo/simple-lexical-scope.rs b/tests/debuginfo/simple-lexical-scope.rs index dfcd701017e..4156e68f8b1 100644 --- a/tests/debuginfo/simple-lexical-scope.rs +++ b/tests/debuginfo/simple-lexical-scope.rs @@ -39,37 +39,37 @@ // lldb-command:run -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] false // lldbr-check:(bool) x = false // lldb-command:continue -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] false // lldbr-check:(bool) x = false // lldb-command:continue -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] 10 // lldbr-check:(i32) x = 10 // lldb-command:continue -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] 10 // lldbr-check:(i32) x = 10 // lldb-command:continue -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] 10.5 // lldbr-check:(f64) x = 10.5 // lldb-command:continue -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] 10 // lldbr-check:(i32) x = 10 // lldb-command:continue -// lldb-command:print x +// lldb-command:v x // lldbg-check:[...] false // lldbr-check:(bool) x = false // lldb-command:continue diff --git a/tests/debuginfo/simple-struct.rs b/tests/debuginfo/simple-struct.rs index 89c0cb491bf..968a5c63e89 100644 --- a/tests/debuginfo/simple-struct.rs +++ b/tests/debuginfo/simple-struct.rs @@ -97,27 +97,27 @@ // lldb-command:run -// lldb-command:print no_padding16 +// lldb-command:v no_padding16 // lldbg-check:[...] { x = 10000 y = -10001 } // lldbr-check:(simple_struct::NoPadding16) no_padding16 = { x = 10000 y = -10001 } -// lldb-command:print no_padding32 +// lldb-command:v no_padding32 // lldbg-check:[...] { x = -10002 y = -10003.5 z = 10004 } // lldbr-check:(simple_struct::NoPadding32) no_padding32 = { x = -10002 y = -10003.5 z = 10004 } -// lldb-command:print no_padding64 +// lldb-command:v no_padding64 // lldbg-check:[...] { x = -10005.5 y = 10006 z = 10007 } // lldbr-check:(simple_struct::NoPadding64) no_padding64 = { x = -10005.5 y = 10006 z = 10007 } -// lldb-command:print no_padding163264 +// lldb-command:v no_padding163264 // lldbg-check:[...] { a = -10008 b = 10009 c = 10010 d = 10011 } // lldbr-check:(simple_struct::NoPadding163264) no_padding163264 = { a = -10008 b = 10009 c = 10010 d = 10011 } -// lldb-command:print internal_padding +// lldb-command:v internal_padding // lldbg-check:[...] { x = 10012 y = -10013 } // lldbr-check:(simple_struct::InternalPadding) internal_padding = { x = 10012 y = -10013 } -// lldb-command:print padding_at_end +// lldb-command:v padding_at_end // lldbg-check:[...] { x = -10014 y = 10015 } // lldbr-check:(simple_struct::PaddingAtEnd) padding_at_end = { x = -10014 y = 10015 } diff --git a/tests/debuginfo/simple-tuple.rs b/tests/debuginfo/simple-tuple.rs index 93f56d117ad..86003105f36 100644 --- a/tests/debuginfo/simple-tuple.rs +++ b/tests/debuginfo/simple-tuple.rs @@ -99,27 +99,27 @@ // lldb-command:run -// lldb-command:print/d noPadding8 +// lldb-command:v/d noPadding8 // lldbg-check:[...] { 0 = -100 1 = 100 } // lldbr-check:((i8, u8)) noPadding8 = { 0 = -100 1 = 100 } -// lldb-command:print noPadding16 +// lldb-command:v noPadding16 // lldbg-check:[...] { 0 = 0 1 = 1 2 = 2 } // lldbr-check:((i16, i16, u16)) noPadding16 = { 0 = 0 1 = 1 2 = 2 } -// lldb-command:print noPadding32 +// lldb-command:v noPadding32 // lldbg-check:[...] { 0 = 3 1 = 4.5 2 = 5 } // lldbr-check:((i32, f32, u32)) noPadding32 = { 0 = 3 1 = 4.5 2 = 5 } -// lldb-command:print noPadding64 +// lldb-command:v noPadding64 // lldbg-check:[...] { 0 = 6 1 = 7.5 2 = 8 } // lldbr-check:((i64, f64, u64)) noPadding64 = { 0 = 6 1 = 7.5 2 = 8 } -// lldb-command:print internalPadding1 +// lldb-command:v internalPadding1 // lldbg-check:[...] { 0 = 9 1 = 10 } // lldbr-check:((i16, i32)) internalPadding1 = { 0 = 9 1 = 10 } -// lldb-command:print internalPadding2 +// lldb-command:v internalPadding2 // lldbg-check:[...] { 0 = 11 1 = 12 2 = 13 3 = 14 } // lldbr-check:((i16, i32, u32, u64)) internalPadding2 = { 0 = 11 1 = 12 2 = 13 3 = 14 } -// lldb-command:print paddingAtEnd +// lldb-command:v paddingAtEnd // lldbg-check:[...] { 0 = 15 1 = 16 } // lldbr-check:((i32, i16)) paddingAtEnd = { 0 = 15 1 = 16 } diff --git a/tests/debuginfo/static-method-on-struct-and-enum.rs b/tests/debuginfo/static-method-on-struct-and-enum.rs index 23384e0c33a..b4ec4543572 100644 --- a/tests/debuginfo/static-method-on-struct-and-enum.rs +++ b/tests/debuginfo/static-method-on-struct-and-enum.rs @@ -28,22 +28,22 @@ // lldb-command:run // STRUCT -// lldb-command:print arg1 +// lldb-command:v arg1 // lldbg-check:[...] 1 // lldbr-check:(isize) arg1 = 1 -// lldb-command:print arg2 +// lldb-command:v arg2 // lldbg-check:[...] 2 // lldbr-check:(isize) arg2 = 2 // lldb-command:continue // ENUM -// lldb-command:print arg1 +// lldb-command:v arg1 // lldbg-check:[...] -3 // lldbr-check:(isize) arg1 = -3 -// lldb-command:print arg2 +// lldb-command:v arg2 // lldbg-check:[...] 4.5 // lldbr-check:(f64) arg2 = 4.5 -// lldb-command:print arg3 +// lldb-command:v arg3 // lldbg-check:[...] 5 // lldbr-check:(usize) arg3 = 5 // lldb-command:continue diff --git a/tests/debuginfo/struct-in-enum.rs b/tests/debuginfo/struct-in-enum.rs index a91f24a3f5c..52e419e6b47 100644 --- a/tests/debuginfo/struct-in-enum.rs +++ b/tests/debuginfo/struct-in-enum.rs @@ -26,12 +26,12 @@ // lldb-command:run -// lldb-command:print case1 +// lldb-command:v case1 // lldb-check:[...] Case1(0, Struct { x: 2088533116, y: 2088533116, z: 31868 }) -// lldb-command:print case2 +// lldb-command:v case2 // lldb-check:[...] Case2(0, 1229782938247303441, 4369) -// lldb-command:print univariant +// lldb-command:v univariant // lldb-check:[...] TheOnlyCase(Struct { x: 123, y: 456, z: 789 }) #![allow(unused_variables)] diff --git a/tests/debuginfo/struct-in-struct.rs b/tests/debuginfo/struct-in-struct.rs index e88d955b6e9..7ca0e3a5ef6 100644 --- a/tests/debuginfo/struct-in-struct.rs +++ b/tests/debuginfo/struct-in-struct.rs @@ -23,35 +23,35 @@ // lldb-command:run -// lldb-command:print three_simple_structs +// lldb-command:v three_simple_structs // lldbg-check:[...] { x = { x = 1 } y = { x = 2 } z = { x = 3 } } // lldbr-check:(struct_in_struct::ThreeSimpleStructs) three_simple_structs = { x = { x = 1 } y = { x = 2 } z = { x = 3 } } -// lldb-command:print internal_padding_parent +// lldb-command:v internal_padding_parent // lldbg-check:[...] { x = { x = 4 y = 5 } y = { x = 6 y = 7 } z = { x = 8 y = 9 } } // lldbr-check:(struct_in_struct::InternalPaddingParent) internal_padding_parent = { x = { x = 4 y = 5 } y = { x = 6 y = 7 } z = { x = 8 y = 9 } } -// lldb-command:print padding_at_end_parent +// lldb-command:v padding_at_end_parent // lldbg-check:[...] { x = { x = 10 y = 11 } y = { x = 12 y = 13 } z = { x = 14 y = 15 } } // lldbr-check:(struct_in_struct::PaddingAtEndParent) padding_at_end_parent = { x = { x = 10 y = 11 } y = { x = 12 y = 13 } z = { x = 14 y = 15 } } -// lldb-command:print mixed +// lldb-command:v mixed // lldbg-check:[...] { x = { x = 16 y = 17 } y = { x = 18 y = 19 } z = { x = 20 } w = 21 } // lldbr-check:(struct_in_struct::Mixed) mixed = { x = { x = 16 y = 17 } y = { x = 18 y = 19 } z = { x = 20 } w = 21 } -// lldb-command:print bag +// lldb-command:v bag // lldbg-check:[...] { x = { x = 22 } } // lldbr-check:(struct_in_struct::Bag) bag = { x = { x = 22 } } -// lldb-command:print bag_in_bag +// lldb-command:v bag_in_bag // lldbg-check:[...] { x = { x = { x = 23 } } } // lldbr-check:(struct_in_struct::BagInBag) bag_in_bag = { x = { x = { x = 23 } } } -// lldb-command:print tjo +// lldb-command:v tjo // lldbg-check:[...] { x = { x = { x = { x = 24 } } } } // lldbr-check:(struct_in_struct::ThatsJustOverkill) tjo = { x = { x = { x = { x = 24 } } } } -// lldb-command:print tree +// 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 } } } } // lldbr-check:(struct_in_struct::Tree) tree = { x = { x = 25 } y = { x = { x = 26 y = 27 } y = { x = 28 y = 29 } z = { x = 30 y = 31 } } z = { x = { x = { x = 32 } } } } diff --git a/tests/debuginfo/struct-namespace.rs b/tests/debuginfo/struct-namespace.rs index d641a788a6f..3cae51e83dd 100644 --- a/tests/debuginfo/struct-namespace.rs +++ b/tests/debuginfo/struct-namespace.rs @@ -5,17 +5,17 @@ // Check that structs get placed in the correct namespace // lldb-command:run -// lldb-command:p struct1 +// lldb-command:v struct1 // lldbg-check:(struct_namespace::Struct1)[...] // lldbr-check:(struct_namespace::Struct1) struct1 = Struct1 { a: 0, b: 1 } -// lldb-command:p struct2 +// lldb-command:v struct2 // lldbg-check:(struct_namespace::Struct2)[...] // lldbr-check:(struct_namespace::Struct2) struct2 = { = 2 } -// lldb-command:p mod1_struct1 +// lldb-command:v mod1_struct1 // lldbg-check:(struct_namespace::mod1::Struct1)[...] // lldbr-check:(struct_namespace::mod1::Struct1) mod1_struct1 = Struct1 { a: 3, b: 4 } -// lldb-command:p mod1_struct2 +// lldb-command:v mod1_struct2 // lldbg-check:(struct_namespace::mod1::Struct2)[...] // lldbr-check:(struct_namespace::mod1::Struct2) mod1_struct2 = { = 5 } diff --git a/tests/debuginfo/struct-style-enum.rs b/tests/debuginfo/struct-style-enum.rs index 2f155d2b83e..517b76c1412 100644 --- a/tests/debuginfo/struct-style-enum.rs +++ b/tests/debuginfo/struct-style-enum.rs @@ -26,16 +26,16 @@ // lldb-command:run -// lldb-command:print case1 +// lldb-command:v case1 // lldbr-check:(struct_style_enum::Regular::Case1) case1 = { a = 0 b = 31868 c = 31868 d = 31868 e = 31868 } -// lldb-command:print case2 +// lldb-command:v case2 // lldbr-check:(struct_style_enum::Regular::Case2) case2 = Case2 { Case1: 0, Case2: 286331153, Case3: 286331153 } -// lldb-command:print case3 +// lldb-command:v case3 // lldbr-check:(struct_style_enum::Regular::Case3) case3 = Case3 { Case1: 0, Case2: 6438275382588823897 } -// lldb-command:print univariant +// lldb-command:v univariant // lldbr-check:(struct_style_enum::Univariant) univariant = Univariant { TheOnlyCase: TheOnlyCase { a: -1 } } #![allow(unused_variables)] diff --git a/tests/debuginfo/struct-with-destructor.rs b/tests/debuginfo/struct-with-destructor.rs index d6686be662c..12e2ac4225c 100644 --- a/tests/debuginfo/struct-with-destructor.rs +++ b/tests/debuginfo/struct-with-destructor.rs @@ -25,19 +25,19 @@ // === LLDB TESTS ================================================================================== // lldb-command:run -// lldb-command:print simple +// lldb-command:v simple // lldbg-check:[...] { x = 10 y = 20 } // lldbr-check:(struct_with_destructor::WithDestructor) simple = { x = 10 y = 20 } -// lldb-command:print noDestructor +// lldb-command:v noDestructor // lldbg-check:[...] { a = { x = 10 y = 20 } guard = -1 } // lldbr-check:(struct_with_destructor::NoDestructorGuarded) noDestructor = { a = { x = 10 y = 20 } guard = -1 } -// lldb-command:print withDestructor +// lldb-command:v withDestructor // lldbg-check:[...] { a = { x = 10 y = 20 } guard = -1 } // lldbr-check:(struct_with_destructor::WithDestructorGuarded) withDestructor = { a = { x = 10 y = 20 } guard = -1 } -// lldb-command:print nested +// lldb-command:v nested // lldbg-check:[...] { a = { a = { x = 7890 y = 9870 } } } // lldbr-check:(struct_with_destructor::NestedOuter) nested = { a = { a = { x = 7890 y = 9870 } } } diff --git a/tests/debuginfo/tuple-in-tuple.rs b/tests/debuginfo/tuple-in-tuple.rs index b6b20cea9b6..8ed0e1f9c13 100644 --- a/tests/debuginfo/tuple-in-tuple.rs +++ b/tests/debuginfo/tuple-in-tuple.rs @@ -35,27 +35,27 @@ // lldb-command:run -// lldb-command:print no_padding1 +// lldb-command:v no_padding1 // lldbg-check:[...] { 0 = { 0 = 0 1 = 1 } 1 = 2 2 = 3 } // lldbr-check:(((u32, u32), u32, u32)) no_padding1 = { 0 = { 0 = 0 1 = 1 } 1 = 2 2 = 3 } -// lldb-command:print no_padding2 +// lldb-command:v no_padding2 // lldbg-check:[...] { 0 = 4 1 = { 0 = 5 1 = 6 } 2 = 7 } // lldbr-check:((u32, (u32, u32), u32)) no_padding2 = { 0 = 4 1 = { 0 = 5 1 = 6 } 2 = 7 } -// lldb-command:print no_padding3 +// lldb-command:v no_padding3 // lldbg-check:[...] { 0 = 8 1 = 9 2 = { 0 = 10 1 = 11 } } // lldbr-check:((u32, u32, (u32, u32))) no_padding3 = { 0 = 8 1 = 9 2 = { 0 = 10 1 = 11 } } -// lldb-command:print internal_padding1 +// lldb-command:v internal_padding1 // lldbg-check:[...] { 0 = 12 1 = { 0 = 13 1 = 14 } } // lldbr-check:((i16, (i32, i32))) internal_padding1 = { 0 = 12 1 = { 0 = 13 1 = 14 } } -// lldb-command:print internal_padding2 +// lldb-command:v internal_padding2 // lldbg-check:[...] { 0 = 15 1 = { 0 = 16 1 = 17 } } // lldbr-check:((i16, (i16, i32))) internal_padding2 = { 0 = 15 1 = { 0 = 16 1 = 17 } } -// lldb-command:print padding_at_end1 +// lldb-command:v padding_at_end1 // lldbg-check:[...] { 0 = 18 1 = { 0 = 19 1 = 20 } } // lldbr-check:((i32, (i32, i16))) padding_at_end1 = { 0 = 18 1 = { 0 = 19 1 = 20 } } -// lldb-command:print padding_at_end2 +// lldb-command:v padding_at_end2 // lldbg-check:[...] { 0 = { 0 = 21 1 = 22 } 1 = 23 } // lldbr-check:(((i32, i16), i32)) padding_at_end2 = { 0 = { 0 = 21 1 = 22 } 1 = 23 } diff --git a/tests/debuginfo/tuple-struct.rs b/tests/debuginfo/tuple-struct.rs index e912f63a8b2..88b1ae19e29 100644 --- a/tests/debuginfo/tuple-struct.rs +++ b/tests/debuginfo/tuple-struct.rs @@ -35,27 +35,27 @@ // lldb-command:run -// lldb-command:print no_padding16 +// lldb-command:v no_padding16 // lldbg-check:[...] { 0 = 10000 1 = -10001 } // lldbr-check:(tuple_struct::NoPadding16) no_padding16 = { 0 = 10000 1 = -10001 } -// lldb-command:print no_padding32 +// lldb-command:v no_padding32 // lldbg-check:[...] { 0 = -10002 1 = -10003.5 2 = 10004 } // lldbr-check:(tuple_struct::NoPadding32) no_padding32 = { 0 = -10002 1 = -10003.5 2 = 10004 } -// lldb-command:print no_padding64 +// lldb-command:v no_padding64 // lldbg-check:[...] { 0 = -10005.5 1 = 10006 2 = 10007 } // lldbr-check:(tuple_struct::NoPadding64) no_padding64 = { 0 = -10005.5 1 = 10006 2 = 10007 } -// lldb-command:print no_padding163264 +// lldb-command:v no_padding163264 // lldbg-check:[...] { 0 = -10008 1 = 10009 2 = 10010 3 = 10011 } // lldbr-check:(tuple_struct::NoPadding163264) no_padding163264 = { 0 = -10008 1 = 10009 2 = 10010 3 = 10011 } -// lldb-command:print internal_padding +// lldb-command:v internal_padding // lldbg-check:[...] { 0 = 10012 1 = -10013 } // lldbr-check:(tuple_struct::InternalPadding) internal_padding = { 0 = 10012 1 = -10013 } -// lldb-command:print padding_at_end +// lldb-command:v padding_at_end // lldbg-check:[...] { 0 = -10014 1 = 10015 } // lldbr-check:(tuple_struct::PaddingAtEnd) padding_at_end = { 0 = -10014 1 = 10015 } diff --git a/tests/debuginfo/tuple-style-enum.rs b/tests/debuginfo/tuple-style-enum.rs index e3e1684cc28..883aa658eb2 100644 --- a/tests/debuginfo/tuple-style-enum.rs +++ b/tests/debuginfo/tuple-style-enum.rs @@ -26,16 +26,16 @@ // lldb-command:run -// lldb-command:print case1 +// lldb-command:v case1 // lldbr-check:(tuple_style_enum::Regular::Case1) case1 = { = 0 = 31868 = 31868 = 31868 = 31868 } -// lldb-command:print case2 +// lldb-command:v case2 // lldbr-check:(tuple_style_enum::Regular::Case2) case2 = Case2 { Case1: 0, Case2: 286331153, Case3: 286331153 } -// lldb-command:print case3 +// lldb-command:v case3 // lldbr-check:(tuple_style_enum::Regular::Case3) case3 = Case3 { Case1: 0, Case2: 6438275382588823897 } -// lldb-command:print univariant +// lldb-command:v univariant // lldbr-check:(tuple_style_enum::Univariant) univariant = { TheOnlyCase = { = -1 } } #![allow(unused_variables)] diff --git a/tests/debuginfo/union-smoke.rs b/tests/debuginfo/union-smoke.rs index 8df4c9dbf96..9b1cf6e1e95 100644 --- a/tests/debuginfo/union-smoke.rs +++ b/tests/debuginfo/union-smoke.rs @@ -18,7 +18,7 @@ // === LLDB TESTS ================================================================================== // lldb-command:run -// lldb-command:print u +// lldb-command:v u // lldbg-check:[...] { a = { 0 = '\x02' 1 = '\x02' } b = 514 } // lldbr-check:(union_smoke::U) u = { a = { 0 = '\x02' 1 = '\x02' } b = 514 } diff --git a/tests/debuginfo/unique-enum.rs b/tests/debuginfo/unique-enum.rs index db2b4403ec6..b3879468e0a 100644 --- a/tests/debuginfo/unique-enum.rs +++ b/tests/debuginfo/unique-enum.rs @@ -22,13 +22,13 @@ // lldb-command:run -// lldb-command:print *the_a +// lldb-command:v *the_a // lldbr-check:(unique_enum::ABC::TheA) *the_a = TheA { TheA: 0, TheB: 8970181431921507452 } -// lldb-command:print *the_b +// lldb-command:v *the_b // lldbr-check:(unique_enum::ABC::TheB) *the_b = { = 0 = 286331153 = 286331153 } -// lldb-command:print *univariant +// lldb-command:v *univariant // lldbr-check:(unique_enum::Univariant) *univariant = { TheOnlyCase = { = 123234 } } #![allow(unused_variables)] diff --git a/tests/debuginfo/var-captured-in-nested-closure.rs b/tests/debuginfo/var-captured-in-nested-closure.rs index 62cb87e4f99..7772ec00337 100644 --- a/tests/debuginfo/var-captured-in-nested-closure.rs +++ b/tests/debuginfo/var-captured-in-nested-closure.rs @@ -43,42 +43,42 @@ // lldb-command:run -// lldb-command:print variable +// lldb-command:v variable // lldbg-check:[...] 1 // lldbr-check:(isize) variable = 1 -// lldb-command:print constant +// lldb-command:v constant // lldbg-check:[...] 2 // lldbr-check:(isize) constant = 2 -// lldb-command:print a_struct +// lldb-command:v a_struct // lldbg-check:[...] { a = -3 b = 4.5 c = 5 } // lldbr-check:(var_captured_in_nested_closure::Struct) a_struct = { a = -3 b = 4.5 c = 5 } -// lldb-command:print *struct_ref +// lldb-command:v *struct_ref // lldbg-check:[...] { a = -3 b = 4.5 c = 5 } // lldbr-check:(var_captured_in_nested_closure::Struct) *struct_ref = { a = -3 b = 4.5 c = 5 } -// lldb-command:print *owned +// lldb-command:v *owned // lldbg-check:[...] 6 // lldbr-check:(isize) *owned = 6 -// lldb-command:print closure_local +// lldb-command:v closure_local // lldbg-check:[...] 8 // lldbr-check:(isize) closure_local = 8 // lldb-command:continue -// lldb-command:print variable +// lldb-command:v variable // lldbg-check:[...] 1 // lldbr-check:(isize) variable = 1 -// lldb-command:print constant +// lldb-command:v constant // lldbg-check:[...] 2 // lldbr-check:(isize) constant = 2 -// lldb-command:print a_struct +// lldb-command:v a_struct // lldbg-check:[...] { a = -3 b = 4.5 c = 5 } // lldbr-check:(var_captured_in_nested_closure::Struct) a_struct = { a = -3 b = 4.5 c = 5 } -// lldb-command:print *struct_ref +// lldb-command:v *struct_ref // lldbg-check:[...] { a = -3 b = 4.5 c = 5 } // lldbr-check:(var_captured_in_nested_closure::Struct) *struct_ref = { a = -3 b = 4.5 c = 5 } -// lldb-command:print *owned +// lldb-command:v *owned // lldbg-check:[...] 6 // lldbr-check:(isize) *owned = 6 -// lldb-command:print closure_local +// lldb-command:v closure_local // lldbg-check:[...] 8 // lldbr-check:(isize) closure_local = 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 e2e154e91cb..782a7d11373 100644 --- a/tests/debuginfo/var-captured-in-sendable-closure.rs +++ b/tests/debuginfo/var-captured-in-sendable-closure.rs @@ -23,13 +23,13 @@ // lldb-command:run -// lldb-command:print constant +// lldb-command:v constant // lldbg-check:[...] 1 // lldbr-check:(isize) constant = 1 -// lldb-command:print a_struct +// lldb-command:v a_struct // lldbg-check:[...] { a = -2 b = 3.5 c = 4 } // lldbr-check:(var_captured_in_sendable_closure::Struct) a_struct = { a = -2 b = 3.5 c = 4 } -// lldb-command:print *owned +// lldb-command:v *owned // lldbg-check:[...] 5 // lldbr-check:(isize) *owned = 5 diff --git a/tests/debuginfo/var-captured-in-stack-closure.rs b/tests/debuginfo/var-captured-in-stack-closure.rs index c704b53ef85..c9a93cd7b7f 100644 --- a/tests/debuginfo/var-captured-in-stack-closure.rs +++ b/tests/debuginfo/var-captured-in-stack-closure.rs @@ -39,37 +39,37 @@ // lldb-command:run -// lldb-command:print variable +// lldb-command:v variable // lldbg-check:[...] 1 // lldbr-check:(isize) variable = 1 -// lldb-command:print constant +// lldb-command:v constant // lldbg-check:[...] 2 // lldbr-check:(isize) constant = 2 -// lldb-command:print a_struct +// lldb-command:v a_struct // lldbg-check:[...] { a = -3 b = 4.5 c = 5 } // lldbr-check:(var_captured_in_stack_closure::Struct) a_struct = { a = -3 b = 4.5 c = 5 } -// lldb-command:print *struct_ref +// lldb-command:v *struct_ref // lldbg-check:[...] { a = -3 b = 4.5 c = 5 } // lldbr-check:(var_captured_in_stack_closure::Struct) *struct_ref = { a = -3 b = 4.5 c = 5 } -// lldb-command:print *owned +// lldb-command:v *owned // lldbg-check:[...] 6 // lldbr-check:(isize) *owned = 6 // lldb-command:continue -// lldb-command:print variable +// lldb-command:v variable // lldbg-check:[...] 2 // lldbr-check:(isize) variable = 2 -// lldb-command:print constant +// lldb-command:v constant // lldbg-check:[...] 2 // lldbr-check:(isize) constant = 2 -// lldb-command:print a_struct +// lldb-command:v a_struct // lldbg-check:[...] { a = -3 b = 4.5 c = 5 } // lldbr-check:(var_captured_in_stack_closure::Struct) a_struct = { a = -3 b = 4.5 c = 5 } -// lldb-command:print *struct_ref +// lldb-command:v *struct_ref // lldbg-check:[...] { a = -3 b = 4.5 c = 5 } // lldbr-check:(var_captured_in_stack_closure::Struct) *struct_ref = { a = -3 b = 4.5 c = 5 } -// lldb-command:print *owned +// lldb-command:v *owned // lldbg-check:[...] 6 // lldbr-check:(isize) *owned = 6 diff --git a/tests/debuginfo/vec-slices.rs b/tests/debuginfo/vec-slices.rs index bf3cad30faf..5a8481699b2 100644 --- a/tests/debuginfo/vec-slices.rs +++ b/tests/debuginfo/vec-slices.rs @@ -70,27 +70,27 @@ // lldb-command:run -// lldb-command:print empty +// lldb-command:v empty // lldbg-check:[...] size=0 // lldbr-check:(&[i64]) empty = size=0 -// lldb-command:print singleton +// lldb-command:v singleton // lldbg-check:[...] size=1 { [0] = 1 } // lldbr-check:(&[i64]) singleton = &[1] -// lldb-command:print multiple +// lldb-command:v multiple // lldbg-check:[...] size=4 { [0] = 2 [1] = 3 [2] = 4 [3] = 5 } // lldbr-check:(&[i64]) multiple = size=4 { [0] = 2 [1] = 3 [2] = 4 [3] = 5 } -// lldb-command:print slice_of_slice +// lldb-command:v slice_of_slice // lldbg-check:[...] size=2 { [0] = 3 [1] = 4 } // lldbr-check:(&[i64]) slice_of_slice = size=2 { [0] = 3 [1] = 4 } -// lldb-command:print padded_tuple +// lldb-command:v padded_tuple // lldbg-check:[...] size=2 { [0] = { 0 = 6 1 = 7 } [1] = { 0 = 8 1 = 9 } } // lldbr-check:(&[(i32, i16)]) padded_tuple = size=2 { [0] = { 0 = 6 1 = 7 } [1] = { 0 = 8 1 = 9 } } -// lldb-command:print padded_struct +// lldb-command:v padded_struct // lldbg-check:[...] size=2 { [0] = { x = 10 y = 11 z = 12 } [1] = { x = 13 y = 14 z = 15 } } // lldbr-check:(&[vec_slices::AStruct]) padded_struct = size=2 { [0] = { x = 10 y = 11 z = 12 } [1] = { x = 13 y = 14 z = 15 } } diff --git a/tests/debuginfo/vec.rs b/tests/debuginfo/vec.rs index 0ac2f2acb59..cf7de0b9b55 100644 --- a/tests/debuginfo/vec.rs +++ b/tests/debuginfo/vec.rs @@ -17,7 +17,7 @@ // === LLDB TESTS ================================================================================== // lldb-command:run -// lldb-command:print a +// lldb-command:v a // lldbg-check:[...] { [0] = 1 [1] = 2 [2] = 3 } // lldbr-check:([i32; 3]) a = { [0] = 1 [1] = 2 [2] = 3 }