From: Pavel Labath <labath@google.com>
Date: Thu, 8 Sep 2016 11:09:14 +0000 (+0000)
Subject: Fix test breakage in r280919
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6f22b771c4482900cbc0f1b585a4b94315d3d15e;p=platform%2Fupstream%2Fllvm.git

Fix test breakage in r280919

It turns out that self.dbg.GetSelectedPlatform().GetTriple() is not a good way
to get the triple of the process, as it returns the incorrect triple in case of a
32-bit process running on a 64-bit platform.

Instead, go the long way round and ask the stub for the process triple. This
fixes the test for i386.

llvm-svn: 280922
---

diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteModuleInfo.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteModuleInfo.py
index 3441075..cab8a9c 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteModuleInfo.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteModuleInfo.py
@@ -14,10 +14,14 @@ class TestGdbRemoteModuleInfo(gdbremote_testcase.GdbRemoteTestCaseBase):
 
     def module_info(self):
         procs = self.prep_debug_monitor_and_inferior()
+        self.add_process_info_collection_packets()
+        context = self.expect_gdbremote_sequence()
+        info = self.parse_process_info_response(context)
+
         self.test_sequence.add_log_lines([
             'read packet: $jModulesInfo:[{"file":"%s","triple":"%s"}]]#00' % (
                 lldbutil.append_to_process_working_directory("a.out"),
-                self.dbg.GetSelectedPlatform().GetTriple()),
+                info["triple"].decode('hex')),
             {"direction": "send",
              "regex": r'^\$\[{(.*)}\]\]#[0-9A-Fa-f]{2}',
              "capture": {1: "spec"}},