diff options
| author | Simon Glass <sjg@chromium.org> | 2014-08-28 09:43:42 -0600 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2014-09-05 13:40:43 -0600 |
| commit | 48c1b6a8ff9f539506f59bfe42590af0f92c8cb8 (patch) | |
| tree | c16fca4abca7f479e8b2fd84196711faee778376 /tools/buildman | |
| parent | 3cf4ae6f8672cd10ddba4b18bf82e4d03aeb15e6 (diff) | |
| download | u-boot-imx-48c1b6a8ff9f539506f59bfe42590af0f92c8cb8.zip u-boot-imx-48c1b6a8ff9f539506f59bfe42590af0f92c8cb8.tar.gz u-boot-imx-48c1b6a8ff9f539506f59bfe42590af0f92c8cb8.tar.bz2 | |
buildman: Remove the directory prefix from each error line
The full path is long and also includes buildman private directories.
Clean this up, so that only a relative U-Boot path is shown.
This will change warnings like these:
/home/sjg/c/src/third_party/u-boot/buildman5/.bm-work/00/arch/sandbox/cpu/cpu.c: In function 'timer_get_us':
/home/sjg/c/src/third_party/u-boot/buildman5/.bm-work/00/arch/sandbox/cpu/cpu.c:40:9: warning: unused variable 'i' [-Wunused-variable]
/home/sjg/c/src/third_party/u-boot/files/arch/sandbox/cpu/cpu.c: In function 'timer_get_us':
/home/sjg/c/src/third_party/u-boot/files/arch/sandbox/cpu/cpu.c:40:9: warning: unused variable 'i' [-Wunused-variable]
to:
arch/sandbox/cpu/cpu.c: In function 'timer_get_us':
arch/sandbox/cpu/cpu.c:40:9: warning: unused variable 'i' [-Wunused-variable]
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'tools/buildman')
| -rw-r--r-- | tools/buildman/builderthread.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/buildman/builderthread.py b/tools/buildman/builderthread.py index 8214662..0246375 100644 --- a/tools/buildman/builderthread.py +++ b/tools/buildman/builderthread.py @@ -177,6 +177,7 @@ class BuilderThread(threading.Thread): Mkdir(out_dir) args = [] cwd = work_dir + src_dir = os.path.realpath(work_dir) if not self.builder.in_tree: if commit_upto is None: # In this case we are building in the original source @@ -189,6 +190,7 @@ class BuilderThread(threading.Thread): work_dir = os.path.realpath(work_dir) args.append('O=%s/build' % work_dir) cwd = None + src_dir = os.getcwd() else: args.append('O=build') args.append('-s') @@ -209,7 +211,7 @@ class BuilderThread(threading.Thread): if result.return_code == 0: result = self.Make(commit, brd, 'build', cwd, *args, env=env) - result.stdout = config_out + result.stdout + result.stderr = result.stderr.replace(src_dir + '/', '') else: result.return_code = 1 result.stderr = 'No tool chain for %s\n' % brd.arch |