vendor/lldb/lldb-trunk-r338150

3 files changed, 49 insertions, 3 deletions

diff --git a/packages/Python/lldbsuite/test/functionalities/command_script/TestCommandScript.py b/packages/Python/lldbsuite/test/functionalities/command_script/TestCommandScript.py
index d562cb1511ac..1698c0d0c35f 100644
--- a/packages/Python/lldbsuite/test/functionalities/command_script/TestCommandScript.py
+++ b/packages/Python/lldbsuite/test/functionalities/command_script/TestCommandScript.py
@@ -8,13 +8,16 @@ from __future__ import print_function
 import os
 import time
 import lldb
+from lldbsuite.test.decorators import *
 from lldbsuite.test.lldbtest import *
 
 
 class CmdPythonTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True
 
+    @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr32343")
     def test(self):
         self.build()
         self.pycmd_tests()
@@ -27,7 +30,7 @@ class CmdPythonTestCase(TestBase):
         self.expect('targetname',
                     substrs=['a.out'], matching=False, error=True)
 
-        exe = os.path.join(os.getcwd(), "a.out")
+        exe = self.getBuildArtifact("a.out")
         self.expect("file " + exe,
                     patterns=["Current executable set to .*a.out"])
 
@@ -46,6 +49,7 @@ class CmdPythonTestCase(TestBase):
             self.runCmd('command script delete tell_curr', check=False)
             self.runCmd('command script delete bug11569', check=False)
             self.runCmd('command script delete takes_exe_ctx', check=False)
+            self.runCmd('command script delete decorated', check=False)
 
         # Execute the cleanup function during test case tear down.
         self.addTearDownHook(cleanup)
@@ -64,13 +68,19 @@ class CmdPythonTestCase(TestBase):
                     substrs=['Just a docstring for welcome_impl',
                              'A command that says hello to LLDB users'])
 
+        decorated_commands = ["decorated" + str(n) for n in range(1, 5)]
+        for name in decorated_commands:
+            self.expect(name, substrs=["hello from " + name])
+            self.expect("help " + name,
+                        substrs=["Python command defined by @lldb.command"])
+
         self.expect("help",
                     substrs=['For more information run',
-                             'welcome'])
+                             'welcome'] + decorated_commands)
 
         self.expect("help -a",
                     substrs=['For more information run',
-                             'welcome'])
+                             'welcome'] + decorated_commands)
 
         self.expect("help -u", matching=False,
                     substrs=['For more information run'])
diff --git a/packages/Python/lldbsuite/test/functionalities/command_script/decorated.py b/packages/Python/lldbsuite/test/functionalities/command_script/decorated.py
new file mode 100644
index 000000000000..f9707a5706ac
--- /dev/null
+++ b/packages/Python/lldbsuite/test/functionalities/command_script/decorated.py
@@ -0,0 +1,35 @@
+from __future__ import print_function
+
+import lldb
+
+
+@lldb.command()
+def decorated1(debugger, args, exe_ctx, result, dict):
+    """
+    Python command defined by @lldb.command
+    """
+    print("hello from decorated1", file=result)
+
+
+@lldb.command(doc="Python command defined by @lldb.command")
+def decorated2(debugger, args, exe_ctx, result, dict):
+    """
+    This docstring is overridden.
+    """
+    print("hello from decorated2", file=result)
+
+
+@lldb.command()
+def decorated3(debugger, args, result, dict):
+    """
+    Python command defined by @lldb.command
+    """
+    print("hello from decorated3", file=result)
+
+
+@lldb.command("decorated4")
+def _decorated4(debugger, args, exe_ctx, result, dict):
+    """
+    Python command defined by @lldb.command
+    """
+    print("hello from decorated4", file=result)
diff --git a/packages/Python/lldbsuite/test/functionalities/command_script/py_import b/packages/Python/lldbsuite/test/functionalities/command_script/py_import
index 169daacc1a83..6c1f7b8185f6 100644
--- a/packages/Python/lldbsuite/test/functionalities/command_script/py_import
+++ b/packages/Python/lldbsuite/test/functionalities/command_script/py_import
@@ -10,3 +10,4 @@ command script add tell_sync --function welcome.check_for_synchro --synchronicit
 command script add tell_async --function welcome.check_for_synchro --synchronicity async
 command script add tell_curr --function welcome.check_for_synchro --synchronicity curr
 command script add takes_exe_ctx --function welcome.takes_exe_ctx
+command script import decorated.py