diff options
| author | chase@chromium.org <chase@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-11 21:00:50 +0000 |
|---|---|---|
| committer | chase@chromium.org <chase@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-11 21:00:50 +0000 |
| commit | 1430561ede1be63543f07085b59ec17112b9b80b (patch) | |
| tree | 31a7648a0f7049c8bcad58d6ed300c741c7346e6 | |
| parent | 791f7693529ae34db21b6b3c3b78231b2f29dc7b (diff) | |
| download | chromium_src-1430561ede1be63543f07085b59ec17112b9b80b.zip chromium_src-1430561ede1be63543f07085b59ec17112b9b80b.tar.gz chromium_src-1430561ede1be63543f07085b59ec17112b9b80b.tar.bz2 | |
Revert "Convert mac10.6/dhtml/times to new expectations format."
This reverts r55769.
BUG=none
TEST=mac10.6/dhtml passes
TBR=nsylvain@chromium.org
Review URL: http://codereview.chromium.org/3151009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55779 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | tools/perf_expectations/perf_expectations.json | 2 | ||||
| -rwxr-xr-x | tools/perf_expectations/tests/perf_expectations_unittest.py | 30 |
2 files changed, 9 insertions, 23 deletions
diff --git a/tools/perf_expectations/perf_expectations.json b/tools/perf_expectations/perf_expectations.json index 797cf439..ecfb922 100644 --- a/tools/perf_expectations/perf_expectations.json +++ b/tools/perf_expectations/perf_expectations.json @@ -16,7 +16,7 @@ "mac-release-10.5/morejs/times/t": {"delta": -35, "var": 80}, "mac-release-10.5/moz/times/t": {"delta": 80, "var": 80}, "mac-release-10.5/startup/warm/t": {"delta": 30, "var": 20}, - "mac-release-10.6/dhtml/times/t": {"improve": -33, "regress": 9}, + "mac-release-10.6/dhtml/times/t": {"delta": -12, "var": 14}, "mac-release-10.6/intl1/times/t": {"delta": 600, "var": 110}, "mac-release-10.6/intl2/times/t": {"delta": 60, "var": 60}, "mac-release-10.6/morejs/times/t": {"delta": -40, "var": 50}, diff --git a/tools/perf_expectations/tests/perf_expectations_unittest.py b/tools/perf_expectations/tests/perf_expectations_unittest.py index ffb0e23..88b8251 100755 --- a/tools/perf_expectations/tests/perf_expectations_unittest.py +++ b/tools/perf_expectations/tests/perf_expectations_unittest.py @@ -105,28 +105,14 @@ class PerfExpectationsUnittest(unittest.TestCase): for key in perf_data: if key == 'load': continue - - # First check if regress/improve is in the key's data. - if 'regress' in perf_data[key]: - if 'improve' not in perf_data[key]: - bad_keys.append(key) - if (not isinstance(perf_data[key]['regress'], int) and - not isinstance(perf_data[key]['regress'], float)): - bad_keys.append(key) - if (not isinstance(perf_data[key]['improve'], int) and - not isinstance(perf_data[key]['improve'], float)): - bad_keys.append(key) - else: - # Otherwise check if delta/var is in the key's data. - if 'delta' not in perf_data[key] or 'var' not in perf_data[key]: - bad_keys.append(key) - if (not isinstance(perf_data[key]['delta'], int) and - not isinstance(perf_data[key]['delta'], float)): - bad_keys.append(key) - if (not isinstance(perf_data[key]['var'], int) and - not isinstance(perf_data[key]['var'], float)): - bad_keys.append(key) - + if 'delta' not in perf_data[key] or 'var' not in perf_data[key]: + bad_keys.append(key) + if (not isinstance(perf_data[key]['delta'], int) and + not isinstance(perf_data[key]['delta'], float)): + bad_keys.append(key) + if (not isinstance(perf_data[key]['var'], int) and + not isinstance(perf_data[key]['var'], float)): + bad_keys.append(key) if len(bad_keys) > 0: msg = "perf expectations key values missing or invalid delta/var" raise Exception("%s: %s" % (msg, bad_keys)) |