From 5bc57b64fed4c525ff1a3c067b4abcf7d5274909 Mon Sep 17 00:00:00 2001 From: yang-g Date: Mon, 13 Jan 2020 15:52:27 -0800 Subject: [PATCH] InitGoogleTest before grpc_init --- test/core/backoff/backoff_test.cc | 2 +- test/core/client_channel/service_config_test.cc | 2 +- test/core/client_channel/xds_bootstrap_test.cc | 2 +- test/core/security/tls_security_connector_test.cc | 2 +- test/core/transport/byte_stream_test.cc | 4 ++-- test/core/transport/chttp2/context_list_test.cc | 2 +- test/core/transport/connectivity_state_test.cc | 2 +- test/core/transport/static_metadata_test.cc | 2 +- .../tsi/alts/handshaker/alts_concurrent_connectivity_test.cc | 4 ++-- test/cpp/end2end/client_callback_end2end_test.cc | 4 ++-- test/cpp/performance/writes_per_rpc_test.cc | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/test/core/backoff/backoff_test.cc b/test/core/backoff/backoff_test.cc index a6a3af91df1..62d60590440 100644 --- a/test/core/backoff/backoff_test.cc +++ b/test/core/backoff/backoff_test.cc @@ -172,8 +172,8 @@ TEST(BackOffTest, JitterBackOff) { } // namespace grpc int main(int argc, char** argv) { - grpc::testing::TestEnvironment env(argc, argv); ::testing::InitGoogleTest(&argc, argv); + grpc::testing::TestEnvironment env(argc, argv); grpc_init(); int ret = RUN_ALL_TESTS(); grpc_shutdown(); diff --git a/test/core/client_channel/service_config_test.cc b/test/core/client_channel/service_config_test.cc index a8d29efa0bd..cca72709fbf 100644 --- a/test/core/client_channel/service_config_test.cc +++ b/test/core/client_channel/service_config_test.cc @@ -1012,9 +1012,9 @@ int main(int argc, char** argv) { "this system."); return 0; #endif + ::testing::InitGoogleTest(&argc, argv); grpc::testing::TestEnvironment env(argc, argv); grpc_init(); - ::testing::InitGoogleTest(&argc, argv); int ret = RUN_ALL_TESTS(); grpc_shutdown(); return ret; diff --git a/test/core/client_channel/xds_bootstrap_test.cc b/test/core/client_channel/xds_bootstrap_test.cc index e5de1afc695..fa35a68b720 100644 --- a/test/core/client_channel/xds_bootstrap_test.cc +++ b/test/core/client_channel/xds_bootstrap_test.cc @@ -368,9 +368,9 @@ int main(int argc, char** argv) { "this system."); return 0; #endif + ::testing::InitGoogleTest(&argc, argv); grpc::testing::TestEnvironment env(argc, argv); grpc_init(); - ::testing::InitGoogleTest(&argc, argv); int ret = RUN_ALL_TESTS(); grpc_shutdown(); return ret; diff --git a/test/core/security/tls_security_connector_test.cc b/test/core/security/tls_security_connector_test.cc index 475157e37be..94a10ceb5cc 100644 --- a/test/core/security/tls_security_connector_test.cc +++ b/test/core/security/tls_security_connector_test.cc @@ -274,8 +274,8 @@ TEST_F(TlsSecurityConnectorTest, CreateServerSecurityConnectorFailInit) { } // namespace grpc int main(int argc, char** argv) { - grpc_init(); ::testing::InitGoogleTest(&argc, argv); + grpc_init(); int ret = RUN_ALL_TESTS(); grpc_shutdown(); return ret; diff --git a/test/core/transport/byte_stream_test.cc b/test/core/transport/byte_stream_test.cc index c8deae34968..589247a5887 100644 --- a/test/core/transport/byte_stream_test.cc +++ b/test/core/transport/byte_stream_test.cc @@ -246,9 +246,9 @@ TEST(CachingByteStream, SharedCache) { } // namespace grpc_core int main(int argc, char** argv) { - grpc_init(); - grpc::testing::TestEnvironment env(argc, argv); ::testing::InitGoogleTest(&argc, argv); + grpc::testing::TestEnvironment env(argc, argv); + grpc_init(); int retval = RUN_ALL_TESTS(); grpc_shutdown(); return retval; diff --git a/test/core/transport/chttp2/context_list_test.cc b/test/core/transport/chttp2/context_list_test.cc index 629e01df196..9305fb20cd9 100644 --- a/test/core/transport/chttp2/context_list_test.cc +++ b/test/core/transport/chttp2/context_list_test.cc @@ -164,8 +164,8 @@ TEST_F(ContextListTest, NonEmptyListEmptyTimestamp) { } // namespace grpc_core int main(int argc, char** argv) { - grpc::testing::TestEnvironment env(argc, argv); ::testing::InitGoogleTest(&argc, argv); + grpc::testing::TestEnvironment env(argc, argv); grpc_init(); int ret = RUN_ALL_TESTS(); grpc_shutdown(); diff --git a/test/core/transport/connectivity_state_test.cc b/test/core/transport/connectivity_state_test.cc index 8e5b2b4fe2e..23bd100e686 100644 --- a/test/core/transport/connectivity_state_test.cc +++ b/test/core/transport/connectivity_state_test.cc @@ -184,11 +184,11 @@ TEST(StateTracker, DoNotNotifyShutdownAtDestructionIfAlreadyInShutdown) { } // namespace grpc_core int main(int argc, char** argv) { + ::testing::InitGoogleTest(&argc, argv); grpc::testing::TestEnvironment env(argc, argv); grpc_init(); grpc_core::testing::grpc_tracer_enable_flag( &grpc_core::grpc_connectivity_state_trace); - ::testing::InitGoogleTest(&argc, argv); int ret = RUN_ALL_TESTS(); grpc_shutdown(); return ret; diff --git a/test/core/transport/static_metadata_test.cc b/test/core/transport/static_metadata_test.cc index 6d3d5ef5c37..834b570f27d 100644 --- a/test/core/transport/static_metadata_test.cc +++ b/test/core/transport/static_metadata_test.cc @@ -42,9 +42,9 @@ TEST(StaticMetadataTest, ReadAllStaticElements) { } // namespace grpc_core int main(int argc, char** argv) { + ::testing::InitGoogleTest(&argc, argv); grpc_init(); grpc::testing::TestEnvironment env(argc, argv); - ::testing::InitGoogleTest(&argc, argv); int retval = RUN_ALL_TESTS(); grpc_shutdown(); return retval; diff --git a/test/core/tsi/alts/handshaker/alts_concurrent_connectivity_test.cc b/test/core/tsi/alts/handshaker/alts_concurrent_connectivity_test.cc index e6444940c76..0ed59f2479c 100644 --- a/test/core/tsi/alts/handshaker/alts_concurrent_connectivity_test.cc +++ b/test/core/tsi/alts/handshaker/alts_concurrent_connectivity_test.cc @@ -590,9 +590,9 @@ TEST(AltsConcurrentConnectivityTest, } // namespace int main(int argc, char** argv) { - grpc_init(); - grpc::testing::TestEnvironment env(argc, argv); ::testing::InitGoogleTest(&argc, argv); + grpc::testing::TestEnvironment env(argc, argv); + grpc_init(); auto result = RUN_ALL_TESTS(); grpc_shutdown(); return result; diff --git a/test/cpp/end2end/client_callback_end2end_test.cc b/test/cpp/end2end/client_callback_end2end_test.cc index dbc9406be00..c428cab8cce 100644 --- a/test/cpp/end2end/client_callback_end2end_test.cc +++ b/test/cpp/end2end/client_callback_end2end_test.cc @@ -1452,9 +1452,9 @@ INSTANTIATE_TEST_SUITE_P(ClientCallbackEnd2endTest, ClientCallbackEnd2endTest, } // namespace grpc int main(int argc, char** argv) { - grpc_init(); - grpc::testing::TestEnvironment env(argc, argv); ::testing::InitGoogleTest(&argc, argv); + grpc::testing::TestEnvironment env(argc, argv); + grpc_init(); int ret = RUN_ALL_TESTS(); grpc_shutdown(); return ret; diff --git a/test/cpp/performance/writes_per_rpc_test.cc b/test/cpp/performance/writes_per_rpc_test.cc index 8cae89cf155..3c33079ad6b 100644 --- a/test/cpp/performance/writes_per_rpc_test.cc +++ b/test/cpp/performance/writes_per_rpc_test.cc @@ -239,8 +239,8 @@ TEST(WritesPerRpcTest, UnaryPingPong) { } // namespace grpc int main(int argc, char** argv) { - grpc::testing::TestEnvironment env(argc, argv); ::testing::InitGoogleTest(&argc, argv); + grpc::testing::TestEnvironment env(argc, argv); grpc_init(); int ret = RUN_ALL_TESTS(); grpc_shutdown();