Author: Adrian Prantl Date: 2023-09-14T09:48:36-07:00 New Revision: 9dfc6d37da65b94208bf81b06908bb20d92de8fb
URL: https://github.com/llvm/llvm-project/commit/9dfc6d37da65b94208bf81b06908bb20d92de8fb DIFF: https://github.com/llvm/llvm-project/commit/9dfc6d37da65b94208bf81b06908bb20d92de8fb.diff LOG: Clean up test case (#66400) Added: lldb/test/API/lang/objc/charstar_dyntype/Makefile lldb/test/API/lang/objc/charstar_dyntype/TestCharStarDynType.py lldb/test/API/lang/objc/charstar_dyntype/main.m Modified: Removed: lldb/test/API/lang/objc/rdar-11355592/Makefile lldb/test/API/lang/objc/rdar-11355592/TestRdar11355592.py lldb/test/API/lang/objc/rdar-11355592/main.m ################################################################################ diff --git a/lldb/test/API/lang/objc/rdar-11355592/Makefile b/lldb/test/API/lang/objc/charstar_dyntype/Makefile similarity index 96% rename from lldb/test/API/lang/objc/rdar-11355592/Makefile rename to lldb/test/API/lang/objc/charstar_dyntype/Makefile index 37dd8f40a9d4ac8..a3198db9e8e8847 100644 --- a/lldb/test/API/lang/objc/rdar-11355592/Makefile +++ b/lldb/test/API/lang/objc/charstar_dyntype/Makefile @@ -1,6 +1,3 @@ OBJC_SOURCES := main.m - - - LD_EXTRAS := -framework Foundation include Makefile.rules diff --git a/lldb/test/API/lang/objc/rdar-11355592/TestRdar11355592.py b/lldb/test/API/lang/objc/charstar_dyntype/TestCharStarDynType.py similarity index 75% rename from lldb/test/API/lang/objc/rdar-11355592/TestRdar11355592.py rename to lldb/test/API/lang/objc/charstar_dyntype/TestCharStarDynType.py index 9378929eeda2153..ab6f0c27fb52372 100644 --- a/lldb/test/API/lang/objc/rdar-11355592/TestRdar11355592.py +++ b/lldb/test/API/lang/objc/charstar_dyntype/TestCharStarDynType.py @@ -2,37 +2,23 @@ Test that we do not attempt to make a dynamic type for a 'const char*' """ - import lldb from lldbsuite.test.decorators import * from lldbsuite.test.lldbtest import * from lldbsuite.test import lldbutil - -class Rdar10967107TestCase(TestBase): +class TestCaseCharStarDynType(TestBase): def setUp(self): # Call super's setUp(). TestBase.setUp(self) - # We'll use the test method name as the exe_name. - self.exe_name = self.testMethodName - # Find the line number to break inside main(). - self.main_source = "main.m" - self.line = line_number(self.main_source, "// Set breakpoint here.") def test_charstar_dyntype(self): """Test that we do not attempt to make a dynamic type for a 'const char*'""" - d = {"EXE": self.exe_name} - self.build(dictionary=d) - self.setTearDownCleanup(dictionary=d) - - exe = self.getBuildArtifact(self.exe_name) - self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET) - - lldbutil.run_break_set_by_file_and_line( - self, self.main_source, self.line, num_expected_locations=1, loc_exact=True + self.build() + lldbutil.run_to_source_breakpoint( + self, "// Set breakpoint here.", lldb.SBFileSpec("main.m") ) - self.runCmd("run", RUN_SUCCEEDED) # check that we correctly see the const char*, even with dynamic types # on self.expect("frame variable -raw-output my_string", substrs=["const char *"]) @@ -41,7 +27,7 @@ def test_charstar_dyntype(self): substrs=["const char *"], ) # check that expr also gets it right - self.expect("e -R -- my_string", substrs=["const char *"]) + self.expect("expr -R -- my_string", substrs=["const char *"]) self.expect("expr -R -d run -- my_string", substrs=["const char *"]) # but check that we get the real Foolie as such self.expect("frame variable my_foolie", substrs=["FoolMeOnce *"]) diff --git a/lldb/test/API/lang/objc/rdar-11355592/main.m b/lldb/test/API/lang/objc/charstar_dyntype/main.m similarity index 100% rename from lldb/test/API/lang/objc/rdar-11355592/main.m rename to lldb/test/API/lang/objc/charstar_dyntype/main.m _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
