[Lldb-commits] [lldb] [lldb][test] Modernize TestModulesAutoImport (PR #194357)

[Raphael Isemann via lldb-commits]

https://github.com/Teemperor created https://github.com/llvm/llvm-project/pull/194357

This replaces all the custom test setup logic with the newer test utilities. Not technically NFC as the newer checks are more strict.

>From cf73a70cf7e759598e1e4b70db8f1afb63d9cb93 Mon Sep 17 00:00:00 2001
From: Raphael Isemann <rise at apple.com>
Date: Mon, 27 Apr 2026 13:21:50 +0100
Subject: [PATCH] [lldb][test] Modernize TestModulesAutoImport

This replaces all the custom test setup logic with the newer test
utilities. Not technically NFC as the newer checks are more strict.
---
 .../TestModulesAutoImport.py                  | 31 ++-----------------
 .../API/lang/objc/modules-auto-import/main.m  |  6 ++--
 2 files changed, 5 insertions(+), 32 deletions(-)

diff --git a/lldb/test/API/lang/objc/modules-auto-import/TestModulesAutoImport.py b/lldb/test/API/lang/objc/modules-auto-import/TestModulesAutoImport.py
index f3558f62d51f8..9c8ba88bc6d83 100644
--- a/lldb/test/API/lang/objc/modules-auto-import/TestModulesAutoImport.py
+++ b/lldb/test/API/lang/objc/modules-auto-import/TestModulesAutoImport.py
@@ -1,6 +1,5 @@
 """Test that importing modules in Objective-C works as expected."""
 
-
 import lldb
 
 from lldbsuite.test.decorators import *
@@ -9,38 +8,14 @@
 
 
 class ObjCModulesAutoImportTestCase(TestBase):
-    def setUp(self):
-        # Call super's setUp().
-        TestBase.setUp(self)
-        # Find the line number to break inside main().
-        self.line = line_number("main.m", "// Set breakpoint 0 here.")
 
     @skipIf(macos_version=["<", "10.12"])
     @skipIf(compiler="clang", compiler_version=["<", "19.0"])
     def test_expr(self):
         self.build()
-        exe = self.getBuildArtifact("a.out")
-        self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET)
-
-        # Break inside the foo function which takes a bar_ptr argument.
-        lldbutil.run_break_set_by_file_and_line(
-            self, "main.m", self.line, num_expected_locations=1, loc_exact=True
-        )
-
-        self.runCmd("run", RUN_SUCCEEDED)
-
-        # The stop reason of the thread should be breakpoint.
-        self.expect(
-            "thread list",
-            STOPPED_DUE_TO_BREAKPOINT,
-            substrs=["stopped", "stop reason = breakpoint"],
+        lldbutil.run_to_source_breakpoint(
+            self, "// break here", lldb.SBFileSpec("main.m", False)
         )
 
-        # The breakpoint should have a hit count of 1.
-        lldbutil.check_breakpoint(self, bpno=1, expected_hit_count=1)
-
         self.runCmd("settings set target.auto-import-clang-modules true")
-
-        self.expect(
-            "expression getpid()", VARIABLES_DISPLAYED_CORRECTLY, substrs=["pid_t"]
-        )
+        self.expect_expr("getpid()", result_type="pid_t")
diff --git a/lldb/test/API/lang/objc/modules-auto-import/main.m b/lldb/test/API/lang/objc/modules-auto-import/main.m
index 5452ffd9bd15e..11508a0cd2029 100644
--- a/lldb/test/API/lang/objc/modules-auto-import/main.m
+++ b/lldb/test/API/lang/objc/modules-auto-import/main.m
@@ -1,7 +1,5 @@
 @import Darwin;
 
-int main()
-{
-    size_t ret = printf("Stop here\n"); // Set breakpoint 0 here.
-    return ret;
+int main() {
+    printf("Stop here\n"); // break here
 }