From aef7f52f96efa8471bfd55ca2c875a122ad8f3f9 Mon Sep 17 00:00:00 2001 From: Sergei Trofimov Date: Tue, 21 Apr 2015 15:12:48 +0100 Subject: [PATCH] telemetry: ignore errors in dividuation subtests. check_output will ignore error code 1 returned by telemetry execution, as this happens when individiual sub-tests and partial results may, and should, still be extracted. --- wlauto/workloads/telemetry/__init__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wlauto/workloads/telemetry/__init__.py b/wlauto/workloads/telemetry/__init__.py index 32ff1156..9f6d6f1b 100644 --- a/wlauto/workloads/telemetry/__init__.py +++ b/wlauto/workloads/telemetry/__init__.py @@ -11,8 +11,8 @@ from wlauto.utils.misc import check_output, get_null, get_meansd from wlauto.utils.types import numeric, identifier -RESULT_REGEX = re.compile(r'RESULT ([^:]+): ([^=]+)\s*=\s*' # preamble and test/metric name - r'(\[([^\]]+)\]|(\S+))' # value +RESULT_REGEX = re.compile(r'RESULT ([^:]+): ([^=]+)\s*=\s*' # preamble and test/metric name + r'(\[([^\]]+)\]|(\S+))' # value r'\s*(\S+)') # units @@ -117,7 +117,7 @@ class Telemetry(Workload): def run(self, context): self.logger.debug(self.command) - self.raw_output, _ = check_output(self.command, shell=True, timeout=self.run_timeout) + self.raw_output, _ = check_output(self.command, shell=True, timeout=self.run_timeout, ignore=1) def update_result(self, context): if not self.raw_output: