diff options
| -rw-r--r-- | crosperf/experiment_file.py | 2 | ||||
| -rw-r--r-- | crosperf/suite_runner.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/crosperf/experiment_file.py b/crosperf/experiment_file.py index c70566fd..293e822f 100644 --- a/crosperf/experiment_file.py +++ b/crosperf/experiment_file.py @@ -33,7 +33,7 @@ class ExperimentFile(object): # Field regex, e.g. "iterations: 3" _FIELD_VALUE_RE = re.compile(r"(\+)?\s*(\w+?)(?:\.(\S+))?\s*:\s*(.*)") # Open settings regex, e.g. "label {" - _OPEN_SETTINGS_RE = re.compile(r"(?:([\w.]+):)?\s*([\w.]+)\s*{") + _OPEN_SETTINGS_RE = re.compile(r"(?:([\w.-]+):)?\s*([\w.-]+)\s*{") # Close settings regex. _CLOSE_SETTINGS_RE = re.compile(r"}") diff --git a/crosperf/suite_runner.py b/crosperf/suite_runner.py index 47e29c49..f69f3728 100644 --- a/crosperf/suite_runner.py +++ b/crosperf/suite_runner.py @@ -20,7 +20,7 @@ def GetProfilerArgs (benchmark): if not perf_args_list[0] in ["record", "stat"]: raise Exception("perf_args must start with either record or stat") extra_test_args = ["profiler=custom_perf", - ("profiler_args=\"'%s'\"" % + ("profiler_args='%s'" % perf_args)] return " ".join(extra_test_args) else: |