summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser_tests.isolate4
-rw-r--r--chrome/chrome_tests.gypi34
-rw-r--r--chrome/interactive_ui_tests.isolate4
-rw-r--r--chrome/sync_integration_tests.isolate2
-rw-r--r--chrome/test/base/browser_tests_main.cc11
-rw-r--r--chrome/test/base/chrome_test_launcher.cc28
-rw-r--r--chrome/test/base/chrome_test_launcher.h13
-rw-r--r--chrome/test/base/interactive_ui_tests_main.cc41
-rw-r--r--chrome/unit_tests.isolate4
9 files changed, 40 insertions, 101 deletions
diff --git a/chrome/browser_tests.isolate b/chrome/browser_tests.isolate
index 150f018..f6978b4 100644
--- a/chrome/browser_tests.isolate
+++ b/chrome/browser_tests.isolate
@@ -8,6 +8,8 @@
'command': [
'../testing/xvfb.py',
'<(PRODUCT_DIR)',
+ '../tools/swarm_client/googletest/run_test_cases.py',
+ '--use-less-jobs',
'<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_tracked': [
@@ -127,6 +129,8 @@
'variables': {
'command': [
'../testing/test_env.py',
+ '../tools/swarm_client/googletest/run_test_cases.py',
+ '--use-less-jobs',
'<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)',
],
},
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 6936edd..0497476 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -74,24 +74,6 @@
],
'targets': [
{
- 'target_name': 'test_support_chrome',
- 'type': 'static_library',
- 'dependencies': [
- 'test_support_common',
- '../testing/gtest.gyp:gtest',
- ],
- 'export_dependent_settings': [
- 'test_support_common',
- ],
- 'include_dirs': [
- '..',
- ],
- 'sources': [
- 'test/base/chrome_test_launcher.cc',
- 'test/base/chrome_test_launcher.h',
- ],
- },
- {
'target_name': 'test_support_ui_runner',
'type': 'static_library',
'dependencies': [
@@ -169,7 +151,6 @@
'common/extensions/api/api.gyp:api',
'debugger',
'renderer',
- 'test_support_chrome',
'test_support_common',
# NOTE: don't add test_support_ui, no more UITests. See
# http://crbug.com/137365
@@ -197,6 +178,7 @@
],
'defines': [
'HAS_OUT_OF_PROC_TEST_RUNNER',
+ 'INTERACTIVE_TESTS',
],
'variables': {
'win_use_external_manifest': 1,
@@ -284,6 +266,7 @@
'browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc',
'browser/ui/views/tabs/tab_drag_controller_interactive_uitest.h',
'browser/ui/views/tabs/tab_drag_controller_interactive_uitest_win.cc',
+ 'test/base/chrome_test_launcher.cc',
'test/base/interactive_test_utils.cc',
'test/base/interactive_test_utils.h',
'test/base/interactive_test_utils_aura.cc',
@@ -292,7 +275,6 @@
'test/base/interactive_test_utils_mac.mm',
'test/base/interactive_test_utils_views.cc',
'test/base/interactive_test_utils_win.cc',
- 'test/base/interactive_ui_tests_main.cc',
'test/base/view_event_test_base.cc',
'test/base/view_event_test_base.h',
'test/ppapi/ppapi_interactive_browsertest.cc',
@@ -940,7 +922,6 @@
'common/extensions/api/api.gyp:api',
'renderer',
'test/perf/perf_test.gyp:*',
- 'test_support_chrome',
'test_support_common',
'test_support_unit',
'../base/base.gyp:base',
@@ -1560,9 +1541,9 @@
'renderer/safe_browsing/phishing_dom_feature_extractor_browsertest.cc',
'renderer/translate/translate_helper_browsertest.cc',
'renderer/translate/translate_script_browsertest.cc',
- 'test/base/browser_tests_main.cc',
'test/base/chrome_render_view_test.cc',
'test/base/chrome_render_view_test.h',
+ 'test/base/chrome_test_launcher.cc',
'test/base/web_ui_browsertest.cc',
'test/base/web_ui_browsertest.h',
'test/base/in_process_browser_test_browsertest.cc',
@@ -2019,7 +2000,6 @@
'chrome_resources.gyp:packed_resources',
'renderer',
'test/perf/perf_test.gyp:*',
- 'test_support_chrome',
'test_support_common',
'../base/base.gyp:base',
'../base/base.gyp:base_i18n',
@@ -2056,9 +2036,9 @@
'browser/extensions/extension_apitest.cc',
'browser/extensions/extension_browsertest.cc',
'browser/extensions/extension_test_notification_observer.cc',
- 'test/base/browser_tests_main.cc',
'test/base/chrome_render_view_test.cc',
'test/base/chrome_render_view_test.h',
+ 'test/base/chrome_test_launcher.cc',
'test/perf/browser_perf_test.cc',
'test/perf/browser_perf_test.h',
'test/perf/rendering/throughput_tests.cc',
@@ -2287,7 +2267,6 @@
'common',
'common/extensions/api/api.gyp:api',
'renderer',
- 'test_support_chrome',
'test_support_common',
'../net/net.gyp:net',
'../printing/printing.gyp:printing',
@@ -2316,7 +2295,7 @@
'app/chrome_dll.rc',
'app/chrome_dll_resource.h',
'app/chrome_version.rc.version',
- 'test/base/browser_tests_main.cc',
+ 'test/base/chrome_test_launcher.cc',
'test/data/resource.rc',
'browser/sync/test/integration/apps_helper.cc',
'browser/sync/test/integration/apps_helper.h',
@@ -2468,7 +2447,6 @@
'chrome',
'common/extensions/api/api.gyp:api',
'test/perf/perf_test.gyp:*',
- 'test_support_chrome',
'test_support_common',
'../skia/skia.gyp:skia',
'../sync/sync.gyp:sync',
@@ -2520,7 +2498,7 @@
'browser/sync/test/integration/sync_test.h',
'browser/sync/test/integration/typed_urls_helper.cc',
'browser/sync/test/integration/typed_urls_helper.h',
- 'test/base/browser_tests_main.cc',
+ 'test/base/chrome_test_launcher.cc',
'test/data/resource.rc',
],
'conditions': [
diff --git a/chrome/interactive_ui_tests.isolate b/chrome/interactive_ui_tests.isolate
index 7f9fc0e..057e0b9 100644
--- a/chrome/interactive_ui_tests.isolate
+++ b/chrome/interactive_ui_tests.isolate
@@ -8,6 +8,8 @@
'command': [
'../testing/xvfb.py',
'<(PRODUCT_DIR)',
+ '../tools/swarm_client/googletest/run_test_cases.py',
+ '-j1',
'<(PRODUCT_DIR)/interactive_ui_tests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_tracked': [
@@ -65,6 +67,8 @@
'variables': {
'command': [
'../testing/test_env.py',
+ '../tools/swarm_client/googletest/run_test_cases.py',
+ '-j1',
'<(PRODUCT_DIR)/interactive_ui_tests<(EXECUTABLE_SUFFIX)',
],
},
diff --git a/chrome/sync_integration_tests.isolate b/chrome/sync_integration_tests.isolate
index 3861306..5aa2463 100644
--- a/chrome/sync_integration_tests.isolate
+++ b/chrome/sync_integration_tests.isolate
@@ -8,6 +8,7 @@
'command': [
'../testing/xvfb.py',
'<(PRODUCT_DIR)',
+ '../tools/swarm_client/googletest/run_test_cases.py',
'<(PRODUCT_DIR)/sync_integration_tests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_tracked': [
@@ -51,6 +52,7 @@
['OS=="mac"', {
'variables': {
'command': [
+ '../tools/swarm_client/googletest/run_test_cases.py',
'<(PRODUCT_DIR)/sync_integration_tests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_tracked': [
diff --git a/chrome/test/base/browser_tests_main.cc b/chrome/test/base/browser_tests_main.cc
deleted file mode 100644
index cb2acce..0000000
--- a/chrome/test/base/browser_tests_main.cc
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "base/sys_info.h"
-#include "chrome/test/base/chrome_test_launcher.h"
-
-int main(int argc, char** argv) {
- int default_jobs = std::max(1, base::SysInfo::NumberOfProcessors() / 2);
- return LaunchChromeTests(default_jobs, argc, argv);
-}
diff --git a/chrome/test/base/chrome_test_launcher.cc b/chrome/test/base/chrome_test_launcher.cc
index f14ace3..345f504 100644
--- a/chrome/test/base/chrome_test_launcher.cc
+++ b/chrome/test/base/chrome_test_launcher.cc
@@ -55,8 +55,6 @@
#include "chrome/app/chrome_breakpad_client.h"
#endif
-namespace {
-
class ChromeTestLauncherDelegate : public content::TestLauncherDelegate {
public:
ChromeTestLauncherDelegate() {}
@@ -128,13 +126,31 @@ class ChromeTestLauncherDelegate : public content::TestLauncherDelegate {
DISALLOW_COPY_AND_ASSIGN(ChromeTestLauncherDelegate);
};
-} // namespace
-
-int LaunchChromeTests(int default_jobs, int argc, char** argv) {
+int main(int argc, char** argv) {
#if defined(OS_MACOSX)
chrome_browser_application_mac::RegisterBrowserCrApp();
#endif
+// Only allow ui_controls to be used in interactive_ui_tests, since they depend
+// on focus and can't be sharded.
+#if defined(INTERACTIVE_TESTS)
+ ui_controls::EnableUIControls();
+
+#if defined(OS_CHROMEOS)
+ ui_controls::InstallUIControlsAura(ash::test::CreateAshUIControls());
+#elif defined(USE_AURA)
+
+#if defined(OS_LINUX)
+ ui_controls::InstallUIControlsAura(
+ views::test::CreateUIControlsDesktopAura());
+#else
+ // TODO(win_ash): when running interactive_ui_tests for Win Ash, use above.
+ ui_controls::InstallUIControlsAura(aura::test::CreateUIControlsAura(NULL));
+#endif
+#endif
+
+#endif
+
#if defined(OS_LINUX) || defined(OS_ANDROID)
// We leak this pointer intentionally. The breakpad client needs to outlive
// all other code.
@@ -145,5 +161,5 @@ int LaunchChromeTests(int default_jobs, int argc, char** argv) {
#endif
ChromeTestLauncherDelegate launcher_delegate;
- return content::LaunchTests(&launcher_delegate, default_jobs, argc, argv);
+ return content::LaunchTests(&launcher_delegate, argc, argv);
}
diff --git a/chrome/test/base/chrome_test_launcher.h b/chrome/test/base/chrome_test_launcher.h
deleted file mode 100644
index b9254d3..0000000
--- a/chrome/test/base/chrome_test_launcher.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CHROME_TEST_BASE_CHROME_TEST_LAUNCHER_H_
-#define CHROME_TEST_BASE_CHROME_TEST_LAUNCHER_H_
-
-// Launches Chrome tests using |launcher_delegate|. |default_jobs| is number
-// of test jobs to be run in parallel, unless overridden from the command line.
-// Returns exit code.
-int LaunchChromeTests(int default_jobs, int argc, char** argv);
-
-#endif // CHROME_TEST_BASE_CHROME_TEST_LAUNCHER_H_
diff --git a/chrome/test/base/interactive_ui_tests_main.cc b/chrome/test/base/interactive_ui_tests_main.cc
deleted file mode 100644
index 8de925a..0000000
--- a/chrome/test/base/interactive_ui_tests_main.cc
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "chrome/test/base/chrome_test_launcher.h"
-
-#include "ui/base/test/ui_controls.h"
-
-#if defined(USE_AURA)
-#include "ui/aura/test/ui_controls_factory_aura.h"
-#include "ui/base/test/ui_controls_aura.h"
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-#include "ui/views/test/ui_controls_factory_desktop_aurax11.h"
-#endif
-#endif
-
-#if defined(OS_CHROMEOS)
-#include "ash/test/ui_controls_factory_ash.h"
-#endif
-
-int main(int argc, char** argv) {
- // Only allow ui_controls to be used in interactive_ui_tests, since they
- // depend on focus and can't be sharded.
- ui_controls::EnableUIControls();
-
-#if defined(OS_CHROMEOS)
- ui_controls::InstallUIControlsAura(ash::test::CreateAshUIControls());
-#elif defined(USE_AURA)
-
-#if defined(OS_LINUX)
- ui_controls::InstallUIControlsAura(
- views::test::CreateUIControlsDesktopAura());
-#else
- // TODO(win_ash): when running interactive_ui_tests for Win Ash, use above.
- ui_controls::InstallUIControlsAura(aura::test::CreateUIControlsAura(NULL));
-#endif
-#endif
-
- // Run interactive_ui_tests serially, they do not support running in parallel.
- return LaunchChromeTests(1, argc, argv);
-}
diff --git a/chrome/unit_tests.isolate b/chrome/unit_tests.isolate
index 3f077d6..71bab21 100644
--- a/chrome/unit_tests.isolate
+++ b/chrome/unit_tests.isolate
@@ -41,8 +41,8 @@
'command': [
'../testing/xvfb.py',
'<(PRODUCT_DIR)',
+ '../tools/swarm_client/googletest/run_test_cases.py',
'<(PRODUCT_DIR)/unit_tests<(EXECUTABLE_SUFFIX)',
- '--brave-new-test-launcher',
],
'isolate_dependency_tracked': [
'../testing/xvfb.py',
@@ -86,8 +86,8 @@
'variables': {
'command': [
'../testing/test_env.py',
+ '../tools/swarm_client/googletest/run_test_cases.py',
'<(PRODUCT_DIR)/unit_tests<(EXECUTABLE_SUFFIX)',
- '--brave-new-test-launcher',
],
'isolate_dependency_untracked': [
'<(PRODUCT_DIR)/test_data/chrome/browser/resources/google_now/',
generated by cgit v1.1 at 2025-02-09 04:07:18 +0000