diff options
author | Doug Anderson <dianders@chromium.org> | 2012-11-26 19:21:40 +0400 |
---|---|---|
committer | Simon Glass <sjg@chromium.org> | 2013-02-01 03:23:39 +0400 |
commit | a970048e755768e7d7d10c6b209999133ef75814 (patch) | |
tree | 21bb88f42d1c48bd30e9d257fe7b1bd531e93691 /tools | |
parent | 05d5282b587f6fb7e34e1014e7312d2c25bb9a7f (diff) | |
download | u-boot-a970048e755768e7d7d10c6b209999133ef75814.tar.xz |
patman: Allow tests to run even if patman is in the path
Several of the patman doctests assume that patman was run with:
./patman
Fix them so that they work even if patman is run with just "patman"
(because patman is in the path).
Signed-off-by: Doug Anderson <dianders@chromium.org>
Acked-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/patman/gitutil.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/tools/patman/gitutil.py b/tools/patman/gitutil.py index 72d37a0b04..41a74a55a0 100644 --- a/tools/patman/gitutil.py +++ b/tools/patman/gitutil.py @@ -217,6 +217,10 @@ def EmailPatches(series, cover_fname, args, dry_run, cc_fname, Returns: Git command that was/would be run + # For the duration of this doctest pretend that we ran patman with ./patman + >>> _old_argv0 = sys.argv[0] + >>> sys.argv[0] = './patman' + >>> alias = {} >>> alias['fred'] = ['f.bloggs@napier.co.nz'] >>> alias['john'] = ['j.bloggs@napier.co.nz'] @@ -244,6 +248,9 @@ def EmailPatches(series, cover_fname, args, dry_run, cc_fname, 'git send-email --annotate --to "f.bloggs@napier.co.nz" --cc \ "f.bloggs@napier.co.nz" --cc "j.bloggs@napier.co.nz" --cc \ "m.poppins@cloud.net" --cc-cmd "./patman --cc-cmd cc-fname" cover p1 p2' + + # Restore argv[0] since we clobbered it. + >>> sys.argv[0] = _old_argv0 """ to = BuildEmailList(series.get('to'), '--to', alias) if not to: @@ -340,8 +347,8 @@ def GetTopLevel(): This test makes sure that we are running tests in the right subdir - >>> os.path.realpath(os.getcwd()) == \ - os.path.join(GetTopLevel(), 'tools', 'scripts', 'patman') + >>> os.path.realpath(os.path.dirname(__file__)) == \ + os.path.join(GetTopLevel(), 'tools', 'patman') True """ return command.OutputOneLine('git', 'rev-parse', '--show-toplevel') |