about summary refs log tree commit diff
path: root/src/test/debuginfo/include_string.rs
diff options
context:
space:
mode:
authorTom Tromey <tom@tromey.com>2018-10-02 10:13:30 -0600
committerTom Tromey <tom@tromey.com>2018-10-08 11:04:24 -0600
commitac33b2e578de58016271012452e4f1be6af9d516 (patch)
tree6c6bdaecc5cf1d2bf3369d9f9c9949abe9ad7873 /src/test/debuginfo/include_string.rs
parent6188c58a55a27efac25f6e50a8e5f18c2650b60f (diff)
downloadrust-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/include_string.rs')
-rw-r--r--src/test/debuginfo/include_string.rs9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/test/debuginfo/include_string.rs b/src/test/debuginfo/include_string.rs
index 2c75349e5c8..e915bf13702 100644
--- a/src/test/debuginfo/include_string.rs
+++ b/src/test/debuginfo/include_string.rs
@@ -26,11 +26,14 @@
 // lldb-command:run
 
 // lldb-command:print string1.length
-// lldb-check:[...]$0 = 48
+// lldbg-check:[...]$0 = 48
+// lldbr-check:(usize) length = 48
 // lldb-command:print string2.length
-// lldb-check:[...]$1 = 49
+// lldbg-check:[...]$1 = 49
+// lldbr-check:(usize) length = 49
 // lldb-command:print string3.length
-// lldb-check:[...]$2 = 50
+// lldbg-check:[...]$2 = 50
+// lldbr-check:(usize) length = 50
 
 // lldb-command:continue