[lldb] Adapted test for remote debugging case

Author: sga-sc

lldb/packages/Python/lldbsuite/test/lldbtest.py

@@ -743,6 +743,20 @@ def getBuildArtifact(self, name="a.out"):
         """Return absolute path to an artifact in the test's build directory."""
         return os.path.join(self.getBuildDir(), name)
 
+    def get_process_working_directory(self):
+        """Get the working directory that should be used when launching processes for local or remote processes."""
+        if lldb.remote_platform:
+            # Remote tests set the platform working directory up in
+            # TestBase.setUp()
+            return lldb.remote_platform.GetWorkingDirectory()
+        else:
+            # local tests change directory into each test subdirectory
+            return self.getBuildDir()
+
+    def getWorkingDirArtifact(self, name="a.out"):
+        """Return absolute path to an artifact in the test's working directory."""
+        return os.path.join(self.get_process_working_directory(), name)
+
     def getSourcePath(self, name):
         """Return absolute path to a file in the test's source directory."""
         return os.path.join(self.getSourceDir(), name)
@@ -2018,16 +2032,6 @@ def frame(self):
             .GetSelectedFrame()
         )
 
-    def get_process_working_directory(self):
-        """Get the working directory that should be used when launching processes for local or remote processes."""
-        if lldb.remote_platform:
-            # Remote tests set the platform working directory up in
-            # TestBase.setUp()
-            return lldb.remote_platform.GetWorkingDirectory()
-        else:
-            # local tests change directory into each test subdirectory
-            return self.getBuildDir()
-
     def tearDown(self):
         # Ensure all the references to SB objects have gone away so that we can
         # be sure that all test-specific resources have been freed before we

lldb/test/API/tools/lldb-server/TestGdbRemoteForkNonStop.py

@@ -156,8 +156,8 @@ def get_all_output_via_vStdio(self, output_test):
 
     @add_test_categories(["fork"])
     def test_c_both_nonstop(self):
-        lock1 = self.getBuildArtifact("lock1")
-        lock2 = self.getBuildArtifact("lock2")
+        lock1 = self.getWorkingDirArtifact("lock1")
+        lock2 = self.getWorkingDirArtifact("lock2")
         parent_pid, parent_tid, child_pid, child_tid = self.start_fork_test(
             [
                 "fork",
@@ -194,8 +194,8 @@ def test_c_both_nonstop(self):
 
     @add_test_categories(["fork"])
     def test_vCont_both_nonstop(self):
-        lock1 = self.getBuildArtifact("lock1")
-        lock2 = self.getBuildArtifact("lock2")
+        lock1 = self.getWorkingDirArtifact("lock1")
+        lock2 = self.getWorkingDirArtifact("lock2")
         parent_pid, parent_tid, child_pid, child_tid = self.start_fork_test(
             [
                 "fork",
@@ -227,8 +227,8 @@ def test_vCont_both_nonstop(self):
         self.assertIn("PID: {}".format(int(child_pid, 16)).encode(), output)
 
     def vCont_both_nonstop_test(self, vCont_packet):
-        lock1 = self.getBuildArtifact("lock1")
-        lock2 = self.getBuildArtifact("lock2")
+        lock1 = self.getWorkingDirArtifact("lock1")
+        lock2 = self.getWorkingDirArtifact("lock2")
         parent_pid, parent_tid, child_pid, child_tid = self.start_fork_test(
             [
                 "fork",