From eac1c02d2a1ae550c1f53ae16d775b1a839b5a92 Mon Sep 17 00:00:00 2001 From: Adrian Prantl Date: Tue, 23 Jan 2018 16:43:01 +0000 Subject: Move getBuildArtifact() from TestBase to Base and derive MiTestCaseBase from it Thanks to Pavel Labath for pointing this out! llvm-svn: 323219 --- lldb/packages/Python/lldbsuite/test/lldbtest.py | 8 ++++---- .../Python/lldbsuite/test/tools/lldb-mi/lldbmi_testcase.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'lldb/packages/Python/lldbsuite/test') diff --git a/lldb/packages/Python/lldbsuite/test/lldbtest.py b/lldb/packages/Python/lldbsuite/test/lldbtest.py index b16c0c8ab3d..7b4dfa4f078 100644 --- a/lldb/packages/Python/lldbsuite/test/lldbtest.py +++ b/lldb/packages/Python/lldbsuite/test/lldbtest.py @@ -717,6 +717,10 @@ class Base(unittest2.TestCase): lldb.remote_platform.Run(shell_cmd) self.addTearDownHook(clean_working_directory) + def getBuildArtifact(self, name="a.out"): + """Return absolute path to an artifact in the test's build directory.""" + return os.path.join(os.getcwd(), name) + def setUp(self): """Fixture for unittest test case setup. @@ -2269,10 +2273,6 @@ class TestBase(Base): else: self.fail("Can't build for debug info: %s" % self.debug_info) - def getBuildArtifact(self, name="a.out"): - """Return absolute path to an artifact in the test's build directory.""" - return os.path.join(os.getcwd(), name) - def run_platform_command(self, cmd): platform = self.dbg.GetSelectedPlatform() shell_command = lldb.SBPlatformShellCommand(cmd) diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/lldbmi_testcase.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/lldbmi_testcase.py index e986204e518..6c38534aec2 100644 --- a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/lldbmi_testcase.py +++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/lldbmi_testcase.py @@ -8,7 +8,7 @@ from __future__ import print_function from lldbsuite.test.lldbtest import * -class MiTestCaseBase(TestBase): +class MiTestCaseBase(Base): mydir = None myexe = None -- cgit v1.2.3