rtems/rtems-tools
1
0
Fork 0
mirror of https://git.rtems.org/rtems-tools/ synced 2025-10-20 00:26:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Coverage : install covoar in tester/bin

Browse Source
This commit is contained in:
Vijay Kumar Banerjee
2018-11-25 14:57:00 +05:30
committed by Chris Johns
parent bf5fdab115
commit a1498ab899
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tester/covoar/wscript
View File

@@ -125,6 +125,7 @@ def build(bld):
bld.program(target = 'covoar', bld.program(target = 'covoar',
source = ['covoar.cc'], source = ['covoar.cc'],
use = ['ccovoar'] + modules, use = ['ccovoar'] + modules,
install_path = '${PREFIX}/share/rtems/tester/bin',
cflags = ['-O2', '-g'], cflags = ['-O2', '-g'],
cxxflags = ['-std=c++11', '-O2', '-g'], cxxflags = ['-std=c++11', '-O2', '-g'],
includes = ['.'] + rtl_includes) includes = ['.'] + rtl_includes)

11
tester/rt/coverage.py
View File

@@ -288,19 +288,20 @@ class covoar(object):
''' '''
Covoar runner Covoar runner
''' '''
def __init__(self, base_result_dir, config_dir, executables, explanations_txt, trace): def __init__(self, base_result_dir, config_dir, executables, explanations_txt, trace, prefix):
self.base_result_dir = base_result_dir self.base_result_dir = base_result_dir
self.config_dir = config_dir self.config_dir = config_dir
self.executables = ' '.join(executables) self.executables = ' '.join(executables)
self.explanations_txt = explanations_txt self.explanations_txt = explanations_txt
self.project_name = 'RTEMS-5' self.project_name = 'RTEMS-5'
self.trace = trace self.trace = trace
self.prefix = prefix
def _find_covoar(self): def _find_covoar(self):
covoar_exe = 'covoar' covoar_exe = 'covoar'
tester_dir = path.dirname(path.abspath(sys.argv[0])) tester_dir = path.dirname(path.abspath(sys.argv[0]))
base = path.dirname(tester_dir) base = path.dirname(tester_dir)
exe = path.join(base, 'bin', covoar_exe) exe = path.join(self.prefix, 'share', 'rtems', 'tester', 'bin', covoar_exe)
if path.isfile(exe): if path.isfile(exe):
return exe return exe
exe = path.join(base, 'build', 'tester', 'covoar', covoar_exe) exe = path.join(base, 'build', 'tester', 'covoar', covoar_exe)
@@ -336,7 +337,7 @@ class coverage_run(object):
''' '''
Coverage analysis support for rtems-test Coverage analysis support for rtems-test
''' '''
def __init__(self, macros_, executables, symbol_set = None, trace = False): def __init__(self, macros_, executables, prefix, symbol_set = None, trace = False):
''' '''
Constructor Constructor
''' '''
@@ -361,6 +362,7 @@ class coverage_run(object):
self.symbol_set = symbol_set self.symbol_set = symbol_set
self.target = self.macros['target'] self.target = self.macros['target']
self.bsp_name = self.macros['bsp'].split('-')[0] self.bsp_name = self.macros['bsp'].split('-')[0]
self.prefix = prefix
def run(self): def run(self):
try: try:
@@ -378,7 +380,8 @@ class coverage_run(object):
parser.write_ini(sset) parser.write_ini(sset)
covoar_runner = covoar(self.test_dir, self.symbol_select_path, covoar_runner = covoar(self.test_dir, self.symbol_select_path,
self.executables, self.explanations_txt, self.executables, self.explanations_txt,
self.trace) self.trace,
self.prefix)
covoar_runner.run(sset, self.symbol_select_path) covoar_runner.run(sset, self.symbol_select_path)
self._generate_reports(symbol_sets); self._generate_reports(symbol_sets);
self._summarize(); self._summarize();

2
tester/rt/test.py
View File

@@ -290,11 +290,13 @@ def run(args, command_path = None):
if len(coverage_enabled) == 2: if len(coverage_enabled) == 2:
coverage_runner = coverage.coverage_run(opts.defaults, coverage_runner = coverage.coverage_run(opts.defaults,
executables, executables,
rtems_tools,
symbol_set = coverage_enabled[1], symbol_set = coverage_enabled[1],
trace = cov_trace) trace = cov_trace)
else: else:
coverage_runner = coverage.coverage_run(opts.defaults, coverage_runner = coverage.coverage_run(opts.defaults,
executables, executables,
rtems_tools,
trace = cov_trace) trace = cov_trace)
report_mode = opts.find_arg('--report-mode') report_mode = opts.find_arg('--report-mode')
if report_mode: if report_mode: