Skip to content

Commit a417a86

Browse files
authored
[lldb-dap] Enable runInTerminal tests on macOS. (#133824)
These tests are currently filtered on macOS if your on an M1 (or newer) device. These tests do work on macOS, for me at least on M1 Max with macOS 15.3.2 and Xcode 16.2. Enabling them again, but if we have CI problems with them we can keep them disabled.
1 parent 0b8c8ed commit a417a86

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

lldb/test/API/tools/lldb-dap/restart/TestDAP_restart_runInTerminal.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def isTestSupported(self):
2121
return False
2222

2323
@skipIfWindows
24-
@skipIf(archs=["arm"]) # Always times out on buildbot
24+
@skipIf(oslist=["linux"], archs=["arm"]) # Always times out on buildbot
2525
def test_basic_functionality(self):
2626
"""
2727
Test basic restarting functionality when the process is running in
@@ -61,7 +61,7 @@ def test_basic_functionality(self):
6161
)
6262

6363
@skipIfWindows
64-
@skipIf(archs=["arm"]) # Always times out on buildbot
64+
@skipIf(oslist=["linux"], archs=["arm"]) # Always times out on buildbot
6565
def test_stopOnEntry(self):
6666
"""
6767
Check that stopOnEntry works correctly when using runInTerminal.

lldb/test/API/tools/lldb-dap/runInTerminal/TestDAP_runInTerminal.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ def isTestSupported(self):
4444
return False
4545

4646
@skipIfWindows
47-
@skipIf(archs=no_match(["x86_64"]))
47+
@skipIf(oslist=["linux"], archs=no_match(["x86_64"]))
4848
def test_runInTerminal(self):
4949
if not self.isTestSupported():
5050
return
@@ -90,7 +90,7 @@ def test_runInTerminal(self):
9090
env = self.dap_server.request_evaluate("foo")["body"]["result"]
9191
self.assertIn("bar", env)
9292

93-
@skipIf(archs=no_match(["x86_64"]))
93+
@skipIf(oslist=["linux"], archs=no_match(["x86_64"]))
9494
def test_runInTerminalWithObjectEnv(self):
9595
if not self.isTestSupported():
9696
return
@@ -114,7 +114,7 @@ def test_runInTerminalWithObjectEnv(self):
114114
self.assertEqual("BAR", request_envs["FOO"])
115115

116116
@skipIfWindows
117-
@skipIf(archs=no_match(["x86_64"]))
117+
@skipIf(oslist=["linux"], archs=no_match(["x86_64"]))
118118
def test_runInTerminalInvalidTarget(self):
119119
if not self.isTestSupported():
120120
return
@@ -133,7 +133,7 @@ def test_runInTerminalInvalidTarget(self):
133133
)
134134

135135
@skipIfWindows
136-
@skipIf(archs=no_match(["x86_64"]))
136+
@skipIf(oslist=["linux"], archs=no_match(["x86_64"]))
137137
def test_missingArgInRunInTerminalLauncher(self):
138138
if not self.isTestSupported():
139139
return
@@ -148,7 +148,7 @@ def test_missingArgInRunInTerminalLauncher(self):
148148
)
149149

150150
@skipIfWindows
151-
@skipIf(archs=no_match(["x86_64"]))
151+
@skipIf(oslist=["linux"], archs=no_match(["x86_64"]))
152152
def test_FakeAttachedRunInTerminalLauncherWithInvalidProgram(self):
153153
if not self.isTestSupported():
154154
return
@@ -175,7 +175,7 @@ def test_FakeAttachedRunInTerminalLauncherWithInvalidProgram(self):
175175
self.assertIn("No such file or directory", stderr)
176176

177177
@skipIfWindows
178-
@skipIf(archs=no_match(["x86_64"]))
178+
@skipIf(oslist=["linux"], archs=no_match(["x86_64"]))
179179
def test_FakeAttachedRunInTerminalLauncherWithValidProgram(self):
180180
if not self.isTestSupported():
181181
return
@@ -202,7 +202,7 @@ def test_FakeAttachedRunInTerminalLauncherWithValidProgram(self):
202202
self.assertIn("foo", stdout)
203203

204204
@skipIfWindows
205-
@skipIf(archs=no_match(["x86_64"]))
205+
@skipIf(oslist=["linux"], archs=no_match(["x86_64"]))
206206
def test_FakeAttachedRunInTerminalLauncherAndCheckEnvironment(self):
207207
if not self.isTestSupported():
208208
return
@@ -223,7 +223,7 @@ def test_FakeAttachedRunInTerminalLauncherAndCheckEnvironment(self):
223223
self.assertIn("FOO=BAR", stdout)
224224

225225
@skipIfWindows
226-
@skipIf(archs=no_match(["x86_64"]))
226+
@skipIf(oslist=["linux"], archs=no_match(["x86_64"]))
227227
def test_NonAttachedRunInTerminalLauncher(self):
228228
if not self.isTestSupported():
229229
return

0 commit comments

Comments
 (0)