From f8ac2da11454d2c2edb9e6254d10e99aa6dc110d Mon Sep 17 00:00:00 2001
From: Chris Bieneman <beanz@apple.com>
Date: Mon, 31 Oct 2016 04:48:19 +0000
Subject: [Test Suite] Pull generateSource into lldbtest

Summary:
Convert tests using LLDB headers to use generateSource to put the right include paths in place regardless of whether or not you're building a framework.

This also abstracted generateSource out of TestPublicAPIHeaders.py into lldbtest.py.

Reviewers: tfiala, zturner

Subscribers: lldb-commits

Differential Revision: https://reviews.llvm.org/D25887

llvm-svn: 285542
---
 .../plugins/commands/TestPluginCommands.py         |  4 ++
 .../functionalities/plugins/commands/plugin.cpp    | 62 ----------------------
 .../plugins/commands/plugin.cpp.template           | 54 +++++++++++++++++++
 3 files changed, 58 insertions(+), 62 deletions(-)
 delete mode 100644 lldb/packages/Python/lldbsuite/test/functionalities/plugins/commands/plugin.cpp
 create mode 100644 lldb/packages/Python/lldbsuite/test/functionalities/plugins/commands/plugin.cpp.template

(limited to 'lldb/packages/Python/lldbsuite/test/functionalities/plugins/commands')

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/plugins/commands/TestPluginCommands.py b/lldb/packages/Python/lldbsuite/test/functionalities/plugins/commands/TestPluginCommands.py
index 9341ff97e6f..18fcc41fa9f 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/plugins/commands/TestPluginCommands.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/plugins/commands/TestPluginCommands.py
@@ -18,6 +18,10 @@ class PluginCommandTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
+    def setUp(self):
+        TestBase.setUp(self)
+        self.generateSource('plugin.cpp')
+
     @skipIfNoSBHeaders
     # Requires a compatible arch and platform to link against the host's built
     # lldb lib.
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/plugins/commands/plugin.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/plugins/commands/plugin.cpp
deleted file mode 100644
index be3d29325de..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/plugins/commands/plugin.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-//===-- plugin.cpp -------------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-/*
-An example plugin for LLDB that provides a new foo command with a child subcommand
-Compile this into a dylib foo.dylib and load by placing in appropriate locations on disk or
-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
-
-namespace lldb {
-    bool
-    PluginInitialize (lldb::SBDebugger debugger);
-}
-
-class ChildCommand : public lldb::SBCommandPluginInterface
-{
-public:
-    virtual bool
-    DoExecute (lldb::SBDebugger debugger,
-               char** command,
-               lldb::SBCommandReturnObject &result)
-    {
-        if (command)
-        {
-            const char* arg = *command;
-            while (arg)
-            {
-                result.Printf("%s ",arg);
-                arg = *(++command);
-            }
-            result.Printf("\n");
-            return true;
-        }
-        return false;
-    }
-    
-};
-
-bool
-lldb::PluginInitialize (lldb::SBDebugger debugger)
-{
-    lldb::SBCommandInterpreter interpreter = debugger.GetCommandInterpreter();
-    lldb::SBCommand foo = interpreter.AddMultiwordCommand("plugin_loaded_command",NULL);
-    foo.AddCommand("child",new ChildCommand(),"a child of plugin_loaded_command");
-    return true;
-}
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/plugins/commands/plugin.cpp.template b/lldb/packages/Python/lldbsuite/test/functionalities/plugins/commands/plugin.cpp.template
new file mode 100644
index 00000000000..393e9feec79
--- /dev/null
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/plugins/commands/plugin.cpp.template
@@ -0,0 +1,54 @@
+//===-- plugin.cpp -------------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+/*
+An example plugin for LLDB that provides a new foo command with a child subcommand
+Compile this into a dylib foo.dylib and load by placing in appropriate locations on disk or
+by typing plugin load foo.dylib at the LLDB command line
+*/
+
+%include_SB_APIs%
+
+namespace lldb {
+    bool
+    PluginInitialize (lldb::SBDebugger debugger);
+}
+
+class ChildCommand : public lldb::SBCommandPluginInterface
+{
+public:
+    virtual bool
+    DoExecute (lldb::SBDebugger debugger,
+               char** command,
+               lldb::SBCommandReturnObject &result)
+    {
+        if (command)
+        {
+            const char* arg = *command;
+            while (arg)
+            {
+                result.Printf("%s ",arg);
+                arg = *(++command);
+            }
+            result.Printf("\n");
+            return true;
+        }
+        return false;
+    }
+    
+};
+
+bool
+lldb::PluginInitialize (lldb::SBDebugger debugger)
+{
+    lldb::SBCommandInterpreter interpreter = debugger.GetCommandInterpreter();
+    lldb::SBCommand foo = interpreter.AddMultiwordCommand("plugin_loaded_command",NULL);
+    foo.AddCommand("child",new ChildCommand(),"a child of plugin_loaded_command");
+    return true;
+}
-- 
cgit v1.2.3