diff options
| author | cmp@chromium.org <cmp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-20 21:31:01 +0000 |
|---|---|---|
| committer | cmp@chromium.org <cmp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-20 21:31:01 +0000 |
| commit | 890e063bcbd0d0729dea281bd801cb7c82bf9181 (patch) | |
| tree | f9633ee0db56ca56e940b3c0c9b78552892c6d5c /tools/perf_expectations | |
| parent | bf870869656305c843ca40283082103491c05c54 (diff) | |
| download | chromium_src-890e063bcbd0d0729dea281bd801cb7c82bf9181.zip chromium_src-890e063bcbd0d0729dea281bd801cb7c82bf9181.tar.gz chromium_src-890e063bcbd0d0729dea281bd801cb7c82bf9181.tar.bz2 | |
Make sure that tests are run on upload.
TBR=nsylvain@chromium.org
Review URL: http://codereview.chromium.org/9008019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115185 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/perf_expectations')
| -rw-r--r-- | tools/perf_expectations/PRESUBMIT.py | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/tools/perf_expectations/PRESUBMIT.py b/tools/perf_expectations/PRESUBMIT.py index 1c1c713..b74e2e6 100644 --- a/tools/perf_expectations/PRESUBMIT.py +++ b/tools/perf_expectations/PRESUBMIT.py @@ -8,10 +8,6 @@ See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts for details on the presubmit API built into gcl. """ -UNIT_TESTS = [ - 'tests.perf_expectations_unittest', -] - PERF_EXPECTATIONS = 'tools/perf_expectations/perf_expectations.json' CONFIG_FILE = 'tools/perf_expectations/chromium_perf_expectations.cfg' @@ -23,9 +19,9 @@ def CheckChangeOnUpload(input_api, output_api): output = [] if run_tests: - output.extend(input_api.canned_checks.RunPythonUnitTests(input_api, - output_api, - UNIT_TESTS)) + whitelist = [r'.+_unittest\.py$'] + output.extend(input_api.canned_checks.RunUnitTestsInDirectory( + input_api, output_api, 'tests', whitelist)) return output @@ -37,9 +33,9 @@ def CheckChangeOnCommit(input_api, output_api): output = [] if run_tests: - output.extend(input_api.canned_checks.RunPythonUnitTests(input_api, - output_api, - UNIT_TESTS)) + whitelist = [r'.+_unittest\.py$'] + output.extend(input_api.canned_checks.RunUnitTestsInDirectory( + input_api, output_api, 'tests', whitelist)) output.extend(input_api.canned_checks.CheckDoNotSubmit(input_api, output_api)) |