Provide more information in ThreadSanitizer's JSON data. Move remaining TSan logic from SBThread to InstrumentationRuntime plugin.

llvm-svn: 265905

1 files changed, 2 insertions, 2 deletions

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tsan/basic/TestTsanBasic.py b/lldb/packages/Python/lldbsuite/test/functionalities/tsan/basic/TestTsanBasic.py
index 1e5933c8aef..12cd13b03f3 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/tsan/basic/TestTsanBasic.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/tsan/basic/TestTsanBasic.py
@@ -73,7 +73,7 @@ class TsanBasicTestCase(TestBase):
         json_line = '\n'.join(output_lines[2:])
         data = json.loads(json_line)
         self.assertEqual(data["instrumentation_class"], "ThreadSanitizer")
-        self.assertEqual(data["description"], "data-race")
+        self.assertEqual(data["issue_type"], "data-race")
         self.assertEqual(len(data["mops"]), 2)
 
         backtraces = thread.GetStopReasonExtendedBacktraces(lldb.eInstrumentationRuntimeTypeAddressSanitizer)
@@ -109,7 +109,7 @@ class TsanBasicTestCase(TestBase):
         self.runCmd("continue")
 
         # the stop reason of the thread should be a SIGABRT.
-        self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
+        self.expect("thread list", "We should be stopped due a SIGABRT",
             substrs = ['stopped', 'stop reason = signal SIGABRT'])
 
         # test that we're in pthread_kill now (TSan abort the process)