summaryrefslogtreecommitdiffstats
path: root/lldb/packages/Python/lldbsuite/test/tools
diff options
context:
space:
mode:
Diffstat (limited to 'lldb/packages/Python/lldbsuite/test/tools')
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiExit.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiFile.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiGdbSetShow.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiLibraryLoaded.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiPrompt.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-mi/breakpoint/TestMiBreak.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-mi/control/TestMiExec.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-mi/data/TestMiData.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-mi/interpreter/TestMiCliSupport.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-mi/interpreter/TestMiInterpreterExec.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-mi/lldbmi_testcase.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-mi/signal/TestMiSignal.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-mi/stack/TestMiStack.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-mi/startup_options/TestMiStartupOptions.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-mi/symbol/TestMiSymbol.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-mi/syntax/TestMiSyntax.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-mi/target/TestMiTarget.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-mi/variable/TestMiGdbSetShowPrint.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-mi/variable/TestMiVar.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGDBRemoteMemoryRead.py4
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteAttach.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteAuxvSupport.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteExpeditedRegisters.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteKill.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteProcessInfo.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteRegisterState.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteSingleStep.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteThreadsInStopReply.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemote_vCont.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestLldbGdbServer.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-server/commandline/TestStubReverseConnect.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-server/commandline/TestStubSetSID.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-server/gdbremote_testcase.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-server/inferior-crash/TestGdbRemoteAbort.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-server/inferior-crash/TestGdbRemoteSegFault.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-server/lldbgdbserverutils.py2
37 files changed, 38 insertions, 38 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiExit.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiExit.py
index 038710e8c5b..c5753ff2665 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiExit.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiExit.py
@@ -7,7 +7,7 @@ from __future__ import print_function
import use_lldb_suite
import lldbmi_testcase
-from lldbtest import *
+from lldbsuite.test.lldbtest import *
class MiExitTestCase(lldbmi_testcase.MiTestCaseBase):
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiFile.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiFile.py
index c48119c8c0b..1c0a3b555ac 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiFile.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiFile.py
@@ -7,7 +7,7 @@ from __future__ import print_function
import use_lldb_suite
import lldbmi_testcase
-from lldbtest import *
+from lldbsuite.test.lldbtest import *
class MiFileTestCase(lldbmi_testcase.MiTestCaseBase):
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiGdbSetShow.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiGdbSetShow.py
index a3f54239e68..8c7ef999a5e 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiGdbSetShow.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiGdbSetShow.py
@@ -8,7 +8,7 @@ import use_lldb_suite
import unittest2
import lldbmi_testcase
-from lldbtest import *
+from lldbsuite.test.lldbtest import *
class MiGdbSetShowTestCase(lldbmi_testcase.MiTestCaseBase):
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiLibraryLoaded.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiLibraryLoaded.py
index caf9a49d47b..4d35b7442a7 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiLibraryLoaded.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiLibraryLoaded.py
@@ -7,7 +7,7 @@ from __future__ import print_function
import use_lldb_suite
import lldbmi_testcase
-from lldbtest import *
+from lldbsuite.test.lldbtest import *
class MiLibraryLoadedTestCase(lldbmi_testcase.MiTestCaseBase):
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiPrompt.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiPrompt.py
index 4f9e2ac7b0d..320dcd78c2b 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiPrompt.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiPrompt.py
@@ -7,7 +7,7 @@ from __future__ import print_function
import use_lldb_suite
import lldbmi_testcase
-from lldbtest import *
+from lldbsuite.test.lldbtest import *
class MiPromptTestCase(lldbmi_testcase.MiTestCaseBase):
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/breakpoint/TestMiBreak.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/breakpoint/TestMiBreak.py
index 056dd29b57a..96cb33b8b8c 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/breakpoint/TestMiBreak.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/breakpoint/TestMiBreak.py
@@ -8,7 +8,7 @@ import use_lldb_suite
import unittest2
import lldbmi_testcase
-from lldbtest import *
+from lldbsuite.test.lldbtest import *
class MiBreakTestCase(lldbmi_testcase.MiTestCaseBase):
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/control/TestMiExec.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/control/TestMiExec.py
index 11f4e6374c0..3d372872514 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/control/TestMiExec.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/control/TestMiExec.py
@@ -7,7 +7,7 @@ from __future__ import print_function
import use_lldb_suite
import lldbmi_testcase
-from lldbtest import *
+from lldbsuite.test.lldbtest import *
class MiExecTestCase(lldbmi_testcase.MiTestCaseBase):
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/data/TestMiData.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/data/TestMiData.py
index 3537096be7c..071883ab705 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/data/TestMiData.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/data/TestMiData.py
@@ -8,7 +8,7 @@ import use_lldb_suite
import unittest2
import lldbmi_testcase
-from lldbtest import *
+from lldbsuite.test.lldbtest import *
class MiDataTestCase(lldbmi_testcase.MiTestCaseBase):
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/interpreter/TestMiCliSupport.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/interpreter/TestMiCliSupport.py
index 594b7595e1c..00dfdaa213e 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/interpreter/TestMiCliSupport.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/interpreter/TestMiCliSupport.py
@@ -7,7 +7,7 @@ from __future__ import print_function
import use_lldb_suite
import lldbmi_testcase
-from lldbtest import *
+from lldbsuite.test.lldbtest import *
class MiCliSupportTestCase(lldbmi_testcase.MiTestCaseBase):
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/interpreter/TestMiInterpreterExec.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/interpreter/TestMiInterpreterExec.py
index ccdc64213b8..d7ea122b212 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/interpreter/TestMiInterpreterExec.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/interpreter/TestMiInterpreterExec.py
@@ -7,7 +7,7 @@ from __future__ import print_function
import use_lldb_suite
import lldbmi_testcase
-from lldbtest import *
+from lldbsuite.test.lldbtest import *
class MiInterpreterExecTestCase(lldbmi_testcase.MiTestCaseBase):
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 944dca0af5e..3c8d3d79e48 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
@@ -6,7 +6,7 @@ from __future__ import print_function
import use_lldb_suite
-from lldbtest import *
+from lldbsuite.test.lldbtest import *
class MiTestCaseBase(Base):
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/signal/TestMiSignal.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/signal/TestMiSignal.py
index d3f22c5ff0f..0ce4bc4665b 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/signal/TestMiSignal.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/signal/TestMiSignal.py
@@ -7,7 +7,7 @@ from __future__ import print_function
import use_lldb_suite
import lldbmi_testcase
-from lldbtest import *
+from lldbsuite.test.lldbtest import *
class MiSignalTestCase(lldbmi_testcase.MiTestCaseBase):
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/stack/TestMiStack.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/stack/TestMiStack.py
index e2c159c834e..b4721f98b9c 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/stack/TestMiStack.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/stack/TestMiStack.py
@@ -7,7 +7,7 @@ from __future__ import print_function
import use_lldb_suite
import lldbmi_testcase
-from lldbtest import *
+from lldbsuite.test.lldbtest import *
class MiStackTestCase(lldbmi_testcase.MiTestCaseBase):
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/startup_options/TestMiStartupOptions.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/startup_options/TestMiStartupOptions.py
index 5f07e337cdf..5687a37e0cb 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/startup_options/TestMiStartupOptions.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/startup_options/TestMiStartupOptions.py
@@ -7,7 +7,7 @@ from __future__ import print_function
import use_lldb_suite
import lldbmi_testcase
-from lldbtest import *
+from lldbsuite.test.lldbtest import *
class MiStartupOptionsTestCase(lldbmi_testcase.MiTestCaseBase):
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/symbol/TestMiSymbol.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/symbol/TestMiSymbol.py
index 8bbe552c6d5..afc75284e3e 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/symbol/TestMiSymbol.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/symbol/TestMiSymbol.py
@@ -7,7 +7,7 @@ from __future__ import print_function
import use_lldb_suite
import lldbmi_testcase
-from lldbtest import *
+from lldbsuite.test.lldbtest import *
class MiSymbolTestCase(lldbmi_testcase.MiTestCaseBase):
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/syntax/TestMiSyntax.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/syntax/TestMiSyntax.py
index df40a81b4ec..87c7cb0a1c2 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/syntax/TestMiSyntax.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/syntax/TestMiSyntax.py
@@ -7,7 +7,7 @@ from __future__ import print_function
import use_lldb_suite
import lldbmi_testcase
-from lldbtest import *
+from lldbsuite.test.lldbtest import *
class MiSyntaxTestCase(lldbmi_testcase.MiTestCaseBase):
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/target/TestMiTarget.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/target/TestMiTarget.py
index d10051b4421..3b516a7815c 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/target/TestMiTarget.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/target/TestMiTarget.py
@@ -7,7 +7,7 @@ from __future__ import print_function
import use_lldb_suite
import lldbmi_testcase
-from lldbtest import *
+from lldbsuite.test.lldbtest import *
class MiTargetTestCase(lldbmi_testcase.MiTestCaseBase):
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/variable/TestMiGdbSetShowPrint.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/variable/TestMiGdbSetShowPrint.py
index a6e08780f36..9b9d27009ad 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/variable/TestMiGdbSetShowPrint.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/variable/TestMiGdbSetShowPrint.py
@@ -8,7 +8,7 @@ from __future__ import print_function
import use_lldb_suite
import lldbmi_testcase
-from lldbtest import *
+from lldbsuite.test.lldbtest import *
class MiGdbSetShowTestCase(lldbmi_testcase.MiTestCaseBase):
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/variable/TestMiVar.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/variable/TestMiVar.py
index d4973e4663f..13cf5b1edf0 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/variable/TestMiVar.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/variable/TestMiVar.py
@@ -7,7 +7,7 @@ from __future__ import print_function
import use_lldb_suite
import lldbmi_testcase
-from lldbtest import *
+from lldbsuite.test.lldbtest import *
class MiVarTestCase(lldbmi_testcase.MiTestCaseBase):
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGDBRemoteMemoryRead.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGDBRemoteMemoryRead.py
index 8ec7fd6f1e6..6ea2da27210 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGDBRemoteMemoryRead.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGDBRemoteMemoryRead.py
@@ -8,8 +8,8 @@ import use_lldb_suite
import os
import lldb
-from lldbtest import *
-import lldbutil
+from lldbsuite.test.lldbtest import *
+import lldbsuite.test.lldbutil as lldbutil
import binascii
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteAttach.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteAttach.py
index 9667c76609a..7a4fbe3f490 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteAttach.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteAttach.py
@@ -5,7 +5,7 @@ import use_lldb_suite
import gdbremote_testcase
import lldbgdbserverutils
-from lldbtest import *
+from lldbsuite.test.lldbtest import *
class TestGdbRemoteAttach(gdbremote_testcase.GdbRemoteTestCaseBase):
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteAuxvSupport.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteAuxvSupport.py
index 5ca05ea888e..01b90a16be1 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteAuxvSupport.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteAuxvSupport.py
@@ -3,7 +3,7 @@ from __future__ import print_function
import use_lldb_suite
import gdbremote_testcase
-from lldbtest import *
+from lldbsuite.test.lldbtest import *
class TestGdbRemoteAuxvSupport(gdbremote_testcase.GdbRemoteTestCaseBase):
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteExpeditedRegisters.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteExpeditedRegisters.py
index e9259182023..79575711544 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteExpeditedRegisters.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteExpeditedRegisters.py
@@ -3,7 +3,7 @@ from __future__ import print_function
import use_lldb_suite
import gdbremote_testcase
-from lldbtest import *
+from lldbsuite.test.lldbtest import *
class TestGdbRemoteExpeditedRegisters(gdbremote_testcase.GdbRemoteTestCaseBase):
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteKill.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteKill.py
index a6f1d14ad6c..bcc6edeb1ad 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteKill.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteKill.py
@@ -5,7 +5,7 @@ import use_lldb_suite
import gdbremote_testcase
import lldbgdbserverutils
-from lldbtest import *
+from lldbsuite.test.lldbtest import *
class TestGdbRemoteKill(gdbremote_testcase.GdbRemoteTestCaseBase):
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteProcessInfo.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteProcessInfo.py
index 9c2363ac4da..d33c6f64e04 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteProcessInfo.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteProcessInfo.py
@@ -6,7 +6,7 @@ import gdbremote_testcase
import lldbgdbserverutils
import sys
-from lldbtest import *
+from lldbsuite.test.lldbtest import *
class TestGdbRemoteProcessInfo(gdbremote_testcase.GdbRemoteTestCaseBase):
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteRegisterState.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteRegisterState.py
index ef2f3ca179e..013dc4facdc 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteRegisterState.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteRegisterState.py
@@ -3,7 +3,7 @@ from __future__ import print_function
import use_lldb_suite
import gdbremote_testcase
-from lldbtest import *
+from lldbsuite.test.lldbtest import *
class TestGdbRemoteRegisterState(gdbremote_testcase.GdbRemoteTestCaseBase):
"""Test QSaveRegisterState/QRestoreRegisterState support."""
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteSingleStep.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteSingleStep.py
index 0155af52f9f..6ff14e6cf95 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteSingleStep.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteSingleStep.py
@@ -3,7 +3,7 @@ from __future__ import print_function
import use_lldb_suite
import gdbremote_testcase
-from lldbtest import *
+from lldbsuite.test.lldbtest import *
class TestGdbRemoteSingleStep(gdbremote_testcase.GdbRemoteTestCaseBase):
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteThreadsInStopReply.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteThreadsInStopReply.py
index e0ca9b15142..d598c3a44a3 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteThreadsInStopReply.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteThreadsInStopReply.py
@@ -3,7 +3,7 @@ from __future__ import print_function
import use_lldb_suite
import gdbremote_testcase
-from lldbtest import *
+from lldbsuite.test.lldbtest import *
class TestGdbRemoteThreadsInStopReply(gdbremote_testcase.GdbRemoteTestCaseBase):
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py
index 084bb44fb62..43a3c813e0c 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py
@@ -6,7 +6,7 @@ import sys
import unittest2
import gdbremote_testcase
-from lldbtest import *
+from lldbsuite.test.lldbtest import *
class TestGdbRemote_qThreadStopInfo(gdbremote_testcase.GdbRemoteTestCaseBase):
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemote_vCont.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemote_vCont.py
index 267ce65d1c6..0a78c6f727a 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemote_vCont.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemote_vCont.py
@@ -3,7 +3,7 @@ from __future__ import print_function
import use_lldb_suite
import gdbremote_testcase
-from lldbtest import *
+from lldbsuite.test.lldbtest import *
class TestGdbRemote_vCont(gdbremote_testcase.GdbRemoteTestCaseBase):
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestLldbGdbServer.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestLldbGdbServer.py
index a254269e25f..3ca7cba53e0 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestLldbGdbServer.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestLldbGdbServer.py
@@ -19,7 +19,7 @@ import gdbremote_testcase
import lldbgdbserverutils
import platform
import signal
-from lldbtest import *
+from lldbsuite.test.lldbtest import *
class LldbGdbServerTestCase(gdbremote_testcase.GdbRemoteTestCaseBase):
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/commandline/TestStubReverseConnect.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/commandline/TestStubReverseConnect.py
index f37da8f54f1..9035237b982 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/commandline/TestStubReverseConnect.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/commandline/TestStubReverseConnect.py
@@ -6,7 +6,7 @@ import re
import select
import socket
import time
-from lldbtest import *
+from lldbsuite.test.lldbtest import *
class TestStubReverseConnect(gdbremote_testcase.GdbRemoteTestCaseBase):
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/commandline/TestStubSetSID.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/commandline/TestStubSetSID.py
index 68d2b2ffa56..4ca2903257a 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/commandline/TestStubSetSID.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/commandline/TestStubSetSID.py
@@ -8,7 +8,7 @@ import os
import select
import tempfile
import time
-from lldbtest import *
+from lldbsuite.test.lldbtest import *
class TestStubSetSIDTestCase(gdbremote_testcase.GdbRemoteTestCaseBase):
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/gdbremote_testcase.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/gdbremote_testcase.py
index 8da1fda2d52..2dd5054f51c 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/gdbremote_testcase.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/gdbremote_testcase.py
@@ -20,7 +20,7 @@ import subprocess
import sys
import tempfile
import time
-from lldbtest import *
+from lldbsuite.test.lldbtest import *
from lldbgdbserverutils import *
import logging
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/inferior-crash/TestGdbRemoteAbort.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/inferior-crash/TestGdbRemoteAbort.py
index 1f00a7d3594..006a534bec9 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/inferior-crash/TestGdbRemoteAbort.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/inferior-crash/TestGdbRemoteAbort.py
@@ -4,7 +4,7 @@ import use_lldb_suite
import gdbremote_testcase
import signal
-from lldbtest import *
+from lldbsuite.test.lldbtest import *
class TestGdbRemoteAbort(gdbremote_testcase.GdbRemoteTestCaseBase):
mydir = TestBase.compute_mydir(__file__)
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/inferior-crash/TestGdbRemoteSegFault.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/inferior-crash/TestGdbRemoteSegFault.py
index 7b3186b9a7c..6226a8313b8 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/inferior-crash/TestGdbRemoteSegFault.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/inferior-crash/TestGdbRemoteSegFault.py
@@ -4,7 +4,7 @@ import use_lldb_suite
import gdbremote_testcase
import signal
-from lldbtest import *
+from lldbsuite.test.lldbtest import *
class TestGdbRemoteSegFault(gdbremote_testcase.GdbRemoteTestCaseBase):
mydir = TestBase.compute_mydir(__file__)
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/lldbgdbserverutils.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/lldbgdbserverutils.py
index 8014a79550b..86a9ee2f66f 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/lldbgdbserverutils.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/lldbgdbserverutils.py
@@ -13,7 +13,7 @@ import six
import socket_packet_pump
import subprocess
import time
-from lldbtest import *
+from lldbsuite.test.lldbtest import *
from six.moves import queue
OpenPOWER on IntegriCloud