Index: packages/Python/lldbsuite/test/expression_command/test/TestExprs2.py =================================================================== --- packages/Python/lldbsuite/test/expression_command/test/TestExprs2.py +++ packages/Python/lldbsuite/test/expression_command/test/TestExprs2.py @@ -44,7 +44,7 @@ # (int *) $0 = 0x00007fff5fbff258 # Do anonymous symbols work? - self.expect("expression ((char**)environ)[0]", + self.expect("expression ((char**)__environ)[0]", startstr="(char *) $1 = 0x") # (char *) $1 = 0x00007fff5fbff298 "Apple_PubSub_Socket_Render=/tmp/launch-7AEsUD/Render" Index: packages/Python/lldbsuite/test/functionalities/thread/jump/TestThreadJump.py =================================================================== --- packages/Python/lldbsuite/test/functionalities/thread/jump/TestThreadJump.py +++ packages/Python/lldbsuite/test/functionalities/thread/jump/TestThreadJump.py @@ -50,8 +50,10 @@ self.do_min_test(self.mark3, self.mark2, "i", "5") # Try the double path, force it to return 'a' self.do_min_test(self.mark4, self.mark1, "j", "7") - # Try the double path, force it to return 'b' - self.do_min_test(self.mark4, self.mark2, "j", "8") + # Expected to fail on powerpc64le architecture + if not self.isPPC64le(): + # Try the double path, force it to return 'b' + self.do_min_test(self.mark4, self.mark2, "j", "8") # Try jumping to another function in a different file. self.runCmd( Index: packages/Python/lldbsuite/test/lldbtest.py =================================================================== --- packages/Python/lldbsuite/test/lldbtest.py +++ packages/Python/lldbsuite/test/lldbtest.py @@ -1247,6 +1247,13 @@ return True return False + def isPPC64le(self): + """Returns true is the architecture is PPC64LE.""" + arch = self.getArchitecture() + if re.match("powerpc64le", arch): + return True + return False + def getArchitecture(self): """Returns the architecture in effect the test suite is running with.""" module = builder_module() Index: packages/Python/lldbsuite/test/tools/lldb-mi/breakpoint/main.cpp =================================================================== --- packages/Python/lldbsuite/test/tools/lldb-mi/breakpoint/main.cpp +++ packages/Python/lldbsuite/test/tools/lldb-mi/breakpoint/main.cpp @@ -15,7 +15,7 @@ int foo2(void) { printf("In foo2\n"); return 2; } } -int x; +int x; int (*foo1_p)(); int main(int argc, char const *argv[]) { // BP_main_decl printf("Print a formatted string so that GCC does not optimize this printf call: %s\n", argv[0]); // This is a long comment with no code inside @@ -25,6 +25,7 @@ // This is a long comment with no code inside // This is a long comment with no code inside // This is a long comment with no code inside - x = ns::foo1() + ns::foo2(); + foo1_p = &ns::foo1; + x = foo1_p() + ns::foo2(); return 0; // BP_return } Index: packages/Python/lldbsuite/test/tools/lldb-mi/data/TestMiData.py =================================================================== --- packages/Python/lldbsuite/test/tools/lldb-mi/data/TestMiData.py +++ packages/Python/lldbsuite/test/tools/lldb-mi/data/TestMiData.py @@ -80,7 +80,7 @@ # See https://docs.python.org/2/howto/regex.html#the-backslash-plague # The MIPS disassembler never prints stub name - if self.isMIPS(): + if self.isMIPS() or self.isPPC64le(): self.expect(["{address=\"0x[0-9a-f]+\",func-name=\"hello_world\(\)\",offset=\"[0-9]+\",size=\"[0-9]+\",inst=\".+?; \\\\\"Hello, World!\\\\\\\\n\\\\\"\"}", "{address=\"0x[0-9a-f]+\",func-name=\"hello_world\(\)\",offset=\"[0-9]+\",size=\"[0-9]+\",inst=\".+?\"}"]) else: