From a402e029b720c23c1043c5b9ab308ff9b6dc5f4d Mon Sep 17 00:00:00 2001 From: Frederic Riss Date: Wed, 9 Oct 2019 21:41:02 +0000 Subject: TestHelloWorld: Make compatible with remote testing The synchronization token handling was not remote-friendly. git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@374234 91177308-0d34-0410-b5e6-96231b3b80d8 --- .../test/python_api/hello_world/TestHelloWorld.py | 24 +++++++++++++--------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/packages/Python/lldbsuite/test/python_api/hello_world/TestHelloWorld.py b/packages/Python/lldbsuite/test/python_api/hello_world/TestHelloWorld.py index a762dc97e..a94b19b35 100644 --- a/packages/Python/lldbsuite/test/python_api/hello_world/TestHelloWorld.py +++ b/packages/Python/lldbsuite/test/python_api/hello_world/TestHelloWorld.py @@ -78,17 +78,19 @@ class HelloWorldTestCase(TestBase): @expectedFailureNetBSD def test_with_attach_to_process_with_id_api(self): """Create target, spawn a process, and attach to it with process id.""" - exe = '%s_%d'%(self.getBuildArtifact(self.testMethodName), os.getpid()) + exe = '%s_%d'%(self.testMethodName, os.getpid()) d = {'EXE': exe} self.build(dictionary=d) self.setTearDownCleanup(dictionary=d) - target = self.dbg.CreateTarget(exe) + target = self.dbg.CreateTarget(self.getBuildArtifact(exe)) # Spawn a new process token = exe+'.token' - if os.path.exists(token): - os.remove(token) - popen = self.spawnSubprocess(exe, [token]) + if not lldb.remote_platform: + token = self.getBuildArtifact(token) + if os.path.exists(token): + os.remove(token) + popen = self.spawnSubprocess(self.getBuildArtifact(exe), [token]) self.addTearDownHook(self.cleanupSubprocesses) lldbutil.wait_for_file_on_target(self, token) @@ -110,17 +112,19 @@ class HelloWorldTestCase(TestBase): @expectedFailureNetBSD def test_with_attach_to_process_with_name_api(self): """Create target, spawn a process, and attach to it with process name.""" - exe = '%s_%d'%(self.getBuildArtifact(self.testMethodName), os.getpid()) + exe = '%s_%d'%(self.testMethodName, os.getpid()) d = {'EXE': exe} self.build(dictionary=d) self.setTearDownCleanup(dictionary=d) - target = self.dbg.CreateTarget(exe) + target = self.dbg.CreateTarget(self.getBuildArtifact(exe)) # Spawn a new process. token = exe+'.token' - if os.path.exists(token): - os.remove(token) - popen = self.spawnSubprocess(exe, [token]) + if not lldb.remote_platform: + token = self.getBuildArtifact(token) + if os.path.exists(token): + os.remove(token) + popen = self.spawnSubprocess(self.getBuildArtifact(exe), [token]) self.addTearDownHook(self.cleanupSubprocesses) lldbutil.wait_for_file_on_target(self, token) -- cgit v1.2.3