Skip to content

Commit 361cd68

Browse files
committed
[lldb] Fixed the test TestGdbRemoteLaunch
Install `a.out` to the remote target (after handshake) if necessary and use the remote path to call vRun.
1 parent c441aa5 commit 361cd68

File tree

1 file changed

+20
-21
lines changed

1 file changed

+20
-21
lines changed

lldb/test/API/tools/lldb-server/TestGdbRemoteLaunch.py

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ class GdbRemoteLaunchTestCase(gdbremote_testcase.GdbRemoteTestCaseBase):
1212
@add_test_categories(["llgs"])
1313
def test_launch_via_A(self):
1414
self.build()
15-
exe_path = self.getBuildArtifact("a.out")
16-
args = [exe_path, "stderr:arg1", "stderr:arg2", "stderr:arg3"]
17-
hex_args = [seven.hexlify(x) for x in args]
18-
1915
server = self.connect_to_debug_monitor()
2016
self.assertIsNotNone(server)
2117
self.do_handshake()
18+
exe_path = lldbutil.install_to_target(self, self.getBuildArtifact("a.out"))
19+
args = [exe_path, "stderr:arg1", "stderr:arg2", "stderr:arg3"]
20+
hex_args = [seven.hexlify(x) for x in args]
21+
2222
# NB: strictly speaking we should use %x here but this packet
2323
# is deprecated, so no point in changing lldb-server's expectations
2424
self.test_sequence.add_log_lines(
@@ -38,13 +38,13 @@ def test_launch_via_A(self):
3838
@add_test_categories(["llgs"])
3939
def test_launch_via_vRun(self):
4040
self.build()
41-
exe_path = self.getBuildArtifact("a.out")
42-
args = [exe_path, "stderr:arg1", "stderr:arg2", "stderr:arg3"]
43-
hex_args = [seven.hexlify(x) for x in args]
44-
4541
server = self.connect_to_debug_monitor()
4642
self.assertIsNotNone(server)
4743
self.do_handshake()
44+
exe_path = lldbutil.install_to_target(self, self.getBuildArtifact("a.out"))
45+
args = [exe_path, "stderr:arg1", "stderr:arg2", "stderr:arg3"]
46+
hex_args = [seven.hexlify(x) for x in args]
47+
4848
self.test_sequence.add_log_lines(
4949
[
5050
"read packet: $vRun;%s;%s;%s;%s#00" % tuple(hex_args),
@@ -60,12 +60,12 @@ def test_launch_via_vRun(self):
6060
@add_test_categories(["llgs"])
6161
def test_launch_via_vRun_no_args(self):
6262
self.build()
63-
exe_path = self.getBuildArtifact("a.out")
64-
hex_path = seven.hexlify(exe_path)
65-
6663
server = self.connect_to_debug_monitor()
6764
self.assertIsNotNone(server)
6865
self.do_handshake()
66+
exe_path = lldbutil.install_to_target(self, self.getBuildArtifact("a.out"))
67+
hex_path = seven.hexlify(exe_path)
68+
6969
self.test_sequence.add_log_lines(
7070
[
7171
"read packet: $vRun;%s#00" % (hex_path,),
@@ -78,6 +78,7 @@ def test_launch_via_vRun_no_args(self):
7878
self.expect_gdbremote_sequence()
7979

8080
@add_test_categories(["llgs"])
81+
@skipIfRemote
8182
def test_launch_failure_via_vRun(self):
8283
self.build()
8384
exe_path = self.getBuildArtifact("a.out")
@@ -110,14 +111,13 @@ def test_launch_failure_via_vRun(self):
110111
@add_test_categories(["llgs"])
111112
def test_QEnvironment(self):
112113
self.build()
113-
exe_path = self.getBuildArtifact("a.out")
114-
env = {"FOO": "test", "BAR": "a=z"}
115-
args = [exe_path, "print-env:FOO", "print-env:BAR"]
116-
hex_args = [seven.hexlify(x) for x in args]
117-
118114
server = self.connect_to_debug_monitor()
119115
self.assertIsNotNone(server)
120116
self.do_handshake()
117+
exe_path = lldbutil.install_to_target(self, self.getBuildArtifact("a.out"))
118+
env = {"FOO": "test", "BAR": "a=z"}
119+
args = [exe_path, "print-env:FOO", "print-env:BAR"]
120+
hex_args = [seven.hexlify(x) for x in args]
121121

122122
for key, value in env.items():
123123
self.test_sequence.add_log_lines(
@@ -143,14 +143,13 @@ def test_QEnvironment(self):
143143
@add_test_categories(["llgs"])
144144
def test_QEnvironmentHexEncoded(self):
145145
self.build()
146-
exe_path = self.getBuildArtifact("a.out")
147-
env = {"FOO": "test", "BAR": "a=z", "BAZ": "a*}#z"}
148-
args = [exe_path, "print-env:FOO", "print-env:BAR", "print-env:BAZ"]
149-
hex_args = [seven.hexlify(x) for x in args]
150-
151146
server = self.connect_to_debug_monitor()
152147
self.assertIsNotNone(server)
153148
self.do_handshake()
149+
exe_path = lldbutil.install_to_target(self, self.getBuildArtifact("a.out"))
150+
env = {"FOO": "test", "BAR": "a=z", "BAZ": "a*}#z"}
151+
args = [exe_path, "print-env:FOO", "print-env:BAR", "print-env:BAZ"]
152+
hex_args = [seven.hexlify(x) for x in args]
154153

155154
for key, value in env.items():
156155
hex_enc = seven.hexlify("%s=%s" % (key, value))

0 commit comments

Comments
 (0)