Commit 7fde6b49 authored by John Budorick's avatar John Budorick Committed by Commit Bot

android: add test filter file for net_unittests on emulators.

Bug: 1046060
Change-Id: I7748fc85861f88ddc7496975d4a822eac9675f4f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2023234Reviewed-by: default avatarRyan Sturm <ryansturm@chromium.org>
Commit-Queue: John Budorick <jbudorick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#736430}
parent 6393fe19
...@@ -4549,7 +4549,10 @@ test("net_unittests") { ...@@ -4549,7 +4549,10 @@ test("net_unittests") {
} }
data = [] data = []
data_deps = [ "third_party/nist-pkits/" ] data_deps = [
"third_party/nist-pkits/",
"//testing/buildbot/filters:net_unittests_filters",
]
if (is_linux || is_mac || is_win || is_fuchsia) { if (is_linux || is_mac || is_win || is_fuchsia) {
deps += [ deps += [
......
...@@ -3895,7 +3895,8 @@ ...@@ -3895,7 +3895,8 @@
"args": [ "args": [
"--gs-results-bucket=chromium-result-details", "--gs-results-bucket=chromium-result-details",
"--recover-devices", "--recover-devices",
"--avd-config=../../tools/android/avd/proto/generic_android23.textpb" "--avd-config=../../tools/android/avd/proto/generic_android23.textpb",
"--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator.net_unittests.filter"
], ],
"merge": { "merge": {
"args": [ "args": [
...@@ -8254,7 +8255,8 @@ ...@@ -8254,7 +8255,8 @@
"args": [ "args": [
"--gs-results-bucket=chromium-result-details", "--gs-results-bucket=chromium-result-details",
"--recover-devices", "--recover-devices",
"--avd-config=../../tools/android/avd/proto/generic_android28.textpb" "--avd-config=../../tools/android/avd/proto/generic_android28.textpb",
"--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator.net_unittests.filter"
], ],
"merge": { "merge": {
"args": [ "args": [
......
...@@ -160,6 +160,10 @@ source_set("media_unittests_filters") { ...@@ -160,6 +160,10 @@ source_set("media_unittests_filters") {
[ "//testing/buildbot/filters/android.emulator.media_unittests.filter" ] [ "//testing/buildbot/filters/android.emulator.media_unittests.filter" ]
} }
source_set("net_unittests_filters") {
data = [ "//testing/buildbot/filters/android.emulator.net_unittests.filter" ]
}
source_set("ozone_unittests_filters") { source_set("ozone_unittests_filters") {
data = [ "//testing/buildbot/filters/chromeos.ozone_unittests.filter" ] data = [ "//testing/buildbot/filters/chromeos.ozone_unittests.filter" ]
} }
......
# crbug.com/1046060
-NetworkQualityEstimatorTest.TestTCPSocketRTT
...@@ -1040,6 +1040,18 @@ ...@@ -1040,6 +1040,18 @@
'shards': 4, 'shards': 4,
} }
}, },
'android-marshmallow-x86-fyi-rel': {
# crbug.com/1046060
'args': [
'--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator.net_unittests.filter',
],
},
'android-pie-x86-fyi-rel': {
# crbug.com/1046060
'args': [
'--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator.net_unittests.filter',
],
},
'chromeos-betty-chrome': { 'chromeos-betty-chrome': {
# TODO(crbug.com/986904): Remove this filter. # TODO(crbug.com/986904): Remove this filter.
'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