[rtems-tools commit] Coverage : install covoar in tester/bin

[Chris Johns]

Module:    rtems-tools
Branch:    master
Commit:    a1498ab899fba117df887551b9cbc43da4aa8d10
Changeset: http://git.rtems.org/rtems-tools/commit/?id=a1498ab899fba117df887551b9cbc43da4aa8d10

Author:    Vijay Kumar Banerjee <vijaykumar9597 at gmail.com>
Date:      Sun Nov 25 15:15:00 2018 +0530

Coverage : install covoar in tester/bin

---

 tester/covoar/wscript |  1 +
 tester/rt/coverage.py | 13 ++++++++-----
 tester/rt/test.py     |  2 ++
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/tester/covoar/wscript b/tester/covoar/wscript
index d447117..a3730ea 100644
--- a/tester/covoar/wscript
+++ b/tester/covoar/wscript
@@ -125,6 +125,7 @@ def build(bld):
     bld.program(target = 'covoar',
                 source = ['covoar.cc'],
                 use = ['ccovoar'] + modules,
+                install_path = '${PREFIX}/share/rtems/tester/bin',
                 cflags = ['-O2', '-g'],
                 cxxflags = ['-std=c++11', '-O2', '-g'],
                 includes = ['.'] + rtl_includes)
diff --git a/tester/rt/coverage.py b/tester/rt/coverage.py
index e9a8218..9ff27ad 100644
--- a/tester/rt/coverage.py
+++ b/tester/rt/coverage.py
@@ -288,19 +288,20 @@ class covoar(object):
     '''
     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.config_dir = config_dir
         self.executables = ' '.join(executables)
         self.explanations_txt = explanations_txt
         self.project_name = 'RTEMS-5'
         self.trace = trace
+        self.prefix = prefix
 
     def _find_covoar(self):
         covoar_exe = 'covoar'
         tester_dir = path.dirname(path.abspath(sys.argv[0]))
         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):
             return exe
         exe = path.join(base, 'build', 'tester', 'covoar', covoar_exe)
@@ -336,7 +337,7 @@ class coverage_run(object):
     '''
     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
         '''
@@ -361,6 +362,7 @@ class coverage_run(object):
         self.symbol_set = symbol_set
         self.target = self.macros['target']
         self.bsp_name = self.macros['bsp'].split('-')[0]
+        self.prefix = prefix
 
     def run(self):
         try:
@@ -377,8 +379,9 @@ class coverage_run(object):
             for sset in symbol_sets:
                 parser.write_ini(sset)
                 covoar_runner = covoar(self.test_dir, self.symbol_select_path,
-                                   self.executables, self.explanations_txt,
-                                   self.trace)
+                                       self.executables, self.explanations_txt,
+                                       self.trace,
+                                       self.prefix)
                 covoar_runner.run(sset, self.symbol_select_path)
             self._generate_reports(symbol_sets);
             self._summarize();
diff --git a/tester/rt/test.py b/tester/rt/test.py
index cc9e9f7..da0a11e 100644
--- a/tester/rt/test.py
+++ b/tester/rt/test.py
@@ -290,11 +290,13 @@ def run(args, command_path = None):
             if len(coverage_enabled) == 2:
                 coverage_runner = coverage.coverage_run(opts.defaults,
                                                         executables,
+                                                        rtems_tools,
                                                         symbol_set = coverage_enabled[1],
                                                         trace = cov_trace)
             else:
                 coverage_runner = coverage.coverage_run(opts.defaults,
                                                         executables,
+                                                        rtems_tools,
                                                         trace = cov_trace)
         report_mode = opts.find_arg('--report-mode')
         if report_mode: