From 29d9bea93f5efad391202e0e15f27d3bbf3bfd50 Mon Sep 17 00:00:00 2001 From: Siva Chandra Date: Fri, 12 Feb 2016 20:30:47 +0000 Subject: Adjust for Python-3. Summary: This does not yet give us a clean testsuite run but it does help with: 1. Actually building on linux 2. Run the testsuite with over 70% tests passing on linux. Reviewers: tfiala, labath, zturner Subscribers: lldb-commits Differential Revision: http://reviews.llvm.org/D17182 llvm-svn: 260721 --- lldb/packages/Python/lldbsuite/test/lldbtest.py | 4 ++++ lldb/packages/Python/lldbsuite/test/plugins/builder_linux.py | 4 ++++ lldb/packages/Python/lldbsuite/test/plugins/builder_linux2.py | 4 ---- 3 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 lldb/packages/Python/lldbsuite/test/plugins/builder_linux.py delete mode 100644 lldb/packages/Python/lldbsuite/test/plugins/builder_linux2.py (limited to 'lldb/packages/Python') diff --git a/lldb/packages/Python/lldbsuite/test/lldbtest.py b/lldb/packages/Python/lldbsuite/test/lldbtest.py index 7bf2a5e663b..ac315fe8155 100644 --- a/lldb/packages/Python/lldbsuite/test/lldbtest.py +++ b/lldb/packages/Python/lldbsuite/test/lldbtest.py @@ -440,6 +440,10 @@ def builder_module(): return __import__("builder_freebsd") if sys.platform.startswith("netbsd"): return __import__("builder_netbsd") + if sys.platform.startswith("linux"): + # sys.platform with Python-3.x returns 'linux', but with + # Python-2.x it returns 'linux2'. + return __import__("builder_linux") return __import__("builder_" + sys.platform) diff --git a/lldb/packages/Python/lldbsuite/test/plugins/builder_linux.py b/lldb/packages/Python/lldbsuite/test/plugins/builder_linux.py new file mode 100644 index 00000000000..e56be429823 --- /dev/null +++ b/lldb/packages/Python/lldbsuite/test/plugins/builder_linux.py @@ -0,0 +1,4 @@ +from builder_base import * + +def buildDsym(sender=None, architecture=None, compiler=None, dictionary=None, clean=True): + return False diff --git a/lldb/packages/Python/lldbsuite/test/plugins/builder_linux2.py b/lldb/packages/Python/lldbsuite/test/plugins/builder_linux2.py deleted file mode 100644 index e56be429823..00000000000 --- a/lldb/packages/Python/lldbsuite/test/plugins/builder_linux2.py +++ /dev/null @@ -1,4 +0,0 @@ -from builder_base import * - -def buildDsym(sender=None, architecture=None, compiler=None, dictionary=None, clean=True): - return False -- cgit v1.2.3