Skip to content

GitLab

T
tangled
Commit 5d675f77 authored by Hans Wennborg's avatar Hans Wennborg
Browse files
Options

Android test exclusions: don't exclude webkit_unit_tests 

These tests do pass on some bots, e.g. [1], and it's not clear why they
were being excluded. If there's a legitimate reason for them not to run
on Android, let's figure it out and get a bug filed.

Sheriffs: if this causes the tests to start failing on Android bots,
please file a bug with information about the error, put the exclusion
back and reference the bug.

Disable ProtocolParserTest.Reading on Android until it's fixed,
see the third bug.

(The CrOS failure was fixed a few months ago, see crbug.com/795645)

Bug: 842698, 795645, 845816

 [1] https://ci.chromium.org/buildbot/chromium.clang/ToTAndroid/3343

R=thakis@chromium.org

Change-Id: I4c683170508d431864880774543f942cf7446b88
Reviewed-on: https://chromium-review.googlesource.com/1068873
Commit-Queue: Hans Wennborg <hans@chromium.org>
Reviewed-by: default avatarNico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#561021}
parent 8d4b3333
Hide whitespace changes
Inline Side-by-side
Showing with 521 additions and 21 deletions
testing/buildbot/chromium.android.fyi.json
View file @ 5d675f77
...@@ -2896,6 +2896,50 @@ ...@@ -2896,6 +2896,50 @@
}, },
"test": "vr_pixeltests" "test": "vr_pixeltests"
}, },
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"webkit_unit_tests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
"location": "bin",
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
}
],
"dimension_sets": [
{
"device_os": "NRD91N",
"device_type": "bullhead"
}
],
"expiration": 10800,
"hard_timeout": 960,
"output_links": [
{
"link": [
"https://luci-logdog.appspot.com/v/?s",
"=android%2Fswarming%2Flogcats%2F",
"${TASK_ID}%2F%2B%2Funified_logcats"
],
"name": "shard #${SHARD_INDEX} logcats"
}
]
},
"test": "webkit_unit_tests"
},
{ {
"merge": { "merge": {
"args": [ "args": [
...@@ -3372,6 +3416,12 @@ ...@@ -3372,6 +3416,12 @@
}, },
"test": "vr_pixeltests" "test": "vr_pixeltests"
}, },
{
"swarming": {
"can_use_on_swarming_builders": false
},
"test": "webkit_unit_tests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": false "can_use_on_swarming_builders": false
...@@ -3698,6 +3748,12 @@ ...@@ -3698,6 +3748,12 @@
}, },
"test": "vr_pixeltests" "test": "vr_pixeltests"
}, },
{
"swarming": {
"can_use_on_swarming_builders": false
},
"test": "webkit_unit_tests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": false "can_use_on_swarming_builders": false
...@@ -6290,6 +6346,30 @@ ...@@ -6290,6 +6346,30 @@
}, },
"test": "vr_pixeltests" "test": "vr_pixeltests"
}, },
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"webkit_unit_tests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"device_type": "gce_x86"
}
]
},
"test": "webkit_unit_tests"
},
{ {
"merge": { "merge": {
"args": [ "args": [
......
testing/buildbot/chromium.android.json
View file @ 5d675f77
...@@ -2680,6 +2680,48 @@ ...@@ -2680,6 +2680,48 @@
}, },
"test": "vr_pixeltests" "test": "vr_pixeltests"
}, },
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"webkit_unit_tests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
"location": "bin",
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
}
],
"dimension_sets": [
{
"device_os": "KTU84P",
"device_type": "hammerhead"
}
],
"output_links": [
{
"link": [
"https://luci-logdog.appspot.com/v/?s",
"=android%2Fswarming%2Flogcats%2F",
"${TASK_ID}%2F%2B%2Funified_logcats"
],
"name": "shard #${SHARD_INDEX} logcats"
}
]
},
"test": "webkit_unit_tests"
},
{ {
"args": [ "args": [
"--gs-results-bucket=chromium-result-details", "--gs-results-bucket=chromium-result-details",
...@@ -4956,6 +4998,48 @@ ...@@ -4956,6 +4998,48 @@
}, },
"test": "vr_pixeltests" "test": "vr_pixeltests"
}, },
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"webkit_unit_tests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
"location": "bin",
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
}
],
"dimension_sets": [
{
"device_os": "KTU84P",
"device_type": "hammerhead"
}
],
"output_links": [
{
"link": [
"https://luci-logdog.appspot.com/v/?s",
"=android%2Fswarming%2Flogcats%2F",
"${TASK_ID}%2F%2B%2Funified_logcats"
],
"name": "shard #${SHARD_INDEX} logcats"
}
]
},
"test": "webkit_unit_tests"
},
{ {
"args": [ "args": [
"--gs-results-bucket=chromium-result-details", "--gs-results-bucket=chromium-result-details",
...@@ -7263,6 +7347,49 @@ ...@@ -7263,6 +7347,49 @@
}, },
"test": "vr_pixeltests" "test": "vr_pixeltests"
}, },
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"webkit_unit_tests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
"location": "bin",
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
}
],
"dimension_sets": [
{
"device_os": "KTU84Z",
"device_type": "flo"
}
],
"expiration": 10800,
"output_links": [
{
"link": [
"https://luci-logdog.appspot.com/v/?s",
"=android%2Fswarming%2Flogcats%2F",
"${TASK_ID}%2F%2B%2Funified_logcats"
],
"name": "shard #${SHARD_INDEX} logcats"
}
]
},
"test": "webkit_unit_tests"
},
{ {
"args": [ "args": [
"--gs-results-bucket=chromium-result-details", "--gs-results-bucket=chromium-result-details",
...@@ -9607,6 +9734,50 @@ ...@@ -9607,6 +9734,50 @@
}, },
"test": "vr_pixeltests" "test": "vr_pixeltests"
}, },
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"webkit_unit_tests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
"location": "bin",
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
}
],
"dimension_sets": [
{
"device_os": "LMY48I",
"device_type": "hammerhead"
}
],
"expiration": 10800,
"hard_timeout": 960,
"output_links": [
{
"link": [
"https://luci-logdog.appspot.com/v/?s",
"=android%2Fswarming%2Flogcats%2F",
"${TASK_ID}%2F%2B%2Funified_logcats"
],
"name": "shard #${SHARD_INDEX} logcats"
}
]
},
"test": "webkit_unit_tests"
},
{ {
"args": [ "args": [
"--gs-results-bucket=chromium-result-details", "--gs-results-bucket=chromium-result-details",
...@@ -11951,6 +12122,50 @@ ...@@ -11951,6 +12122,50 @@
}, },
"test": "vr_pixeltests" "test": "vr_pixeltests"
}, },
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"webkit_unit_tests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
"location": "bin",
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
}
],
"dimension_sets": [
{
"device_os": "LMY49B",
"device_type": "flo"
}
],
"expiration": 10800,
"hard_timeout": 120,
"output_links": [
{
"link": [
"https://luci-logdog.appspot.com/v/?s",
"=android%2Fswarming%2Flogcats%2F",
"${TASK_ID}%2F%2B%2Funified_logcats"
],
"name": "shard #${SHARD_INDEX} logcats"
}
]
},
"test": "webkit_unit_tests"
},
{ {
"args": [ "args": [
"--gs-results-bucket=chromium-result-details", "--gs-results-bucket=chromium-result-details",
...@@ -14290,6 +14505,49 @@ ...@@ -14290,6 +14505,49 @@
}, },
"test": "vr_pixeltests" "test": "vr_pixeltests"
}, },
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"webkit_unit_tests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
"location": "bin",
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
}
],
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_type": "bullhead"
}
],
"hard_timeout": 960,
"output_links": [
{
"link": [
"https://luci-logdog.appspot.com/v/?s",
"=android%2Fswarming%2Flogcats%2F",
"${TASK_ID}%2F%2B%2Funified_logcats"
],
"name": "shard #${SHARD_INDEX} logcats"
}
]
},
"test": "webkit_unit_tests"
},
{ {
"args": [ "args": [
"--gs-results-bucket=chromium-result-details", "--gs-results-bucket=chromium-result-details",
...@@ -16601,6 +16859,48 @@ ...@@ -16601,6 +16859,48 @@
}, },
"test": "vr_pixeltests" "test": "vr_pixeltests"
}, },
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"webkit_unit_tests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
"location": "bin",
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
}
],
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_type": "bullhead"
}
],
"output_links": [
{
"link": [
"https://luci-logdog.appspot.com/v/?s",
"=android%2Fswarming%2Flogcats%2F",
"${TASK_ID}%2F%2B%2Funified_logcats"
],
"name": "shard #${SHARD_INDEX} logcats"
}
]
},
"test": "webkit_unit_tests"
},
{ {
"args": [ "args": [
"--gs-results-bucket=chromium-result-details", "--gs-results-bucket=chromium-result-details",
...@@ -18973,6 +19273,49 @@ ...@@ -18973,6 +19273,49 @@
}, },
"test": "vr_pixeltests" "test": "vr_pixeltests"
}, },
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"webkit_unit_tests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
"location": "bin",
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
}
],
"dimension_sets": [
{
"device_os": "MRA58Z",
"device_type": "flo"
}
],
"expiration": 10800,
"output_links": [
{
"link": [
"https://luci-logdog.appspot.com/v/?s",
"=android%2Fswarming%2Flogcats%2F",
"${TASK_ID}%2F%2B%2Funified_logcats"
],
"name": "shard #${SHARD_INDEX} logcats"
}
]
},
"test": "webkit_unit_tests"
},
{ {
"args": [ "args": [
"--gs-results-bucket=chromium-result-details", "--gs-results-bucket=chromium-result-details",
...@@ -21356,6 +21699,48 @@ ...@@ -21356,6 +21699,48 @@
}, },
"test": "vr_pixeltests" "test": "vr_pixeltests"
}, },
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"webkit_unit_tests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
"location": "bin",
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
}
],
"dimension_sets": [
{
"device_os": "KTU84P",
"device_type": "hammerhead"
}
],
"output_links": [
{
"link": [
"https://luci-logdog.appspot.com/v/?s",
"=android%2Fswarming%2Flogcats%2F",
"${TASK_ID}%2F%2B%2Funified_logcats"
],
"name": "shard #${SHARD_INDEX} logcats"
}
]
},
"test": "webkit_unit_tests"
},
{ {
"args": [ "args": [
"--gs-results-bucket=chromium-result-details", "--gs-results-bucket=chromium-result-details",
...@@ -23693,6 +24078,48 @@ ...@@ -23693,6 +24078,48 @@
}, },
"test": "vr_pixeltests" "test": "vr_pixeltests"
}, },
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"webkit_unit_tests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
"location": "bin",
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
}
],
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_type": "bullhead"
}
],
"output_links": [
{
"link": [
"https://luci-logdog.appspot.com/v/?s",
"=android%2Fswarming%2Flogcats%2F",
"${TASK_ID}%2F%2B%2Funified_logcats"
],
"name": "shard #${SHARD_INDEX} logcats"
}
]
},
"test": "webkit_unit_tests"
},
{ {
"args": [ "args": [
"--gs-results-bucket=chromium-result-details", "--gs-results-bucket=chromium-result-details",
......
testing/buildbot/chromium.chromiumos.json
View file @ 5d675f77
...@@ -1061,6 +1061,12 @@ ...@@ -1061,6 +1061,12 @@
}, },
"test": "wayland_client_perftests" "test": "wayland_client_perftests"
}, },
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "webkit_unit_tests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
......
testing/buildbot/test_suite_exceptions.pyl
View file @ 5d675f77
...@@ -2912,26 +2912,6 @@ ...@@ -2912,26 +2912,6 @@
}, },
}, },
'webkit_unit_tests': { 'webkit_unit_tests': {
'remove_from': [
# On chromium.android, unclear why these aren't run.
'android-kitkat-arm-rel',
'android-marshmallow-arm64-rel',
'KitKat Phone Tester (dbg)',
'KitKat Phone Tester (rel)',
'KitKat Tablet Tester',
'Lollipop Phone Tester',
'Lollipop Tablet Tester',
'Marshmallow 64 bit Tester',
'Marshmallow Phone Tester (rel)',
'Marshmallow Tablet Tester',
'Nougat Phone Tester',
# chromium.android.fyi
'Unswarmed N5 Tests Dummy Builder',
'Unswarmed N5X Tests Dummy Builder',
'x86 Cloud Tester',
# chromium.chromiumos
'linux-chromeos-rel', # crbug.com/795440
],
'modifications': { 'modifications': {
# chromium.memory # chromium.memory
'Linux ASan LSan Tests (1)': { 'Linux ASan LSan Tests (1)': {
......
third_party/blink/renderer/core/inspector/protocol_parser_test.cc
View file @ 5d675f77
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#include "third_party/blink/renderer/core/inspector/protocol/Protocol.h" #include "third_party/blink/renderer/core/inspector/protocol/Protocol.h"
#include "build/build_config.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
namespace blink { namespace blink {
...@@ -16,7 +17,13 @@ static std::unique_ptr<protocol::Value> ParseJSON(const String& string) { ...@@ -16,7 +17,13 @@ static std::unique_ptr<protocol::Value> ParseJSON(const String& string) {
return protocol::StringUtil::parseJSON(string); return protocol::StringUtil::parseJSON(string);
} }
TEST(ProtocolParserTest, Reading) { // The test fails on Android. https://crbug.com/845816
#if defined(OS_ANDROID)
#define MAYBE_Reading DISABLED_Reading
#else
#define MAYBE_Reading Reading
#endif
TEST(ProtocolParserTest, MAYBE_Reading) {
Value* tmp_value; Value* tmp_value;
std::unique_ptr<Value> root; std::unique_ptr<Value> root;
std::unique_ptr<Value> root2; std::unique_ptr<Value> root2;
......
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