Fix expectation for TestPlatformCommand.test_shell

[tberghammer]

Summary

Fix expectation for TestPlatformCommand.test_shell

• Create expectation based on target platform
• Add custom expectation for remote android target

[vharron]

test/functionalities/platform/TestPlatformCommand.py

37 ↗

(On Diff #21096)

I think that you should refactored into a function, maybe based off of compiler's target triple?

vharron-macbookpro:test vharron$ clang -target x86_64--linux-gnu --version
Apple LLVM version 6.0 (clang-600.0.56) (based on LLVM 3.5svn)
Target: x86_64--linux-gnu
Thread model: posix

vharron@tifa:~/ll/svn/lldb/test$ gcc -m32 -print-multiarch
i386-linux-gnu

[vharron]

It can be based on compiler triple or platform_name but it should abstract local/remote targets.

[tberghammer]

Use the target triple to get the expectations

[zturner]

Windows stuff looks good

[clayborg]

Looks good.

lldb/trunk/source/API/SBPlatform.cpp

 }
 
 const char *
 SBPlatform::GetTriple()
 {
     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
             return ConstString(arch.GetTriple().getTriple().c_str()).GetCString();
         }
     }
     return NULL;
 }

lldb/trunk/test/functionalities/platform/TestPlatformCommand.py

def test_process_info_with_no_arg(self):
             substrs = ['one or more process id(s) must be specified'])
 
     def test_status(self):
         self.expect("platform status",
             substrs = ['Platform', 'Triple', 'OS Version', 'Kernel', 'Hostname'])
 
     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"])
 
     def test_shell_builtin(self):
         """ Test a shell built-in command (echo) """
         self.expect("platform shell echo hello lldb",
             substrs = ["hello lldb"])