Revert "[Test Suite] Pull generateSource into lldbtest"

This reverts commit r285357.

I committed this patch accidentally out of order. Will recommit when the change this depends on is landed.

llvm-svn: 285361

8 files changed, 17 insertions, 15 deletions

diff --git a/lldb/packages/Python/lldbsuite/test/api/multithreaded/TestMultithreaded.py b/lldb/packages/Python/lldbsuite/test/api/multithreaded/TestMultithreaded.py
index abd252b1e5b..970c25107f6 100644
--- a/lldb/packages/Python/lldbsuite/test/api/multithreaded/TestMultithreaded.py
+++ b/lldb/packages/Python/lldbsuite/test/api/multithreaded/TestMultithreaded.py
@@ -15,15 +15,6 @@ import subprocess
 
 class SBBreakpointCallbackCase(TestBase):
 
-    def setUp(self):
-        TestBase.setUp(self)
-        self.generateSource('driver.cpp')
-        self.generateSource('listener_test.cpp')
-        self.generateSource('test_breakpoint_callback.cpp')
-        self.generateSource('test_listener_event_description.cpp')
-        self.generateSource('test_listener_event_process_state.cpp')
-        self.generateSource('test_listener_resume.cpp')
-
     mydir = TestBase.compute_mydir(__file__)
 
     @skipIfRemote
diff --git a/lldb/packages/Python/lldbsuite/test/api/multithreaded/driver.cpp.template b/lldb/packages/Python/lldbsuite/test/api/multithreaded/driver.cpp
index adb1d200655..fa0c48e0ecf 100644
--- a/lldb/packages/Python/lldbsuite/test/api/multithreaded/driver.cpp.template
+++ b/lldb/packages/Python/lldbsuite/test/api/multithreaded/driver.cpp
@@ -7,7 +7,7 @@
 #include <string>
 #include <vector>
 
-%include_SB_APIs%
+#include "lldb-headers.h"
 
 #include "common.h"
 
diff --git a/lldb/packages/Python/lldbsuite/test/api/multithreaded/listener_test.cpp.template b/lldb/packages/Python/lldbsuite/test/api/multithreaded/listener_test.cpp
index e305d1af489..b20868ff94f 100644
--- a/lldb/packages/Python/lldbsuite/test/api/multithreaded/listener_test.cpp.template
+++ b/lldb/packages/Python/lldbsuite/test/api/multithreaded/listener_test.cpp
@@ -7,7 +7,7 @@
 #include <thread>
 #include <vector>
 
-%include_SB_APIs%
+#include "lldb-headers.h"
 #include "common.h"
 
 using namespace lldb;
diff --git a/lldb/packages/Python/lldbsuite/test/api/multithreaded/lldb-headers.h b/lldb/packages/Python/lldbsuite/test/api/multithreaded/lldb-headers.h
new file mode 100644
index 00000000000..da0914b3b07
--- /dev/null
+++ b/lldb/packages/Python/lldbsuite/test/api/multithreaded/lldb-headers.h
@@ -0,0 +1,11 @@
+
+#ifndef LLDB_HEADERS_H
+#define LLDB_HEADERS_H
+
+#ifdef __APPLE__
+#include <LLDB/LLDB.h>
+#else
+#include "lldb/API/LLDB.h"
+#endif
+
+#endif // LLDB_HEADERS_H
diff --git a/lldb/packages/Python/lldbsuite/test/api/multithreaded/test_breakpoint_callback.cpp.template b/lldb/packages/Python/lldbsuite/test/api/multithreaded/test_breakpoint_callback.cpp
index 4133025aa49..def31f82b0c 100644
--- a/lldb/packages/Python/lldbsuite/test/api/multithreaded/test_breakpoint_callback.cpp.template
+++ b/lldb/packages/Python/lldbsuite/test/api/multithreaded/test_breakpoint_callback.cpp
@@ -7,7 +7,7 @@
 #include <vector>
 #include <string>
 
-%include_SB_APIs%
+#include "lldb-headers.h"
 
 #include "common.h"
 
diff --git a/lldb/packages/Python/lldbsuite/test/api/multithreaded/test_listener_event_description.cpp.template b/lldb/packages/Python/lldbsuite/test/api/multithreaded/test_listener_event_description.cpp
index 63e3f3631e5..0d7844dce6d 100644
--- a/lldb/packages/Python/lldbsuite/test/api/multithreaded/test_listener_event_description.cpp.template
+++ b/lldb/packages/Python/lldbsuite/test/api/multithreaded/test_listener_event_description.cpp
@@ -8,7 +8,7 @@
 #include <string>
 #include <thread>
 
-%include_SB_APIs%
+#include "lldb-headers.h"
 
 #include "common.h"
 
diff --git a/lldb/packages/Python/lldbsuite/test/api/multithreaded/test_listener_event_process_state.cpp.template b/lldb/packages/Python/lldbsuite/test/api/multithreaded/test_listener_event_process_state.cpp
index 2926ece4d8d..574257e98ee 100644
--- a/lldb/packages/Python/lldbsuite/test/api/multithreaded/test_listener_event_process_state.cpp.template
+++ b/lldb/packages/Python/lldbsuite/test/api/multithreaded/test_listener_event_process_state.cpp
@@ -8,7 +8,7 @@
 #include <string>
 #include <thread>
 
-%include_SB_APIs%
+#include "lldb-headers.h"
 
 #include "common.h"
 
diff --git a/lldb/packages/Python/lldbsuite/test/api/multithreaded/test_listener_resume.cpp.template b/lldb/packages/Python/lldbsuite/test/api/multithreaded/test_listener_resume.cpp
index 4adc9b33887..8cf786b1160 100644
--- a/lldb/packages/Python/lldbsuite/test/api/multithreaded/test_listener_resume.cpp.template
+++ b/lldb/packages/Python/lldbsuite/test/api/multithreaded/test_listener_resume.cpp
@@ -8,7 +8,7 @@
 #include <string>
 #include <thread>
 
-%include_SB_APIs%
+#include "lldb-headers.h"
 
 #include "common.h"