1 files changed, 12 insertions, 10 deletions
diff --git a/packages/Python/lldbsuite/test/functionalities/target_command/TestTargetCommand.py b/packages/Python/lldbsuite/test/functionalities/target_command/TestTargetCommand.py
index 7d2900d61718e..71bfff1d05d44 100644
--- a/packages/Python/lldbsuite/test/functionalities/target_command/TestTargetCommand.py
+++ b/packages/Python/lldbsuite/test/functionalities/target_command/TestTargetCommand.py
@@ -25,15 +25,15 @@ class targetCommandTestCase(TestBase):
 
     def test_target_command(self):
         """Test some target commands: create, list, select."""
-        da = {'C_SOURCES': 'a.c', 'EXE': 'a.out'}
+        da = {'C_SOURCES': 'a.c', 'EXE': self.getBuildArtifact('a.out')}
         self.build(dictionary=da)
         self.addTearDownCleanup(dictionary=da)
 
-        db = {'C_SOURCES': 'b.c', 'EXE': 'b.out'}
+        db = {'C_SOURCES': 'b.c', 'EXE': self.getBuildArtifact('b.out')}
         self.build(dictionary=db)
         self.addTearDownCleanup(dictionary=db)
 
-        dc = {'C_SOURCES': 'c.c', 'EXE': 'c.out'}
+        dc = {'C_SOURCES': 'c.c', 'EXE': self.getBuildArtifact('c.out')}
         self.build(dictionary=dc)
         self.addTearDownCleanup(dictionary=dc)
 
@@ -44,7 +44,7 @@ class targetCommandTestCase(TestBase):
     @expectedFailureAndroid(archs=['aarch64'])
     def test_target_variable_command(self):
         """Test 'target variable' command before and after starting the inferior."""
-        d = {'C_SOURCES': 'globals.c', 'EXE': 'globals'}
+        d = {'C_SOURCES': 'globals.c', 'EXE': self.getBuildArtifact('globals')}
         self.build(dictionary=d)
         self.addTearDownCleanup(dictionary=d)
 
@@ -53,7 +53,7 @@ class targetCommandTestCase(TestBase):
     @expectedFailureAndroid(archs=['aarch64'])
     def test_target_variable_command_no_fail(self):
         """Test 'target variable' command before and after starting the inferior."""
-        d = {'C_SOURCES': 'globals.c', 'EXE': 'globals'}
+        d = {'C_SOURCES': 'globals.c', 'EXE': self.getBuildArtifact('globals')}
         self.build(dictionary=d)
         self.addTearDownCleanup(dictionary=d)
 
@@ -61,9 +61,9 @@ class targetCommandTestCase(TestBase):
 
     def do_target_command(self):
         """Exercise 'target create', 'target list', 'target select' commands."""
-        exe_a = os.path.join(os.getcwd(), "a.out")
-        exe_b = os.path.join(os.getcwd(), "b.out")
-        exe_c = os.path.join(os.getcwd(), "c.out")
+        exe_a = self.getBuildArtifact("a.out")
+        exe_b = self.getBuildArtifact("b.out")
+        exe_c = self.getBuildArtifact("c.out")
 
         self.runCmd("target list")
         output = self.res.GetOutput()
@@ -114,7 +114,8 @@ class targetCommandTestCase(TestBase):
 
     def do_target_variable_command(self, exe_name):
         """Exercise 'target variable' command before and after starting the inferior."""
-        self.runCmd("file " + exe_name, CURRENT_EXECUTABLE_SET)
+        self.runCmd("file " + self.getBuildArtifact(exe_name),
+                    CURRENT_EXECUTABLE_SET)
 
         self.expect(
             "target variable my_global_char",
@@ -206,7 +207,8 @@ class targetCommandTestCase(TestBase):
 
     def do_target_variable_command_no_fail(self, exe_name):
         """Exercise 'target variable' command before and after starting the inferior."""
-        self.runCmd("file " + exe_name, CURRENT_EXECUTABLE_SET)
+        self.runCmd("file " + self.getBuildArtifact(exe_name),
+                    CURRENT_EXECUTABLE_SET)
 
         self.expect(
             "target variable my_global_char",