Commit c9d03f9e authored by Stephen McGruer's avatar Stephen McGruer Committed by Commit Bot

Revert "Enable Cronet tests on desktop platforms."

This reverts commit 8fa7eced.

Reason for revert: HistogramManager.HistogramBucketFields crashes consistently on Win7 Tests (dbg):

https://test-results.appspot.com/dashboards/flakiness_dashboard.html#testType=cronet_unittests&tests=HistogramManager.HistogramBucketFields

First failing run:

https://ci.chromium.org/p/chromium/builders/luci.chromium.ci/Win7%20Tests%20%28dbg%29%281%29/68309

Original change's description:
> Enable Cronet tests on desktop platforms.
> 
> - Only initialize global state (e.g. AtExitManager) in non-Debug builds, so that our component-
>   build Debug bots can run cronet_tests.
> - Fix memory leaks in a number of unit-tests.
> - Disable some StaleHostResolver tests under ASAN, since they have leaks
>   that need resolving.
> 
> Bug: 812268, 816705, 829097
> Cq-Include-Trybots: master.tryserver.chromium.android:android_cronet_tester;master.tryserver.chromium.mac:ios-simulator-cronet
> Change-Id: I5084dd578682b2a8c128487c62de12e437e646f3
> Reviewed-on: https://chromium-review.googlesource.com/981787
> Commit-Queue: Wez <wez@chromium.org>
> Reviewed-by: John Budorick <jbudorick@chromium.org>
> Reviewed-by: Misha Efimov <mef@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#548672}

TBR=wez@chromium.org,mef@chromium.org,jbudorick@chromium.org

Change-Id: Ic30729594ae2b1264702c7bb77c971d55e5e9ae9
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 812268, 816705, 829097
Cq-Include-Trybots: master.tryserver.chromium.android:android_cronet_tester;master.tryserver.chromium.mac:ios-simulator-cronet
Reviewed-on: https://chromium-review.googlesource.com/999334Reviewed-by: default avatarStephen McGruer <smcgruer@chromium.org>
Commit-Queue: Stephen McGruer <smcgruer@chromium.org>
Cr-Commit-Position: refs/heads/master@{#548771}
parent b120d938
...@@ -20,16 +20,10 @@ namespace cronet { ...@@ -20,16 +20,10 @@ namespace cronet {
namespace { namespace {
scoped_refptr<base::SingleThreadTaskRunner> InitializeAndCreateTaskRunner() { scoped_refptr<base::SingleThreadTaskRunner> InitializeAndCreateTaskRunner() {
// TODO(https://crbug.com/816705): Chromium Debug bots use component builds,
// which result in //base and other process-global state being shared between
// the library and the test suite. Since the Debug build is only used to run
// the Debug cronet_tests, assume the suite will define things, for now.
#if defined(NDEBUG)
// TODO(wez): Remove this once AtExitManager dependencies are gone. // TODO(wez): Remove this once AtExitManager dependencies are gone.
// This fails cronet_test in component builds, which are not supported. // This fails cronet_test in component builds, which are not supported.
// See https://crbug.com/816705. // See https://crbug.com/816705.
ignore_result(new base::AtExitManager); ignore_result(new base::AtExitManager);
#endif // defined(NDEBUG)
url::Initialize(); url::Initialize();
......
...@@ -144,7 +144,6 @@ TEST_F(RunnablesTest, TestRunCallbackOnExecutor) { ...@@ -144,7 +144,6 @@ TEST_F(RunnablesTest, TestRunCallbackOnExecutor) {
base::RunLoop().RunUntilIdle(); base::RunLoop().RunUntilIdle();
ASSERT_TRUE(callback_called()); ASSERT_TRUE(callback_called());
Cronet_Executor_Destroy(executor); Cronet_Executor_Destroy(executor);
Cronet_UrlRequestCallback_Destroy(callback);
} }
// Example of posting application callback to the executor using OneClosure. // Example of posting application callback to the executor using OneClosure.
...@@ -168,7 +167,6 @@ TEST_F(RunnablesTest, TestRunOnceClosureOnExecutor) { ...@@ -168,7 +167,6 @@ TEST_F(RunnablesTest, TestRunOnceClosureOnExecutor) {
base::RunLoop().RunUntilIdle(); base::RunLoop().RunUntilIdle();
ASSERT_TRUE(callback_called()); ASSERT_TRUE(callback_called());
Cronet_Executor_Destroy(executor); Cronet_Executor_Destroy(executor);
Cronet_UrlRequestCallback_Destroy(callback);
} }
// Example of posting application callback to the executor and passing // Example of posting application callback to the executor and passing
...@@ -197,7 +195,6 @@ TEST_F(RunnablesTest, TestCronetBuffer) { ...@@ -197,7 +195,6 @@ TEST_F(RunnablesTest, TestCronetBuffer) {
base::RunLoop().RunUntilIdle(); base::RunLoop().RunUntilIdle();
ASSERT_TRUE(callback_called()); ASSERT_TRUE(callback_called());
Cronet_Executor_Destroy(executor); Cronet_Executor_Destroy(executor);
Cronet_UrlRequestCallback_Destroy(callback);
} }
} // namespace } // namespace
...@@ -108,7 +108,6 @@ TEST_F(BufferTest, TestInitWithDataAndCallback) { ...@@ -108,7 +108,6 @@ TEST_F(BufferTest, TestInitWithDataAndCallback) {
EXPECT_EQ(Cronet_Buffer_GetSize(buffer), kTestBufferSize); EXPECT_EQ(Cronet_Buffer_GetSize(buffer), kTestBufferSize);
Cronet_Buffer_Destroy(buffer); Cronet_Buffer_Destroy(buffer);
ASSERT_TRUE(on_destroy_called()); ASSERT_TRUE(on_destroy_called());
Cronet_BufferCallback_Destroy(buffer_callback);
} }
// Example of posting application on_destroy to the executor and passing // Example of posting application on_destroy to the executor and passing
...@@ -130,8 +129,6 @@ TEST_F(BufferTest, TestCronetBufferAsync) { ...@@ -130,8 +129,6 @@ TEST_F(BufferTest, TestCronetBufferAsync) {
base::RunLoop().RunUntilIdle(); base::RunLoop().RunUntilIdle();
ASSERT_TRUE(on_destroy_called()); ASSERT_TRUE(on_destroy_called());
Cronet_Executor_Destroy(executor); Cronet_Executor_Destroy(executor);
Cronet_BufferCallback_Destroy(buffer_callback);
Cronet_Runnable_Destroy(runnable);
} }
} // namespace } // namespace
...@@ -73,7 +73,6 @@ TEST_F(ExecutorsTest, TestTestExecutor) { ...@@ -73,7 +73,6 @@ TEST_F(ExecutorsTest, TestTestExecutor) {
Cronet_Executor_Destroy(executor); Cronet_Executor_Destroy(executor);
base::RunLoop().RunUntilIdle(); base::RunLoop().RunUntilIdle();
ASSERT_TRUE(runnable_called()); ASSERT_TRUE(runnable_called());
Cronet_Runnable_Destroy(runnable);
} }
} // namespace } // namespace
...@@ -120,7 +120,6 @@ TEST_F(UrlRequestTest, InitChecks) { ...@@ -120,7 +120,6 @@ TEST_F(UrlRequestTest, InitChecks) {
Cronet_EngineParams_enable_check_result_set(engine_params, false); Cronet_EngineParams_enable_check_result_set(engine_params, false);
EXPECT_EQ(Cronet_RESULT_SUCCESS, EXPECT_EQ(Cronet_RESULT_SUCCESS,
Cronet_Engine_StartWithParams(engine, engine_params)); Cronet_Engine_StartWithParams(engine, engine_params));
Cronet_EngineParams_Destroy(engine_params);
Cronet_UrlRequestPtr request = Cronet_UrlRequest_Create(); Cronet_UrlRequestPtr request = Cronet_UrlRequest_Create();
Cronet_UrlRequestParamsPtr request_params = Cronet_UrlRequestParams_Create(); Cronet_UrlRequestParamsPtr request_params = Cronet_UrlRequestParams_Create();
......
...@@ -229,16 +229,6 @@ Cronet_RESULT Cronet_UrlRequestImpl::InitWithParams( ...@@ -229,16 +229,6 @@ Cronet_RESULT Cronet_UrlRequestImpl::InitWithParams(
return engine_->CheckResult(Cronet_RESULT_NULL_POINTER_EXECUTOR); return engine_->CheckResult(Cronet_RESULT_NULL_POINTER_EXECUTOR);
VLOG(1) << "New Cronet_UrlRequest: " << url; VLOG(1) << "New Cronet_UrlRequest: " << url;
// Tests call InitWithParams() repeatedly on the same Cronet_UrlRequestPtr,
// rather than Destroy()ing and creating a new one, so ensure that any prior
// |request_| is not leaked (see https://crbug.com/829077).
{
base::AutoLock lock(lock_);
if (request_)
request_->Destroy(false);
}
request_ = new CronetURLRequest( request_ = new CronetURLRequest(
engine_->cronet_url_request_context(), engine_->cronet_url_request_context(),
std::make_unique<Callback>(url, this, callback, executor), GURL(url), std::make_unique<Callback>(url, this, callback, executor), GURL(url),
......
...@@ -128,7 +128,9 @@ class StaleHostResolver::RequestImpl { ...@@ -128,7 +128,9 @@ class StaleHostResolver::RequestImpl {
RequestImpl* request_; RequestImpl* request_;
}; };
bool have_network_request() const { return network_request_ != nullptr; } bool have_network_request() const {
return network_request_.get() != nullptr;
}
bool have_stale_data() const { bool have_stale_data() const {
return stale_error_ != net::ERR_DNS_CACHE_MISS; return stale_error_ != net::ERR_DNS_CACHE_MISS;
} }
......
...@@ -122,15 +122,15 @@ class StaleHostResolverTest : public testing::Test { ...@@ -122,15 +122,15 @@ class StaleHostResolverTest : public testing::Test {
net::HostResolverImpl::ProcTaskParams proc_params(mock_proc_.get(), 1u); net::HostResolverImpl::ProcTaskParams proc_params(mock_proc_.get(), 1u);
inner_resolver->set_proc_params_for_test(proc_params); inner_resolver->set_proc_params_for_test(proc_params);
stale_resolver_ = std::make_unique<StaleHostResolver>( stale_resolver_ = base::WrapUnique(
std::move(inner_resolver), options_); new StaleHostResolver(std::move(inner_resolver), options_));
resolver_ = stale_resolver_.get(); resolver_ = stale_resolver_.get();
} }
void DestroyResolver() { void DestroyResolver() {
DCHECK(stale_resolver_); DCHECK(stale_resolver_);
stale_resolver_ = nullptr; stale_resolver_.reset();
resolver_ = nullptr; resolver_ = nullptr;
} }
...@@ -241,7 +241,7 @@ class StaleHostResolverTest : public testing::Test { ...@@ -241,7 +241,7 @@ class StaleHostResolverTest : public testing::Test {
DCHECK(resolver_); DCHECK(resolver_);
EXPECT_TRUE(resolve_pending_); EXPECT_TRUE(resolve_pending_);
request_ = nullptr; delete request_.release();
resolve_pending_ = false; resolve_pending_ = false;
} }
...@@ -249,7 +249,7 @@ class StaleHostResolverTest : public testing::Test { ...@@ -249,7 +249,7 @@ class StaleHostResolverTest : public testing::Test {
void OnResolveComplete(int error) { void OnResolveComplete(int error) {
EXPECT_TRUE(resolve_pending_); EXPECT_TRUE(resolve_pending_);
request_ = nullptr; request_.reset();
resolve_error_ = error; resolve_error_ = error;
resolve_pending_ = false; resolve_pending_ = false;
...@@ -381,9 +381,7 @@ TEST_F(StaleHostResolverTest, CancelWithStaleCache) { ...@@ -381,9 +381,7 @@ TEST_F(StaleHostResolverTest, CancelWithStaleCache) {
// Limited expired time cases are flaky under iOS and MACOS (crbug.com/792173). // Limited expired time cases are flaky under iOS and MACOS (crbug.com/792173).
// Disallow other networks cases fail under Fuchsia (crbug.com/816143). // Disallow other networks cases fail under Fuchsia (crbug.com/816143).
// TODO(https://crbug.com/829097): Fix memory leaks and re-enable under ASAN. #if defined(OS_IOS) || defined(OS_FUCHSIA) || defined(OS_MACOSX)
#if defined(OS_IOS) || defined(OS_FUCHSIA) || defined(OS_MACOSX) || \
defined(ADDRESS_SANITIZER)
#define MAYBE_StaleUsability DISABLED_StaleUsability #define MAYBE_StaleUsability DISABLED_StaleUsability
#else #else
#define MAYBE_StaleUsability StaleUsability #define MAYBE_StaleUsability StaleUsability
...@@ -485,8 +483,6 @@ TEST_F(StaleHostResolverTest, MAYBE_StaleUsability) { ...@@ -485,8 +483,6 @@ TEST_F(StaleHostResolverTest, MAYBE_StaleUsability) {
} }
} }
#if !defined(ADDRESS_SANITIZER)
// TODO(https://crbug.com/829097): Fix memory leaks and re-enable under ASAN.
TEST_F(StaleHostResolverTest, CreatedByContext) { TEST_F(StaleHostResolverTest, CreatedByContext) {
URLRequestContextConfig config( URLRequestContextConfig config(
// Enable QUIC. // Enable QUIC.
...@@ -549,7 +545,6 @@ TEST_F(StaleHostResolverTest, CreatedByContext) { ...@@ -549,7 +545,6 @@ TEST_F(StaleHostResolverTest, CreatedByContext) {
EXPECT_EQ(1u, resolve_addresses().size()); EXPECT_EQ(1u, resolve_addresses().size());
EXPECT_EQ(kCacheAddress, resolve_addresses()[0].ToStringWithoutPort()); EXPECT_EQ(kCacheAddress, resolve_addresses()[0].ToStringWithoutPort());
} }
#endif // !defined(ADDRESS_SANITIZER)
} // namespace } // namespace
......
This diff is collapsed.
...@@ -434,18 +434,6 @@ ...@@ -434,18 +434,6 @@
}, },
"test": "content_unittests" "test": "content_unittests"
}, },
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "cronet_tests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "cronet_unittests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
...@@ -823,18 +811,6 @@ ...@@ -823,18 +811,6 @@
}, },
"test": "content_unittests" "test": "content_unittests"
}, },
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "cronet_tests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "cronet_unittests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
...@@ -1246,18 +1222,6 @@ ...@@ -1246,18 +1222,6 @@
}, },
"test": "crashpad_tests" "test": "crashpad_tests"
}, },
{
"swarming": {
"can_use_on_swarming_builders": false
},
"test": "cronet_tests"
},
{
"swarming": {
"can_use_on_swarming_builders": false
},
"test": "cronet_unittests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": false "can_use_on_swarming_builders": false
...@@ -1654,18 +1618,6 @@ ...@@ -1654,18 +1618,6 @@
}, },
"test": "crashpad_tests" "test": "crashpad_tests"
}, },
{
"swarming": {
"can_use_on_swarming_builders": false
},
"test": "cronet_tests"
},
{
"swarming": {
"can_use_on_swarming_builders": false
},
"test": "cronet_unittests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": false "can_use_on_swarming_builders": false
...@@ -2004,18 +1956,6 @@ ...@@ -2004,18 +1956,6 @@
}, },
"test": "crashpad_tests" "test": "crashpad_tests"
}, },
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "cronet_tests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "cronet_unittests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
...@@ -2433,18 +2373,6 @@ ...@@ -2433,18 +2373,6 @@
}, },
"test": "courgette_unittests" "test": "courgette_unittests"
}, },
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "cronet_tests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "cronet_unittests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
...@@ -2861,18 +2789,6 @@ ...@@ -2861,18 +2789,6 @@
}, },
"test": "courgette_unittests" "test": "courgette_unittests"
}, },
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "cronet_tests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "cronet_unittests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
...@@ -3169,18 +3085,6 @@ ...@@ -3169,18 +3085,6 @@
}, },
"test": "courgette_unittests" "test": "courgette_unittests"
}, },
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "cronet_tests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "cronet_unittests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
...@@ -3470,18 +3374,6 @@ ...@@ -3470,18 +3374,6 @@
}, },
"test": "courgette_unittests" "test": "courgette_unittests"
}, },
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "cronet_tests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "cronet_unittests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
...@@ -4745,28 +4637,6 @@ ...@@ -4745,28 +4637,6 @@
}, },
"test": "content_unittests" "test": "content_unittests"
}, },
{
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
]
},
"test": "cronet_tests"
},
{
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
]
},
"test": "cronet_unittests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true, "can_use_on_swarming_builders": true,
...@@ -6889,18 +6759,6 @@ ...@@ -6889,18 +6759,6 @@
}, },
"test": "content_unittests" "test": "content_unittests"
}, },
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "cronet_tests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "cronet_unittests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
...@@ -7294,18 +7152,6 @@ ...@@ -7294,18 +7152,6 @@
}, },
"test": "crashpad_tests" "test": "crashpad_tests"
}, },
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "cronet_tests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "cronet_unittests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
...@@ -7647,18 +7493,6 @@ ...@@ -7647,18 +7493,6 @@
}, },
"test": "crashpad_tests" "test": "crashpad_tests"
}, },
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "cronet_tests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "cronet_unittests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
...@@ -8208,18 +8042,6 @@ ...@@ -8208,18 +8042,6 @@
}, },
"test": "content_unittests" "test": "content_unittests"
}, },
{
"swarming": {
"can_use_on_swarming_builders": false
},
"test": "cronet_tests"
},
{
"swarming": {
"can_use_on_swarming_builders": false
},
"test": "cronet_unittests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": false "can_use_on_swarming_builders": false
...@@ -8647,18 +8469,6 @@ ...@@ -8647,18 +8469,6 @@
}, },
"test": "crashpad_tests" "test": "crashpad_tests"
}, },
{
"swarming": {
"can_use_on_swarming_builders": false
},
"test": "cronet_tests"
},
{
"swarming": {
"can_use_on_swarming_builders": false
},
"test": "cronet_unittests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": false "can_use_on_swarming_builders": false
...@@ -9345,18 +9155,6 @@ ...@@ -9345,18 +9155,6 @@
}, },
"test": "crashpad_tests" "test": "crashpad_tests"
}, },
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "cronet_tests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "cronet_unittests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
......
...@@ -855,18 +855,6 @@ ...@@ -855,18 +855,6 @@
}, },
"test": "content_unittests" "test": "content_unittests"
}, },
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "cronet_tests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "cronet_unittests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
...@@ -1665,18 +1653,6 @@ ...@@ -1665,18 +1653,6 @@
}, },
"test": "content_unittests" "test": "content_unittests"
}, },
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "cronet_tests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "cronet_unittests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
...@@ -2322,18 +2298,6 @@ ...@@ -2322,18 +2298,6 @@
}, },
"test": "content_unittests" "test": "content_unittests"
}, },
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "cronet_tests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "cronet_unittests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
......
...@@ -129,18 +129,6 @@ ...@@ -129,18 +129,6 @@
}, },
"test": "crashpad_tests" "test": "crashpad_tests"
}, },
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "cronet_tests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "cronet_unittests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
...@@ -602,18 +590,6 @@ ...@@ -602,18 +590,6 @@
}, },
"test": "crashpad_tests" "test": "crashpad_tests"
}, },
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "cronet_tests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "cronet_unittests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
...@@ -1051,18 +1027,6 @@ ...@@ -1051,18 +1027,6 @@
}, },
"test": "crashpad_tests" "test": "crashpad_tests"
}, },
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "cronet_tests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "cronet_unittests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
...@@ -1525,18 +1489,6 @@ ...@@ -1525,18 +1489,6 @@
}, },
"test": "crashpad_tests" "test": "crashpad_tests"
}, },
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "cronet_tests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "cronet_unittests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
...@@ -1987,18 +1939,6 @@ ...@@ -1987,18 +1939,6 @@
}, },
"test": "crashpad_tests" "test": "crashpad_tests"
}, },
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "cronet_tests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "cronet_unittests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
......
...@@ -723,26 +723,6 @@ ...@@ -723,26 +723,6 @@
}, },
"test": "content_unittests" "test": "content_unittests"
}, },
{
"args": [
"--test-launcher-batch-limit=1",
"--test-launcher-print-test-stdio=always"
],
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "cronet_tests"
},
{
"args": [
"--test-launcher-batch-limit=1",
"--test-launcher-print-test-stdio=always"
],
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "cronet_unittests"
},
{ {
"args": [ "args": [
"--test-launcher-batch-limit=1", "--test-launcher-batch-limit=1",
...@@ -1213,18 +1193,6 @@ ...@@ -1213,18 +1193,6 @@
}, },
"test": "content_unittests" "test": "content_unittests"
}, },
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "cronet_tests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "cronet_unittests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
...@@ -2883,18 +2851,6 @@ ...@@ -2883,18 +2851,6 @@
}, },
"test": "content_unittests" "test": "content_unittests"
}, },
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "cronet_tests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "cronet_unittests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
......
...@@ -177,18 +177,6 @@ ...@@ -177,18 +177,6 @@
}, },
"test": "crashpad_tests" "test": "crashpad_tests"
}, },
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "cronet_tests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "cronet_unittests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
...@@ -785,18 +773,6 @@ ...@@ -785,18 +773,6 @@
}, },
"test": "crashpad_tests" "test": "crashpad_tests"
}, },
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "cronet_tests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "cronet_unittests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
...@@ -1326,18 +1302,6 @@ ...@@ -1326,18 +1302,6 @@
}, },
"test": "crashpad_tests" "test": "crashpad_tests"
}, },
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "cronet_tests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "cronet_unittests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
...@@ -1998,18 +1962,6 @@ ...@@ -1998,18 +1962,6 @@
}, },
"test": "crashpad_tests" "test": "crashpad_tests"
}, },
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "cronet_tests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "cronet_unittests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
...@@ -2615,18 +2567,6 @@ ...@@ -2615,18 +2567,6 @@
}, },
"test": "crashpad_tests" "test": "crashpad_tests"
}, },
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "cronet_tests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "cronet_unittests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
......
...@@ -1352,8 +1352,6 @@ ...@@ -1352,8 +1352,6 @@
'non_android_and_cast_and_chromeos_chromium_gtests': { 'non_android_and_cast_and_chromeos_chromium_gtests': {
'blink_platform_unittests': {}, 'blink_platform_unittests': {},
'cronet_tests': {},
'cronet_unittests': {},
}, },
'non_android_and_cast_and_chromeos_and_clang_and_mac_fyi_chromium_gtests': { 'non_android_and_cast_and_chromeos_and_clang_and_mac_fyi_chromium_gtests': {
......
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