Support multiple values for plugin disable

Author: dmpots

lldb/source/Commands/CommandObjectPlugin.cpp

@@ -261,6 +261,30 @@ List only the plugin 'foo' matching a fully qualified name exactly
   PluginListCommandOptions m_options;
 };
 
+static void DoPluginEnableDisable(Args &command, CommandReturnObject &result,
+                                  bool enable) {
+  const char *name = enable ? "enable" : "disable";
+  size_t argc = command.GetArgumentCount();
+  if (argc == 0) {
+    result.AppendErrorWithFormat("'plugin %s' requires one or more arguments",
+                                 name);
+    return;
+  }
+  result.SetStatus(eReturnStatusSuccessFinishResult);
+
+  for (size_t i = 0; i < argc; ++i) {
+    llvm::StringRef pattern = command[i].ref();
+    int num_matching = SetEnableOnMatchingPlugins(pattern, result, enable);
+
+    if (num_matching == 0) {
+      result.AppendErrorWithFormat(
+          "Found no matching plugins to %s for pattern '%s'", name,
+          pattern.data());
+      break;
+    }
+  }
+}
+
 class CommandObjectPluginEnable : public CommandObjectParsed {
 public:
   CommandObjectPluginEnable(CommandInterpreter &interpreter)
@@ -273,23 +297,7 @@ class CommandObjectPluginEnable : public CommandObjectParsed {
 
 protected:
   void DoExecute(Args &command, CommandReturnObject &result) override {
-    size_t argc = command.GetArgumentCount();
-    if (argc == 0) {
-      result.AppendError("'plugin enable' requires one or more arguments");
-      return;
-    }
-    result.SetStatus(eReturnStatusSuccessFinishResult);
-
-    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 for pattern '%s'",pattern.data());
-        break;
-      }
-    }
+    DoPluginEnableDisable(command, result, true);
   }
 };
 
@@ -305,18 +313,7 @@ class CommandObjectPluginDisable : public CommandObjectParsed {
 
 protected:
   void DoExecute(Args &command, CommandReturnObject &result) override {
-    size_t argc = command.GetArgumentCount();
-    if (argc != 1) {
-      result.AppendError("'plugin disable' requires one argument");
-      return;
-    }
-    llvm::StringRef pattern = command[0].ref();
-    result.SetStatus(eReturnStatusSuccessFinishResult);
-
-    int num_matching = SetEnableOnMatchingPlugins(pattern, result, false);
-
-    if (num_matching == 0)
-      result.AppendErrorWithFormat("Found no matching plugins to disable");
+    DoPluginEnableDisable(command, result, false);
   }
 };
 

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

@@ -60,11 +60,18 @@ plugin disable instrumentation-runtime
 # 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.
+# 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 disable with multiple arguments.
+plugin disable system-runtime instrumentation-runtime
+# CHECK-LABEL: plugin disable 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
@@ -77,5 +84,4 @@ CHECK:   [+] AddressSanitizer               AddressSanitizer instrumentation run
 # 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
-# ERROR_ARGUMENTS_DISABLE: error: 'plugin disable' requires one argument
+# ERROR_ARGUMENTS_DISABLE: error: 'plugin disable' requires one or more arguments