diff options
Diffstat (limited to 'lldb/test/api')
| -rw-r--r-- | lldb/test/api/check_public_api_headers/TestPublicAPIHeaders.py | 3 | ||||
| -rw-r--r-- | lldb/test/api/multithreaded/TestMultithreaded.py | 9 |
2 files changed, 8 insertions, 4 deletions
diff --git a/lldb/test/api/check_public_api_headers/TestPublicAPIHeaders.py b/lldb/test/api/check_public_api_headers/TestPublicAPIHeaders.py index 9df567c3f3a..63618e05c36 100644 --- a/lldb/test/api/check_public_api_headers/TestPublicAPIHeaders.py +++ b/lldb/test/api/check_public_api_headers/TestPublicAPIHeaders.py @@ -22,6 +22,9 @@ class SBDirCheckerCase(TestBase): def test_sb_api_directory(self): """Test the SB API directory and make sure there's no unwanted stuff.""" + # Only proceed if this is "darwin", "x86_64", and local platform. + if not (sys.platform.startswith("darwin") and self.getArchitecture() == "x86_64" and not lldb.test_remote): + self.skipTest("This test is only for LLDB.framework built 64-bit and !lldb.test_remote") if self.getArchitecture() == "i386": self.skipTest("LLDB is 64-bit and cannot be linked to 32-bit test program.") diff --git a/lldb/test/api/multithreaded/TestMultithreaded.py b/lldb/test/api/multithreaded/TestMultithreaded.py index bb5c26271e5..b8d74ef7655 100644 --- a/lldb/test/api/multithreaded/TestMultithreaded.py +++ b/lldb/test/api/multithreaded/TestMultithreaded.py @@ -61,12 +61,13 @@ class SBBreakpointCallbackCase(TestBase): exe = [os.path.join(os.getcwd(), test_name), self.inferior] + env = {self.dylibPath : self.getLLDBLibraryEnvVal()} if self.TraceOn(): print "Running test %s" % " ".join(exe) - - check_call(exe, env={self.dylibPath : self.getLLDBLibraryEnvVal()}) - - + check_call(exe, env=env) + else: + with open(os.devnull, 'w') as fnull: + check_call(exe, env=env, stdout=fnull, stderr=fnull) def build_program(self, sources, program): return self.buildDriver(sources, program) |
