2 files changed, 19 insertions, 17 deletions
diff --git a/packages/Python/lldbsuite/test/functionalities/plugins/commands/TestPluginCommands.py b/packages/Python/lldbsuite/test/functionalities/plugins/commands/TestPluginCommands.py
index 619ed7afe3282..18fcc41fa9f63 100644
--- a/packages/Python/lldbsuite/test/functionalities/plugins/commands/TestPluginCommands.py
+++ b/packages/Python/lldbsuite/test/functionalities/plugins/commands/TestPluginCommands.py
@@ -5,20 +5,27 @@ Test that plugins that load commands work correctly.
 from __future__ import print_function
 
 
-
-import os, time
+import os
+import time
 import re
 import lldb
 from lldbsuite.test.decorators import *
 from lldbsuite.test.lldbtest import *
 from lldbsuite.test import lldbutil
 
+
 class PluginCommandTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
+    def setUp(self):
+        TestBase.setUp(self)
+        self.generateSource('plugin.cpp')
+
     @skipIfNoSBHeaders
-    @skipIfHostIncompatibleWithRemote # Requires a compatible arch and platform to link against the host's built lldb lib.
+    # Requires a compatible arch and platform to link against the host's built
+    # lldb lib.
+    @skipIfHostIncompatibleWithRemote
     @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24778")
     @no_debug_info_test
     def test_load_plugin(self):
@@ -37,23 +44,26 @@ class PluginCommandTestCase(TestBase):
 
         retobj = lldb.SBCommandReturnObject()
 
-        retval = debugger.GetCommandInterpreter().HandleCommand("plugin load %s" % plugin_lib_name, retobj)
+        retval = debugger.GetCommandInterpreter().HandleCommand(
+            "plugin load %s" % plugin_lib_name, retobj)
 
         retobj.Clear()
 
-        retval = debugger.GetCommandInterpreter().HandleCommand("plugin_loaded_command child abc def ghi",retobj)
+        retval = debugger.GetCommandInterpreter().HandleCommand(
+            "plugin_loaded_command child abc def ghi", retobj)
 
         if self.TraceOn():
             print(retobj.GetOutput())
 
-        self.expect(retobj,substrs = ['abc def ghi'], exe=False)
+        self.expect(retobj, substrs=['abc def ghi'], exe=False)
 
         retobj.Clear()
 
         # check that abbreviations work correctly in plugin commands.
-        retval = debugger.GetCommandInterpreter().HandleCommand("plugin_loaded_ ch abc def ghi",retobj)
+        retval = debugger.GetCommandInterpreter().HandleCommand(
+            "plugin_loaded_ ch abc def ghi", retobj)
 
         if self.TraceOn():
             print(retobj.GetOutput())
 
-        self.expect(retobj,substrs = ['abc def ghi'], exe=False)
+        self.expect(retobj, substrs=['abc def ghi'], exe=False)
diff --git a/packages/Python/lldbsuite/test/functionalities/plugins/commands/plugin.cpp b/packages/Python/lldbsuite/test/functionalities/plugins/commands/plugin.cpp.template
index be3d29325de1a..393e9feec7969 100644
--- a/packages/Python/lldbsuite/test/functionalities/plugins/commands/plugin.cpp
+++ b/packages/Python/lldbsuite/test/functionalities/plugins/commands/plugin.cpp.template
@@ -13,15 +13,7 @@ Compile this into a dylib foo.dylib and load by placing in appropriate locations
 by typing plugin load foo.dylib at the LLDB command line
 */
 
-#if defined (__APPLE__)
-#include <LLDB/SBCommandInterpreter.h>
-#include <LLDB/SBCommandReturnObject.h>
-#include <LLDB/SBDebugger.h>
-#else
-#include <lldb/API/SBCommandInterpreter.h>
-#include <lldb/API/SBCommandReturnObject.h>
-#include <lldb/API/SBDebugger.h>
-#endif
+%include_SB_APIs%
 
 namespace lldb {
     bool