diff options
| author | Tom Tromey <tom@tromey.com> | 2018-10-02 10:13:30 -0600 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2018-10-08 11:04:24 -0600 |
| commit | ac33b2e578de58016271012452e4f1be6af9d516 (patch) | |
| tree | 6c6bdaecc5cf1d2bf3369d9f9c9949abe9ad7873 /src/test/debuginfo/method-on-generic-struct.rs | |
| parent | 6188c58a55a27efac25f6e50a8e5f18c2650b60f (diff) | |
| download | rust-ac33b2e578de58016271012452e4f1be6af9d516.tar.gz rust-ac33b2e578de58016271012452e4f1be6af9d516.zip | |
Run debuginfo tests against rust-enabled lldb, when possible
If the rust-enabled lldb was built, then use it when running the debuginfo tests. Updating the lldb submodule was necessary as this needed a way to differentiate the rust-enabled lldb, so I added a line to the --version output. This adds compiletest commands to differentiate between the rust-enabled and non-rust-enabled lldb, as is already done for gdb. A new "rust-lldb" header directive is also added, but not used in this patch; I plan to use it in #54004. This updates all the tests.
Diffstat (limited to 'src/test/debuginfo/method-on-generic-struct.rs')
| -rw-r--r-- | src/test/debuginfo/method-on-generic-struct.rs | 45 |
1 files changed, 30 insertions, 15 deletions
diff --git a/src/test/debuginfo/method-on-generic-struct.rs b/src/test/debuginfo/method-on-generic-struct.rs index 20d419b4ac0..57238961e3f 100644 --- a/src/test/debuginfo/method-on-generic-struct.rs +++ b/src/test/debuginfo/method-on-generic-struct.rs @@ -73,47 +73,62 @@ // STACK BY REF // lldb-command:print *self -// lldb-check:[...]$0 = Struct<(u32, i32)> { x: (8888, -8888) } +// lldbg-check:[...]$0 = Struct<(u32, i32)> { x: (8888, -8888) } +// lldbr-check:(method_on_generic_struct::Struct<(u32, i32)>) *self = { x = { = 8888 = -8888 } } // lldb-command:print arg1 -// lldb-check:[...]$1 = -1 +// lldbg-check:[...]$1 = -1 +// lldbr-check:(isize) arg1 = -1 // lldb-command:print arg2 -// lldb-check:[...]$2 = -2 +// lldbg-check:[...]$2 = -2 +// lldbr-check:(isize) arg2 = -2 // lldb-command:continue // STACK BY VAL // lldb-command:print self -// lldb-check:[...]$3 = Struct<(u32, i32)> { x: (8888, -8888) } +// lldbg-check:[...]$3 = Struct<(u32, i32)> { x: (8888, -8888) } +// lldbr-check:(method_on_generic_struct::Struct<(u32, i32)>) self = { x = { = 8888 = -8888 } } // lldb-command:print arg1 -// lldb-check:[...]$4 = -3 +// lldbg-check:[...]$4 = -3 +// lldbr-check:(isize) arg1 = -3 // lldb-command:print arg2 -// lldb-check:[...]$5 = -4 +// lldbg-check:[...]$5 = -4 +// lldbr-check:(isize) arg2 = -4 // lldb-command:continue // OWNED BY REF // lldb-command:print *self -// lldb-check:[...]$6 = Struct<f64> { x: 1234.5 } +// lldbg-check:[...]$6 = Struct<f64> { x: 1234.5 } +// lldbr-check:(method_on_generic_struct::Struct<f64>) *self = Struct<f64> { x: 1234.5 } // lldb-command:print arg1 -// lldb-check:[...]$7 = -5 +// lldbg-check:[...]$7 = -5 +// lldbr-check:(isize) arg1 = -5 // lldb-command:print arg2 -// lldb-check:[...]$8 = -6 +// lldbg-check:[...]$8 = -6 +// lldbr-check:(isize) arg2 = -6 // lldb-command:continue // OWNED BY VAL // lldb-command:print self -// lldb-check:[...]$9 = Struct<f64> { x: 1234.5 } +// lldbg-check:[...]$9 = Struct<f64> { x: 1234.5 } +// lldbr-check:(method_on_generic_struct::Struct<f64>) self = Struct<f64> { x: 1234.5 } // lldb-command:print arg1 -// lldb-check:[...]$10 = -7 +// lldbg-check:[...]$10 = -7 +// lldbr-check:(isize) arg1 = -7 // lldb-command:print arg2 -// lldb-check:[...]$11 = -8 +// lldbg-check:[...]$11 = -8 +// lldbr-check:(isize) arg2 = -8 // lldb-command:continue // OWNED MOVED // lldb-command:print *self -// lldb-check:[...]$12 = Struct<f64> { x: 1234.5 } +// lldbg-check:[...]$12 = Struct<f64> { x: 1234.5 } +// lldbr-check:(method_on_generic_struct::Struct<f64>) *self = Struct<f64> { x: 1234.5 } // lldb-command:print arg1 -// lldb-check:[...]$13 = -9 +// lldbg-check:[...]$13 = -9 +// lldbr-check:(isize) arg1 = -9 // lldb-command:print arg2 -// lldb-check:[...]$14 = -10 +// lldbg-check:[...]$14 = -10 +// lldbr-check:(isize) arg2 = -10 // lldb-command:continue |