[Lldb-commits] [lldb] 3254623 - Revert "[LLDB] Fix the use of "platform process launch" with no extra arguments"

[David Spickett via lldb-commits]

Author: David Spickett
Date: 2023-06-27T14:04:41Z
New Revision: 3254623d73fb7252385817d8057640c9d5d5ffd1

URL: https://github.com/llvm/llvm-project/commit/3254623d73fb7252385817d8057640c9d5d5ffd1
DIFF: https://github.com/llvm/llvm-project/commit/3254623d73fb7252385817d8057640c9d5d5ffd1.diff

LOG: Revert "[LLDB] Fix the use of "platform process launch" with no extra arguments"

This reverts commit cc0fc358540517a3d205243c27bd543afeae2b02 due to a failure
reported on MacOS.

Added: 
    

Modified: 
    lldb/source/Commands/CommandObjectPlatform.cpp

Removed: 
    lldb/test/API/commands/platform/process/launch/Makefile
    lldb/test/API/commands/platform/process/launch/TestPlatformProcessLaunch.py
    lldb/test/API/commands/platform/process/launch/main.c


################################################################################
diff  --git a/lldb/source/Commands/CommandObjectPlatform.cpp b/lldb/source/Commands/CommandObjectPlatform.cpp
index 6c954ce6fbbcb..92aa110cba7f1 100644
--- a/lldb/source/Commands/CommandObjectPlatform.cpp
+++ b/lldb/source/Commands/CommandObjectPlatform.cpp
@@ -1207,12 +1207,8 @@ class CommandObjectPlatformProcessLaunch : public CommandObjectParsed {
       if (m_options.launch_info.GetExecutableFile()) {
         Debugger &debugger = GetDebugger();
 
-        if (argc == 0) {
-          // If no arguments were given to the command, use target.run-args.
-          Args target_run_args;
-          target->GetRunArguments(target_run_args);
-          m_options.launch_info.GetArguments().AppendArguments(target_run_args);
-        }
+        if (argc == 0)
+          target->GetRunArguments(m_options.launch_info.GetArguments());
 
         ProcessSP process_sp(platform_sp->DebugProcess(
             m_options.launch_info, debugger, *target, error));

diff  --git a/lldb/test/API/commands/platform/process/launch/Makefile b/lldb/test/API/commands/platform/process/launch/Makefile
deleted file mode 100644
index 10495940055b6..0000000000000
--- a/lldb/test/API/commands/platform/process/launch/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-C_SOURCES := main.c
-
-include Makefile.rules

diff  --git a/lldb/test/API/commands/platform/process/launch/TestPlatformProcessLaunch.py b/lldb/test/API/commands/platform/process/launch/TestPlatformProcessLaunch.py
deleted file mode 100644
index 59031e7531dcd..0000000000000
--- a/lldb/test/API/commands/platform/process/launch/TestPlatformProcessLaunch.py
+++ /dev/null
@@ -1,59 +0,0 @@
-"""
-Test platform process launch.
-"""
-
-from textwrap import dedent
-from lldbsuite.test.lldbtest import TestBase
-
-
-class ProcessLaunchTestCase(TestBase):
-    NO_DEBUG_INFO_TESTCASE = True
-
-    def setup(self):
-        self.build()
-        exe = self.getBuildArtifact("a.out")
-        self.runCmd("file " + exe)
-        return (exe, self.getBuildArtifact("stdio.log"))
-
-    def test_process_launch_no_args(self):
-        # When there are no extra arguments we just have 0, the program name.
-        exe, outfile = self.setup()
-        self.runCmd("platform process launch --stdout {} -s".format(outfile))
-        self.runCmd("continue")
-
-        with open(outfile) as f:
-           self.assertEqual(dedent("""\
-                Got 1 argument(s).
-                [0]: {}
-                """.format(exe)), f.read())
-
-    def test_process_launch_command_args(self):
-        exe, outfile = self.setup()
-        # Arguments given via the command override those in the settings.
-        self.runCmd("settings set target.run-args D E")
-        self.runCmd("platform process launch --stdout {} -s -- A B C".format(outfile))
-        self.runCmd("continue")
-
-        with open(outfile) as f:
-           self.assertEqual(dedent("""\
-                Got 4 argument(s).
-                [0]: {}
-                [1]: A
-                [2]: B
-                [3]: C
-                """.format(exe)), f.read())
-
-    def test_process_launch_target_args(self):
-        exe, outfile = self.setup()
-        # When no arguments are passed via the command, use the setting.
-        self.runCmd("settings set target.run-args D E")
-        self.runCmd("platform process launch --stdout {}".format(outfile))
-        self.runCmd("continue")
-
-        with open(outfile) as f:
-           self.assertEqual(dedent("""\
-                Got 3 argument(s).
-                [0]: {}
-                [1]: D
-                [2]: E
-                """.format(exe)), f.read())
\ No newline at end of file

diff  --git a/lldb/test/API/commands/platform/process/launch/main.c b/lldb/test/API/commands/platform/process/launch/main.c
deleted file mode 100644
index 84208372bc4d1..0000000000000
--- a/lldb/test/API/commands/platform/process/launch/main.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include <stdio.h>
-
-int main(int argc, char const *argv[]) {
-  printf("Got %d argument(s).\n", argc);
-  for (int i = 0; i < argc; ++i)
-    printf("[%d]: %s\n", i, argv[i]);
-  return 0;
-}