leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

buildman: Remove the directory prefix from each error line

Browse Source 
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>
This commit is contained in:
Simon Glass 2014-08-28 09:43:42 -06:00
parent 3cf4ae6f86
commit 48c1b6a8ff
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/buildman/builderthread.py
View File

@ -177,6 +177,7 @@ class BuilderThread(threading.Thread):
Mkdir(out_dir) Mkdir(out_dir)
args = [] args = []
cwd = work_dir cwd = work_dir
src_dir = os.path.realpath(work_dir)
if not self.builder.in_tree: if not self.builder.in_tree:
if commit_upto is None: if commit_upto is None:
# In this case we are building in the original source # 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) work_dir = os.path.realpath(work_dir)
args.append('O=%s/build' % work_dir) args.append('O=%s/build' % work_dir)
cwd = None cwd = None
src_dir = os.getcwd()
else: else:
args.append('O=build') args.append('O=build')
args.append('-s') args.append('-s')
@ -209,7 +211,7 @@ class BuilderThread(threading.Thread):
if result.return_code == 0: if result.return_code == 0:
result = self.Make(commit, brd, 'build', cwd, *args, result = self.Make(commit, brd, 'build', cwd, *args,
env=env) env=env)
result.stdout = config_out + result.stdout result.stderr = result.stderr.replace(src_dir + '/', '')
else: else:
result.return_code = 1 result.return_code = 1
result.stderr = 'No tool chain for %s\n' % brd.arch result.stderr = 'No tool chain for %s\n' % brd.arch