diff options
| -rw-r--r-- | lldb/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py | 2 | ||||
| -rw-r--r-- | lldb/test/lldbtest.py | 21 |
2 files changed, 11 insertions, 12 deletions
diff --git a/lldb/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py b/lldb/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py index 4577c617ce1..7a9648d98a3 100644 --- a/lldb/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py +++ b/lldb/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py @@ -205,7 +205,7 @@ class CrashingRecursiveInferiorTestCase(TestBase): self.check_stop_reason() expected_state = 'exited' # Provide the exit code. - if self.platformIsDarwin() or self.platformIsLinux(): + if self.platformIsDarwin() or self.getPlatform() == "linux": expected_state = 'stopped' # TODO: Determine why 'next' and 'continue' have no effect after a crash. self.expect("next", diff --git a/lldb/test/lldbtest.py b/lldb/test/lldbtest.py index 65fc7daff5e..5e0a2582886 100644 --- a/lldb/test/lldbtest.py +++ b/lldb/test/lldbtest.py @@ -626,7 +626,7 @@ def expectedFailureWindows(bugnumber=None, compilers=None): def expectedFailureLLGS(bugnumber=None, compilers=None): def fn(self): # llgs local is only an option on Linux targets - if not self.platformIsLinux(): + if self.getPlatform() != 'linux': return False self.runCmd('settings show platform.plugin.linux.use-llgs-for-local') return 'true' in self.res.GetOutput() and self.expectedCompiler(compilers) @@ -703,11 +703,16 @@ def skipUnlessDarwin(func): return skipUnlessPlatform(getDarwinOSTriples())(func) def getPlatform(): + """Returns the target platform the test suite is running on.""" platform = lldb.DBG.GetSelectedPlatform().GetTriple().split('-')[2] if platform.startswith('freebsd'): platform = 'freebsd' return platform +def platformIsDarwin(): + """Returns true if the OS triple for the selected platform is any valid apple OS""" + return getPlatform() in getDarwinOSTriples() + def skipIfPlatform(oslist): """Decorate the item to skip tests if running on one of the listed platforms.""" return unittest2.skipIf(getPlatform() in oslist, @@ -868,9 +873,9 @@ class Base(unittest2.TestCase): os.chdir(os.path.join(os.environ["LLDB_TEST"], cls.mydir)) # Set platform context. - if sys.platform.startswith('darwin'): + if platformIsDarwin(): cls.platformContext = _PlatformContext('DYLD_LIBRARY_PATH', 'lib', 'dylib') - elif sys.platform.startswith('linux') or sys.platform.startswith('freebsd'): + elif getPlatform() == "linux" or getPlatform() == "freebsd": cls.platformContext = _PlatformContext('LD_LIBRARY_PATH', 'lib', 'so') else: cls.platformContext = None @@ -1402,16 +1407,10 @@ class Base(unittest2.TestCase): def platformIsDarwin(self): """Returns true if the OS triple for the selected platform is any valid apple OS""" - platform_name = self.getPlatform() - return platform_name in getDarwinOSTriples() - - def platformIsLinux(self): - """Returns true if the OS triple for the selected platform is any valid apple OS""" - platform_name = self.getPlatform() - return platform_name == "linux" + return platformIsDarwin() def getPlatform(self): - """Returns the platform the test suite is running on.""" + """Returns the target platform the test suite is running on.""" return getPlatform() def isIntelCompiler(self): |
