[Lldb-commits] [lldb] Clean up test case (PR #66400)

[via lldb-commits]

llvmbot wrote:


<!--LLVM PR SUMMARY COMMENT-->

@llvm/pr-subscribers-lldb
            
<details>
<summary>Changes</summary>
None
--
Full diff: https://github.com/llvm/llvm-project/pull/66400.diff

3 Files Affected:

- (renamed) lldb/test/API/lang/objc/charstar_dyntype/Makefile (-3) 
- (renamed) lldb/test/API/lang/objc/charstar_dyntype/TestCharStarDynType.py (+5-19) 
- (renamed) lldb/test/API/lang/objc/charstar_dyntype/main.m () 


<pre>
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 &#x27;const char*&#x27;
 &quot;&quot;&quot;
 
-
 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&#x27;s setUp().
         TestBase.setUp(self)
-        # We&#x27;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 = &quot;main.m&quot;
-        self.line = line_number(self.main_source, &quot;// Set breakpoint here.&quot;)
 
     def test_charstar_dyntype(self):
         &quot;&quot;&quot;Test that we do not attempt to make a dynamic type for a &#x27;const char*&#x27;&quot;&quot;&quot;
-        d = {&quot;EXE&quot;: self.exe_name}
-        self.build(dictionary=d)
-        self.setTearDownCleanup(dictionary=d)
-
-        exe = self.getBuildArtifact(self.exe_name)
-        self.runCmd(&quot;file &quot; + 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, &quot;// Set breakpoint here.&quot;, lldb.SBFileSpec(&quot;main.m&quot;)
         )
 
-        self.runCmd(&quot;run&quot;, RUN_SUCCEEDED)
         # check that we correctly see the const char*, even with dynamic types
         # on
         self.expect(&quot;frame variable -raw-output my_string&quot;, substrs=[&quot;const char *&quot;])
@@ -41,7 +27,7 @@ def test_charstar_dyntype(self):
             substrs=[&quot;const char *&quot;],
         )
         # check that expr also gets it right
-        self.expect(&quot;e -R -- my_string&quot;, substrs=[&quot;const char *&quot;])
+        self.expect(&quot;expr -R -- my_string&quot;, substrs=[&quot;const char *&quot;])
         self.expect(&quot;expr -R -d run -- my_string&quot;, substrs=[&quot;const char *&quot;])
         # but check that we get the real Foolie as such
         self.expect(&quot;frame variable my_foolie&quot;, substrs=[&quot;FoolMeOnce *&quot;])
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
</pre>
</details>


https://github.com/llvm/llvm-project/pull/66400