Skip to content

Remove obsolete manual test runner logic. (NFC) #1335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 15, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions lldb/test/API/lang/swift/address_of/TestSwiftAddressOf.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,3 @@ def test_any_type(self):
# the inout type appears as direct.
self.check_variable("in_struct", False, 12345)



if __name__ == '__main__':
import atexit
lldb.SBDebugger.Initialize()
atexit.register(lldb.SBDebugger.Terminate)
unittest2.main()
6 changes: 0 additions & 6 deletions lldb/test/API/lang/swift/any/TestSwiftAnyType.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,3 @@ def test_any_type(self):

self.expect("expression -d run -- q", substrs=['12'])
self.expect("frame variable -d run -- q", substrs=['12'])

if __name__ == '__main__':
import atexit
lldb.SBDebugger.Initialize()
atexit.register(lldb.SBDebugger.Terminate)
unittest2.main()
6 changes: 0 additions & 6 deletions lldb/test/API/lang/swift/any_object/TestSwiftAnyObjectType.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,3 @@ def test_any_object_type(self):
use_dynamic=False,
value='12',
typename="Swift.Int")

if __name__ == '__main__':
import atexit
lldb.SBDebugger.Initialize()
atexit.register(lldb.SBDebugger.Terminate)
unittest2.main()
Original file line number Diff line number Diff line change
Expand Up @@ -120,9 +120,3 @@ def test_swift_archetype_resolution(self):
self.assertTrue(var_x.GetValue() == 'A', "GE case fails")
if self.TraceOn():
self.runCmd("frame variable -d run")

if __name__ == '__main__':
import atexit
lldb.SBDebugger.Initialize()
atexit.register(lldb.SBDebugger.Terminate)
unittest2.main()
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,3 @@ def test_swift_associated_type_resolution(self):
(i, var.GetError().GetCString()))
value = child.GetValueAsUnsigned()
self.assertEqual(value, i, "Wrong value: %d not %d."%(value, i))

if __name__ == '__main__':
import atexit
lldb.SBDebugger.Initialize()
atexit.register(lldb.SBDebugger.Terminate)
unittest2.main()
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,3 @@ def test_simple(self):
# FIXME: This doesn't work.
#self.expect("fr v generic", substrs=['-1'])

if __name__ == '__main__':
import atexit
lldb.SBDebugger.Initialize()
atexit.register(lldb.SBDebugger.Terminate)
unittest2.main()
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,3 @@ def break_commands(self):
self.runCmd("continue", RUN_SUCCEEDED)

self.expect("frame select 0", substrs=['Accumulator', 'incr'])

if __name__ == '__main__':
import atexit
lldb.SBDebugger.Initialize()
atexit.register(lldb.SBDebugger.Terminate)
unittest2.main()
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,3 @@ def do_test(self):
'arg1=12', 'arg2="Hello world"'])
self.expect("breakpoint set -p other", substrs=['g<U, T>'])

if __name__ == '__main__':
import atexit
lldb.SBDebugger.Initialize()
atexit.register(lldb.SBDebugger.Terminate)
unittest2.main()
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,3 @@ def test(self):
substrs=['(dylib.C<a.Wrapper>.Something)', "hello"])
self.assertTrue(os.path.isdir(mod_cache), "module cache exists")


if __name__ == '__main__':
import atexit
lldb.SBDebugger.Initialize()
atexit.register(lldb.SBDebugger.Terminate)
unittest2.main()
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,3 @@ def testSwiftDebugMacros(self):
self.assertTrue(space == 1)
self.assertTrue(space_with_space == 0)
self.assertTrue(ndebug == 1)

if __name__ == '__main__':
import atexit
lldb.SBDebugger.Initialize()
atexit.register(lldb.SBDebugger.Terminate)
unittest2.main()
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,3 @@ def test(self):
self.assertTrue((not value.GetError().Success()) or
not value.GetSummary())
self.runCmd("settings set symbols.use-swift-dwarfimporter true")


if __name__ == '__main__':
import atexit
lldb.SBDebugger.Initialize()
atexit.register(lldb.SBDebugger.Terminate)
unittest2.main()
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,3 @@ def test(self):
self.assertTrue((not value.GetError().Success()) or
not value.GetSummary())
self.runCmd("settings set symbols.use-swift-dwarfimporter true")


if __name__ == '__main__':
import atexit
lldb.SBDebugger.Initialize()
atexit.register(lldb.SBDebugger.Terminate)
unittest2.main()
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,3 @@ def test_with_dwarfimporter(self):
self.expect("v foo", substrs=["42"])
self.assertTrue(os.path.isdir(mod_cache), "module cache exists")
lldb.SBDebugger.MemoryPressureDetected()

if __name__ == '__main__':
import atexit
lldb.SBDebugger.Initialize()
atexit.register(lldb.SBDebugger.Terminate)
unittest2.main()
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,3 @@ def test(self):
self.expect("p baz", "correct baz", substrs=["i_am_from_Foo"])
self.expect("fr var baz", "correct baz", substrs=["i_am_from_Foo"])


if __name__ == '__main__':
import atexit
lldb.SBDebugger.Initialize()
atexit.register(lldb.SBDebugger.Terminate)
unittest2.main()
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,3 @@ def test(self):
self.expect("p foo", "expected result", substrs=["23"])
self.expect("p $R6", "expected result", substrs=["23"])
self.expect("p $R8", "expected result", substrs=["23"])

if __name__ == '__main__':
import atexit
lldb.SBDebugger.Initialize()
atexit.register(lldb.SBDebugger.Terminate)
unittest2.main()
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,3 @@ def test(self):
self.expect("p $R6", "expected result", substrs=["23"])
self.expect("p $R8", "expected result", substrs=["23"])

if __name__ == '__main__':
import atexit
lldb.SBDebugger.Initialize()
atexit.register(lldb.SBDebugger.Terminate)
unittest2.main()
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,3 @@ def testSwiftRemoteASTImport(self):
substrs=['(Library.LibraryProtocol) $R0'])
self.expect("expr -d run-target -- input",
substrs=['(a.FromMainModule) $R2'])

if __name__ == '__main__':
import atexit
lldb.SBDebugger.Initialize()
atexit.register(lldb.SBDebugger.Terminate)
unittest2.main()
Original file line number Diff line number Diff line change
Expand Up @@ -130,9 +130,3 @@ def dotest(self, remap):
self.assertEqual(found_ovl, 2)
else:
self.assertTrue(errs > 0, "expected module import error")

if __name__ == '__main__':
import atexit
lldb.SBDebugger.Initialize()
atexit.register(lldb.SBDebugger.Terminate)
unittest2.main()
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
import lldbsuite.test.lldbutil as lldbutil
import os
import unittest2
import shutil

class TestSwiftStaticArchiveTwoSwiftmodules(TestBase):

Expand Down Expand Up @@ -56,9 +55,3 @@ def test(self):
process.Continue()
self.expect("fr var bar", "expected result", substrs=["42"])
self.expect("p bar", "expected result", substrs=["j", "42"])

if __name__ == '__main__':
import atexit
lldb.SBDebugger.Initialize()
atexit.register(lldb.SBDebugger.Terminate)
unittest2.main()
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,3 @@ def break_commands(self):

self.check_x_and_y(threads[0].frames[0], '3', '1')

if __name__ == '__main__':
import atexit
lldb.SBDebugger.Initialize()
atexit.register(lldb.SBDebugger.Terminate)
unittest2.main()
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,3 @@ def test_cross_module_extension(self):
lldbutil.check_variable(self, var, False, typename="moda.S.A")
lldbutil.check_variable(self, child_v, False, value="3")

if __name__ == '__main__':
import atexit
lldb.SBDebugger.Initialize()
atexit.register(lldb.SBDebugger.Terminate)
unittest2.main()
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,3 @@ def test_swift_different_clang_flags(self):
var = self.frame().EvaluateExpression("fA()")
lldbutil.check_variable(self, var, False, value="2")

if __name__ == '__main__':
import atexit
lldb.SBDebugger.Initialize()
atexit.register(lldb.SBDebugger.Terminate)
unittest2.main()
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,3 @@ def test_dwarf_importer(self):
process.Clear()
target.Clear()
lldb.SBDebugger.MemoryPressureDetected()

if __name__ == '__main__':
import atexit
lldb.SBDebugger.Initialize()
atexit.register(lldb.SBDebugger.Terminate)
unittest2.main()
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,3 @@ def dynamic_val_commands(self):
".Base = {",
"v = 449493530",
"q = 3735928559"])

if __name__ == '__main__':
import atexit
lldb.SBDebugger.Initialize()
atexit.register(lldb.SBDebugger.Terminate)
unittest2.main()
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,3 @@ def test_swift_expression_access_control(self):
self, 'Set breakpoint here', lldb.SBFileSpec('main.swift'))
self.check_expression("foo.m_a", "3", use_summary=False)

if __name__ == '__main__':
import atexit
lldb.SBDebugger.Initialize()
atexit.register(lldb.SBDebugger.Terminate)
unittest2.main()
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,3 @@ def test_swift_expressions_from_objc(self):
self.check_expression("m_ivar", "10", use_summary=False)
self.check_expression("self.m_ivar == 11", "false")

if __name__ == '__main__':
import atexit
lldb.SBDebugger.Initialize()
atexit.register(lldb.SBDebugger.Terminate)
unittest2.main()
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,3 @@ def test_expressions_in_methods(self):
self.check_expression("m_ivar", "10", use_summary=False)
self.check_expression("self.m_ivar == 11", "false")

if __name__ == '__main__':
import atexit
lldb.SBDebugger.Initialize()
atexit.register(lldb.SBDebugger.Terminate)
unittest2.main()
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,3 @@ def do_test(self, bkpt_name, compare_value, counter_value):
value.GetSummary() == "false",
"1 == 2 didn't return false.")

if __name__ == '__main__':
import atexit
lldb.SBDebugger.Initialize()
atexit.register(lldb.SBDebugger.Terminate)
unittest2.main()
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,3 @@ def do_test(self):
"Expected 'Over 100', got %s" %
(message.GetSummary()))

if __name__ == '__main__':
import atexit
lldb.SBDebugger.Initialize()
atexit.register(lldb.SBDebugger.Terminate)
unittest2.main()
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,3 @@ def check_expression(self, frame, expression, expected_result, use_summary=True)
self.assertTrue(answer == expected_result, report_str)


if __name__ == '__main__':
import atexit
lldb.SBDebugger.Initialize()
atexit.register(lldb.SBDebugger.Terminate)
unittest2.main()
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,3 @@ def do_ivar_test(self):

self.runCmd("continue")

if __name__ == '__main__':
import atexit
lldb.SBDebugger.Initialize()
atexit.register(lldb.SBDebugger.Terminate)
unittest2.main()
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,3 @@ def test_swift_no_process(self):
"Swift expressions with no process should fail.")


if __name__ == '__main__':
import atexit
lldb.SBDebugger.Initialize()
atexit.register(lldb.SBDebugger.Terminate)
unittest2.main()
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,3 @@ def test_simple_overload_expressions(self):
self.check_expression('$overload(10)', '1', False)
self.check_expression('$overload("some string")', '2', False)

if __name__ == '__main__':
import atexit
lldb.SBDebugger.Initialize()
atexit.register(lldb.SBDebugger.Terminate)
unittest2.main()
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,3 @@ def test_protocol_extension(self):
self.check_expression("local_var", "222", False)


if __name__ == '__main__':
import atexit
lldb.SBDebugger.Initialize()
atexit.register(lldb.SBDebugger.Terminate)
unittest2.main()
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,3 @@ def do_test(self):
self.check_expression("a", "\"foo\"", use_summary=True)
self.check_expression("self.b", "5", use_summary=False)

if __name__ == '__main__':
import atexit
lldb.SBDebugger.Initialize()
atexit.register(lldb.SBDebugger.Terminate)
unittest2.main()
Original file line number Diff line number Diff line change
Expand Up @@ -182,8 +182,3 @@ def test_simple_swift_expressions(self):
self.check_expression(
"var enum_six : SomeValues = SomeValues.Six; return enum_six == .Six", "true")

if __name__ == '__main__':
import atexit
lldb.SBDebugger.Initialize()
atexit.register(lldb.SBDebugger.Terminate)
unittest2.main()
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,3 @@ def test_expressions_in_class_functions(self):
self.check_expression("self", "a.H<Int>")
self.runCmd("continue")

if __name__ == '__main__':
import atexit
lldb.SBDebugger.Initialize()
atexit.register(lldb.SBDebugger.Terminate)
unittest2.main()
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,3 @@ def test_swift_submodule_import(self):
"The import was not successful: %s" %
(value.GetError().GetCString()))

if __name__ == '__main__':
import atexit
lldb.SBDebugger.Initialize()
atexit.register(lambda: lldb.SBDebugger.Terminate())
unittest2.main()
5 changes: 0 additions & 5 deletions lldb/test/API/lang/swift/file_private/TestFilePrivate.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,3 @@ def test(self):
self.check_expression("privateVariable as Int", "3", False)
self.check_expression("privateVariable as String", "\"five\"")

if __name__ == '__main__':
import atexit
lldb.SBDebugger.Initialize()
atexit.register(lambda: lldb.SBDebugger.Terminate())
unittest2.main()
6 changes: 0 additions & 6 deletions lldb/test/API/lang/swift/fixits/TestSwiftFixIts.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,3 @@ def do_test(self):
self.assertTrue(tmp_value.GetError().Success())
self.assertTrue(tmp_value.GetSummary() == 'true')


if __name__ == '__main__':
import atexit
lldb.SBDebugger.Initialize()
atexit.register(lldb.SBDebugger.Terminate)
unittest2.main()
Loading