Author: Dmitry Vasilyev Date: 2024-05-14T11:26:14+04:00 New Revision: e2f079cc6c3689fa5a6f64550b2d4fdc628dad6f
URL: https://github.com/llvm/llvm-project/commit/e2f079cc6c3689fa5a6f64550b2d4fdc628dad6f DIFF: https://github.com/llvm/llvm-project/commit/e2f079cc6c3689fa5a6f64550b2d4fdc628dad6f.diff LOG: [lldb] Fixed the test TestGdbRemoteLaunch (#91931) Install `a.out` to the remote target (after handshake) if necessary and use the remote path to call `vRun`. Added: Modified: lldb/test/API/tools/lldb-server/TestGdbRemoteLaunch.py Removed: ################################################################################ diff --git a/lldb/test/API/tools/lldb-server/TestGdbRemoteLaunch.py b/lldb/test/API/tools/lldb-server/TestGdbRemoteLaunch.py index 78a4d326c12d1..ad84a40932c65 100644 --- a/lldb/test/API/tools/lldb-server/TestGdbRemoteLaunch.py +++ b/lldb/test/API/tools/lldb-server/TestGdbRemoteLaunch.py @@ -12,13 +12,13 @@ class GdbRemoteLaunchTestCase(gdbremote_testcase.GdbRemoteTestCaseBase): @add_test_categories(["llgs"]) def test_launch_via_A(self): self.build() - exe_path = self.getBuildArtifact("a.out") - args = [exe_path, "stderr:arg1", "stderr:arg2", "stderr:arg3"] - hex_args = [seven.hexlify(x) for x in args] - server = self.connect_to_debug_monitor() self.assertIsNotNone(server) self.do_handshake() + exe_path = lldbutil.install_to_target(self, self.getBuildArtifact("a.out")) + args = [exe_path, "stderr:arg1", "stderr:arg2", "stderr:arg3"] + hex_args = [seven.hexlify(x) for x in args] + # NB: strictly speaking we should use %x here but this packet # is deprecated, so no point in changing lldb-server's expectations self.test_sequence.add_log_lines( @@ -38,13 +38,13 @@ def test_launch_via_A(self): @add_test_categories(["llgs"]) def test_launch_via_vRun(self): self.build() - exe_path = self.getBuildArtifact("a.out") - args = [exe_path, "stderr:arg1", "stderr:arg2", "stderr:arg3"] - hex_args = [seven.hexlify(x) for x in args] - server = self.connect_to_debug_monitor() self.assertIsNotNone(server) self.do_handshake() + exe_path = lldbutil.install_to_target(self, self.getBuildArtifact("a.out")) + args = [exe_path, "stderr:arg1", "stderr:arg2", "stderr:arg3"] + hex_args = [seven.hexlify(x) for x in args] + self.test_sequence.add_log_lines( [ "read packet: $vRun;%s;%s;%s;%s#00" % tuple(hex_args), @@ -60,12 +60,12 @@ def test_launch_via_vRun(self): @add_test_categories(["llgs"]) def test_launch_via_vRun_no_args(self): self.build() - exe_path = self.getBuildArtifact("a.out") - hex_path = seven.hexlify(exe_path) - server = self.connect_to_debug_monitor() self.assertIsNotNone(server) self.do_handshake() + exe_path = lldbutil.install_to_target(self, self.getBuildArtifact("a.out")) + hex_path = seven.hexlify(exe_path) + self.test_sequence.add_log_lines( [ "read packet: $vRun;%s#00" % (hex_path,), @@ -78,6 +78,7 @@ def test_launch_via_vRun_no_args(self): self.expect_gdbremote_sequence() @add_test_categories(["llgs"]) + @skipIfRemote def test_launch_failure_via_vRun(self): self.build() exe_path = self.getBuildArtifact("a.out") @@ -110,14 +111,13 @@ def test_launch_failure_via_vRun(self): @add_test_categories(["llgs"]) def test_QEnvironment(self): self.build() - exe_path = self.getBuildArtifact("a.out") - env = {"FOO": "test", "BAR": "a=z"} - args = [exe_path, "print-env:FOO", "print-env:BAR"] - hex_args = [seven.hexlify(x) for x in args] - server = self.connect_to_debug_monitor() self.assertIsNotNone(server) self.do_handshake() + exe_path = lldbutil.install_to_target(self, self.getBuildArtifact("a.out")) + env = {"FOO": "test", "BAR": "a=z"} + args = [exe_path, "print-env:FOO", "print-env:BAR"] + hex_args = [seven.hexlify(x) for x in args] for key, value in env.items(): self.test_sequence.add_log_lines( @@ -143,14 +143,13 @@ def test_QEnvironment(self): @add_test_categories(["llgs"]) def test_QEnvironmentHexEncoded(self): self.build() - exe_path = self.getBuildArtifact("a.out") - env = {"FOO": "test", "BAR": "a=z", "BAZ": "a*}#z"} - args = [exe_path, "print-env:FOO", "print-env:BAR", "print-env:BAZ"] - hex_args = [seven.hexlify(x) for x in args] - server = self.connect_to_debug_monitor() self.assertIsNotNone(server) self.do_handshake() + exe_path = lldbutil.install_to_target(self, self.getBuildArtifact("a.out")) + env = {"FOO": "test", "BAR": "a=z", "BAZ": "a*}#z"} + args = [exe_path, "print-env:FOO", "print-env:BAR", "print-env:BAZ"] + hex_args = [seven.hexlify(x) for x in args] for key, value in env.items(): hex_enc = seven.hexlify("%s=%s" % (key, value)) _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
