Merge pull request #21625 from veblush/testenv2

Make test code use TestEnvironment (part 2)

test/core/compression/stream_compression_test.cc

@@ -24,6 +24,7 @@
 #include <grpc/support/log.h>
 
 #include "src/core/lib/compression/stream_compression.h"
+#include "test/core/util/test_config.h"
 
 static void generate_random_payload(char* payload, size_t size) {
   size_t i;
@@ -287,7 +288,8 @@ static void test_stream_compression_sync_flush() {
   grpc_slice_buffer_destroy(&sink);
 }
 
-int main(int /*argc*/, char** /*argv*/) {
+int main(int argc, char** argv) {
+  grpc::testing::TestEnvironment env(argc, argv);
   grpc_init();
   test_stream_compression_simple_compress_decompress();
   test_stream_compression_simple_compress_decompress_with_output_size_constraint();
@@ -295,6 +297,5 @@ int main(int /*argc*/, char** /*argv*/) {
   test_stream_compression_sync_flush();
   test_stream_compression_drop_context();
   grpc_shutdown();
-
   return 0;
 }

test/core/handshake/verify_peer_options.cc

@@ -228,7 +228,9 @@ static int verify_callback(const char* target_host, const char* target_pem,
 
 static void verify_destruct(void* userdata) { destruct_userdata = userdata; }
 
-int main(int /*argc*/, char* /*argv*/ []) {
+int main(int argc, char* argv[]) {
+  grpc::testing::TestEnvironment env(argc, argv);
+
   int userdata = 42;
   verify_peer_options verify_options;
 

test/core/tsi/alts/crypt/aes_gcm_test.cc

@@ -18,6 +18,7 @@
 
 #include "src/core/tsi/alts/crypt/gsec.h"
 #include "test/core/tsi/alts/crypt/gsec_test_util.h"
+#include "test/core/util/test_config.h"
 
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
@@ -2093,7 +2094,8 @@ static void gsec_test_do_vector_tests_ieee() {
   gsec_aead_free_test_vector(test_vector_20);
 }
 
-int main(int /*argc*/, char** /*argv*/) {
+int main(int argc, char** argv) {
+  grpc::testing::TestEnvironment env(argc, argv);
   grpc_init();
   gsec_test_do_generic_crypter_tests();
   gsec_test_do_vector_tests_nist();

test/core/tsi/alts/handshaker/alts_handshaker_client_test.cc

@@ -25,6 +25,7 @@
 #include "src/core/tsi/transport_security.h"
 #include "src/core/tsi/transport_security_interface.h"
 #include "test/core/tsi/alts/handshaker/alts_handshaker_service_api_test_lib.h"
+#include "test/core/util/test_config.h"
 
 #define ALTS_HANDSHAKER_CLIENT_TEST_OUT_FRAME "Hello Google"
 #define ALTS_HANDSHAKER_CLIENT_TEST_TARGET_NAME "bigtable.google.api.com"
@@ -494,7 +495,8 @@ static void schedule_request_grpc_call_failure_test() {
   destroy_config(config);
 }
 
-int main(int /*argc*/, char** /*argv*/) {
+int main(int argc, char** argv) {
+  grpc::testing::TestEnvironment env(argc, argv);
   /* Initialization. */
   grpc_init();
   grpc_alts_shared_resource_dedicated_init();

test/core/tsi/alts/handshaker/alts_tsi_handshaker_test.cc

@@ -29,6 +29,7 @@
 #include "src/core/tsi/alts/handshaker/alts_tsi_handshaker_private.h"
 #include "src/proto/grpc/gcp/altscontext.upb.h"
 #include "test/core/tsi/alts/handshaker/alts_handshaker_service_api_test_lib.h"
+#include "test/core/util/test_config.h"
 
 #define ALTS_TSI_HANDSHAKER_TEST_RECV_BYTES "Hello World"
 #define ALTS_TSI_HANDSHAKER_TEST_OUT_FRAME "Hello Google"
@@ -966,7 +967,8 @@ void check_handshaker_success() {
   notification_destroy(&tsi_to_caller_notification);
 }
 
-int main(int /*argc*/, char** /*argv*/) {
+int main(int argc, char** argv) {
+  grpc::testing::TestEnvironment env(argc, argv);
   /* Initialization. */
   grpc_init();
   grpc_alts_shared_resource_dedicated_init();

test/core/tsi/alts/handshaker/alts_tsi_utils_test.cc

@@ -18,6 +18,7 @@
 
 #include "src/core/tsi/alts/handshaker/alts_tsi_utils.h"
 #include "test/core/tsi/alts/handshaker/alts_handshaker_service_api_test_lib.h"
+#include "test/core/util/test_config.h"
 
 #define ALTS_TSI_UTILS_TEST_OUT_FRAME "Hello Google"
 
@@ -66,7 +67,8 @@ static void deserialize_response_test() {
   grpc_byte_buffer_destroy(buffer);
 }
 
-int main(int /*argc*/, char** /*argv*/) {
+int main(int argc, char** argv) {
+  grpc::testing::TestEnvironment env(argc, argv);
   /* Tests. */
   grpc_init();
   deserialize_response_test();

test/cpp/client/client_channel_stress_test.cc

@@ -343,9 +343,9 @@ class ClientChannelStressTest {
 }  // namespace grpc
 
 int main(int argc, char** argv) {
-  grpc_init();
   grpc::testing::TestEnvironment env(argc, argv);
   grpc::testing::ClientChannelStressTest test;
+  grpc_init();
   test.Run();
   grpc_shutdown();
   return 0;

test/cpp/interop/client.cc

@@ -27,6 +27,7 @@
 #include <grpcpp/client_context.h>
 
 #include "src/core/lib/gpr/string.h"
+#include "test/core/util/test_config.h"
 #include "test/cpp/interop/client_helper.h"
 #include "test/cpp/interop/interop_client.h"
 #include "test/cpp/util/test_config.h"
@@ -159,6 +160,7 @@ bool ParseAdditionalMetadataFlag(
 }  // namespace
 
 int main(int argc, char** argv) {
+  grpc::testing::TestEnvironment env(argc, argv);
   grpc::testing::InitTest(&argc, &argv, true);
   gpr_log(GPR_INFO, "Testing these cases: %s", FLAGS_test_case.c_str());
   int ret = 0;

test/cpp/interop/interop_server_bootstrap.cc

@@ -18,6 +18,7 @@
 
 #include <signal.h>
 
+#include "test/core/util/test_config.h"
 #include "test/cpp/interop/server_helper.h"
 #include "test/cpp/util/test_config.h"
 
@@ -28,6 +29,7 @@ static void sigint_handler(int /*x*/) {
 }
 
 int main(int argc, char** argv) {
+  grpc::testing::TestEnvironment env(argc, argv);
   grpc::testing::InitTest(&argc, &argv, true);
   signal(SIGINT, sigint_handler);