summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tools/perf_expectations/perf_expectations.json10
-rwxr-xr-xtools/perf_expectations/tests/perf_expectations_unittest.py2
2 files changed, 9 insertions, 3 deletions
diff --git a/tools/perf_expectations/perf_expectations.json b/tools/perf_expectations/perf_expectations.json
index 1034d79..46c0417 100644
--- a/tools/perf_expectations/perf_expectations.json
+++ b/tools/perf_expectations/perf_expectations.json
@@ -1,4 +1,8 @@
-{"linux-release-hardy/morejs/times/t": {"delta": 200, "var": 65},
- "linux-release-hardy/startup/warm/t": {"delta": 200, "var": 12},
- "load": false
+{"linux-release-hardy/morejs/times/t": {"delta": 0, "var": 70},
+ "linux-release-hardy/startup/warm/t": {"delta": 0, "var": 15},
+ "mac-release-10.5/morejs/times/t": {"delta": -30, "var": 60},
+ "mac-release-10.5/startup/warm/t": {"delta": -155, "var": 20},
+ "xp-release-dual-core/morejs/times/t": {"delta": 50, "var": 20},
+ "xp-release-dual-core/startup/warm/t": {"delta": -30, "var": 10},
+ "load": true
}
diff --git a/tools/perf_expectations/tests/perf_expectations_unittest.py b/tools/perf_expectations/tests/perf_expectations_unittest.py
index 47c25d1..88b8251 100755
--- a/tools/perf_expectations/tests/perf_expectations_unittest.py
+++ b/tools/perf_expectations/tests/perf_expectations_unittest.py
@@ -121,6 +121,8 @@ class PerfExpectationsUnittest(unittest.TestCase):
for key in perf_data:
if key == 'load':
continue
+ # tools/buildbot/scripts/master/log_parser.py should have a matching
+ # regular expression.
if not re.match(r"^([\w\.-]+)/([\w\.-]+)/([\w\.-]+)/([\w\.-]+)$", key):
bad_keys.append(key)
if len(bad_keys) > 0: