[Lldb-commits] [lldb] b623f3c - [lldb] Move builders under lldbsuite.test as they import lldbtest (NFC)

[Jonas Devlieghere via lldb-commits]

Author: Jonas Devlieghere
Date: 2020-08-19T09:07:51-07:00
New Revision: b623f3c0b41aee2984e54bf7a4909532faacc426

URL: https://github.com/llvm/llvm-project/commit/b623f3c0b41aee2984e54bf7a4909532faacc426
DIFF: https://github.com/llvm/llvm-project/commit/b623f3c0b41aee2984e54bf7a4909532faacc426.diff

LOG: [lldb] Move builders under lldbsuite.test as they import lldbtest (NFC)

Added: 
    lldb/packages/Python/lldbsuite/test/builders/__init__.py
    lldb/packages/Python/lldbsuite/test/builders/builder.py
    lldb/packages/Python/lldbsuite/test/builders/darwin.py

Modified: 
    lldb/packages/Python/lldbsuite/test/lldbtest.py

Removed: 
    lldb/packages/Python/lldbsuite/builders/__init__.py
    lldb/packages/Python/lldbsuite/builders/builder.py
    lldb/packages/Python/lldbsuite/builders/darwin.py


################################################################################
diff  --git a/lldb/packages/Python/lldbsuite/builders/__init__.py b/lldb/packages/Python/lldbsuite/test/builders/__init__.py
similarity index 93%
rename from lldb/packages/Python/lldbsuite/builders/__init__.py
rename to lldb/packages/Python/lldbsuite/test/builders/__init__.py
index 0bfcd592031d..84024f291810 100644
--- a/lldb/packages/Python/lldbsuite/builders/__init__.py
+++ b/lldb/packages/Python/lldbsuite/test/builders/__init__.py
@@ -5,12 +5,12 @@
 factory method below hands out builders based on the given platform.
 """
 
-from .builder import Builder
-
 
 def get_builder(platform):
   """Returns a Builder instance for the given platform."""
   if platform == 'darwin':
     from .darwin import BuilderDarwin
     return BuilderDarwin()
+
+  from .builder import Builder
   return Builder()

diff  --git a/lldb/packages/Python/lldbsuite/builders/builder.py b/lldb/packages/Python/lldbsuite/test/builders/builder.py
similarity index 100%
rename from lldb/packages/Python/lldbsuite/builders/builder.py
rename to lldb/packages/Python/lldbsuite/test/builders/builder.py

diff  --git a/lldb/packages/Python/lldbsuite/builders/darwin.py b/lldb/packages/Python/lldbsuite/test/builders/darwin.py
similarity index 100%
rename from lldb/packages/Python/lldbsuite/builders/darwin.py
rename to lldb/packages/Python/lldbsuite/test/builders/darwin.py

diff  --git a/lldb/packages/Python/lldbsuite/test/lldbtest.py b/lldb/packages/Python/lldbsuite/test/lldbtest.py
index 21e112a709c6..de9a9a2c7002 100644
--- a/lldb/packages/Python/lldbsuite/test/lldbtest.py
+++ b/lldb/packages/Python/lldbsuite/test/lldbtest.py
@@ -65,9 +65,9 @@
 from . import lldbtest_config
 from . import lldbutil
 from . import test_categories
-from lldbsuite.builders import get_builder
 from lldbsuite.support import encoded_file
 from lldbsuite.support import funcutils
+from lldbsuite.test.builders import get_builder
 
 # See also dotest.parseOptionsAndInitTestdirs(), where the environment variables
 # LLDB_COMMAND_TRACE is set from '-t' option.