aboutsummaryrefslogtreecommitdiff
path: root/tools/buildman
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2020-04-17 18:09:05 -0600
committerSimon Glass <sjg@chromium.org>2020-04-26 14:25:21 -0600
commitb4fa94959db039c7eca4531a5b9a41baffa8b4c8 (patch)
tree31c441d8968f3432b7be5149f401f0fc29fc3d34 /tools/buildman
parentbf776679a73f3b9eae37aabd2be5754483039cb2 (diff)
downloadu-boot-b4fa94959db039c7eca4531a5b9a41baffa8b4c8.zip
u-boot-b4fa94959db039c7eca4531a5b9a41baffa8b4c8.tar.gz
u-boot-b4fa94959db039c7eca4531a5b9a41baffa8b4c8.tar.bz2
patman: Tidy up sys.path changes
Now that we are using absolute paths we can remove some of the sys.path mangling that appears in the tools. We only need to add the path to 'tools/' so that everything can find modules relative to that directory. The special paths for finding pylibfdt remain. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'tools/buildman')
-rwxr-xr-xtools/buildman/main.py3
-rw-r--r--tools/buildman/test.py1
2 files changed, 1 insertions, 3 deletions
diff --git a/tools/buildman/main.py b/tools/buildman/main.py
index 52a83fc..2b71473 100755
--- a/tools/buildman/main.py
+++ b/tools/buildman/main.py
@@ -16,7 +16,6 @@ import unittest
# Bring in the patman libraries
our_path = os.path.dirname(os.path.realpath(__file__))
sys.path.insert(1, os.path.join(our_path, '..'))
-sys.path.insert(2, os.path.join(our_path, '../patman'))
# Our modules
from buildman import board
@@ -35,7 +34,7 @@ def RunTests(skip_net_tests):
import doctest
result = unittest.TestResult()
- for module in ['toolchain', 'gitutil']:
+ for module in ['buildman.toolchain', 'patman.gitutil']:
suite = doctest.DocTestSuite(module)
suite.run(result)
diff --git a/tools/buildman/test.py b/tools/buildman/test.py
index b37c37b2..40811ba 100644
--- a/tools/buildman/test.py
+++ b/tools/buildman/test.py
@@ -11,7 +11,6 @@ import unittest
# Bring in the patman libraries
our_path = os.path.dirname(os.path.realpath(__file__))
-sys.path.append(os.path.join(our_path, '../patman'))
from buildman import board
from buildman import bsettings