aboutsummaryrefslogtreecommitdiffstats
path: root/meta/lib/oeqa/buildperf
diff options
context:
space:
mode:
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>2016-08-29 22:48:31 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-03 09:58:31 +0100
commitb22a71cf3a53a33763ff02608119d2c73cbde006 (patch)
treefe81a627d7655c97e277d8c35f14ceeb229c9515 /meta/lib/oeqa/buildperf
parent4502f0979bf2e8698bb196345b89b170641fd43f (diff)
downloadopenembedded-core-contrib-b22a71cf3a53a33763ff02608119d2c73cbde006.tar.gz
oeqa.buildperf: include commands log file name in results.json
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa/buildperf')
-rw-r--r--meta/lib/oeqa/buildperf/base.py14
1 files changed, 9 insertions, 5 deletions
diff --git a/meta/lib/oeqa/buildperf/base.py b/meta/lib/oeqa/buildperf/base.py
index 0b2c0f8e733..be3a946ddf2 100644
--- a/meta/lib/oeqa/buildperf/base.py
+++ b/meta/lib/oeqa/buildperf/base.py
@@ -220,6 +220,8 @@ class BuildPerfTestResult(unittest.TextTestResult):
'status': status,
'start_time': test.start_time,
'elapsed_time': test.elapsed_time,
+ 'cmd_log_file': os.path.relpath(test.cmd_log_file,
+ self.out_dir),
'measurements': test.measurements}
results['tests'] = tests
@@ -312,6 +314,10 @@ class BuildPerfTestCase(unittest.TestCase):
def out_dir(self):
return os.path.join(self.base_dir, self.name)
+ @property
+ def cmd_log_file(self):
+ return os.path.join(self.out_dir, 'commands.log')
+
def setUp(self):
"""Set-up fixture for each test"""
if self.build_target:
@@ -328,9 +334,8 @@ class BuildPerfTestCase(unittest.TestCase):
"""Run a command and log it's output"""
cmd_str = cmd if isinstance(cmd, str) else ' '.join(cmd)
log.info("Logging command: %s", cmd_str)
- cmd_log = os.path.join(self.out_dir, 'commands.log')
try:
- with open(cmd_log, 'a') as fobj:
+ with open(self.cmd_log_file, 'a') as fobj:
runCmd2(cmd, stdout=fobj)
except CommandError as err:
log.error("Command failed: %s", err.retcode)
@@ -368,9 +373,8 @@ class BuildPerfTestCase(unittest.TestCase):
cmd_str = cmd if isinstance(cmd, str) else ' '.join(cmd)
log.info("Timing command: %s", cmd_str)
data_q = SimpleQueue()
- cmd_log = os.path.join(self.out_dir, 'commands.log')
try:
- with open(cmd_log, 'a') as fobj:
+ with open(self.cmd_log_file, 'a') as fobj:
proc = Process(target=_worker, args=(data_q, cmd,),
kwargs={'stdout': fobj})
proc.start()
@@ -380,7 +384,7 @@ class BuildPerfTestCase(unittest.TestCase):
raise data
except CommandError:
log.error("Command '%s' failed, see %s for more details", cmd_str,
- cmd_log)
+ self.cmd_log_file)
raise
etime = data['elapsed_time']