From b623f3c0b41aee2984e54bf7a4909532faacc426 Mon Sep 17 00:00:00 2001
From: Jonas Devlieghere <jonas@devlieghere.com>
Date: Wed, 19 Aug 2020 09:05:11 -0700
Subject: [PATCH] [lldb] Move builders under lldbsuite.test as they import
 lldbtest (NFC)

---
 lldb/packages/Python/lldbsuite/{ => test}/builders/__init__.py | 4 ++--
 lldb/packages/Python/lldbsuite/{ => test}/builders/builder.py  | 0
 lldb/packages/Python/lldbsuite/{ => test}/builders/darwin.py   | 0
 lldb/packages/Python/lldbsuite/test/lldbtest.py                | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename lldb/packages/Python/lldbsuite/{ => test}/builders/__init__.py (93%)
 rename lldb/packages/Python/lldbsuite/{ => test}/builders/builder.py (100%)
 rename lldb/packages/Python/lldbsuite/{ => test}/builders/darwin.py (100%)

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 0bfcd59..84024f2 100644
--- a/lldb/packages/Python/lldbsuite/builders/__init__.py
+++ b/lldb/packages/Python/lldbsuite/test/builders/__init__.py
@@ -5,12 +5,12 @@ Platform specific builders can override methods in the Builder base class. The
 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 21e112a..de9a9a2 100644
--- a/lldb/packages/Python/lldbsuite/test/lldbtest.py
+++ b/lldb/packages/Python/lldbsuite/test/lldbtest.py
@@ -65,9 +65,9 @@ from . import lldbplatformutil
 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.
-- 
2.7.4