summaryrefslogtreecommitdiffstats
path: root/PRESUBMIT.py
diff options
context:
space:
mode:
authoragable@chromium.org <agable@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-07 02:45:13 +0000
committeragable@chromium.org <agable@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-07 02:45:13 +0000
commit71afb4ec85e974f2b8832291e4bc8881e3035d97 (patch)
tree1c05399b4b1500be5d587b4a2ee73862209d230a /PRESUBMIT.py
parent957744328a490e084500d084962b71b93ae72b69 (diff)
downloadchromium_src-71afb4ec85e974f2b8832291e4bc8881e3035d97.zip
chromium_src-71afb4ec85e974f2b8832291e4bc8881e3035d97.tar.gz
chromium_src-71afb4ec85e974f2b8832291e4bc8881e3035d97.tar.bz2
Swap linux_aura for linux_gtk in PRESUBMIT try stuff.
Needs to land at the same time as the master restart for https://codereview.chromium.org/151393003/ BUG=336581 NOTRY=true R=phajdan.jr@chromium.org Review URL: https://codereview.chromium.org/147233003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@249591 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'PRESUBMIT.py')
-rw-r--r--PRESUBMIT.py19
1 files changed, 6 insertions, 13 deletions
diff --git a/PRESUBMIT.py b/PRESUBMIT.py
index 714b8a7..349910a 100644
--- a/PRESUBMIT.py
+++ b/PRESUBMIT.py
@@ -1244,17 +1244,6 @@ def GetDefaultTryConfigs(bots=None):
#'webkit_unit_tests',
]
- linux_aura_tests = [
- 'app_list_unittests',
- 'aura_unittests',
- 'browser_tests',
- 'compositor_unittests',
- 'content_browsertests',
- 'content_unittests',
- 'events_unittests',
- 'interactive_ui_tests',
- 'unit_tests',
- ]
builders_and_tests = {
# TODO(maruel): Figure out a way to run 'sizes' where people can
# effectively update the perf expectation correctly. This requires a
@@ -1280,7 +1269,7 @@ def GetDefaultTryConfigs(bots=None):
'ios_rel_device': ['compile'],
'linux_asan': ['defaulttests'],
#TODO(stip): Change the name of this builder to reflect that it's release.
- 'linux_aura': linux_aura_tests,
+ 'linux_gtk': standard_tests,
'linux_chromeos_asan': ['defaulttests'],
'linux_chromeos_clang': ['compile'],
# Note: It is a Release builder even if its name convey otherwise.
@@ -1301,9 +1290,13 @@ def GetDefaultTryConfigs(bots=None):
'linux_clang': ['compile'],
'linux_nacl_sdk_build': ['compile'],
'linux_rel': standard_tests + [
+ 'app_list_unittests',
+ 'aura_unittests',
'cc_unittests',
'chromedriver_unittests',
'components_unittests',
+ 'compositor_unittests',
+ 'events_unittests',
'google_apis_unittests',
'nacl_integration',
'remoting_unittests',
@@ -1429,7 +1422,7 @@ def GetPreferredTrySlaves(project, change):
'android_dbg',
'ios_dbg_simulator',
'ios_rel_device',
- 'linux_aura',
+ 'linux_gtk',
'linux_asan',
'linux_chromeos',
'linux_clang',