sascha/workload-automation
1
0
Fork 0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-03-21 01:59:13 +00:00
Code Issues Releases Wiki Activity

octaned8: fix log file creation and appending

Browse Source 
Make sure that output is appended to a new log file
Also reduced timeouts to more sensible values

Tested on Mate 8
This commit is contained in:
James Hartley 2016-11-17 17:48:49 +00:00
parent 40d281b336
commit 725d894b9a
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
wlauto/workloads/octaned8/__init__.py
View File

@ -59,7 +59,7 @@ class Octaned8(Workload):
""" """
parameters = [ parameters = [
Parameter('timeout', kind=int, default=120, Parameter('run_timeout', kind=int, default=180,
description='Timeout, in seconds, for the script run time.'), description='Timeout, in seconds, for the script run time.'),
] ]
@ -73,9 +73,9 @@ class Octaned8(Workload):
assets_tar = 'octaned8-assets.tar' assets_tar = 'octaned8-assets.tar'
fpath = context.resolver.get(File(self, assets_tar)) fpath = context.resolver.get(File(self, assets_tar))
self.device.push_file(fpath, assets_dir, timeout=300) self.device.push_file(fpath, assets_dir, timeout=10)
self.command = 'cd {}; {} busybox tar -x -f {}'.format(assets_dir, self.device.busybox, assets_tar) self.command = 'cd {}; {} busybox tar -x -f {}'.format(assets_dir, self.device.busybox, assets_tar)
self.output = self.device.execute(self.command, timeout=self.timeout, check_exit_code=False) self.output = self.device.execute(self.command, timeout=10, check_exit_code=False)
for f in self.executables: for f in self.executables:
binFile = context.resolver.get(Executable(self, self.device.abi, f)) binFile = context.resolver.get(Executable(self, self.device.abi, f))
@ -85,11 +85,12 @@ class Octaned8(Workload):
self.logger.info('Copying d8 binaries to device') self.logger.info('Copying d8 binaries to device')
assets_dir = self.device.path.join(self.device.working_directory, 'assets') assets_dir = self.device.path.join(self.device.working_directory, 'assets')
device_file = self.device.path.join(self.device.working_directory, 'octaned8.output') device_file = self.device.path.join(self.device.working_directory, 'octaned8.output')
self.device.execute('rm {}'.format(device_file))
self.command = 'cd {}; {}/d8 ./run.js >> {} 2>&1'.format(assets_dir, self.device.binaries_directory, device_file) self.command = 'cd {}; {}/d8 ./run.js >> {} 2>&1'.format(assets_dir, self.device.binaries_directory, device_file)
def run(self, context): def run(self, context):
self.logger.info('Starting d8 tests') self.logger.info('Starting d8 tests')
self.output = self.device.execute(self.command, timeout=self.timeout, check_exit_code=False) self.output = self.device.execute(self.command, timeout=self.run_timeout, check_exit_code=False)
def update_result(self, context): def update_result(self, context):
host_file = os.path.join(context.output_directory, 'octaned8.output') host_file = os.path.join(context.output_directory, 'octaned8.output')
@ -103,6 +104,8 @@ class Octaned8(Workload):
match = regex.search(line) match = regex.search(line)
if match: if match:
context.result.add_metric(label, float(match.group(1))) context.result.add_metric(label, float(match.group(1)))
device_file = self.device.path.join(self.device.working_directory, 'octaned8.output')
self.device.execute('rm {}'.format(device_file))
def finalize(self, context): def finalize(self, context):
for f in self.executables: for f in self.executables:
@ -110,5 +113,3 @@ class Octaned8(Workload):
self.device.execute('rm {}'.format(self.device.path.join(self.device.working_directory, f))) self.device.execute('rm {}'.format(self.device.path.join(self.device.working_directory, f)))
assets_dir = self.device.path.join(self.device.working_directory, 'assets') assets_dir = self.device.path.join(self.device.working_directory, 'assets')
self.device.execute('rm -rf {}'.format(assets_dir)) self.device.execute('rm -rf {}'.format(assets_dir))
device_file = self.device.path.join(self.device.working_directory, 'octaned8.output')
self.device.execute('rm {}'.format(device_file))