diff options
Diffstat (limited to 'lldb/test/tools/lldb-server')
18 files changed, 27 insertions, 71 deletions
diff --git a/lldb/test/tools/lldb-server/TestGDBRemoteMemoryRead.py b/lldb/test/tools/lldb-server/TestGDBRemoteMemoryRead.py index 33baaa559ab..33a6832981e 100644 --- a/lldb/test/tools/lldb-server/TestGDBRemoteMemoryRead.py +++ b/lldb/test/tools/lldb-server/TestGDBRemoteMemoryRead.py @@ -2,8 +2,9 @@ Tests the binary ($x) and hex ($m) memory read packets of the remote stub """ +import lldb_shared + import os -import unittest2 import lldb from lldbtest import * import lldbutil @@ -36,10 +37,3 @@ class MemoryReadTestCase(TestBase): process.Continue() self.assertEqual(process.GetState(), lldb.eStateExited, "Process exited") - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/tools/lldb-server/TestGdbRemoteAttach.py b/lldb/test/tools/lldb-server/TestGdbRemoteAttach.py index dab3ff44ca3..797814b704a 100644 --- a/lldb/test/tools/lldb-server/TestGdbRemoteAttach.py +++ b/lldb/test/tools/lldb-server/TestGdbRemoteAttach.py @@ -1,6 +1,7 @@ +import lldb_shared + import gdbremote_testcase import lldbgdbserverutils -import unittest2 from lldbtest import * @@ -55,7 +56,3 @@ class TestGdbRemoteAttach(gdbremote_testcase.GdbRemoteTestCaseBase): self.build() self.set_inferior_startup_attach_manually() self.attach_with_vAttach() - - -if __name__ == '__main__': - unittest2.main() diff --git a/lldb/test/tools/lldb-server/TestGdbRemoteAuxvSupport.py b/lldb/test/tools/lldb-server/TestGdbRemoteAuxvSupport.py index 0a185b58923..782a3d700f0 100644 --- a/lldb/test/tools/lldb-server/TestGdbRemoteAuxvSupport.py +++ b/lldb/test/tools/lldb-server/TestGdbRemoteAuxvSupport.py @@ -1,4 +1,4 @@ -import unittest2 +import lldb_shared import gdbremote_testcase from lldbtest import * @@ -197,7 +197,3 @@ class TestGdbRemoteAuxvSupport(gdbremote_testcase.GdbRemoteTestCaseBase): self.build() self.set_inferior_startup_launch() self.auxv_chunked_reads_work() - - -if __name__ == '__main__': - unittest2.main() diff --git a/lldb/test/tools/lldb-server/TestGdbRemoteExpeditedRegisters.py b/lldb/test/tools/lldb-server/TestGdbRemoteExpeditedRegisters.py index 06b103d8e2d..9218dbfb134 100644 --- a/lldb/test/tools/lldb-server/TestGdbRemoteExpeditedRegisters.py +++ b/lldb/test/tools/lldb-server/TestGdbRemoteExpeditedRegisters.py @@ -1,4 +1,4 @@ -import unittest2 +import lldb_shared import gdbremote_testcase from lldbtest import * @@ -140,7 +140,3 @@ class TestGdbRemoteExpeditedRegisters(gdbremote_testcase.GdbRemoteTestCaseBase): self.build() self.set_inferior_startup_launch() self.stop_notification_contains_sp_register() - - -if __name__ == '__main__': - unittest2.main() diff --git a/lldb/test/tools/lldb-server/TestGdbRemoteKill.py b/lldb/test/tools/lldb-server/TestGdbRemoteKill.py index 459879e700c..f4de5a0c9c8 100644 --- a/lldb/test/tools/lldb-server/TestGdbRemoteKill.py +++ b/lldb/test/tools/lldb-server/TestGdbRemoteKill.py @@ -1,4 +1,4 @@ -import unittest2 +import lldb_shared import gdbremote_testcase import lldbgdbserverutils diff --git a/lldb/test/tools/lldb-server/TestGdbRemoteProcessInfo.py b/lldb/test/tools/lldb-server/TestGdbRemoteProcessInfo.py index 4aa9218de36..3ef299eac99 100644 --- a/lldb/test/tools/lldb-server/TestGdbRemoteProcessInfo.py +++ b/lldb/test/tools/lldb-server/TestGdbRemoteProcessInfo.py @@ -1,7 +1,8 @@ +import lldb_shared + import gdbremote_testcase import lldbgdbserverutils import sys -import unittest2 from lldbtest import * @@ -174,7 +175,3 @@ class TestGdbRemoteProcessInfo(gdbremote_testcase.GdbRemoteTestCaseBase): self.init_llgs_test() self.build() self.qProcessInfo_does_not_contain_keys(set(['cputype', 'cpusubtype'])) - - -if __name__ == '__main__': - unittest2.main() diff --git a/lldb/test/tools/lldb-server/TestGdbRemoteRegisterState.py b/lldb/test/tools/lldb-server/TestGdbRemoteRegisterState.py index a6d62221fba..f2d44cad93f 100644 --- a/lldb/test/tools/lldb-server/TestGdbRemoteRegisterState.py +++ b/lldb/test/tools/lldb-server/TestGdbRemoteRegisterState.py @@ -1,4 +1,4 @@ -import unittest2 +import lldb_shared import gdbremote_testcase from lldbtest import * @@ -122,7 +122,3 @@ class TestGdbRemoteRegisterState(gdbremote_testcase.GdbRemoteTestCaseBase): self.build() self.set_inferior_startup_launch() self.grp_register_save_restore_works(USE_THREAD_SUFFIX) - - -if __name__ == '__main__': - unittest2.main() diff --git a/lldb/test/tools/lldb-server/TestGdbRemoteSingleStep.py b/lldb/test/tools/lldb-server/TestGdbRemoteSingleStep.py index 53aa4b5392f..98ea7df55e8 100644 --- a/lldb/test/tools/lldb-server/TestGdbRemoteSingleStep.py +++ b/lldb/test/tools/lldb-server/TestGdbRemoteSingleStep.py @@ -1,4 +1,4 @@ -import unittest2 +import lldb_shared import gdbremote_testcase from lldbtest import * @@ -21,6 +21,3 @@ class TestGdbRemoteSingleStep(gdbremote_testcase.GdbRemoteTestCaseBase): self.build() self.set_inferior_startup_launch() self.single_step_only_steps_one_instruction(use_Hc_packet=True, step_instruction="s") - -if __name__ == '__main__': - unittest2.main() diff --git a/lldb/test/tools/lldb-server/TestGdbRemoteThreadsInStopReply.py b/lldb/test/tools/lldb-server/TestGdbRemoteThreadsInStopReply.py index 7e3f4ddd041..ab4f4571829 100644 --- a/lldb/test/tools/lldb-server/TestGdbRemoteThreadsInStopReply.py +++ b/lldb/test/tools/lldb-server/TestGdbRemoteThreadsInStopReply.py @@ -1,4 +1,4 @@ -import unittest2 +import lldb_shared import gdbremote_testcase from lldbtest import * @@ -160,7 +160,3 @@ class TestGdbRemoteThreadsInStopReply(gdbremote_testcase.GdbRemoteTestCaseBase): self.build() self.set_inferior_startup_launch() self.stop_reply_reports_correct_threads(5) - - -if __name__ == '__main__': - unittest2.main() diff --git a/lldb/test/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py b/lldb/test/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py index 915b1a1aef9..d8abdfc4f1a 100644 --- a/lldb/test/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py +++ b/lldb/test/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py @@ -1,6 +1,8 @@ +import lldb_shared + import sys -import unittest2 +import unittest2 import gdbremote_testcase from lldbtest import * @@ -144,7 +146,3 @@ class TestGdbRemote_qThreadStopInfo(gdbremote_testcase.GdbRemoteTestCaseBase): self.build() self.set_inferior_startup_launch() self.qThreadStopInfo_has_valid_thread_names(self.THREAD_COUNT, "a.out") - - -if __name__ == '__main__': - unittest2.main() diff --git a/lldb/test/tools/lldb-server/TestGdbRemote_vCont.py b/lldb/test/tools/lldb-server/TestGdbRemote_vCont.py index 8716ee16c5f..370d9459306 100644 --- a/lldb/test/tools/lldb-server/TestGdbRemote_vCont.py +++ b/lldb/test/tools/lldb-server/TestGdbRemote_vCont.py @@ -1,4 +1,4 @@ -import unittest2 +import lldb_shared import gdbremote_testcase from lldbtest import * @@ -112,7 +112,3 @@ class TestGdbRemote_vCont(gdbremote_testcase.GdbRemoteTestCaseBase): self.build() self.set_inferior_startup_launch() self.single_step_only_steps_one_instruction(use_Hc_packet=False, step_instruction="vCont;s:{thread}") - - -if __name__ == '__main__': - unittest2.main() diff --git a/lldb/test/tools/lldb-server/TestLldbGdbServer.py b/lldb/test/tools/lldb-server/TestLldbGdbServer.py index bbe8e776ca1..9d8f418b906 100644 --- a/lldb/test/tools/lldb-server/TestLldbGdbServer.py +++ b/lldb/test/tools/lldb-server/TestLldbGdbServer.py @@ -10,11 +10,13 @@ gdb remote packet functional areas. For now it contains the initial set of tests implemented. """ +import lldb_shared + +import unittest2 import gdbremote_testcase import lldbgdbserverutils import platform import signal -import unittest2 from lldbtest import * class LldbGdbServerTestCase(gdbremote_testcase.GdbRemoteTestCaseBase): @@ -1465,7 +1467,3 @@ class LldbGdbServerTestCase(gdbremote_testcase.GdbRemoteTestCaseBase): self.build() self.set_inferior_startup_launch() self.P_and_p_thread_suffix_work() - - -if __name__ == '__main__': - unittest2.main() diff --git a/lldb/test/tools/lldb-server/commandline/TestStubReverseConnect.py b/lldb/test/tools/lldb-server/commandline/TestStubReverseConnect.py index 6e793b9a9f9..34850c74868 100644 --- a/lldb/test/tools/lldb-server/commandline/TestStubReverseConnect.py +++ b/lldb/test/tools/lldb-server/commandline/TestStubReverseConnect.py @@ -83,7 +83,3 @@ class TestStubReverseConnect(gdbremote_testcase.GdbRemoteTestCaseBase): self.init_llgs_test(use_named_pipe=False) self.set_inferior_startup_launch() self.reverse_connect_works() - - -if __name__ == '__main__': - unittest2.main() diff --git a/lldb/test/tools/lldb-server/commandline/TestStubSetSID.py b/lldb/test/tools/lldb-server/commandline/TestStubSetSID.py index 32e4818176d..401206bca02 100644 --- a/lldb/test/tools/lldb-server/commandline/TestStubSetSID.py +++ b/lldb/test/tools/lldb-server/commandline/TestStubSetSID.py @@ -1,4 +1,4 @@ -import unittest2 +import lldb_shared import gdbremote_testcase import lldbgdbserverutils diff --git a/lldb/test/tools/lldb-server/gdbremote_testcase.py b/lldb/test/tools/lldb-server/gdbremote_testcase.py index 159a5172cf9..91f36c0111a 100644 --- a/lldb/test/tools/lldb-server/gdbremote_testcase.py +++ b/lldb/test/tools/lldb-server/gdbremote_testcase.py @@ -2,6 +2,8 @@ Base class for gdb-remote test cases. """ +import lldb_shared + import errno import os import os.path @@ -16,7 +18,6 @@ import subprocess import sys import tempfile import time -import unittest2 from lldbtest import * from lldbgdbserverutils import * import logging diff --git a/lldb/test/tools/lldb-server/inferior-crash/TestGdbRemoteAbort.py b/lldb/test/tools/lldb-server/inferior-crash/TestGdbRemoteAbort.py index 2948aff2a7e..e07fe8bc096 100644 --- a/lldb/test/tools/lldb-server/inferior-crash/TestGdbRemoteAbort.py +++ b/lldb/test/tools/lldb-server/inferior-crash/TestGdbRemoteAbort.py @@ -1,4 +1,4 @@ -import unittest2 +import lldb_shared import gdbremote_testcase import signal diff --git a/lldb/test/tools/lldb-server/inferior-crash/TestGdbRemoteSegFault.py b/lldb/test/tools/lldb-server/inferior-crash/TestGdbRemoteSegFault.py index 322f41cd336..0c0bef457de 100644 --- a/lldb/test/tools/lldb-server/inferior-crash/TestGdbRemoteSegFault.py +++ b/lldb/test/tools/lldb-server/inferior-crash/TestGdbRemoteSegFault.py @@ -1,4 +1,4 @@ -import unittest2 +import lldb_shared import gdbremote_testcase import signal diff --git a/lldb/test/tools/lldb-server/test/test_lldbgdbserverutils.py b/lldb/test/tools/lldb-server/test/test_lldbgdbserverutils.py index 034714e586c..f5b4ba35a9a 100644 --- a/lldb/test/tools/lldb-server/test/test_lldbgdbserverutils.py +++ b/lldb/test/tools/lldb-server/test/test_lldbgdbserverutils.py @@ -1,9 +1,10 @@ +import lldb_shared + +import unittest2 import os.path import re import sys -import unittest2 - from lldbgdbserverutils import * @@ -44,6 +45,3 @@ class TestLldbGdbServerUtils(unittest2.TestCase): except AssertionError: # okay return None - -if __name__ == '__main__': - unittest2.main() |
