diff options
| author | Ben Murdoch <benm@google.com> | 2014-04-16 11:17:03 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2014-04-16 11:17:03 +0100 |
| commit | a02191e04bc25c4935f804f2c080ae28663d096d (patch) | |
| tree | 3cf38961650b5734763e473336009287244306ac /testing | |
| parent | 8bad47e0f7d0c250a0443923cceb52f4a4abcd40 (diff) | |
| download | chromium_org-a02191e04bc25c4935f804f2c080ae28663d096d.tar.gz | |
Merge from Chromium at DEPS revision 263965
This commit was generated by merge_to_master.py.
Change-Id: Ia1121eddd985123f160afde6372525c3d25975bf
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/buildbot/chromium_trybot.json | 32 | ||||
| -rw-r--r-- | testing/gtest.gyp | 10 |
2 files changed, 31 insertions, 11 deletions
diff --git a/testing/buildbot/chromium_trybot.json b/testing/buildbot/chromium_trybot.json index bd6f85b548..65bd06404d 100644 --- a/testing/buildbot/chromium_trybot.json +++ b/testing/buildbot/chromium_trybot.json @@ -1,8 +1,24 @@ [ "app_list_unittests", + "base_unittests", + "browser_tests", + "cacheinvalidation_unittests", + "cc_unittests", + "chromedriver_unittests", + "components_unittests", + "content_browsertests", + "content_unittests", + "crypto_unittests", "device_unittests", "gcm_unit_tests", "gfx_unittests", + "google_apis_unittests", + "gpu_unittests", + "interactive_ui_tests", + "ipc_tests", + "jingle_unittests", + "media_unittests", + "message_center_unittests", "mojo_apps_js_unittests", "mojo_common_unittests", "mojo_js_unittests", @@ -11,5 +27,19 @@ "mojo_public_system_unittests", "mojo_public_utility_unittests", "mojo_service_manager_unittests", - "mojo_system_unittests" + "mojo_system_unittests", + "net_unittests", + "ppapi_unittests", + "printing_unittests", + "remoting_unittests", + "sql_unittests", + "sync_integration_tests", + "sync_unit_tests", + "ui_unittests", + "unit_tests", + { + "test": "sandbox_linux_unittests", + "platforms": ["linux"], + "args": ["--test-launcher-print-test-stdio=always"] + } ] diff --git a/testing/gtest.gyp b/testing/gtest.gyp index 486f3e774d..3a787e12dd 100644 --- a/testing/gtest.gyp +++ b/testing/gtest.gyp @@ -175,16 +175,6 @@ ], }, }], - ['OS=="win" and (MSVS_VERSION=="2012" or MSVS_VERSION=="2012e")', { - 'defines': [ - '_VARIADIC_MAX=10', - ], - 'direct_dependent_settings': { - 'defines': [ - '_VARIADIC_MAX=10', - ], - }, - }], ], 'direct_dependent_settings': { 'defines': [ |