Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

waf: add post build callbacks in separate function 

That makes it easier see what callbacks are or not being added and the order
they are executed. While at it, don't add build summary callback when in a
check command.
This commit is contained in:
Gustavo Jose de Sousa 2016-07-28 14:15:18 -03:00 committed by Lucas De Marchi
parent d1c5691501
commit cb1c7b66cb
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
wscript
View File

@ -217,10 +217,9 @@ def _build_cmd_tweaks(bld):
bld.cmd = 'check' bld.cmd = 'check'
if bld.cmd == 'check': if bld.cmd == 'check':
bld.options.clear_failed_tests = True
if not bld.env.HAS_GTEST: if not bld.env.HAS_GTEST:
bld.fatal('check: gtest library is required') bld.fatal('check: gtest library is required')
bld.add_post_fun(ardupilotwaf.test_summary) bld.options.clear_failed_tests = True
def _build_dynamic_sources(bld): def _build_dynamic_sources(bld):
bld( bld(
@ -307,6 +306,14 @@ def _write_version_header(tsk):
bld = tsk.generator.bld bld = tsk.generator.bld
return bld.write_version_header(tsk.outputs[0].abspath()) return bld.write_version_header(tsk.outputs[0].abspath())
def _build_post_funs(bld):
if bld.cmd == 'check':
bld.add_post_fun(ardupilotwaf.test_summary)
else:
bld.build_summary_post_fun()
if bld.env.SUBMODULE_UPDATE:
bld.git_submodule_post_fun()
def build(bld): def build(bld):
config_hash = Utils.h_file(bld.bldnode.make_node('ap_config.h').abspath()) config_hash = Utils.h_file(bld.bldnode.make_node('ap_config.h').abspath())
@ -341,9 +348,7 @@ def build(bld):
group='dynamic_sources', group='dynamic_sources',
) )
bld.load('build_summary') _build_post_funs(bld)
if bld.env.SUBMODULE_UPDATE:
bld.git_submodule_post_fun()
ardupilotwaf.build_command('check', ardupilotwaf.build_command('check',
program_group_list='all', program_group_list='all',