https://github.com/Teemperor created https://github.com/llvm/llvm-project/pull/208402
This removes the various `types/` tests in LLDB. These tests suffer from various problems: * They are slow. Their current runtime is nearly 90s on my new machine, which is a lot for tests that only print a few integers/float vars. * Their scope is very vague. E.g., `TestCharType` doesn't just test char types, but also tests capturing them in block functions. Also while most tests are related to basic types, some also test edge cases of struct types and other things that belong into their own test folder. * They are very overengineered. Tests should be stupid and not have whole dedicated output-capturing-and-parsing system. * They don't really test anything. There are no edge cases or problematic values tested. The tests will were replaced by the following previous commits: [TODO] >From 589d961803a8c23474c67967a46e450a54868ae8 Mon Sep 17 00:00:00 2001 From: Raphael Isemann <[email protected]> Date: Thu, 9 Jul 2026 09:24:56 +0100 Subject: [PATCH] [lldb][test] Delete 'types' test This removes the various `types/` tests in LLDB. These tests suffer from various problems: * They are slow. Their current runtime is nearly 90s on my new machine, which is a lot for tests that only print a few integers/float vars. * Their scope is very vague. E.g., `TestCharType` doesn't just test char types, but also tests capturing them in block functions. Also while most tests are related to basic types, some also test edge cases of struct types and other things that belong into their own test folder. * They are very overengineered. Tests should be stupid and not have whole dedicated output-capturing-and-parsing system. * They don't really test anything. There are no edge cases or problematic values tested. The tests will were replaced by the following previous commits: [TODO] --- lldb/test/API/types/AbstractBase.py | 303 -------------------- lldb/test/API/types/HideTestFailures.py | 78 ----- lldb/test/API/types/Makefile | 5 - lldb/test/API/types/TestCharType.py | 27 -- lldb/test/API/types/TestCharTypeExpr.py | 29 -- lldb/test/API/types/TestDoubleTypes.py | 22 -- lldb/test/API/types/TestDoubleTypesExpr.py | 26 -- lldb/test/API/types/TestFloatTypes.py | 22 -- lldb/test/API/types/TestFloatTypesExpr.py | 26 -- lldb/test/API/types/TestIntegerType.py | 27 -- lldb/test/API/types/TestIntegerTypeExpr.py | 32 --- lldb/test/API/types/TestLongTypes.py | 45 --- lldb/test/API/types/TestLongTypesExpr.py | 47 --- lldb/test/API/types/TestRecursiveTypes.py | 49 ---- lldb/test/API/types/TestShortType.py | 27 -- lldb/test/API/types/TestShortTypeExpr.py | 27 -- lldb/test/API/types/basic_type.cpp | 225 --------------- lldb/test/API/types/char.cpp | 9 - lldb/test/API/types/double.cpp | 9 - lldb/test/API/types/float.cpp | 9 - lldb/test/API/types/int.cpp | 9 - lldb/test/API/types/long.cpp | 18 -- lldb/test/API/types/long_long.cpp | 18 -- lldb/test/API/types/recursive_type_1.cpp | 12 - lldb/test/API/types/recursive_type_2.cpp | 10 - lldb/test/API/types/recursive_type_main.cpp | 8 - lldb/test/API/types/short.cpp | 9 - lldb/test/API/types/unsigned_char.cpp | 9 - lldb/test/API/types/unsigned_int.cpp | 9 - lldb/test/API/types/unsigned_long.cpp | 18 -- lldb/test/API/types/unsigned_long_long.cpp | 18 -- lldb/test/API/types/unsigned_short.cpp | 9 - 32 files changed, 1191 deletions(-) delete mode 100644 lldb/test/API/types/AbstractBase.py delete mode 100644 lldb/test/API/types/HideTestFailures.py delete mode 100644 lldb/test/API/types/Makefile delete mode 100644 lldb/test/API/types/TestCharType.py delete mode 100644 lldb/test/API/types/TestCharTypeExpr.py delete mode 100644 lldb/test/API/types/TestDoubleTypes.py delete mode 100644 lldb/test/API/types/TestDoubleTypesExpr.py delete mode 100644 lldb/test/API/types/TestFloatTypes.py delete mode 100644 lldb/test/API/types/TestFloatTypesExpr.py delete mode 100644 lldb/test/API/types/TestIntegerType.py delete mode 100644 lldb/test/API/types/TestIntegerTypeExpr.py delete mode 100644 lldb/test/API/types/TestLongTypes.py delete mode 100644 lldb/test/API/types/TestLongTypesExpr.py delete mode 100644 lldb/test/API/types/TestRecursiveTypes.py delete mode 100644 lldb/test/API/types/TestShortType.py delete mode 100644 lldb/test/API/types/TestShortTypeExpr.py delete mode 100644 lldb/test/API/types/basic_type.cpp delete mode 100644 lldb/test/API/types/char.cpp delete mode 100644 lldb/test/API/types/double.cpp delete mode 100644 lldb/test/API/types/float.cpp delete mode 100644 lldb/test/API/types/int.cpp delete mode 100644 lldb/test/API/types/long.cpp delete mode 100644 lldb/test/API/types/long_long.cpp delete mode 100644 lldb/test/API/types/recursive_type_1.cpp delete mode 100644 lldb/test/API/types/recursive_type_2.cpp delete mode 100644 lldb/test/API/types/recursive_type_main.cpp delete mode 100644 lldb/test/API/types/short.cpp delete mode 100644 lldb/test/API/types/unsigned_char.cpp delete mode 100644 lldb/test/API/types/unsigned_int.cpp delete mode 100644 lldb/test/API/types/unsigned_long.cpp delete mode 100644 lldb/test/API/types/unsigned_long_long.cpp delete mode 100644 lldb/test/API/types/unsigned_short.cpp diff --git a/lldb/test/API/types/AbstractBase.py b/lldb/test/API/types/AbstractBase.py deleted file mode 100644 index 0420ffd8f3bbb..0000000000000 --- a/lldb/test/API/types/AbstractBase.py +++ /dev/null @@ -1,303 +0,0 @@ -""" -Abstract base class of basic types provides a generic type tester method. -""" - -import os -import re -import lldb -from lldbsuite.test.lldbtest import * -import lldbsuite.test.lldbutil as lldbutil - - -def Msg(var, val, using_frame_variable): - return "'%s %s' matches the output (from compiled code): %s" % ( - "frame variable --show-types" if using_frame_variable else "expression", - var, - val, - ) - - -class GenericTester(TestBase): - # This is the pattern by design to match the " var = 'value'" output from - # printf() stmts (see basic_type.cpp). - pattern = re.compile(r" (\*?a[^=]*) = '([^=]*)'$") - - SHARED_BUILD_TESTCASE = False - - # Assert message. - DATA_TYPE_GROKKED = "Data type from expr parser output is parsed correctly" - - def setUp(self): - # Call super's setUp(). - TestBase.setUp(self) - # We'll use the test method name as the exe_name. - # There are a bunch of test cases under test/types and we don't want the - # module cacheing subsystem to be confused with executable name "a.out" - # used for all the test cases. - self.exe_name = self.testMethodName - golden = "{}-golden-output.txt".format(self.testMethodName) - self.golden_filename = self.getBuildArtifact(golden) - - def tearDown(self): - """Cleanup the test byproducts.""" - if os.path.exists(self.golden_filename): - os.remove(self.golden_filename) - TestBase.tearDown(self) - - # ==========================================================================# - # Functions build_and_run() and build_and_run_expr() are generic functions # - # which are called from the Test*Types*.py test cases. The API client is # - # responsible for supplying two mandatory arguments: the source file, e.g.,# - # 'int.cpp', and the atoms, e.g., set(['unsigned', 'long long']) to the # - # functions. There are also three optional keyword arguments of interest, # - # as follows: # - # # - # bc -> blockCaptured (defaulted to False) # - # True: testing vars of various basic types from inside a block # - # False: testing vars of various basic types from a function # - # qd -> quotedDisplay (defaulted to False) # - # True: the output from 'frame var' or 'expr var' contains a pair # - # of single quotes around the value # - # False: no single quotes are to be found around the value of # - # variable # - # ==========================================================================# - - def build_and_run(self, source, atoms, bc=False, qd=False): - self.build_and_run_with_source_atoms_expr( - source, atoms, expr=False, bc=bc, qd=qd - ) - - def build_and_run_expr(self, source, atoms, bc=False, qd=False): - self.build_and_run_with_source_atoms_expr( - source, atoms, expr=True, bc=bc, qd=qd - ) - - def build_and_run_with_source_atoms_expr( - self, source, atoms, expr, bc=False, qd=False - ): - # See also Makefile and basic_type.cpp:177. - if bc: - d = { - "CXX_SOURCES": source, - "EXE": self.exe_name, - "CFLAGS_EXTRAS": "-DTEST_BLOCK_CAPTURED_VARS", - } - else: - d = {"CXX_SOURCES": source, "EXE": self.exe_name} - self.build(dictionary=d) - self.setTearDownCleanup(dictionary=d) - if expr: - self.generic_type_expr_tester( - self.exe_name, atoms, blockCaptured=bc, quotedDisplay=qd - ) - else: - self.generic_type_tester( - self.exe_name, atoms, blockCaptured=bc, quotedDisplay=qd - ) - - def process_launch_o(self): - # process launch command output redirect always goes to host the - # process is running on - if lldb.remote_platform: - # process launch -o requires a path that is valid on the target - self.assertIsNotNone(lldb.remote_platform.GetWorkingDirectory()) - remote_path = lldbutil.append_to_process_working_directory( - self, "lldb-stdout-redirect.txt" - ) - self.runCmd("process launch -- {remote}".format(remote=remote_path)) - # copy remote_path to local host - self.runCmd( - 'platform get-file {remote} "{local}"'.format( - remote=remote_path, local=self.golden_filename - ) - ) - else: - self.runCmd( - 'process launch -o "{local}"'.format(local=self.golden_filename) - ) - - def get_golden_list(self, blockCaptured=False): - with open(self.golden_filename, "r") as f: - go = f.read() - - golden_list = [] - # Scan the golden output line by line, looking for the pattern: - # - # variable = 'value' - # - for line in go.split(os.linesep): - # We'll ignore variables of array types from inside a block. - if blockCaptured and "[" in line: - continue - match = self.pattern.search(line) - if match: - var, val = match.group(1), match.group(2) - golden_list.append((var, val)) - return golden_list - - def generic_type_tester( - self, exe_name, atoms, quotedDisplay=False, blockCaptured=False - ): - """Test that variables with basic types are displayed correctly.""" - self.runCmd("file %s" % self.getBuildArtifact(exe_name), CURRENT_EXECUTABLE_SET) - - # First, capture the golden output emitted by the oracle, i.e., the - # series of printf statements. - self.process_launch_o() - - # This golden list contains a list of (variable, value) pairs extracted - # from the golden output. - gl = self.get_golden_list(blockCaptured) - - # This test uses a #include of "basic_type.cpp" so we need to enable - # always setting inlined breakpoints. - self.runCmd("settings set target.inline-breakpoint-strategy always") - - # Inherit TCC permissions. We can leave this set. - self.runCmd("settings set target.inherit-tcc true") - - # Kill rather than detach from the inferior if something goes wrong. - self.runCmd("settings set target.detach-on-error false") - - # And add hooks to restore the settings during tearDown(). - self.addTearDownHook( - lambda: self.runCmd( - "settings set target.inline-breakpoint-strategy headers" - ) - ) - - # Bring the program to the point where we can issue a series of - # 'frame variable --show-types' command. - if blockCaptured: - break_line = line_number( - "basic_type.cpp", "// Break here to test block captured variables." - ) - else: - break_line = line_number( - "basic_type.cpp", - "// Here is the line we will break on to check variables.", - ) - lldbutil.run_break_set_by_file_and_line( - self, "basic_type.cpp", break_line, num_expected_locations=1, loc_exact=True - ) - - self.runCmd("run", RUN_SUCCEEDED) - self.expect( - "process status", - STOPPED_DUE_TO_BREAKPOINT, - substrs=[ - "stop reason = breakpoint", - " at basic_type.cpp:%d" % break_line, - ], - ) - - # self.runCmd("frame variable --show-types") - - # Now iterate through the golden list, comparing against the output from - # 'frame variable --show-types var'. - for var, val in gl: - self.runCmd("frame variable --show-types %s" % var) - output = self.res.GetOutput() - - # The input type is in a canonical form as a set of named atoms. - # The display type string must contain each and every element. - # - # Example: - # runCmd: frame variable --show-types a_array_bounded[0] - # output: (char) a_array_bounded[0] = 'a' - # - try: - dt = re.match(r"^\((.*)\)", output).group(1) - except: - self.fail(self.DATA_TYPE_GROKKED) - - # Expect the display type string to contain each and every atoms. - self.expect( - dt, - "Display type: '%s' must contain the type atoms: '%s'" % (dt, atoms), - exe=False, - substrs=list(atoms), - ) - - # The (var, val) pair must match, too. - nv = ("%s = '%s'" if quotedDisplay else "%s = %s") % (var, val) - self.expect(output, Msg(var, val, True), exe=False, substrs=[nv]) - - def generic_type_expr_tester( - self, exe_name, atoms, quotedDisplay=False, blockCaptured=False - ): - """Test that variable expressions with basic types are evaluated correctly.""" - - self.runCmd("file %s" % self.getBuildArtifact(exe_name), CURRENT_EXECUTABLE_SET) - - # First, capture the golden output emitted by the oracle, i.e., the - # series of printf statements. - self.process_launch_o() - - # This golden list contains a list of (variable, value) pairs extracted - # from the golden output. - gl = self.get_golden_list(blockCaptured) - - # This test uses a #include of "basic_type.cpp" so we need to enable - # always setting inlined breakpoints. - self.runCmd("settings set target.inline-breakpoint-strategy always") - # And add hooks to restore the settings during tearDown(). - self.addTearDownHook( - lambda: self.runCmd( - "settings set target.inline-breakpoint-strategy headers" - ) - ) - - # Bring the program to the point where we can issue a series of - # 'expr' command. - if blockCaptured: - break_line = line_number( - "basic_type.cpp", "// Break here to test block captured variables." - ) - else: - break_line = line_number( - "basic_type.cpp", - "// Here is the line we will break on to check variables.", - ) - lldbutil.run_break_set_by_file_and_line( - self, "basic_type.cpp", break_line, num_expected_locations=1, loc_exact=True - ) - - self.runCmd("run", RUN_SUCCEEDED) - self.expect( - "process status", - STOPPED_DUE_TO_BREAKPOINT, - substrs=["stop reason = breakpoint", " at basic_type.cpp:%d" % break_line], - ) - - # self.runCmd("frame variable --show-types") - - # Now iterate through the golden list, comparing against the output from - # 'expr var'. - for var, val in gl: - self.runCmd("expression %s" % var) - output = self.res.GetOutput() - - # The input type is in a canonical form as a set of named atoms. - # The display type string must contain each and every element. - # - # Example: - # runCmd: expr a - # output: (double) $0 = 1100.12 - # - try: - dt = re.match(r"^\((.*)\) \$[0-9]+ = ", output).group(1) - except: - self.fail(self.DATA_TYPE_GROKKED) - - # Expect the display type string to contain each and every atoms. - self.expect( - dt, - "Display type: '%s' must contain the type atoms: '%s'" % (dt, atoms), - exe=False, - substrs=list(atoms), - ) - - # The val part must match, too. - valPart = ("'%s'" if quotedDisplay else "%s") % val - self.expect(output, Msg(var, val, False), exe=False, substrs=[valPart]) diff --git a/lldb/test/API/types/HideTestFailures.py b/lldb/test/API/types/HideTestFailures.py deleted file mode 100644 index 3118617d7e041..0000000000000 --- a/lldb/test/API/types/HideTestFailures.py +++ /dev/null @@ -1,78 +0,0 @@ -""" -Test that variables of integer basic types are displayed correctly. -""" - - -import AbstractBase -import lldb -from lldbsuite.test.lldbtest import * - -# rdar://problem/9649573 -# Capture the lldb and gdb-remote log files for test failures when run -# with no "-w" option - - -class DebugIntegerTypesFailures(TestBase): - SHARED_BUILD_TESTCASE = False - - def setUp(self): - # Call super's setUp(). - TestBase.setUp(self) - # If we're lucky, test_long_type_with_dsym fails. - # Let's turn on logging just for that. - try: - if "test_long_type_with_dsym" in self.id(): - self.runCmd( - "log enable -n -f %s lldb commands event process state" - % os.environ["DEBUG_LLDB_LOG"] - ) - self.runCmd( - "log enable -n -f %s gdb-remote packets process" - % os.environ["DEBUG_GDB_REMOTE_LOG"] - ) - except: - pass - - def tearDown(self): - # If we're lucky, test_long_type_with_dsym fails. - # Let's turn off logging just for that. - if "test_long_type_with_dsym" in self.id(): - self.runCmd("log disable lldb") - self.runCmd("log disable gdb-remote") - # Call super's tearDown(). - TestBase.tearDown(self) - - def test_char_type(self): - """Test that char-type variables are displayed correctly.""" - d = {"CXX_SOURCES": "char.cpp"} - self.build(dictionary=d) - self.setTearDownCleanup(dictionary=d) - self.generic_type_tester(set(["char"]), quotedDisplay=True) - - def test_short_type(self): - """Test that short-type variables are displayed correctly.""" - d = {"CXX_SOURCES": "short.cpp"} - self.build(dictionary=d) - self.setTearDownCleanup(dictionary=d) - self.generic_type_tester(set(["short"])) - - def test_int_type(self): - """Test that int-type variables are displayed correctly.""" - d = {"CXX_SOURCES": "int.cpp"} - self.build(dictionary=d) - self.setTearDownCleanup(dictionary=d) - self.generic_type_tester(set(["int"])) - - def test_long_type(self): - """Test that long-type variables are displayed correctly.""" - d = {"CXX_SOURCES": "long.cpp"} - self.build(dictionary=d) - self.setTearDownCleanup(dictionary=d) - self.generic_type_tester(set(["long"])) - - def test_long_long_type(self): - """Test that 'long long'-type variables are displayed correctly.""" - d = {"CXX_SOURCES": "long_long.cpp"} - self.build(dictionary=d) - self.setTearDownCleanup(dictionary=d) - self.generic_type_tester(set(["long long"])) diff --git a/lldb/test/API/types/Makefile b/lldb/test/API/types/Makefile deleted file mode 100644 index d48ed7688a47e..0000000000000 --- a/lldb/test/API/types/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -# Example: -# -# CXX_SOURCES := int.cpp - -include Makefile.rules diff --git a/lldb/test/API/types/TestCharType.py b/lldb/test/API/types/TestCharType.py deleted file mode 100644 index 049d40e5535bf..0000000000000 --- a/lldb/test/API/types/TestCharType.py +++ /dev/null @@ -1,27 +0,0 @@ -""" -Test that variables of type char are displayed correctly. -""" - -import AbstractBase - -from lldbsuite.test.decorators import * - - -class CharTypeTestCase(AbstractBase.GenericTester): - def test_char_type(self): - """Test that char-type variables are displayed correctly.""" - self.build_and_run("char.cpp", ["char"], qd=True) - - @skipUnlessDarwin - def test_char_type_from_block(self): - """Test that char-type variables are displayed correctly from a block.""" - self.build_and_run("char.cpp", ["char"], bc=True, qd=True) - - def test_unsigned_char_type(self): - """Test that 'unsigned_char'-type variables are displayed correctly.""" - self.build_and_run("unsigned_char.cpp", ["unsigned", "char"], qd=True) - - @skipUnlessDarwin - def test_unsigned_char_type_from_block(self): - """Test that 'unsigned char'-type variables are displayed correctly from a block.""" - self.build_and_run("unsigned_char.cpp", ["unsigned", "char"], bc=True, qd=True) diff --git a/lldb/test/API/types/TestCharTypeExpr.py b/lldb/test/API/types/TestCharTypeExpr.py deleted file mode 100644 index cc8b27f51b8d8..0000000000000 --- a/lldb/test/API/types/TestCharTypeExpr.py +++ /dev/null @@ -1,29 +0,0 @@ -""" -Test that variable expressions of type char are evaluated correctly. -""" - -import AbstractBase - -from lldbsuite.test.decorators import * - - -class CharTypeExprTestCase(AbstractBase.GenericTester): - def test_char_type(self): - """Test that char-type variable expressions are evaluated correctly.""" - self.build_and_run_expr("char.cpp", ["char"], qd=True) - - @skipUnlessDarwin - def test_char_type_from_block(self): - """Test that char-type variables are displayed correctly from a block.""" - self.build_and_run_expr("char.cpp", ["char"], bc=True, qd=True) - - def test_unsigned_char_type(self): - """Test that 'unsigned_char'-type variable expressions are evaluated correctly.""" - self.build_and_run_expr("unsigned_char.cpp", ["unsigned", "char"], qd=True) - - @skipUnlessDarwin - def test_unsigned_char_type_from_block(self): - """Test that 'unsigned char'-type variables are displayed correctly from a block.""" - self.build_and_run_expr( - "unsigned_char.cpp", ["unsigned", "char"], bc=True, qd=True - ) diff --git a/lldb/test/API/types/TestDoubleTypes.py b/lldb/test/API/types/TestDoubleTypes.py deleted file mode 100644 index a863612cb0ddf..0000000000000 --- a/lldb/test/API/types/TestDoubleTypes.py +++ /dev/null @@ -1,22 +0,0 @@ -""" -Test that variables of floating point types are displayed correctly. -""" - - -import AbstractBase - -import lldb -from lldbsuite.test.decorators import * -from lldbsuite.test.lldbtest import * -from lldbsuite.test import lldbutil - - -class DoubleTypesTestCase(AbstractBase.GenericTester): - def test_double_type(self): - """Test that double-type variables are displayed correctly.""" - self.build_and_run("double.cpp", set(["double"])) - - @skipUnlessDarwin - def test_double_type_from_block(self): - """Test that double-type variables are displayed correctly from a block.""" - self.build_and_run("double.cpp", set(["double"]), bc=True) diff --git a/lldb/test/API/types/TestDoubleTypesExpr.py b/lldb/test/API/types/TestDoubleTypesExpr.py deleted file mode 100644 index dd9bd68ae43ea..0000000000000 --- a/lldb/test/API/types/TestDoubleTypesExpr.py +++ /dev/null @@ -1,26 +0,0 @@ -""" -Test that variable expressions of floating point types are evaluated correctly. -""" - - -import AbstractBase - -import lldb -from lldbsuite.test.decorators import * -from lldbsuite.test.lldbtest import * -from lldbsuite.test import lldbutil - - -class DoubleTypesExprTestCase(AbstractBase.GenericTester): - # rdar://problem/8493023 - # test/types failures for Test*TypesExpr.py: element offset computed wrong - # and sign error? - - def test_double_type(self): - """Test that double-type variable expressions are evaluated correctly.""" - self.build_and_run_expr("double.cpp", set(["double"])) - - @skipUnlessDarwin - def test_double_type_from_block(self): - """Test that double-type variables are displayed correctly from a block.""" - self.build_and_run_expr("double.cpp", set(["double"]), bc=True) diff --git a/lldb/test/API/types/TestFloatTypes.py b/lldb/test/API/types/TestFloatTypes.py deleted file mode 100644 index 85f1f9d56699c..0000000000000 --- a/lldb/test/API/types/TestFloatTypes.py +++ /dev/null @@ -1,22 +0,0 @@ -""" -Test that variables of floating point types are displayed correctly. -""" - - -import AbstractBase - -import lldb -from lldbsuite.test.decorators import * -from lldbsuite.test.lldbtest import * -from lldbsuite.test import lldbutil - - -class FloatTypesTestCase(AbstractBase.GenericTester): - def test_float_type(self): - """Test that float-type variables are displayed correctly.""" - self.build_and_run("float.cpp", set(["float"])) - - @skipUnlessDarwin - def test_float_type_from_block(self): - """Test that float-type variables are displayed correctly from a block.""" - self.build_and_run("float.cpp", set(["float"]), bc=True) diff --git a/lldb/test/API/types/TestFloatTypesExpr.py b/lldb/test/API/types/TestFloatTypesExpr.py deleted file mode 100644 index 9c2ab79e70082..0000000000000 --- a/lldb/test/API/types/TestFloatTypesExpr.py +++ /dev/null @@ -1,26 +0,0 @@ -""" -Test that variable expressions of floating point types are evaluated correctly. -""" - - -import AbstractBase - -import lldb -from lldbsuite.test.decorators import * -from lldbsuite.test.lldbtest import * -from lldbsuite.test import lldbutil - - -class FloatTypesExprTestCase(AbstractBase.GenericTester): - # rdar://problem/8493023 - # test/types failures for Test*TypesExpr.py: element offset computed wrong - # and sign error? - - def test_float_type(self): - """Test that float-type variable expressions are evaluated correctly.""" - self.build_and_run_expr("float.cpp", set(["float"])) - - @skipUnlessDarwin - def test_float_type_from_block(self): - """Test that float-type variables are displayed correctly from a block.""" - self.build_and_run_expr("float.cpp", set(["float"]), bc=True) diff --git a/lldb/test/API/types/TestIntegerType.py b/lldb/test/API/types/TestIntegerType.py deleted file mode 100644 index 583bee0eb7110..0000000000000 --- a/lldb/test/API/types/TestIntegerType.py +++ /dev/null @@ -1,27 +0,0 @@ -""" -Test that variables of type integer are displayed correctly. -""" - -import AbstractBase - -from lldbsuite.test.decorators import * - - -class IntegerTypesTestCase(AbstractBase.GenericTester): - def test_int_type(self): - """Test that int-type variables are displayed correctly.""" - self.build_and_run("int.cpp", ["int"]) - - @skipUnlessDarwin - def test_int_type_from_block(self): - """Test that int-type variables are displayed correctly from a block.""" - self.build_and_run("int.cpp", ["int"]) - - def test_unsigned_int_type(self): - """Test that 'unsigned_int'-type variables are displayed correctly.""" - self.build_and_run("unsigned_int.cpp", ["unsigned", "int"]) - - @skipUnlessDarwin - def test_unsigned_int_type_from_block(self): - """Test that 'unsigned int'-type variables are displayed correctly from a block.""" - self.build_and_run("unsigned_int.cpp", ["unsigned", "int"], bc=True) diff --git a/lldb/test/API/types/TestIntegerTypeExpr.py b/lldb/test/API/types/TestIntegerTypeExpr.py deleted file mode 100644 index 77ce42541a054..0000000000000 --- a/lldb/test/API/types/TestIntegerTypeExpr.py +++ /dev/null @@ -1,32 +0,0 @@ -""" -Test that variable expressions of type integer are evaluated correctly. -""" - -import AbstractBase - -from lldbsuite.test.decorators import * - - -class IntegerTypeExprTestCase(AbstractBase.GenericTester): - @skipUnlessDarwin - def test_unsigned_short_type_from_block(self): - """Test that 'unsigned short'-type variables are displayed correctly from a block.""" - self.build_and_run_expr("unsigned_short.cpp", ["unsigned", "short"], bc=True) - - def test_int_type(self): - """Test that int-type variable expressions are evaluated correctly.""" - self.build_and_run_expr("int.cpp", ["int"]) - - @skipUnlessDarwin - def test_int_type_from_block(self): - """Test that int-type variables are displayed correctly from a block.""" - self.build_and_run_expr("int.cpp", ["int"]) - - def test_unsigned_int_type(self): - """Test that 'unsigned_int'-type variable expressions are evaluated correctly.""" - self.build_and_run_expr("unsigned_int.cpp", ["unsigned", "int"]) - - @skipUnlessDarwin - def test_unsigned_int_type_from_block(self): - """Test that 'unsigned int'-type variables are displayed correctly from a block.""" - self.build_and_run_expr("unsigned_int.cpp", ["unsigned", "int"], bc=True) diff --git a/lldb/test/API/types/TestLongTypes.py b/lldb/test/API/types/TestLongTypes.py deleted file mode 100644 index 33e748f3bd8aa..0000000000000 --- a/lldb/test/API/types/TestLongTypes.py +++ /dev/null @@ -1,45 +0,0 @@ -""" -Test that variables of integer basic types are displayed correctly. -""" - -import AbstractBase - -from lldbsuite.test.decorators import * - - -class LongTypesTestCase(AbstractBase.GenericTester): - def test_long_type(self): - """Test that long-type variables are displayed correctly.""" - self.build_and_run("long.cpp", ["long"]) - - @skipUnlessDarwin - def test_long_type_from_block(self): - """Test that long-type variables are displayed correctly from a block.""" - self.build_and_run("long.cpp", ["long"], bc=True) - - def test_unsigned_long_type(self): - """Test that 'unsigned long'-type variables are displayed correctly.""" - self.build_and_run("unsigned_long.cpp", ["unsigned", "long"]) - - @skipUnlessDarwin - def test_unsigned_long_type_from_block(self): - """Test that 'unsigned_long'-type variables are displayed correctly from a block.""" - self.build_and_run("unsigned_long.cpp", ["unsigned", "long"], bc=True) - - def test_long_long_type(self): - """Test that 'long long'-type variables are displayed correctly.""" - self.build_and_run("long_long.cpp", ["long long"]) - - @skipUnlessDarwin - def test_long_long_type_from_block(self): - """Test that 'long_long'-type variables are displayed correctly from a block.""" - self.build_and_run("long_long.cpp", ["long long"], bc=True) - - def test_unsigned_long_long_type(self): - """Test that 'unsigned long long'-type variables are displayed correctly.""" - self.build_and_run("unsigned_long_long.cpp", ["unsigned", "long long"]) - - @skipUnlessDarwin - def test_unsigned_long_long_type_from_block(self): - """Test that 'unsigned_long_long'-type variables are displayed correctly from a block.""" - self.build_and_run("unsigned_long_long.cpp", ["unsigned", "long long"], bc=True) diff --git a/lldb/test/API/types/TestLongTypesExpr.py b/lldb/test/API/types/TestLongTypesExpr.py deleted file mode 100644 index cfa538b5b226d..0000000000000 --- a/lldb/test/API/types/TestLongTypesExpr.py +++ /dev/null @@ -1,47 +0,0 @@ -""" -Test that variable expressions of integer basic types are evaluated correctly. -""" - -import AbstractBase - -from lldbsuite.test.decorators import * - - -class LongTypesExprTestCase(AbstractBase.GenericTester): - def test_long_type(self): - """Test that long-type variable expressions are evaluated correctly.""" - self.build_and_run_expr("long.cpp", ["long"]) - - @skipUnlessDarwin - def test_long_type_from_block(self): - """Test that long-type variables are displayed correctly from a block.""" - self.build_and_run_expr("long.cpp", ["long"], bc=True) - - def test_unsigned_long_type(self): - """Test that 'unsigned long'-type variable expressions are evaluated correctly.""" - self.build_and_run_expr("unsigned_long.cpp", ["unsigned", "long"]) - - @skipUnlessDarwin - def test_unsigned_long_type_from_block(self): - """Test that 'unsigned_long'-type variables are displayed correctly from a block.""" - self.build_and_run_expr("unsigned_long.cpp", ["unsigned", "long"], bc=True) - - def test_long_long_type(self): - """Test that 'long long'-type variable expressions are evaluated correctly.""" - self.build_and_run_expr("long_long.cpp", ["long long"]) - - @skipUnlessDarwin - def test_long_long_type_from_block(self): - """Test that 'long_long'-type variables are displayed correctly from a block.""" - self.build_and_run_expr("long_long.cpp", ["long long"], bc=True) - - def test_unsigned_long_long_type(self): - """Test that 'unsigned long long'-type variable expressions are evaluated correctly.""" - self.build_and_run_expr("unsigned_long_long.cpp", ["unsigned", "long long"]) - - @skipUnlessDarwin - def test_unsigned_long_long_type_from_block(self): - """Test that 'unsigned_long_long'-type variables are displayed correctly from a block.""" - self.build_and_run_expr( - "unsigned_long_long.cpp", ["unsigned", "long long"], bc=True - ) diff --git a/lldb/test/API/types/TestRecursiveTypes.py b/lldb/test/API/types/TestRecursiveTypes.py deleted file mode 100644 index 79bb008e3c923..0000000000000 --- a/lldb/test/API/types/TestRecursiveTypes.py +++ /dev/null @@ -1,49 +0,0 @@ -""" -Test that recursive types are handled correctly. -""" - -import lldb -import lldbsuite.test.lldbutil as lldbutil -from lldbsuite.test.lldbtest import * - - -class RecursiveTypesTestCase(TestBase): - SHARED_BUILD_TESTCASE = False - - def setUp(self): - # Call super's setUp(). - TestBase.setUp(self) - - # Find the line number to break for main.c. - self.line = line_number("recursive_type_main.cpp", "// Test at this line.") - - self.d1 = {"CXX_SOURCES": "recursive_type_main.cpp recursive_type_1.cpp"} - self.d2 = {"CXX_SOURCES": "recursive_type_main.cpp recursive_type_2.cpp"} - - def test_recursive_type_1(self): - """Test that recursive structs are displayed correctly.""" - self.build(dictionary=self.d1) - self.setTearDownCleanup(dictionary=self.d1) - self.print_struct() - - def test_recursive_type_2(self): - """Test that recursive structs are displayed correctly.""" - self.build(dictionary=self.d2) - self.setTearDownCleanup(dictionary=self.d2) - self.print_struct() - - def print_struct(self): - self.runCmd("file " + self.getBuildArtifact("a.out"), CURRENT_EXECUTABLE_SET) - - lldbutil.run_break_set_by_file_and_line( - self, - "recursive_type_main.cpp", - self.line, - num_expected_locations=-1, - loc_exact=True, - ) - - self.runCmd("run", RUN_SUCCEEDED) - - self.runCmd("expression tpi") - self.runCmd("expression *tpi") diff --git a/lldb/test/API/types/TestShortType.py b/lldb/test/API/types/TestShortType.py deleted file mode 100644 index 2335ecc31e047..0000000000000 --- a/lldb/test/API/types/TestShortType.py +++ /dev/null @@ -1,27 +0,0 @@ -""" -Test that variables of type short are displayed correctly. -""" - -import AbstractBase - -from lldbsuite.test.decorators import * - - -class ShortTypeTestCase(AbstractBase.GenericTester): - def test_short_type(self): - """Test that short-type variables are displayed correctly.""" - self.build_and_run("short.cpp", ["short"]) - - @skipUnlessDarwin - def test_short_type_from_block(self): - """Test that short-type variables are displayed correctly from a block.""" - self.build_and_run("short.cpp", ["short"], bc=True) - - def test_unsigned_short_type(self): - """Test that 'unsigned_short'-type variables are displayed correctly.""" - self.build_and_run("unsigned_short.cpp", ["unsigned", "short"]) - - @skipUnlessDarwin - def test_unsigned_short_type_from_block(self): - """Test that 'unsigned short'-type variables are displayed correctly from a block.""" - self.build_and_run("unsigned_short.cpp", ["unsigned", "short"], bc=True) diff --git a/lldb/test/API/types/TestShortTypeExpr.py b/lldb/test/API/types/TestShortTypeExpr.py deleted file mode 100644 index 0de2be3e58967..0000000000000 --- a/lldb/test/API/types/TestShortTypeExpr.py +++ /dev/null @@ -1,27 +0,0 @@ -""" -Test that variable expressions of type short are evaluated correctly. -""" - -import AbstractBase - -from lldbsuite.test.decorators import * - - -class ShortExprTestCase(AbstractBase.GenericTester): - def test_short_type(self): - """Test that short-type variable expressions are evaluated correctly.""" - self.build_and_run_expr("short.cpp", ["short"]) - - @skipUnlessDarwin - def test_short_type_from_block(self): - """Test that short-type variables are displayed correctly from a block.""" - self.build_and_run_expr("short.cpp", ["short"], bc=True) - - def test_unsigned_short_type(self): - """Test that 'unsigned_short'-type variable expressions are evaluated correctly.""" - self.build_and_run_expr("unsigned_short.cpp", ["unsigned", "short"]) - - @skipUnlessDarwin - def test_unsigned_short_type_from_block(self): - """Test that 'unsigned short'-type variables are displayed correctly from a block.""" - self.build_and_run_expr("unsigned_short.cpp", ["unsigned", "short"], bc=True) diff --git a/lldb/test/API/types/basic_type.cpp b/lldb/test/API/types/basic_type.cpp deleted file mode 100644 index 2d7e7b2e21bf3..0000000000000 --- a/lldb/test/API/types/basic_type.cpp +++ /dev/null @@ -1,225 +0,0 @@ -// This file must have the following defined before it is included: -// T defined to the type to test (int, float, etc) -// T_CSTR a C string representation of the type T ("int", "float") -// T_VALUE_1 defined to a valid initializer value for TEST_TYPE (7 for int, 2.0 for float) -// T_VALUE_2, T_VALUE_3, T_VALUE_4 defined to a valid initializer value for TEST_TYPE that is different from TEST_VALUE_1 -// T_PRINTF_FORMAT defined if T can be printed with printf -// -// An example for integers is below -#if 0 - -#define T int -#define T_CSTR "int" -#define T_VALUE_1 11001110 -#define T_VALUE_2 22002220 -#define T_VALUE_3 33003330 -#define T_VALUE_4 44044440 -#define T_PRINTF_FORMAT "%i" - -#include "basic_type.cpp" - -#endif - -#ifdef TEST_BLOCK_CAPTURED_VARS -#include <dispatch/dispatch.h> -#endif -#include <cstdint> -#include <cstdio> -#include <cstdlib> - -class a_class -{ -public: - a_class (const T& a, const T& b) : - m_a (a), - m_b (b) - { - } - - ~a_class () - { - } - - const T& - get_a() const - { - return m_a; - } - - void - set_a (const T& a) - { - m_a = a; - } - - const T& - get_b() const - { - return m_b; - } - - void - set_b (const T& b) - { - m_b = b; - } - -protected: - T m_a; - T m_b; -}; - -typedef struct a_struct_tag { - T a; - T b; -} a_struct_t; - - -typedef union a_union_zero_tag { - T a; - double a_double; -} a_union_zero_t; - -typedef struct a_union_nonzero_tag { - double a_double; - a_union_zero_t u; -} a_union_nonzero_t; - - -int -main (int argc, char const *argv[]) -{ - FILE *out = stdout; - - // By default, output to stdout - // If a filename is provided as the command line argument, - // output to that file. - if (argc == 2 && argv[1] && argv[1][0] != '\0') - { - out = fopen (argv[1], "w"); - } - - T a = T_VALUE_1; - T* a_ptr = &a; - T& a_ref = a; - T a_array_bounded[2] = { T_VALUE_1, T_VALUE_2 }; - T a_array_unbounded[] = { T_VALUE_1, T_VALUE_2 }; - - a_class a_class_instance (T_VALUE_1, T_VALUE_2); - a_class *a_class_ptr = &a_class_instance; - a_class &a_class_ref = a_class_instance; - - a_struct_t a_struct = { T_VALUE_1, T_VALUE_2 }; - a_struct_t *a_struct_ptr = &a_struct; - a_struct_t &a_struct_ref = a_struct; - - // Create a union with type T at offset zero - a_union_zero_t a_union_zero; - a_union_zero.a = T_VALUE_1; - a_union_zero_t *a_union_zero_ptr = &a_union_zero; - a_union_zero_t &a_union_zero_ref = a_union_zero; - - // Create a union with type T at a non-zero offset - a_union_nonzero_t a_union_nonzero; - a_union_nonzero.u.a = T_VALUE_1; - a_union_nonzero_t *a_union_nonzero_ptr = &a_union_nonzero; - a_union_nonzero_t &a_union_nonzero_ref = a_union_nonzero; - - a_struct_t a_struct_array_bounded[2] = {{ T_VALUE_1, T_VALUE_2 }, { T_VALUE_3, T_VALUE_4 }}; - a_struct_t a_struct_array_unbounded[] = {{ T_VALUE_1, T_VALUE_2 }, { T_VALUE_3, T_VALUE_4 }}; - a_union_zero_t a_union_zero_array_bounded[2]; - a_union_zero_array_bounded[0].a = T_VALUE_1; - a_union_zero_array_bounded[1].a = T_VALUE_2; - a_union_zero_t a_union_zero_array_unbounded[] = {{ T_VALUE_1 }, { T_VALUE_2 }}; - -#ifdef T_PRINTF_FORMAT - fprintf (out, "%s: a = '" T_PRINTF_FORMAT "'\n", T_CSTR, a); - fprintf (out, "%s*: %p => *a_ptr = '" T_PRINTF_FORMAT "'\n", T_CSTR, a_ptr, *a_ptr); - fprintf (out, "%s&: @%p => a_ref = '" T_PRINTF_FORMAT "'\n", T_CSTR, &a_ref, a_ref); - - fprintf (out, "%s[2]: a_array_bounded[0] = '" T_PRINTF_FORMAT "'\n", T_CSTR, a_array_bounded[0]); - fprintf (out, "%s[2]: a_array_bounded[1] = '" T_PRINTF_FORMAT "'\n", T_CSTR, a_array_bounded[1]); - - fprintf (out, "%s[]: a_array_unbounded[0] = '" T_PRINTF_FORMAT "'\n", T_CSTR, a_array_unbounded[0]); - fprintf (out, "%s[]: a_array_unbounded[1] = '" T_PRINTF_FORMAT "'\n", T_CSTR, a_array_unbounded[1]); - - fprintf (out, "(a_class) a_class_instance.m_a = '" T_PRINTF_FORMAT "'\n", a_class_instance.get_a()); - fprintf (out, "(a_class) a_class_instance.m_b = '" T_PRINTF_FORMAT "'\n", a_class_instance.get_b()); - fprintf (out, "(a_class*) a_class_ptr = %p, a_class_ptr->m_a = '" T_PRINTF_FORMAT "'\n", a_class_ptr, a_class_ptr->get_a()); - fprintf (out, "(a_class*) a_class_ptr = %p, a_class_ptr->m_b = '" T_PRINTF_FORMAT "'\n", a_class_ptr, a_class_ptr->get_b()); - fprintf (out, "(a_class&) a_class_ref = %p, a_class_ref.m_a = '" T_PRINTF_FORMAT "'\n", &a_class_ref, a_class_ref.get_a()); - fprintf (out, "(a_class&) a_class_ref = %p, a_class_ref.m_b = '" T_PRINTF_FORMAT "'\n", &a_class_ref, a_class_ref.get_b()); - - fprintf (out, "(a_struct_t) a_struct.a = '" T_PRINTF_FORMAT "'\n", a_struct.a); - fprintf (out, "(a_struct_t) a_struct.b = '" T_PRINTF_FORMAT "'\n", a_struct.b); - fprintf (out, "(a_struct_t*) a_struct_ptr = %p, a_struct_ptr->a = '" T_PRINTF_FORMAT "'\n", a_struct_ptr, a_struct_ptr->a); - fprintf (out, "(a_struct_t*) a_struct_ptr = %p, a_struct_ptr->b = '" T_PRINTF_FORMAT "'\n", a_struct_ptr, a_struct_ptr->b); - fprintf (out, "(a_struct_t&) a_struct_ref = %p, a_struct_ref.a = '" T_PRINTF_FORMAT "'\n", &a_struct_ref, a_struct_ref.a); - fprintf (out, "(a_struct_t&) a_struct_ref = %p, a_struct_ref.b = '" T_PRINTF_FORMAT "'\n", &a_struct_ref, a_struct_ref.b); - - fprintf (out, "(a_union_zero_t) a_union_zero.a = '" T_PRINTF_FORMAT "'\n", a_union_zero.a); - fprintf (out, "(a_union_zero_t*) a_union_zero_ptr = %p, a_union_zero_ptr->a = '" T_PRINTF_FORMAT "'\n", a_union_zero_ptr, a_union_zero_ptr->a); - fprintf (out, "(a_union_zero_t&) a_union_zero_ref = %p, a_union_zero_ref.a = '" T_PRINTF_FORMAT "'\n", &a_union_zero_ref, a_union_zero_ref.a); - - fprintf (out, "(a_union_nonzero_t) a_union_nonzero.u.a = '" T_PRINTF_FORMAT "'\n", a_union_nonzero.u.a); - fprintf (out, "(a_union_nonzero_t*) a_union_nonzero_ptr = %p, a_union_nonzero_ptr->u.a = '" T_PRINTF_FORMAT "'\n", a_union_nonzero_ptr, a_union_nonzero_ptr->u.a); - fprintf (out, "(a_union_nonzero_t&) a_union_nonzero_ref = %p, a_union_nonzero_ref.u.a = '" T_PRINTF_FORMAT "'\n", &a_union_nonzero_ref, a_union_nonzero_ref.u.a); - - fprintf (out, "(a_struct_t[2]) a_struct_array_bounded[0].a = '" T_PRINTF_FORMAT "'\n", a_struct_array_bounded[0].a); - fprintf (out, "(a_struct_t[2]) a_struct_array_bounded[0].b = '" T_PRINTF_FORMAT "'\n", a_struct_array_bounded[0].b); - fprintf (out, "(a_struct_t[2]) a_struct_array_bounded[1].a = '" T_PRINTF_FORMAT "'\n", a_struct_array_bounded[1].a); - fprintf (out, "(a_struct_t[2]) a_struct_array_bounded[1].b = '" T_PRINTF_FORMAT "'\n", a_struct_array_bounded[1].b); - - fprintf (out, "(a_struct_t[]) a_struct_array_unbounded[0].a = '" T_PRINTF_FORMAT "'\n", a_struct_array_unbounded[0].a); - fprintf (out, "(a_struct_t[]) a_struct_array_unbounded[0].b = '" T_PRINTF_FORMAT "'\n", a_struct_array_unbounded[0].b); - fprintf (out, "(a_struct_t[]) a_struct_array_unbounded[1].a = '" T_PRINTF_FORMAT "'\n", a_struct_array_unbounded[1].a); - fprintf (out, "(a_struct_t[]) a_struct_array_unbounded[1].b = '" T_PRINTF_FORMAT "'\n", a_struct_array_unbounded[1].b); - - fprintf (out, "(a_union_zero_t[2]) a_union_zero_array_bounded[0].a = '" T_PRINTF_FORMAT "'\n", a_union_zero_array_bounded[0].a); - fprintf (out, "(a_union_zero_t[2]) a_union_zero_array_bounded[1].a = '" T_PRINTF_FORMAT "'\n", a_union_zero_array_bounded[1].a); - - fprintf (out, "(a_union_zero_t[]) a_union_zero_array_unbounded[0].a = '" T_PRINTF_FORMAT "'\n", a_union_zero_array_unbounded[0].a); - fprintf (out, "(a_union_zero_t[]) a_union_zero_array_unbounded[1].a = '" T_PRINTF_FORMAT "'\n", a_union_zero_array_unbounded[1].a); - -#endif - puts("About to exit, break here to check values..."); // Here is the line we will break on to check variables. - -#ifdef TEST_BLOCK_CAPTURED_VARS - void (^myBlock)() = ^() { - fprintf (out, "%s: a = '" T_PRINTF_FORMAT "'\n", T_CSTR, a); - fprintf (out, "%s*: %p => *a_ptr = '" T_PRINTF_FORMAT "'\n", T_CSTR, a_ptr, *a_ptr); - fprintf (out, "%s&: @%p => a_ref = '" T_PRINTF_FORMAT "'\n", T_CSTR, &a_ref, a_ref); - - fprintf (out, "(a_class) a_class_instance.m_a = '" T_PRINTF_FORMAT "'\n", a_class_instance.get_a()); - fprintf (out, "(a_class) a_class_instance.m_b = '" T_PRINTF_FORMAT "'\n", a_class_instance.get_b()); - fprintf (out, "(a_class*) a_class_ptr = %p, a_class_ptr->m_a = '" T_PRINTF_FORMAT "'\n", a_class_ptr, a_class_ptr->get_a()); - fprintf (out, "(a_class*) a_class_ptr = %p, a_class_ptr->m_b = '" T_PRINTF_FORMAT "'\n", a_class_ptr, a_class_ptr->get_b()); - fprintf (out, "(a_class&) a_class_ref = %p, a_class_ref.m_a = '" T_PRINTF_FORMAT "'\n", &a_class_ref, a_class_ref.get_a()); - fprintf (out, "(a_class&) a_class_ref = %p, a_class_ref.m_b = '" T_PRINTF_FORMAT "'\n", &a_class_ref, a_class_ref.get_b()); - - fprintf (out, "(a_struct_t) a_struct.a = '" T_PRINTF_FORMAT "'\n", a_struct.a); - fprintf (out, "(a_struct_t) a_struct.b = '" T_PRINTF_FORMAT "'\n", a_struct.b); - fprintf (out, "(a_struct_t*) a_struct_ptr = %p, a_struct_ptr->a = '" T_PRINTF_FORMAT "'\n", a_struct_ptr, a_struct_ptr->a); - fprintf (out, "(a_struct_t*) a_struct_ptr = %p, a_struct_ptr->b = '" T_PRINTF_FORMAT "'\n", a_struct_ptr, a_struct_ptr->b); - fprintf (out, "(a_struct_t&) a_struct_ref = %p, a_struct_ref.a = '" T_PRINTF_FORMAT "'\n", &a_struct_ref, a_struct_ref.a); - fprintf (out, "(a_struct_t&) a_struct_ref = %p, a_struct_ref.b = '" T_PRINTF_FORMAT "'\n", &a_struct_ref, a_struct_ref.b); - - fprintf (out, "(a_union_zero_t) a_union_zero.a = '" T_PRINTF_FORMAT "'\n", a_union_zero.a); - fprintf (out, "(a_union_zero_t*) a_union_zero_ptr = %p, a_union_zero_ptr->a = '" T_PRINTF_FORMAT "'\n", a_union_zero_ptr, a_union_zero_ptr->a); - fprintf (out, "(a_union_zero_t&) a_union_zero_ref = %p, a_union_zero_ref.a = '" T_PRINTF_FORMAT "'\n", &a_union_zero_ref, a_union_zero_ref.a); - - fprintf (out, "(a_union_nonzero_t) a_union_nonzero.u.a = '" T_PRINTF_FORMAT "'\n", a_union_nonzero.u.a); - fprintf (out, "(a_union_nonzero_t*) a_union_nonzero_ptr = %p, a_union_nonzero_ptr->u.a = '" T_PRINTF_FORMAT "'\n", a_union_nonzero_ptr, a_union_nonzero_ptr->u.a); - fprintf (out, "(a_union_nonzero_t&) a_union_nonzero_ref = %p, a_union_nonzero_ref.u.a = '" T_PRINTF_FORMAT "'\n", &a_union_nonzero_ref, a_union_nonzero_ref.u.a); - - fprintf (out, "That's All Folks!\n"); // Break here to test block captured variables. - }; - - myBlock(); -#endif - - if (out != stdout) - fclose (out); - - return 0; -} diff --git a/lldb/test/API/types/char.cpp b/lldb/test/API/types/char.cpp deleted file mode 100644 index 584582ed9b9c8..0000000000000 --- a/lldb/test/API/types/char.cpp +++ /dev/null @@ -1,9 +0,0 @@ -#define T char -#define T_CSTR "char" -#define T_VALUE_1 'a' -#define T_VALUE_2 'b' -#define T_VALUE_3 '!' -#define T_VALUE_4 '~' -#define T_PRINTF_FORMAT "%c" - -#include "basic_type.cpp" diff --git a/lldb/test/API/types/double.cpp b/lldb/test/API/types/double.cpp deleted file mode 100644 index 6788dadfe02ff..0000000000000 --- a/lldb/test/API/types/double.cpp +++ /dev/null @@ -1,9 +0,0 @@ -#define T double -#define T_CSTR "double" -#define T_VALUE_1 1100.125 -#define T_VALUE_2 2200.250 -#define T_VALUE_3 33.00 -#define T_VALUE_4 44.00 -#define T_PRINTF_FORMAT "%lg" - -#include "basic_type.cpp" diff --git a/lldb/test/API/types/float.cpp b/lldb/test/API/types/float.cpp deleted file mode 100644 index 4bc124661aad6..0000000000000 --- a/lldb/test/API/types/float.cpp +++ /dev/null @@ -1,9 +0,0 @@ -#define T float -#define T_CSTR "float" -#define T_VALUE_1 1100.125 -#define T_VALUE_2 2200.250 -#define T_VALUE_3 33.00 -#define T_VALUE_4 44.00 -#define T_PRINTF_FORMAT "%g" - -#include "basic_type.cpp" diff --git a/lldb/test/API/types/int.cpp b/lldb/test/API/types/int.cpp deleted file mode 100644 index 922398b1c6e35..0000000000000 --- a/lldb/test/API/types/int.cpp +++ /dev/null @@ -1,9 +0,0 @@ -#define T int -#define T_CSTR "int" -#define T_VALUE_1 11001110 -#define T_VALUE_2 22002220 -#define T_VALUE_3 33003330 -#define T_VALUE_4 44004440 -#define T_PRINTF_FORMAT "%i" - -#include "basic_type.cpp" diff --git a/lldb/test/API/types/long.cpp b/lldb/test/API/types/long.cpp deleted file mode 100644 index 9056b42ee77d6..0000000000000 --- a/lldb/test/API/types/long.cpp +++ /dev/null @@ -1,18 +0,0 @@ -#define T long -#define T_CSTR "long" - -#ifdef __LP64__ -#define T_VALUE_1 110011101111 -#define T_VALUE_2 220022202222 -#define T_VALUE_3 330033303333 -#define T_VALUE_4 440044404444 -#else -#define T_VALUE_1 110011101 -#define T_VALUE_2 220022202 -#define T_VALUE_3 330033303 -#define T_VALUE_4 440044404 -#endif - -#define T_PRINTF_FORMAT "%ld" - -#include "basic_type.cpp" diff --git a/lldb/test/API/types/long_long.cpp b/lldb/test/API/types/long_long.cpp deleted file mode 100644 index 5b442e7257e98..0000000000000 --- a/lldb/test/API/types/long_long.cpp +++ /dev/null @@ -1,18 +0,0 @@ -#define T long long -#define T_CSTR "long long" - -#ifdef __LP64__ -#define T_VALUE_1 110011101111 -#define T_VALUE_2 220022202222 -#define T_VALUE_3 330033303333 -#define T_VALUE_4 440044404444 -#else -#define T_VALUE_1 110011101 -#define T_VALUE_2 220022202 -#define T_VALUE_3 330033303 -#define T_VALUE_4 440044404 -#endif - -#define T_PRINTF_FORMAT "%lld" - -#include "basic_type.cpp" diff --git a/lldb/test/API/types/recursive_type_1.cpp b/lldb/test/API/types/recursive_type_1.cpp deleted file mode 100644 index 81d923ffd9459..0000000000000 --- a/lldb/test/API/types/recursive_type_1.cpp +++ /dev/null @@ -1,12 +0,0 @@ -typedef struct t *tp; -typedef tp (*get_tp)(); - -struct s { - get_tp get_tp_p; -}; - -struct t { - struct s *s; -}; - -struct t t; diff --git a/lldb/test/API/types/recursive_type_2.cpp b/lldb/test/API/types/recursive_type_2.cpp deleted file mode 100644 index 304739049a068..0000000000000 --- a/lldb/test/API/types/recursive_type_2.cpp +++ /dev/null @@ -1,10 +0,0 @@ -typedef struct t *tp; -typedef tp (*get_tp)(); - -struct t { - struct { - get_tp get_tp_p; - }; -}; - -struct t t; diff --git a/lldb/test/API/types/recursive_type_main.cpp b/lldb/test/API/types/recursive_type_main.cpp deleted file mode 100644 index e06cd309be30a..0000000000000 --- a/lldb/test/API/types/recursive_type_main.cpp +++ /dev/null @@ -1,8 +0,0 @@ -typedef struct t *tp; -extern struct t t; - -int main() { - tp tpi = &t; - // Test at this line. - return 0; -} diff --git a/lldb/test/API/types/short.cpp b/lldb/test/API/types/short.cpp deleted file mode 100644 index 470c68aa8ba7b..0000000000000 --- a/lldb/test/API/types/short.cpp +++ /dev/null @@ -1,9 +0,0 @@ -#define T short -#define T_CSTR "short" -#define T_VALUE_1 11001 -#define T_VALUE_2 22002 -#define T_VALUE_3 -32768 -#define T_VALUE_4 32767 -#define T_PRINTF_FORMAT "%hd" - -#include "basic_type.cpp" diff --git a/lldb/test/API/types/unsigned_char.cpp b/lldb/test/API/types/unsigned_char.cpp deleted file mode 100644 index 0ac555a5a1830..0000000000000 --- a/lldb/test/API/types/unsigned_char.cpp +++ /dev/null @@ -1,9 +0,0 @@ -#define T unsigned char -#define T_CSTR "unsigned char" -#define T_VALUE_1 '0' -#define T_VALUE_2 '9' -#define T_VALUE_3 '@' -#define T_VALUE_4 '$' -#define T_PRINTF_FORMAT "%c" - -#include "basic_type.cpp" diff --git a/lldb/test/API/types/unsigned_int.cpp b/lldb/test/API/types/unsigned_int.cpp deleted file mode 100644 index 1b307b04afc11..0000000000000 --- a/lldb/test/API/types/unsigned_int.cpp +++ /dev/null @@ -1,9 +0,0 @@ -#define T unsigned int -#define T_CSTR "unsigned int" -#define T_VALUE_1 11001110 -#define T_VALUE_2 22002220 -#define T_VALUE_3 33003330 -#define T_VALUE_4 44004440 -#define T_PRINTF_FORMAT "%u" - -#include "basic_type.cpp" diff --git a/lldb/test/API/types/unsigned_long.cpp b/lldb/test/API/types/unsigned_long.cpp deleted file mode 100644 index 0c442e399d53c..0000000000000 --- a/lldb/test/API/types/unsigned_long.cpp +++ /dev/null @@ -1,18 +0,0 @@ -#define T unsigned long -#define T_CSTR "unsigned long" - -#ifdef __LP64__ -#define T_VALUE_1 110011101111 -#define T_VALUE_2 220022202222 -#define T_VALUE_3 330033303333 -#define T_VALUE_4 440044404444 -#else -#define T_VALUE_1 110011101 -#define T_VALUE_2 220022202 -#define T_VALUE_3 330033303 -#define T_VALUE_4 440044404 -#endif - -#define T_PRINTF_FORMAT "%lu" - -#include "basic_type.cpp" diff --git a/lldb/test/API/types/unsigned_long_long.cpp b/lldb/test/API/types/unsigned_long_long.cpp deleted file mode 100644 index 648aad01b3a3f..0000000000000 --- a/lldb/test/API/types/unsigned_long_long.cpp +++ /dev/null @@ -1,18 +0,0 @@ -#define T unsigned long long -#define T_CSTR "unsigned long long" - -#ifdef __LP64__ -#define T_VALUE_1 110011101111 -#define T_VALUE_2 220022202222 -#define T_VALUE_3 330033303333 -#define T_VALUE_4 440044404444 -#else -#define T_VALUE_1 110011101 -#define T_VALUE_2 220022202 -#define T_VALUE_3 330033303 -#define T_VALUE_4 440044404 -#endif - -#define T_PRINTF_FORMAT "%llu" - -#include "basic_type.cpp" diff --git a/lldb/test/API/types/unsigned_short.cpp b/lldb/test/API/types/unsigned_short.cpp deleted file mode 100644 index 09af2aad62c26..0000000000000 --- a/lldb/test/API/types/unsigned_short.cpp +++ /dev/null @@ -1,9 +0,0 @@ -#define T unsigned short -#define T_CSTR "unsigned short" -#define T_VALUE_1 11001 -#define T_VALUE_2 22002 -#define T_VALUE_3 0 -#define T_VALUE_4 65535 -#define T_PRINTF_FORMAT "%hu" - -#include "basic_type.cpp" _______________________________________________ lldb-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
