Commit b880df2d authored by James Cook's avatar James Cook Committed by Commit Bot

Move select_to_speak_extension_tests into browser_tests

select_to_speak_extension_tests compiles and links all of chrome, so
folding into browser_tests will save work on the bots. It will also
give coverage for SingleProcessMash and other projects that run
browser_tests with optional flags.

Bug: 892179
Change-Id: I8dfce56a8b522194dfbb0d24de7cb8f5cdd45b01
Reviewed-on: https://chromium-review.googlesource.com/c/1300073Reviewed-by: default avatarScott Violet <sky@chromium.org>
Commit-Queue: James Cook <jamescook@chromium.org>
Cr-Commit-Position: refs/heads/master@{#602964}
parent 1038c4ed
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
# found in the LICENSE file. # found in the LICENSE file.
import("//build/config/features.gni") import("//build/config/features.gni")
import("//chrome/common/features.gni")
import("//testing/test.gni") import("//testing/test.gni")
import("//chrome/test/base/js2gtest.gni") import("//chrome/test/base/js2gtest.gni")
import("//chrome/browser/resources/chromeos/chromevox/run_jsbundler.gni") import("//chrome/browser/resources/chromeos/chromevox/run_jsbundler.gni")
...@@ -98,42 +99,15 @@ manifest("select_to_speak_guest_manifest") { ...@@ -98,42 +99,15 @@ manifest("select_to_speak_guest_manifest") {
is_guest_manifest = true is_guest_manifest = true
} }
# TODO(jamescook): Fold this into browser_tests. source_set("browser_tests") {
test("select_to_speak_extension_tests") { testonly = true
sources = [ assert(enable_extensions)
"//chrome/browser/extensions/browsertest_util.cc",
"//chrome/browser/extensions/browsertest_util.h",
"//chrome/browser/ui/webui/web_ui_test_handler.cc",
"//chrome/browser/ui/webui/web_ui_test_handler.h",
"//chrome/test/base/extension_js_browser_test.cc",
"//chrome/test/base/extension_js_browser_test.h",
"//chrome/test/base/extension_load_waiter_one_shot.cc",
"//chrome/test/base/extension_load_waiter_one_shot.h",
"//chrome/test/base/javascript_browser_test.cc",
"//chrome/test/base/javascript_browser_test.h",
"//chrome/test/base/test_chrome_web_ui_controller_factory.cc",
"//chrome/test/base/test_chrome_web_ui_controller_factory.h",
"//chrome/test/base/web_ui_browser_test.cc",
"//chrome/test/base/web_ui_browser_test.h",
]
deps = [ deps = [
":select_to_speak_extjs_tests", ":select_to_speak_extjs_tests",
"//base",
"//base/test:test_support",
"//chrome:browser_tests_pak",
"//chrome:packed_resources",
"//chrome:resources",
"//chrome/browser",
"//chrome/renderer",
"//chrome/test:browser_tests_runner",
"//chrome/test:test_support",
"//chrome/test:test_support_ui",
"//content/test:test_support",
"//testing/gmock",
"//testing/gtest",
] ]
# TODO(jamescook): Figure out which of these are really necessary.
data = [ data = [
"$root_out_dir/chrome_100_percent.pak", "$root_out_dir/chrome_100_percent.pak",
"$root_out_dir/chrome_200_percent.pak", "$root_out_dir/chrome_200_percent.pak",
......
...@@ -1856,6 +1856,7 @@ test("browser_tests") { ...@@ -1856,6 +1856,7 @@ test("browser_tests") {
"//ash/public/interfaces:test_interfaces", "//ash/public/interfaces:test_interfaces",
"//chrome/browser/chromeos:arc_test_support", "//chrome/browser/chromeos:arc_test_support",
"//chrome/browser/resources/chromeos/chromevox:browser_tests", "//chrome/browser/resources/chromeos/chromevox:browser_tests",
"//chrome/browser/resources/chromeos/select_to_speak:browser_tests",
"//chrome/services/file_util/public/cpp:browser_tests", "//chrome/services/file_util/public/cpp:browser_tests",
"//chromeos/components/drivefs:test_support", "//chromeos/components/drivefs:test_support",
"//components/arc:arc_test_support", "//components/arc:arc_test_support",
......
...@@ -111,8 +111,9 @@ out/release/browser_tests --test-launcher-jobs=20 --gtest_filter=ChromeVox* ...@@ -111,8 +111,9 @@ out/release/browser_tests --test-launcher-jobs=20 --gtest_filter=ChromeVox*
### Select-To-Speak tests ### Select-To-Speak tests
``` ```
autoninja -C out/release unit_tests autoninja -C out/release unit_tests browser_tests
out/release/unit_tests --gtest_filter="*SelectToSpeak*" out/release/unit_tests --gtest_filter=*SelectToSpeak*
out/release/browser_tests --gtest_filter=*SelectToSpeak*
``` ```
## Performance tests ## Performance tests
......
...@@ -990,12 +990,6 @@ ...@@ -990,12 +990,6 @@
}, },
"test": "sandbox_linux_unittests" "test": "sandbox_linux_unittests"
}, },
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "select_to_speak_extension_tests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
...@@ -1701,12 +1695,6 @@ ...@@ -1701,12 +1695,6 @@
}, },
"test": "sandbox_linux_unittests" "test": "sandbox_linux_unittests"
}, },
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "select_to_speak_extension_tests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
......
...@@ -4883,15 +4883,6 @@ ...@@ -4883,15 +4883,6 @@
}, },
"test": "sandbox_linux_unittests" "test": "sandbox_linux_unittests"
}, },
{
"args": [
"--test-launcher-print-test-stdio=always"
],
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "select_to_speak_extension_tests"
},
{ {
"args": [ "args": [
"--test-launcher-print-test-stdio=always" "--test-launcher-print-test-stdio=always"
...@@ -6361,21 +6352,6 @@ ...@@ -6361,21 +6352,6 @@
}, },
"test": "sandbox_linux_unittests" "test": "sandbox_linux_unittests"
}, },
{
"args": [
"--test-launcher-print-test-stdio=always"
],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"os": "Ubuntu-14.04"
}
]
},
"test": "select_to_speak_extension_tests"
},
{ {
"args": [ "args": [
"--test-launcher-print-test-stdio=always" "--test-launcher-print-test-stdio=always"
......
...@@ -33,8 +33,9 @@ ...@@ -33,8 +33,9 @@
-AutomationApiTestWithDeviceScaleFactor.* -AutomationApiTestWithDeviceScaleFactor.*
-AutomationManagerAuraBrowserTest.* -AutomationManagerAuraBrowserTest.*
# ChromeVox not yet supported. https://crbug.com/594887 # ChromeVox and Select-to-Speak not yet supported. https://crbug.com/594887
-ChromeVox* -ChromeVox*
-SelectToSpeak*
# Touch gestures don't work in webcontents. https://crbug.com/866991. # Touch gestures don't work in webcontents. https://crbug.com/866991.
-TopControlsSlideControllerTest.TestScrollingMaximizedPageBeforeGoingToTabletMode -TopControlsSlideControllerTest.TestScrollingMaximizedPageBeforeGoingToTabletMode
......
...@@ -27,8 +27,9 @@ ...@@ -27,8 +27,9 @@
-AutomationApiTestWithDeviceScaleFactor.* -AutomationApiTestWithDeviceScaleFactor.*
-AutomationManagerAuraBrowserTest.* -AutomationManagerAuraBrowserTest.*
# ChromeVox not yet supported. https://crbug.com/594887 # ChromeVox and Select-to-Speak not yet supported. https://crbug.com/594887
-ChromeVox* -ChromeVox*
-SelectToSpeak*
# Touch gestures don't work in webcontents. https://crbug.com/866991. # Touch gestures don't work in webcontents. https://crbug.com/866991.
-TopControlsSlideControllerTest.DisplayRotation -TopControlsSlideControllerTest.DisplayRotation
......
...@@ -1027,10 +1027,6 @@ ...@@ -1027,10 +1027,6 @@
"label": "//sandbox/win:sbox_validation_tests", "label": "//sandbox/win:sbox_validation_tests",
"type": "console_test_launcher", "type": "console_test_launcher",
}, },
"select_to_speak_extension_tests": {
"label": "//chrome/browser/resources/chromeos/select_to_speak:select_to_speak_extension_tests",
"type": "windowed_test_launcher",
},
"service_manager_unittests": { "service_manager_unittests": {
"label": "//services/service_manager/tests:service_manager_unittests", "label": "//services/service_manager/tests:service_manager_unittests",
"type": "console_test_launcher", "type": "console_test_launcher",
......
...@@ -1730,7 +1730,6 @@ ...@@ -1730,7 +1730,6 @@
}, },
'ozone_unittests': {}, 'ozone_unittests': {},
'ozone_x11_unittests': {}, 'ozone_x11_unittests': {},
'select_to_speak_extension_tests': {},
'single_process_mash_ash_unittests': { 'single_process_mash_ash_unittests': {
'test': 'ash_unittests', 'test': 'ash_unittests',
'args': [ 'args': [
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment