Promote gpr_test_util to part of grpc_test_util, add a sample to show it works, build.yaml change first

gRPC-Core.podspec

@@ -1196,9 +1196,7 @@ Pod::Spec.new do |s|
     ss.dependency "#{s.name}/Interface", version
     ss.dependency "#{s.name}/Implementation", version
 
-    ss.source_files = 'test/core/util/test_config.cc',
-                      'test/core/util/test_config.h',
-                      'test/core/end2end/data/client_certs.cc',
+    ss.source_files = 'test/core/end2end/data/client_certs.cc',
                       'test/core/end2end/data/server1_cert.cc',
                       'test/core/end2end/data/server1_key.cc',
                       'test/core/end2end/data/test_root_cert.cc',
@@ -1221,6 +1219,7 @@ Pod::Spec.new do |s|
                       'test/core/util/slice_splitter.cc',
                       'test/core/util/subprocess_posix.cc',
                       'test/core/util/subprocess_windows.cc',
+                      'test/core/util/test_config.cc',
                       'test/core/util/tracer_util.cc',
                       'test/core/util/trickle_endpoint.cc',
                       'test/core/util/cmdline.cc',
@@ -1245,6 +1244,7 @@ Pod::Spec.new do |s|
                       'test/core/util/port_server_client.h',
                       'test/core/util/slice_splitter.h',
                       'test/core/util/subprocess.h',
+                      'test/core/util/test_config.h',
                       'test/core/util/tracer_util.h',
                       'test/core/util/trickle_endpoint.h',
                       'test/core/util/cmdline.h',

grpc.gyp

@@ -258,16 +258,6 @@
         'src/core/lib/profiling/stap_timers.cc',
       ],
     },
-    {
-      'target_name': 'gpr_test_util',
-      'type': 'static_library',
-      'dependencies': [
-        'gpr',
-      ],
-      'sources': [
-        'test/core/util/test_config.cc',
-      ],
-    },
     {
       'target_name': 'grpc',
       'type': 'static_library',
@@ -604,7 +594,6 @@
       'target_name': 'grpc_test_util',
       'type': 'static_library',
       'dependencies': [
-        'gpr_test_util',
         'gpr',
         'grpc',
       ],
@@ -633,6 +622,7 @@
         'test/core/util/slice_splitter.cc',
         'test/core/util/subprocess_posix.cc',
         'test/core/util/subprocess_windows.cc',
+        'test/core/util/test_config.cc',
         'test/core/util/tracer_util.cc',
         'test/core/util/trickle_endpoint.cc',
         'test/core/util/cmdline.cc',
@@ -850,7 +840,6 @@
       'type': 'static_library',
       'dependencies': [
         'gpr',
-        'gpr_test_util',
         'grpc_unsecure',
       ],
       'sources': [
@@ -873,6 +862,7 @@
         'test/core/util/slice_splitter.cc',
         'test/core/util/subprocess_posix.cc',
         'test/core/util/subprocess_windows.cc',
+        'test/core/util/test_config.cc',
         'test/core/util/tracer_util.cc',
         'test/core/util/trickle_endpoint.cc',
         'test/core/util/cmdline.cc',
@@ -1351,7 +1341,6 @@
         'test_tcp_server',
         'grpc_test_util',
         'grpc',
-        'gpr_test_util',
         'gpr',
       ],
       'sources': [
@@ -1364,7 +1353,6 @@
       'dependencies': [
         'grpc_test_util',
         'grpc',
-        'gpr_test_util',
         'gpr',
       ],
       'sources': [
@@ -1679,7 +1667,6 @@
         'grpc_test_util',
         'grpc++',
         'grpc',
-        'gpr_test_util',
         'gpr',
         'grpc++_test_config',
       ],
@@ -1714,7 +1701,6 @@
         'grpc_test_util',
         'grpc++',
         'grpc',
-        'gpr_test_util',
         'gpr',
         'grpc++_test_config',
       ],
@@ -2667,7 +2653,6 @@
       'dependencies': [
         'grpc_test_util_unsecure',
         'grpc_unsecure',
-        'gpr_test_util',
         'gpr',
       ],
       'sources': [
@@ -2680,7 +2665,6 @@
       'dependencies': [
         'grpc_test_util',
         'grpc',
-        'gpr_test_util',
         'gpr',
       ],
       'sources': [
@@ -2772,7 +2756,6 @@
       'dependencies': [
         'grpc_test_util_unsecure',
         'grpc_unsecure',
-        'gpr_test_util',
         'gpr',
       ],
       'sources': [

src/core/lib/surface/init.cc

@@ -195,3 +195,7 @@ int grpc_is_initialized(void) {
   gpr_mu_unlock(&g_init_mu);
   return r;
 }
+
+void grpc_test_x(void) {
+  gpr_log(GPR_ERROR, "X");
+}

src/core/lib/surface/init.h

@@ -22,5 +22,6 @@
 void grpc_register_security_filters(void);
 void grpc_security_pre_init(void);
 void grpc_security_init(void);
+void grpc_test_x(void);
 
 #endif /* GRPC_CORE_LIB_SURFACE_INIT_H */

test/core/bad_client/gen_build_yaml.py

@@ -56,7 +56,6 @@ def main():
             'deps': [
               'grpc_test_util_unsecure',
               'grpc_unsecure',
-              'gpr_test_util',
               'gpr'
             ]
           }],
@@ -74,7 +73,6 @@ def main():
                   'bad_client_test',
                   'grpc_test_util_unsecure',
                   'grpc_unsecure',
-                  'gpr_test_util',
                   'gpr'
               ]
           }

test/core/bad_ssl/gen_build_yaml.py

@@ -45,7 +45,6 @@ def main():
               'deps': [
                   'grpc_test_util',
                   'grpc',
-                  'gpr_test_util',
                   'gpr'
               ]
           }
@@ -63,7 +62,6 @@ def main():
                   'bad_ssl_test_server',
                   'grpc_test_util',
                   'grpc',
-                  'gpr_test_util',
                   'gpr'
               ]
           }
@@ -79,7 +77,6 @@ def main():
               'deps': [
                   'grpc_test_util',
                   'grpc',
-                  'gpr_test_util',
                   'gpr'
               ]
           }

test/core/end2end/gen_build_yaml.py

@@ -281,13 +281,11 @@ def main():
   sec_deps = [
     'grpc_test_util',
     'grpc',
-    'gpr_test_util',
     'gpr'
   ]
   unsec_deps = [
     'grpc_test_util_unsecure',
     'grpc_unsecure',
-    'gpr_test_util',
     'gpr'
   ]
   json = {

test/core/util/test_config.cc

@@ -31,6 +31,7 @@
 #include "src/core/lib/gpr/env.h"
 #include "src/core/lib/gpr/string.h"
 #include "src/core/lib/gpr/useful.h"
+#include "src/core/lib/surface/init.h"
 
 int64_t g_fixture_slowdown_factor = 1;
 int64_t g_poller_slowdown_factor = 1;
@@ -405,7 +406,7 @@ TestEnvironment::TestEnvironment(int argc, char** argv) {
   grpc_test_init(argc, argv);
 }
 
-TestEnvironment::~TestEnvironment() {}
+TestEnvironment::~TestEnvironment() { grpc_test_x(); }
 
 }  // namespace testing
 }  // namespace grpc

test/cpp/naming/gen_build_yaml.py

@@ -72,7 +72,6 @@ def main():
               'deps': [
                   'grpc++_test_util' + unsecure_build_config_suffix,
                   'grpc_test_util' + unsecure_build_config_suffix,
-                  'gpr_test_util',
                   'grpc++' + unsecure_build_config_suffix,
                   'grpc' + unsecure_build_config_suffix,
                   'gpr',
@@ -91,7 +90,6 @@ def main():
               'deps': [
                   'grpc++_test_util',
                   'grpc_test_util',
-                  'gpr_test_util',
                   'grpc++',
                   'grpc',
                   'gpr',
@@ -114,7 +112,6 @@ def main():
               'deps': [
                   'grpc++_test_util' + unsecure_build_config_suffix,
                   'grpc_test_util' + unsecure_build_config_suffix,
-                  'gpr_test_util',
                   'grpc++' + unsecure_build_config_suffix,
                   'grpc' + unsecure_build_config_suffix,
                   'gpr',
@@ -133,7 +130,6 @@ def main():
           'deps': [
               'grpc++_test_util',
               'grpc_test_util',
-              'gpr_test_util',
               'grpc++',
               'grpc',
               'gpr',