diff options
| author | Adrian Prantl <aprantl@apple.com> | 2018-01-19 23:24:35 +0000 |
|---|---|---|
| committer | Adrian Prantl <aprantl@apple.com> | 2018-01-19 23:24:35 +0000 |
| commit | 595048f3ecf3317aa2d32bed5141a526415f5aea (patch) | |
| tree | 92980c57a7209f1ec112bb5f938b2021fec08f21 /lldb/packages/Python/lldbsuite/test/benchmarks | |
| parent | ce8746d178dba08ae576c7f53448772d6728d2f5 (diff) | |
| download | bcm5719-llvm-595048f3ecf3317aa2d32bed5141a526415f5aea.tar.gz bcm5719-llvm-595048f3ecf3317aa2d32bed5141a526415f5aea.zip | |
Wrap all references to build artifacts in the LLDB testsuite (NFC)
in TestBase::getBuildArtifact(). This NFC commit is in preparation for
https://reviews.llvm.org/D42281 (compile the LLDB tests out-of-tree).
Differential Revision: https://reviews.llvm.org/D42280
llvm-svn: 323007
Diffstat (limited to 'lldb/packages/Python/lldbsuite/test/benchmarks')
5 files changed, 8 insertions, 5 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/continue/TestBenchmarkContinue.py b/lldb/packages/Python/lldbsuite/test/benchmarks/continue/TestBenchmarkContinue.py index 74336693bcb..acc09224050 100644 --- a/lldb/packages/Python/lldbsuite/test/benchmarks/continue/TestBenchmarkContinue.py +++ b/lldb/packages/Python/lldbsuite/test/benchmarks/continue/TestBenchmarkContinue.py @@ -30,7 +30,8 @@ class TestBenchmarkContinue(BenchBase): def data_formatter_commands(self): """Benchmark different ways to continue a process""" - self.runCmd("file a.out", CURRENT_EXECUTABLE_SET) + self.runCmd("file "+self.getBuildArtifact("a.out"), + CURRENT_EXECUTABLE_SET) bkpt = self.target().FindBreakpointByID( lldbutil.run_break_set_by_source_regexp( diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/expression/TestExpressionCmd.py b/lldb/packages/Python/lldbsuite/test/benchmarks/expression/TestExpressionCmd.py index a9899d93bf0..064e7b3f520 100644 --- a/lldb/packages/Python/lldbsuite/test/benchmarks/expression/TestExpressionCmd.py +++ b/lldb/packages/Python/lldbsuite/test/benchmarks/expression/TestExpressionCmd.py @@ -39,7 +39,7 @@ class ExpressionEvaluationCase(BenchBase): def run_lldb_repeated_exprs(self, exe_name, count): import pexpect - exe = os.path.join(os.getcwd(), exe_name) + exe = self.getBuildArtifact(exe_name) # Set self.child_prompt, which is "(lldb) ". self.child_prompt = '(lldb) ' diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/expression/TestRepeatedExprs.py b/lldb/packages/Python/lldbsuite/test/benchmarks/expression/TestRepeatedExprs.py index a223d2cf1fa..ebc128bd272 100644 --- a/lldb/packages/Python/lldbsuite/test/benchmarks/expression/TestRepeatedExprs.py +++ b/lldb/packages/Python/lldbsuite/test/benchmarks/expression/TestRepeatedExprs.py @@ -44,7 +44,7 @@ class RepeatedExprsCase(BenchBase): def run_lldb_repeated_exprs(self, exe_name, count): import pexpect - exe = os.path.join(os.getcwd(), exe_name) + exe = self.getBuildArtifact(exe_name) # Set self.child_prompt, which is "(lldb) ". self.child_prompt = '(lldb) ' diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/libcxxlist/TestBenchmarkLibcxxList.py b/lldb/packages/Python/lldbsuite/test/benchmarks/libcxxlist/TestBenchmarkLibcxxList.py index 659382e7311..4ebb111c802 100644 --- a/lldb/packages/Python/lldbsuite/test/benchmarks/libcxxlist/TestBenchmarkLibcxxList.py +++ b/lldb/packages/Python/lldbsuite/test/benchmarks/libcxxlist/TestBenchmarkLibcxxList.py @@ -30,7 +30,8 @@ class TestBenchmarkLibcxxList(BenchBase): def data_formatter_commands(self): """Benchmark the std::list data formatter (libc++)""" - self.runCmd("file a.out", CURRENT_EXECUTABLE_SET) + self.runCmd("file " + self.getBuildArtifact("a.out"), + CURRENT_EXECUTABLE_SET) bkpt = self.target().FindBreakpointByID( lldbutil.run_break_set_by_source_regexp( diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/libcxxmap/TestBenchmarkLibcxxMap.py b/lldb/packages/Python/lldbsuite/test/benchmarks/libcxxmap/TestBenchmarkLibcxxMap.py index 343f93d95c4..0c50661c5c7 100644 --- a/lldb/packages/Python/lldbsuite/test/benchmarks/libcxxmap/TestBenchmarkLibcxxMap.py +++ b/lldb/packages/Python/lldbsuite/test/benchmarks/libcxxmap/TestBenchmarkLibcxxMap.py @@ -30,7 +30,8 @@ class TestBenchmarkLibcxxMap(BenchBase): def data_formatter_commands(self): """Benchmark the std::map data formatter (libc++)""" - self.runCmd("file a.out", CURRENT_EXECUTABLE_SET) + self.runCmd("file " +self.getBuildArtifact("a.out"), + CURRENT_EXECUTABLE_SET) bkpt = self.target().FindBreakpointByID( lldbutil.run_break_set_by_source_regexp( |
