Support multiple values in plugin enable

Author: dmpots

lldb/source/Commands/CommandObjectPlugin.cpp

@@ -274,17 +274,22 @@ class CommandObjectPluginEnable : public CommandObjectParsed {
 protected:
   void DoExecute(Args &command, CommandReturnObject &result) override {
     size_t argc = command.GetArgumentCount();
-    if (argc != 1) {
-      result.AppendError("'plugin enable' requires one argument");
+    if (argc == 0) {
+      result.AppendError("'plugin enable' requires one or more arguments");
       return;
     }
-    llvm::StringRef pattern = command[0].ref();
     result.SetStatus(eReturnStatusSuccessFinishResult);
 
-    int num_matching = SetEnableOnMatchingPlugins(pattern, result, true);
+    for (size_t i = 0; i < argc; ++i)
+    {
+      llvm::StringRef pattern = command[i].ref();
+      int num_matching = SetEnableOnMatchingPlugins(pattern, result, true);
 
-    if (num_matching == 0)
-      result.AppendErrorWithFormat("Found no matching plugins to enable");
+      if (num_matching == 0) {
+        result.AppendErrorWithFormat("Found no matching plugins to enable for pattern '%s'",pattern.data());
+        break;
+      }
+    }
   }
 };
 

lldb/test/Shell/Commands/command-plugin-enable+disable.test

@@ -57,15 +57,24 @@ plugin disable instrumentation-runtime
 # CHECK: instrumentation-runtime
 # CHECK:  [-] AddressSanitizer
 
+# Test plugin enable with multiple arguments.
+plugin enable system-runtime instrumentation-runtime
+# CHECK-LABEL: plugin enable system-runtime instrumentation-runtime
+CHECK: system-runtime
+CHECK:   [+] systemruntime-macosx           System runtime plugin for Mac OS X native libraries.
+CHECK: instrumentation-runtime
+CHECK:   [+] AddressSanitizer               AddressSanitizer instrumentation runtime plugin.
+
+
 # Test plugin enable/disable for unknown plugin returns an error.
 # RUN: %lldb -o "plugin enable some-plugin-that-does-not-exist" 2>&1 | FileCheck %s --check-prefix=ERROR_PLUGIN_NOT_FOUND
 # RUN: %lldb -o "plugin disable some-plugin-that-does-not-exist" 2>&1 | FileCheck %s --check-prefix=ERROR_PLUGIN_NOT_FOUND
+# RUN: %lldb -o "plugin enable system-runtime some-plugin-that-does-not-exist" 2>&1 | FileCheck %s --check-prefix=ERROR_PLUGIN_NOT_FOUND
 # ERROR_PLUGIN_NOT_FOUND: error: Found no matching plugins
 
 # Test plugin enable/disable requires a plugin name.
 # RUN: %lldb -o "plugin enable" 2>&1 | FileCheck %s --check-prefix=ERROR_ARGUMENTS_ENABLE
-# RUN: %lldb -o "plugin enable a b c" 2>&1 | FileCheck %s --check-prefix=ERROR_ARGUMENTS_ENABLE
-# ERROR_ARGUMENTS_ENABLE: error: 'plugin enable' requires one argument
+# ERROR_ARGUMENTS_ENABLE: error: 'plugin enable' requires one or more arguments
 
 # RUN: %lldb -o "plugin disable" 2>&1 | FileCheck %s --check-prefix=ERROR_ARGUMENTS_DISABLE
 # RUN: %lldb -o "plugin disable a b c" 2>&1 | FileCheck %s --check-prefix=ERROR_ARGUMENTS_DISABLE