Commit 09e1f36c authored by Nico Weber's avatar Nico Weber

Increase timeout for LayerTreeTests under asan and run cc_unittests on win/asan bot.

LayerTreeHostBlendingPixelTest.BlendingWith* still timeout on win/asan after
the switch to swiftshader, so bump up the timeout even more.

Bug: 875223
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;master.tryserver.blink:linux_trusty_blink_rel
Change-Id: I30eb5e3717ed7c5f55a478b8e2e1323c8e59d974
Reviewed-on: https://chromium-review.googlesource.com/1180282Reviewed-by: default avatarAlexis Hétu <sugoi@chromium.org>
Reviewed-by: default avatarenne <enne@chromium.org>
Commit-Queue: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#584313}
parent c8635904
......@@ -634,7 +634,7 @@ LayerTreeTest::LayerTreeTest()
#elif defined(ADDRESS_SANITIZER) || defined(_DEBUG) || defined(USE_OZONE)
// ASAN and Debug builds are slower than release builds, as expected
// Ozone builds also go through a slower path than regular Linux builds
timeout_seconds_ = 15;
timeout_seconds_ = 30;
#else
timeout_seconds_ = 10;
#endif
......
......@@ -212,7 +212,7 @@ class LayerTreeTest : public testing::Test, public TestHooks {
mutable base::Lock test_ended_lock_;
bool ended_ = false;
int timeout_seconds_ = false;
int timeout_seconds_ = 0;
viz::BeginFrameSource* begin_frame_source_ = nullptr; // NOT OWNED.
......
......@@ -7585,6 +7585,17 @@
},
"test": "cast_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Windows-10-15063"
}
]
},
"test": "cc_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true,
......
......@@ -254,11 +254,6 @@
},
},
},
'cc_unittests': {
'remove_from': [
'win-asan', # https://crbug.com/875223
],
},
'checkbins': {
'remove_from': [
'linux-rel',
......
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