Some tests would fail when the test data is not available, so it doesn't make much sense to expose the action when patman is running outside of the u-boot git checkout.
Reviewed-by: Simon Glass sjg@chromium.org Signed-off-by: Maxim Cournoyer maxim.cournoyer@savoirfairelinux.com ---
Changes in v3: - Mention the test command is hidden unless run from the git repo
tools/patman/__main__.py | 9 ++++++--- tools/patman/patman.rst | 4 ++++ 2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/tools/patman/__main__.py b/tools/patman/__main__.py index 5a7756a221..82cef4fc0b 100755 --- a/tools/patman/__main__.py +++ b/tools/patman/__main__.py @@ -21,6 +21,7 @@ if __name__ == "__main__": # Our modules from patman import command from patman import control +from patman import func_test from patman import gitutil from patman import project from patman import settings @@ -96,9 +97,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 8c5c9cc2cc..ff4c8b3ed2 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.