diff options
Diffstat (limited to 'lldb/test/tools')
37 files changed, 68 insertions, 141 deletions
diff --git a/lldb/test/tools/lldb-mi/TestMiExit.py b/lldb/test/tools/lldb-mi/TestMiExit.py index 9c0e1735e8a..3d0463de86d 100644 --- a/lldb/test/tools/lldb-mi/TestMiExit.py +++ b/lldb/test/tools/lldb-mi/TestMiExit.py @@ -2,9 +2,10 @@ Test that the lldb-mi driver exits properly. """ +import lldb_shared + import lldbmi_testcase from lldbtest import * -import unittest2 class MiExitTestCase(lldbmi_testcase.MiTestCaseBase): @@ -82,6 +83,3 @@ class MiExitTestCase(lldbmi_testcase.MiTestCaseBase): self.runCmd("q") import pexpect self.expect(pexpect.EOF) - -if __name__ == '__main__': - unittest2.main() diff --git a/lldb/test/tools/lldb-mi/TestMiFile.py b/lldb/test/tools/lldb-mi/TestMiFile.py index 16add25b95b..01f9dc643ea 100644 --- a/lldb/test/tools/lldb-mi/TestMiFile.py +++ b/lldb/test/tools/lldb-mi/TestMiFile.py @@ -2,9 +2,10 @@ Test lldb-mi -file-xxx commands. """ +import lldb_shared + import lldbmi_testcase from lldbtest import * -import unittest2 class MiFileTestCase(lldbmi_testcase.MiTestCaseBase): @@ -76,6 +77,3 @@ class MiFileTestCase(lldbmi_testcase.MiTestCaseBase): path = "unknown_dir/%s" % self.myexe self.runCmd("-file-exec-and-symbols %s" % path) self.expect("\^error") - -if __name__ == '__main__': - unittest2.main() diff --git a/lldb/test/tools/lldb-mi/TestMiGdbSetShow.py b/lldb/test/tools/lldb-mi/TestMiGdbSetShow.py index cedfecea7bc..45aff71ae52 100644 --- a/lldb/test/tools/lldb-mi/TestMiGdbSetShow.py +++ b/lldb/test/tools/lldb-mi/TestMiGdbSetShow.py @@ -2,9 +2,11 @@ Test lldb-mi -gdb-set and -gdb-show commands. """ +import lldb_shared + +import unittest2 import lldbmi_testcase from lldbtest import * -import unittest2 class MiGdbSetShowTestCase(lldbmi_testcase.MiTestCaseBase): @@ -191,6 +193,3 @@ class MiGdbSetShowTestCase(lldbmi_testcase.MiTestCaseBase): self.expect("\^done"); self.runCmd("-var-evaluate-expression var_a"); self.expect("\^done,value=\"10\""); - -if __name__ == '__main__': - unittest2.main() diff --git a/lldb/test/tools/lldb-mi/TestMiLibraryLoaded.py b/lldb/test/tools/lldb-mi/TestMiLibraryLoaded.py index bc46c716772..841398618c9 100644 --- a/lldb/test/tools/lldb-mi/TestMiLibraryLoaded.py +++ b/lldb/test/tools/lldb-mi/TestMiLibraryLoaded.py @@ -2,9 +2,10 @@ Test lldb-mi =library-loaded notifications. """ +import lldb_shared + import lldbmi_testcase from lldbtest import * -import unittest2 class MiLibraryLoadedTestCase(lldbmi_testcase.MiTestCaseBase): @@ -29,6 +30,3 @@ class MiLibraryLoadedTestCase(lldbmi_testcase.MiTestCaseBase): def add_slashes(x): return x.replace("\\", "\\\\").replace("\"", "\\\"").replace("\'", "\\\'").replace("\0", "\\\0") self.expect([ "=library-loaded,id=\"%s\",target-name=\"%s\",host-name=\"%s\",symbols-loaded=\"1\",symbols-path=\"%s\",loaded_addr=\"-\",size=\"[0-9]+\"" % (add_slashes(path), add_slashes(path), add_slashes(path), add_slashes(symbols_path)), "=library-loaded,id=\"%s\",target-name=\"%s\",host-name=\"%s\",symbols-loaded=\"0\",loaded_addr=\"-\",size=\"[0-9]+\"" % (add_slashes(path), add_slashes(path), add_slashes(path)) ]) - -if __name__ == '__main__': - unittest2.main() diff --git a/lldb/test/tools/lldb-mi/TestMiPrompt.py b/lldb/test/tools/lldb-mi/TestMiPrompt.py index 32ae53281e3..6f4bb76ddc7 100644 --- a/lldb/test/tools/lldb-mi/TestMiPrompt.py +++ b/lldb/test/tools/lldb-mi/TestMiPrompt.py @@ -2,9 +2,10 @@ Test that the lldb-mi driver prints prompt properly. """ +import lldb_shared + import lldbmi_testcase from lldbtest import * -import unittest2 class MiPromptTestCase(lldbmi_testcase.MiTestCaseBase): @@ -50,6 +51,3 @@ class MiPromptTestCase(lldbmi_testcase.MiTestCaseBase): # Test that lldb-mi is ready after program exited self.expect("\*stopped,reason=\"exited-normally\"") self.expect(self.child_prompt, exactly = True) - -if __name__ == '__main__': - unittest2.main() diff --git a/lldb/test/tools/lldb-mi/breakpoint/TestMiBreak.py b/lldb/test/tools/lldb-mi/breakpoint/TestMiBreak.py index 57a49257fa2..c08e92eba6a 100644 --- a/lldb/test/tools/lldb-mi/breakpoint/TestMiBreak.py +++ b/lldb/test/tools/lldb-mi/breakpoint/TestMiBreak.py @@ -2,9 +2,11 @@ Test lldb-mi -break-xxx commands. """ +import lldb_shared + +import unittest2 import lldbmi_testcase from lldbtest import * -import unittest2 class MiBreakTestCase(lldbmi_testcase.MiTestCaseBase): @@ -247,6 +249,3 @@ class MiBreakTestCase(lldbmi_testcase.MiTestCaseBase): self.runCmd("-exec-continue") self.expect("\^running") self.expect("\*stopped,reason=\"exited-normally\"") - -if __name__ == '__main__': - unittest2.main() diff --git a/lldb/test/tools/lldb-mi/control/TestMiExec.py b/lldb/test/tools/lldb-mi/control/TestMiExec.py index 9e027b23c2f..a17fd66eb6e 100644 --- a/lldb/test/tools/lldb-mi/control/TestMiExec.py +++ b/lldb/test/tools/lldb-mi/control/TestMiExec.py @@ -2,9 +2,10 @@ Test lldb-mi -exec-xxx commands. """ +import lldb_shared + import lldbmi_testcase from lldbtest import * -import unittest2 class MiExecTestCase(lldbmi_testcase.MiTestCaseBase): @@ -466,6 +467,3 @@ class MiExecTestCase(lldbmi_testcase.MiTestCaseBase): self.runCmd("-exec-finish --thread 1 --frame 0") self.expect("\^running") self.expect("\*stopped,reason=\"end-stepping-range\".+?func=\"main\"") - -if __name__ == '__main__': - unittest2.main() diff --git a/lldb/test/tools/lldb-mi/data/TestMiData.py b/lldb/test/tools/lldb-mi/data/TestMiData.py index 9d2cf7e0143..c26c16e0c6e 100644 --- a/lldb/test/tools/lldb-mi/data/TestMiData.py +++ b/lldb/test/tools/lldb-mi/data/TestMiData.py @@ -2,9 +2,11 @@ Test lldb-mi -data-xxx commands. """ +import lldb_shared + +import unittest2 import lldbmi_testcase from lldbtest import * -import unittest2 class MiDataTestCase(lldbmi_testcase.MiTestCaseBase): @@ -334,6 +336,3 @@ class MiDataTestCase(lldbmi_testcase.MiTestCaseBase): # Check 2d array self.runCmd("-data-evaluate-expression array2d") self.expect("\^done,value=\"\{\[0\] = \{\[0\] = 1, \[1\] = 2, \[2\] = 3\}, \[1\] = \{\[0\] = 4, \[1\] = 5, \[2\] = 6\}\}\"") - -if __name__ == '__main__': - unittest2.main() diff --git a/lldb/test/tools/lldb-mi/interpreter/TestMiCliSupport.py b/lldb/test/tools/lldb-mi/interpreter/TestMiCliSupport.py index 96de4425573..b28c055afbe 100644 --- a/lldb/test/tools/lldb-mi/interpreter/TestMiCliSupport.py +++ b/lldb/test/tools/lldb-mi/interpreter/TestMiCliSupport.py @@ -2,9 +2,10 @@ Test lldb-mi can interpret CLI commands directly. """ +import lldb_shared + import lldbmi_testcase from lldbtest import * -import unittest2 class MiCliSupportTestCase(lldbmi_testcase.MiTestCaseBase): @@ -209,6 +210,3 @@ class MiCliSupportTestCase(lldbmi_testcase.MiTestCaseBase): self.expect("\^done") self.expect("@\"argc=1\\\\r\\\\n") self.expect("\*stopped,reason=\"exited-normally\"") - -if __name__ == '__main__': - unittest2.main() diff --git a/lldb/test/tools/lldb-mi/interpreter/TestMiInterpreterExec.py b/lldb/test/tools/lldb-mi/interpreter/TestMiInterpreterExec.py index ce277a85c44..86eb8ffb3c4 100644 --- a/lldb/test/tools/lldb-mi/interpreter/TestMiInterpreterExec.py +++ b/lldb/test/tools/lldb-mi/interpreter/TestMiInterpreterExec.py @@ -2,9 +2,10 @@ Test lldb-mi -interpreter-exec command. """ +import lldb_shared + import lldbmi_testcase from lldbtest import * -import unittest2 class MiInterpreterExecTestCase(lldbmi_testcase.MiTestCaseBase): @@ -231,6 +232,3 @@ class MiInterpreterExecTestCase(lldbmi_testcase.MiTestCaseBase): self.expect("\^done") self.expect("@\"argc=1\\\\r\\\\n") self.expect("\*stopped,reason=\"exited-normally\"") - -if __name__ == '__main__': - unittest2.main() diff --git a/lldb/test/tools/lldb-mi/lldbmi_testcase.py b/lldb/test/tools/lldb-mi/lldbmi_testcase.py index c9ba78203d7..e29864ac5df 100644 --- a/lldb/test/tools/lldb-mi/lldbmi_testcase.py +++ b/lldb/test/tools/lldb-mi/lldbmi_testcase.py @@ -2,8 +2,9 @@ Base class for lldb-mi test cases. """ +import lldb_shared + from lldbtest import * -import unittest2 class MiTestCaseBase(Base): diff --git a/lldb/test/tools/lldb-mi/signal/TestMiSignal.py b/lldb/test/tools/lldb-mi/signal/TestMiSignal.py index 16532c8d13e..22f05c31952 100644 --- a/lldb/test/tools/lldb-mi/signal/TestMiSignal.py +++ b/lldb/test/tools/lldb-mi/signal/TestMiSignal.py @@ -2,9 +2,10 @@ Test that the lldb-mi handles signals properly. """ +import lldb_shared + import lldbmi_testcase from lldbtest import * -import unittest2 class MiSignalTestCase(lldbmi_testcase.MiTestCaseBase): @@ -197,6 +198,3 @@ class MiSignalTestCase(lldbmi_testcase.MiTestCaseBase): # Exit self.runCmd("-gdb-exit") self.expect("\^exit") - -if __name__ == '__main__': - unittest2.main() diff --git a/lldb/test/tools/lldb-mi/stack/TestMiStack.py b/lldb/test/tools/lldb-mi/stack/TestMiStack.py index 1410c25f709..f4ebf30141e 100644 --- a/lldb/test/tools/lldb-mi/stack/TestMiStack.py +++ b/lldb/test/tools/lldb-mi/stack/TestMiStack.py @@ -2,9 +2,10 @@ Test lldb-mi -stack-xxx commands. """ +import lldb_shared + import lldbmi_testcase from lldbtest import * -import unittest2 class MiStackTestCase(lldbmi_testcase.MiTestCaseBase): @@ -481,6 +482,3 @@ class MiStackTestCase(lldbmi_testcase.MiTestCaseBase): # Test that current frame is #0 and it has the same information self.runCmd("-stack-info-frame") self.expect("\^done,frame=\{level=\"0\",addr=\"0x[0-9a-f]+\",func=\"main\",file=\"main\.cpp\",fullname=\".+?main\.cpp\",line=\"\d+\"\}") - -if __name__ == '__main__': - unittest2.main() diff --git a/lldb/test/tools/lldb-mi/startup_options/TestMiStartupOptions.py b/lldb/test/tools/lldb-mi/startup_options/TestMiStartupOptions.py index fc732bd1940..8f341197387 100644 --- a/lldb/test/tools/lldb-mi/startup_options/TestMiStartupOptions.py +++ b/lldb/test/tools/lldb-mi/startup_options/TestMiStartupOptions.py @@ -2,9 +2,10 @@ Test lldb-mi startup options. """ +import lldb_shared + import lldbmi_testcase from lldbtest import * -import unittest2 class MiStartupOptionsTestCase(lldbmi_testcase.MiTestCaseBase): @@ -295,6 +296,3 @@ class MiStartupOptionsTestCase(lldbmi_testcase.MiTestCaseBase): # Delete log for f in logFile: os.remove(f) - -if __name__ == '__main__': - unittest2.main() diff --git a/lldb/test/tools/lldb-mi/symbol/TestMiSymbol.py b/lldb/test/tools/lldb-mi/symbol/TestMiSymbol.py index 6bfba63ca02..aec5ef13860 100644 --- a/lldb/test/tools/lldb-mi/symbol/TestMiSymbol.py +++ b/lldb/test/tools/lldb-mi/symbol/TestMiSymbol.py @@ -2,9 +2,10 @@ Test lldb-mi -symbol-xxx commands. """ +import lldb_shared + import lldbmi_testcase from lldbtest import * -import unittest2 class MiSymbolTestCase(lldbmi_testcase.MiTestCaseBase): @@ -69,6 +70,3 @@ class MiSymbolTestCase(lldbmi_testcase.MiTestCaseBase): # Test that -symbol-list-lines fails when file doesn't exist self.runCmd("-symbol-list-lines unknown_dir/main.cpp") self.expect("\^error,message=\"warning: No source filenames matched 'unknown_dir/main\.cpp'\. error: no source filenames matched any command arguments \"") - -if __name__ == '__main__': - unittest2.main() diff --git a/lldb/test/tools/lldb-mi/syntax/TestMiSyntax.py b/lldb/test/tools/lldb-mi/syntax/TestMiSyntax.py index ffcf3fe05e2..96ff1076c2f 100644 --- a/lldb/test/tools/lldb-mi/syntax/TestMiSyntax.py +++ b/lldb/test/tools/lldb-mi/syntax/TestMiSyntax.py @@ -2,9 +2,10 @@ Test that the lldb-mi driver understands MI command syntax. """ +import lldb_shared + import lldbmi_testcase from lldbtest import * -import unittest2 class MiSyntaxTestCase(lldbmi_testcase.MiTestCaseBase): @@ -78,6 +79,3 @@ class MiSyntaxTestCase(lldbmi_testcase.MiTestCaseBase): # Test that a process output is wrapped correctly self.expect("\@\"'\\\\r\\\\n\"") self.expect("\@\"` - it's \\\\\\\\n\\\\x12\\\\\"\\\\\\\\\\\\\"") - -if __name__ == '__main__': - unittest2.main() diff --git a/lldb/test/tools/lldb-mi/target/TestMiTarget.py b/lldb/test/tools/lldb-mi/target/TestMiTarget.py index a6bff66ddaa..0166c8d674a 100644 --- a/lldb/test/tools/lldb-mi/target/TestMiTarget.py +++ b/lldb/test/tools/lldb-mi/target/TestMiTarget.py @@ -2,9 +2,10 @@ Test lldb-mi -target-xxx commands. """ +import lldb_shared + import lldbmi_testcase from lldbtest import * -import unittest2 class MiTargetTestCase(lldbmi_testcase.MiTestCaseBase): diff --git a/lldb/test/tools/lldb-mi/variable/TestMiGdbSetShowPrint.py b/lldb/test/tools/lldb-mi/variable/TestMiGdbSetShowPrint.py index 93f6ed009ef..177ddae8c73 100644 --- a/lldb/test/tools/lldb-mi/variable/TestMiGdbSetShowPrint.py +++ b/lldb/test/tools/lldb-mi/variable/TestMiGdbSetShowPrint.py @@ -3,9 +3,10 @@ Test lldb-mi -gdb-set and -gdb-show commands for 'print option-name'. """ +import lldb_shared + import lldbmi_testcase from lldbtest import * -import unittest2 class MiGdbSetShowTestCase(lldbmi_testcase.MiTestCaseBase): @@ -225,6 +226,3 @@ class MiGdbSetShowTestCase(lldbmi_testcase.MiTestCaseBase): # Test that -gdb-set print aggregate-field-names fails when option is unknown self.runCmd("-gdb-set print aggregate-field-names unknown") self.expect("\^error,msg=\"The request ''print' expects option-name and \"on\" or \"off\"' failed.\"") - -if __name__ == '__main__': - unittest2.main() diff --git a/lldb/test/tools/lldb-mi/variable/TestMiVar.py b/lldb/test/tools/lldb-mi/variable/TestMiVar.py index 8d464fc4413..d1d3bdc9a77 100644 --- a/lldb/test/tools/lldb-mi/variable/TestMiVar.py +++ b/lldb/test/tools/lldb-mi/variable/TestMiVar.py @@ -2,9 +2,10 @@ Test lldb-mi -var-xxx commands. """ +import lldb_shared + import lldbmi_testcase from lldbtest import * -import unittest2 class MiVarTestCase(lldbmi_testcase.MiTestCaseBase): @@ -353,6 +354,3 @@ class MiVarTestCase(lldbmi_testcase.MiTestCaseBase): # Test for std::string self.runCmd("-var-create - * std_string") self.expect('\^done,name="var\d+",numchild="[0-9]+",value="\\\\"hello\\\\"",type="std::[\S]*?string",thread-id="1",has_more="0"') - -if __name__ == '__main__': - unittest2.main() 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() |
