summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xtools/patman/__main__.py9
-rw-r--r--tools/patman/patman.rst4
2 files changed, 10 insertions, 3 deletions
diff --git a/tools/patman/__main__.py b/tools/patman/__main__.py
index 2a2a7eaa240..70968f661b6 100755
--- a/tools/patman/__main__.py
+++ b/tools/patman/__main__.py
@@ -20,6 +20,7 @@ if __name__ == "__main__":
# Our modules
from patman import control
+from patman import func_test
from patman import gitutil
from patman import project
from patman import settings
@@ -95,9 +96,11 @@ send.add_argument('--smtp-server', type=str,
send.add_argument('patchfiles', nargs='*')
-test_parser = subparsers.add_parser('test', help='Run tests')
-test_parser.add_argument('testname', type=str, default=None, nargs='?',
- help="Specify the test to run")
+# Only add the 'test' action if the test data files are available.
+if os.path.exists(func_test.TEST_DATA_DIR):
+ test_parser = subparsers.add_parser('test', help='Run tests')
+ test_parser.add_argument('testname', type=str, default=None, nargs='?',
+ help="Specify the test to run")
status = subparsers.add_parser('status',
help='Check status of patches in patchwork')
diff --git a/tools/patman/patman.rst b/tools/patman/patman.rst
index 8c5c9cc2ccc..ff4c8b3ed2c 100644
--- a/tools/patman/patman.rst
+++ b/tools/patman/patman.rst
@@ -680,6 +680,10 @@ them:
$ tools/patman/patman test
+Note that since the test suite depends on data files only available in
+the git checkout, the `test` command is hidden unless `patman` is
+invoked from the U-Boot git repository.
+
Error handling doesn't always produce friendly error messages - e.g.
putting an incorrect tag in a commit may provide a confusing message.