[Lldb-commits] [PATCH] Fix expectation for TestPlatformCommand.test_shell

[Tamas Berghammer]

REPOSITORY
  rL LLVM

http://reviews.llvm.org/D8031

Files:
  lldb/trunk/source/API/SBPlatform.cpp
  lldb/trunk/test/functionalities/platform/TestPlatformCommand.py

Index: lldb/trunk/source/API/SBPlatform.cpp
===================================================================
--- lldb/trunk/source/API/SBPlatform.cpp
+++ lldb/trunk/source/API/SBPlatform.cpp
@@ -378,7 +378,7 @@
     PlatformSP platform_sp(GetSP());
     if (platform_sp)
     {
-        ArchSpec arch(platform_sp->GetRemoteSystemArchitecture());
+        ArchSpec arch(platform_sp->GetSystemArchitecture());
         if (arch.IsValid())
         {
             // Const-ify the string so we don't need to worry about the lifetime of the string
Index: lldb/trunk/test/functionalities/platform/TestPlatformCommand.py
===================================================================
--- lldb/trunk/test/functionalities/platform/TestPlatformCommand.py
+++ lldb/trunk/test/functionalities/platform/TestPlatformCommand.py
@@ -33,8 +33,11 @@
 
     def test_shell(self):
         """ Test that the platform shell command can invoke ls. """
-        if sys.platform.startswith("win32"):
+        triple = self.dbg.GetSelectedPlatform().GetTriple()
+        if re.match(".*-.*-windows", triple):
           self.expect("platform shell dir c:\\", substrs = ["Windows", "Program Files"])
+        elif re.match(".*-.*-.*-android", triple):
+          self.expect("platform shell ls /", substrs = ["cache", "dev", "system"])
         else:
           self.expect("platform shell ls /", substrs = ["dev", "tmp", "usr"])

EMAIL PREFERENCES
  http://reviews.llvm.org/settings/panel/emailpreferences/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D8031.21187.patch
Type: text/x-patch
Size: 1415 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/lldb-commits/attachments/20150304/648527fc/attachment.bin>