Commit e2d6a4e8 authored by Oleh Prypin's avatar Oleh Prypin Committed by Commit Bot

Port AppRTC browsertests to isolate/Swarming

Bug: 888429
Change-Id: I6b71736b7455ed2c4ca2a235c34df024c013ffa5
Reviewed-on: https://chromium-review.googlesource.com/c/1254202Reviewed-by: default avatarStephen Martinis <martiniss@chromium.org>
Reviewed-by: default avatarPatrik Höglund <phoglund@chromium.org>
Commit-Queue: Oleh Prypin <oprypin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#625251}
parent 2ae12b98
...@@ -2233,6 +2233,24 @@ test("browser_tests") { ...@@ -2233,6 +2233,24 @@ test("browser_tests") {
} }
} }
if (is_linux || is_mac || is_win) {
group("browser_tests_apprtc") {
testonly = true
data_deps = [
":browser_tests",
]
data = [
"//out/apprtc/out/app_engine/",
"//out/apprtc/temp/google-cloud-sdk/",
"//out/collider/",
]
write_runtime_deps = "$root_out_dir/${target_name}.runtime_deps"
}
}
group("telemetry_perf_unittests") { group("telemetry_perf_unittests") {
testonly = true testonly = true
deps = [ deps = [
......
...@@ -75,23 +75,28 @@ ...@@ -75,23 +75,28 @@
"gtest_tests": [ "gtest_tests": [
{ {
"args": [ "args": [
"--gtest_filter=WebRtcApprtcBrowserTest.*", "--test-launcher-filter-file=../../testing/buildbot/filters/webrtc_functional.browser_tests.filter",
"--run-manual", "--run-manual",
"--test-launcher-jobs=1" "--test-launcher-jobs=1"
], ],
"name": "browser_tests_apprtc", "name": "browser_tests_functional",
"swarming": { "swarming": {
"can_use_on_swarming_builders": false "can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"os": "Ubuntu-14.04"
}
]
}, },
"test": "browser_tests" "test": "browser_tests"
}, },
{ {
"args": [ "args": [
"--test-launcher-filter-file=../../testing/buildbot/filters/webrtc_functional.browser_tests.filter", "--gtest_filter=WebRtcApprtcBrowserTest.*",
"--run-manual", "--run-manual",
"--test-launcher-jobs=1" "--test-launcher-jobs=1"
], ],
"name": "browser_tests_functional",
"swarming": { "swarming": {
"can_use_on_swarming_builders": true, "can_use_on_swarming_builders": true,
"dimension_sets": [ "dimension_sets": [
...@@ -101,7 +106,7 @@ ...@@ -101,7 +106,7 @@
} }
] ]
}, },
"test": "browser_tests" "test": "browser_tests_apprtc"
}, },
{ {
"args": [ "args": [
...@@ -202,23 +207,28 @@ ...@@ -202,23 +207,28 @@
"gtest_tests": [ "gtest_tests": [
{ {
"args": [ "args": [
"--gtest_filter=WebRtcApprtcBrowserTest.*", "--test-launcher-filter-file=../../testing/buildbot/filters/webrtc_functional.browser_tests.filter",
"--run-manual", "--run-manual",
"--test-launcher-jobs=1" "--test-launcher-jobs=1"
], ],
"name": "browser_tests_apprtc", "name": "browser_tests_functional",
"swarming": { "swarming": {
"can_use_on_swarming_builders": false "can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
}, },
"test": "browser_tests" "test": "browser_tests"
}, },
{ {
"args": [ "args": [
"--test-launcher-filter-file=../../testing/buildbot/filters/webrtc_functional.browser_tests.filter", "--gtest_filter=WebRtcApprtcBrowserTest.*",
"--run-manual", "--run-manual",
"--test-launcher-jobs=1" "--test-launcher-jobs=1"
], ],
"name": "browser_tests_functional",
"swarming": { "swarming": {
"can_use_on_swarming_builders": true, "can_use_on_swarming_builders": true,
"dimension_sets": [ "dimension_sets": [
...@@ -228,7 +238,7 @@ ...@@ -228,7 +238,7 @@
} }
] ]
}, },
"test": "browser_tests" "test": "browser_tests_apprtc"
}, },
{ {
"args": [ "args": [
...@@ -329,23 +339,28 @@ ...@@ -329,23 +339,28 @@
"gtest_tests": [ "gtest_tests": [
{ {
"args": [ "args": [
"--gtest_filter=WebRtcApprtcBrowserTest.*", "--test-launcher-filter-file=../../testing/buildbot/filters/webrtc_functional.browser_tests.filter",
"--run-manual", "--run-manual",
"--test-launcher-jobs=1" "--test-launcher-jobs=1"
], ],
"name": "browser_tests_apprtc", "name": "browser_tests_functional",
"swarming": { "swarming": {
"can_use_on_swarming_builders": false "can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"os": "Windows-10-15063"
}
]
}, },
"test": "browser_tests" "test": "browser_tests"
}, },
{ {
"args": [ "args": [
"--test-launcher-filter-file=../../testing/buildbot/filters/webrtc_functional.browser_tests.filter", "--gtest_filter=WebRtcApprtcBrowserTest.*",
"--run-manual", "--run-manual",
"--test-launcher-jobs=1" "--test-launcher-jobs=1"
], ],
"name": "browser_tests_functional",
"swarming": { "swarming": {
"can_use_on_swarming_builders": true, "can_use_on_swarming_builders": true,
"dimension_sets": [ "dimension_sets": [
...@@ -355,7 +370,7 @@ ...@@ -355,7 +370,7 @@
} }
] ]
}, },
"test": "browser_tests" "test": "browser_tests_apprtc"
}, },
{ {
"args": [ "args": [
...@@ -438,23 +453,28 @@ ...@@ -438,23 +453,28 @@
"gtest_tests": [ "gtest_tests": [
{ {
"args": [ "args": [
"--gtest_filter=WebRtcApprtcBrowserTest.*", "--test-launcher-filter-file=../../testing/buildbot/filters/webrtc_functional.browser_tests.filter",
"--run-manual", "--run-manual",
"--test-launcher-jobs=1" "--test-launcher-jobs=1"
], ],
"name": "browser_tests_apprtc", "name": "browser_tests_functional",
"swarming": { "swarming": {
"can_use_on_swarming_builders": false "can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"os": "Windows-7-SP1"
}
]
}, },
"test": "browser_tests" "test": "browser_tests"
}, },
{ {
"args": [ "args": [
"--test-launcher-filter-file=../../testing/buildbot/filters/webrtc_functional.browser_tests.filter", "--gtest_filter=WebRtcApprtcBrowserTest.*",
"--run-manual", "--run-manual",
"--test-launcher-jobs=1" "--test-launcher-jobs=1"
], ],
"name": "browser_tests_functional",
"swarming": { "swarming": {
"can_use_on_swarming_builders": true, "can_use_on_swarming_builders": true,
"dimension_sets": [ "dimension_sets": [
...@@ -464,7 +484,7 @@ ...@@ -464,7 +484,7 @@
} }
] ]
}, },
"test": "browser_tests" "test": "browser_tests_apprtc"
}, },
{ {
"args": [ "args": [
...@@ -547,23 +567,28 @@ ...@@ -547,23 +567,28 @@
"gtest_tests": [ "gtest_tests": [
{ {
"args": [ "args": [
"--gtest_filter=WebRtcApprtcBrowserTest.*", "--test-launcher-filter-file=../../testing/buildbot/filters/webrtc_functional.browser_tests.filter",
"--run-manual", "--run-manual",
"--test-launcher-jobs=1" "--test-launcher-jobs=1"
], ],
"name": "browser_tests_apprtc", "name": "browser_tests_functional",
"swarming": { "swarming": {
"can_use_on_swarming_builders": false "can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"os": "Windows-8.1-SP0"
}
]
}, },
"test": "browser_tests" "test": "browser_tests"
}, },
{ {
"args": [ "args": [
"--test-launcher-filter-file=../../testing/buildbot/filters/webrtc_functional.browser_tests.filter", "--gtest_filter=WebRtcApprtcBrowserTest.*",
"--run-manual", "--run-manual",
"--test-launcher-jobs=1" "--test-launcher-jobs=1"
], ],
"name": "browser_tests_functional",
"swarming": { "swarming": {
"can_use_on_swarming_builders": true, "can_use_on_swarming_builders": true,
"dimension_sets": [ "dimension_sets": [
...@@ -573,7 +598,7 @@ ...@@ -573,7 +598,7 @@
} }
] ]
}, },
"test": "browser_tests" "test": "browser_tests_apprtc"
}, },
{ {
"args": [ "args": [
......
...@@ -38,27 +38,26 @@ ...@@ -38,27 +38,26 @@
"gtest_tests": [ "gtest_tests": [
{ {
"args": [ "args": [
"--gtest_filter=WebRtcApprtcBrowserTest.*", "--test-launcher-filter-file=../../testing/buildbot/filters/webrtc_functional.browser_tests.filter",
"--run-manual", "--run-manual",
"--test-launcher-jobs=1" "--test-launcher-jobs=1"
], ],
"name": "browser_tests_apprtc", "name": "browser_tests_functional",
"swarming": { "swarming": {
"can_use_on_swarming_builders": false "can_use_on_swarming_builders": true
}, },
"test": "browser_tests" "test": "browser_tests"
}, },
{ {
"args": [ "args": [
"--test-launcher-filter-file=../../testing/buildbot/filters/webrtc_functional.browser_tests.filter", "--gtest_filter=WebRtcApprtcBrowserTest.*",
"--run-manual", "--run-manual",
"--test-launcher-jobs=1" "--test-launcher-jobs=1"
], ],
"name": "browser_tests_functional",
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
}, },
"test": "browser_tests" "test": "browser_tests_apprtc"
}, },
{ {
"args": [ "args": [
...@@ -142,27 +141,26 @@ ...@@ -142,27 +141,26 @@
"gtest_tests": [ "gtest_tests": [
{ {
"args": [ "args": [
"--gtest_filter=WebRtcApprtcBrowserTest.*", "--test-launcher-filter-file=../../testing/buildbot/filters/webrtc_functional.browser_tests.filter",
"--run-manual", "--run-manual",
"--test-launcher-jobs=1" "--test-launcher-jobs=1"
], ],
"name": "browser_tests_apprtc", "name": "browser_tests_functional",
"swarming": { "swarming": {
"can_use_on_swarming_builders": false "can_use_on_swarming_builders": true
}, },
"test": "browser_tests" "test": "browser_tests"
}, },
{ {
"args": [ "args": [
"--test-launcher-filter-file=../../testing/buildbot/filters/webrtc_functional.browser_tests.filter", "--gtest_filter=WebRtcApprtcBrowserTest.*",
"--run-manual", "--run-manual",
"--test-launcher-jobs=1" "--test-launcher-jobs=1"
], ],
"name": "browser_tests_functional",
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
}, },
"test": "browser_tests" "test": "browser_tests_apprtc"
}, },
{ {
"args": [ "args": [
...@@ -246,27 +244,26 @@ ...@@ -246,27 +244,26 @@
"gtest_tests": [ "gtest_tests": [
{ {
"args": [ "args": [
"--gtest_filter=WebRtcApprtcBrowserTest.*", "--test-launcher-filter-file=../../testing/buildbot/filters/webrtc_functional.browser_tests.filter",
"--run-manual", "--run-manual",
"--test-launcher-jobs=1" "--test-launcher-jobs=1"
], ],
"name": "browser_tests_apprtc", "name": "browser_tests_functional",
"swarming": { "swarming": {
"can_use_on_swarming_builders": false "can_use_on_swarming_builders": true
}, },
"test": "browser_tests" "test": "browser_tests"
}, },
{ {
"args": [ "args": [
"--test-launcher-filter-file=../../testing/buildbot/filters/webrtc_functional.browser_tests.filter", "--gtest_filter=WebRtcApprtcBrowserTest.*",
"--run-manual", "--run-manual",
"--test-launcher-jobs=1" "--test-launcher-jobs=1"
], ],
"name": "browser_tests_functional",
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
}, },
"test": "browser_tests" "test": "browser_tests_apprtc"
}, },
{ {
"args": [ "args": [
...@@ -343,27 +340,26 @@ ...@@ -343,27 +340,26 @@
"gtest_tests": [ "gtest_tests": [
{ {
"args": [ "args": [
"--gtest_filter=WebRtcApprtcBrowserTest.*", "--test-launcher-filter-file=../../testing/buildbot/filters/webrtc_functional.browser_tests.filter",
"--run-manual", "--run-manual",
"--test-launcher-jobs=1" "--test-launcher-jobs=1"
], ],
"name": "browser_tests_apprtc", "name": "browser_tests_functional",
"swarming": { "swarming": {
"can_use_on_swarming_builders": false "can_use_on_swarming_builders": true
}, },
"test": "browser_tests" "test": "browser_tests"
}, },
{ {
"args": [ "args": [
"--test-launcher-filter-file=../../testing/buildbot/filters/webrtc_functional.browser_tests.filter", "--gtest_filter=WebRtcApprtcBrowserTest.*",
"--run-manual", "--run-manual",
"--test-launcher-jobs=1" "--test-launcher-jobs=1"
], ],
"name": "browser_tests_functional",
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
}, },
"test": "browser_tests" "test": "browser_tests_apprtc"
}, },
{ {
"args": [ "args": [
...@@ -440,27 +436,26 @@ ...@@ -440,27 +436,26 @@
"gtest_tests": [ "gtest_tests": [
{ {
"args": [ "args": [
"--gtest_filter=WebRtcApprtcBrowserTest.*", "--test-launcher-filter-file=../../testing/buildbot/filters/webrtc_functional.browser_tests.filter",
"--run-manual", "--run-manual",
"--test-launcher-jobs=1" "--test-launcher-jobs=1"
], ],
"name": "browser_tests_apprtc", "name": "browser_tests_functional",
"swarming": { "swarming": {
"can_use_on_swarming_builders": false "can_use_on_swarming_builders": true
}, },
"test": "browser_tests" "test": "browser_tests"
}, },
{ {
"args": [ "args": [
"--test-launcher-filter-file=../../testing/buildbot/filters/webrtc_functional.browser_tests.filter", "--gtest_filter=WebRtcApprtcBrowserTest.*",
"--run-manual", "--run-manual",
"--test-launcher-jobs=1" "--test-launcher-jobs=1"
], ],
"name": "browser_tests_functional",
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
}, },
"test": "browser_tests" "test": "browser_tests_apprtc"
}, },
{ {
"args": [ "args": [
......
...@@ -403,6 +403,11 @@ ...@@ -403,6 +403,11 @@
"label": "//chrome/test:browser_tests", "label": "//chrome/test:browser_tests",
"type": "windowed_test_launcher", "type": "windowed_test_launcher",
}, },
"browser_tests_apprtc": {
"label": "//chrome/test:browser_tests_apprtc",
"type": "windowed_test_launcher",
"executable": "browser_tests",
},
"cacheinvalidation_unittests": { "cacheinvalidation_unittests": {
"label": "//third_party/cacheinvalidation:cacheinvalidation_unittests", "label": "//third_party/cacheinvalidation:cacheinvalidation_unittests",
"type": "console_test_launcher", "type": "console_test_launcher",
......
...@@ -4239,11 +4239,6 @@ ...@@ -4239,11 +4239,6 @@
'browser_tests_apprtc': { 'browser_tests_apprtc': {
'args': ['--gtest_filter=WebRtcApprtcBrowserTest.*', 'args': ['--gtest_filter=WebRtcApprtcBrowserTest.*',
'--run-manual', '--test-launcher-jobs=1'], '--run-manual', '--test-launcher-jobs=1'],
'test': 'browser_tests',
# TODO(crbug.com/888429): Port this test to swarming.
'swarming': {
'can_use_on_swarming_builders': False,
},
}, },
'content_unittests': { 'content_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