From e9a253477d06041b6cd137dd0b40c4e2bc658563 Mon Sep 17 00:00:00 2001
From: Craig Tiller <craig.tiller@gmail.com>
Date: Fri, 9 Jan 2015 13:34:53 -0800
Subject: [PATCH 01/18] Fix win32 build error.

---
 include/grpc/support/port_platform.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/grpc/support/port_platform.h b/include/grpc/support/port_platform.h
index 27a7b5529f7..978b3377243 100644
--- a/include/grpc/support/port_platform.h
+++ b/include/grpc/support/port_platform.h
@@ -126,7 +126,7 @@
 #error Must define exactly one of GPR_ARCH_32, GPR_ARCH_64
 #endif
 
-#if defined(GPR_CPU_LINUX) + defined(GPR_CPU_POSIX) != 1
+#if defined(GPR_CPU_LINUX) + defined(GPR_CPU_POSIX) + defined(GPR_WIN32) != 1
 #error Must define exactly one of GPR_CPU_LINUX, GPR_CPU_POSIX
 #endif
 

From 93d970a9eff403579e7f5205692f92902ba9f91c Mon Sep 17 00:00:00 2001
From: Craig Tiller <craig.tiller@gmail.com>
Date: Fri, 9 Jan 2015 13:35:04 -0800
Subject: [PATCH 02/18] Fix win32 build error.

---
 src/core/iomgr/pollset.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/core/iomgr/pollset.h b/src/core/iomgr/pollset.h
index 7374a4ec131..36d80d5c297 100644
--- a/src/core/iomgr/pollset.h
+++ b/src/core/iomgr/pollset.h
@@ -35,6 +35,7 @@
 #define __GRPC_INTERNAL_IOMGR_POLLSET_H_
 
 #include <grpc/support/port_platform.h>
+#include <grpc/support/time.h>
 
 /* A grpc_pollset is a set of file descriptors that a higher level item is
    interested in. For example:

From 5d191a4bf48ae7c02ed6047aa02898901741c326 Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Mon, 12 Jan 2015 13:38:32 -0800
Subject: [PATCH 03/18] Add build outputs to .gitignore.

---
 .gitignore | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.gitignore b/.gitignore
index e69de29bb2d..5202b53ad25 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,6 @@
+bins
+deps
+libs
+objs
+*.pyc
+

From 3b08306c1319c55f2f5724104cb96982d895de9a Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Mon, 12 Jan 2015 13:51:28 -0800
Subject: [PATCH 04/18] Cleanup and fixes to jobset.py

---
 tools/run_tests/jobset.py | 47 +++++++++++++++++++++++++++++----------
 1 file changed, 35 insertions(+), 12 deletions(-)

diff --git a/tools/run_tests/jobset.py b/tools/run_tests/jobset.py
index d3a46b63e14..7e1ec366f96 100755
--- a/tools/run_tests/jobset.py
+++ b/tools/run_tests/jobset.py
@@ -39,6 +39,36 @@ _RUNNING = object()
 _KILLED = object()
 
 
+_COLORS = {
+    'red': 31,
+    'green': 32,
+    'yellow': 33,
+    }
+
+
+_BEGINNING_OF_LINE = '\x1b[0G'
+_CLEAR_LINE = '\x1b[2K'
+
+
+_TAG_COLOR = {
+    'FAILED': 'red',
+    'PASSED': 'green',
+    'START': 'yellow',
+    'WAITING': 'yellow',
+    }
+
+
+def message(tag, message, explanatory_text=None):
+  sys.stdout.write('%s%s\x1b[%dm%s\x1b[0m: %s%s' % (
+      _BEGINNING_OF_LINE,
+      _CLEAR_LINE,
+      _COLORS[_TAG_COLOR[tag]],
+      tag,
+      message,
+      '\n%s\n' % explanatory_text if explanatory_text is not None else ''))
+  sys.stdout.flush()
+
+
 class Job(object):
   """Manages one job."""
 
@@ -49,9 +79,7 @@ class Job(object):
                                      stderr=subprocess.STDOUT,
                                      stdout=self._tempfile)
     self._state = _RUNNING
-    sys.stdout.write('\x1b[0G\x1b[2K\x1b[33mSTART\x1b[0m: %s' %
-                     self._cmdline)
-    sys.stdout.flush()
+    message('START', self._cmdline)
 
   def state(self):
     """Poll current state of the job. Prints messages at completion."""
@@ -60,16 +88,10 @@ class Job(object):
         self._state = _FAILURE
         self._tempfile.seek(0)
         stdout = self._tempfile.read()
-        sys.stdout.write('\x1b[0G\x1b[2K\x1b[31mFAILED\x1b[0m: %s'
-                         ' [ret=%d]\n'
-                         '%s\n' % (
-                             self._cmdline, self._process.returncode, stdout))
-        sys.stdout.flush()
+        message('FAILED', '%s [ret=%d]' % (self._cmdline, self._process.returncode), stdout)
       else:
         self._state = _SUCCESS
-        sys.stdout.write('\x1b[0G\x1b[2K\x1b[32mPASSED\x1b[0m: %s' %
-                         self._cmdline)
-        sys.stdout.flush()
+        message('PASSED', '%s' % self._cmdline)
     return self._state
 
   def kill(self):
@@ -107,7 +129,8 @@ class Jobset(object):
         dead.add(job)
       for job in dead:
         self._running.remove(job)
-      if not dead: return
+      if dead: return
+      message('WAITING', '%d jobs left' % len(self._running))
       time.sleep(0.1)
 
   def cancelled(self):

From b29797b142a016ec9821b65479309329e151f6b4 Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Mon, 12 Jan 2015 13:51:54 -0800
Subject: [PATCH 05/18] Remove ?san from the default tests.

At least until they stabilize some.
---
 tools/run_tests/run_tests.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py
index 9234682bea7..c9aedc1679e 100755
--- a/tools/run_tests/run_tests.py
+++ b/tools/run_tests/run_tests.py
@@ -13,13 +13,14 @@ import watch_dirs
 
 # flags required for make for each configuration
 _CONFIGS = ['dbg', 'opt', 'tsan', 'msan', 'asan']
+_DEFAULT = ['dbg', 'opt']
 
 # parse command line
 argp = argparse.ArgumentParser(description='Run grpc tests.')
 argp.add_argument('-c', '--config',
                   choices=['all'] + _CONFIGS,
                   nargs='+',
-                  default=['all'])
+                  default=_DEFAULT)
 argp.add_argument('-t', '--test-filter', nargs='*', default=['*'])
 argp.add_argument('-n', '--runs_per_test', default=1, type=int)
 argp.add_argument('-f', '--forever',

From 738c334432bfe79104d4d301989fe30823364279 Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Mon, 12 Jan 2015 14:28:33 -0800
Subject: [PATCH 06/18] Allow running tests under valgrind

---
 tools/run_tests/jobset.py    |  7 ++--
 tools/run_tests/run_tests.py | 62 ++++++++++++++++++++++++++----------
 2 files changed, 51 insertions(+), 18 deletions(-)

diff --git a/tools/run_tests/jobset.py b/tools/run_tests/jobset.py
index 7e1ec366f96..b7bcb7b02c1 100755
--- a/tools/run_tests/jobset.py
+++ b/tools/run_tests/jobset.py
@@ -8,7 +8,7 @@ import tempfile
 import time
 
 
-_MAX_JOBS = 16 * multiprocessing.cpu_count()
+_MAX_JOBS = 3
 
 
 def shuffle_iteratable(it):
@@ -108,6 +108,7 @@ class Jobset(object):
     self._check_cancelled = check_cancelled
     self._cancelled = False
     self._failures = 0
+    self._completed = 0
 
   def start(self, cmdline):
     """Start a job. Return True on success, False on failure."""
@@ -128,9 +129,11 @@ class Jobset(object):
         if st == _FAILURE: self._failures += 1
         dead.add(job)
       for job in dead:
+        self._completed += 1
         self._running.remove(job)
       if dead: return
-      message('WAITING', '%d jobs left' % len(self._running))
+      message('WAITING', '%d jobs running, %d complete' % (
+          len(self._running), self._completed))
       time.sleep(0.1)
 
   def cancelled(self):
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py
index c9aedc1679e..2bd2e6d830c 100755
--- a/tools/run_tests/run_tests.py
+++ b/tools/run_tests/run_tests.py
@@ -11,14 +11,42 @@ import time
 import jobset
 import watch_dirs
 
-# flags required for make for each configuration
-_CONFIGS = ['dbg', 'opt', 'tsan', 'msan', 'asan']
+
+# SimpleConfig: just compile with CONFIG=config, and run the binary to test
+class SimpleConfig(object):
+  def __init__(self, config):
+    self.build_config = config
+
+  def run_command(self, binary):
+    return [binary]
+
+
+# ValgrindConfig: compile with some CONFIG=config, but use valgrind to run
+class ValgrindConfig(object):
+  def __init__(self, config):
+    self.build_config = config
+
+  def run_command(self, binary):
+    return ['valgrind', binary]
+
+
+# different configurations we can run under
+_CONFIGS = {
+  'dbg': SimpleConfig('dbg'),
+  'opt': SimpleConfig('opt'),
+  'tsan': SimpleConfig('tsan'),
+  'msan': SimpleConfig('msan'),
+  'asan': SimpleConfig('asan'),
+  'valgrind': ValgrindConfig('dbg'),
+  }
+
+
 _DEFAULT = ['dbg', 'opt']
 
 # parse command line
 argp = argparse.ArgumentParser(description='Run grpc tests.')
 argp.add_argument('-c', '--config',
-                  choices=['all'] + _CONFIGS,
+                  choices=['all'] + sorted(_CONFIGS.keys()),
                   nargs='+',
                   default=_DEFAULT)
 argp.add_argument('-t', '--test-filter', nargs='*', default=['*'])
@@ -30,10 +58,11 @@ argp.add_argument('-f', '--forever',
 args = argp.parse_args()
 
 # grab config
-configs = [cfg
-           for cfg in itertools.chain.from_iterable(
-               _CONFIGS if x == 'all' else [x]
-               for x in args.config)]
+run_configs = set(_CONFIGS[cfg]
+                  for cfg in itertools.chain.from_iterable(
+                      _CONFIGS.iterkeys() if x == 'all' else [x]
+                      for x in args.config))
+build_configs = set(cfg.build_config for cfg in run_configs)
 filters = args.test_filter
 runs_per_test = args.runs_per_test
 forever = args.forever
@@ -44,20 +73,21 @@ def _build_and_run(check_cancelled):
   # build latest, sharing cpu between the various makes
   if not jobset.run(
       (['make',
-        '-j', '%d' % max(multiprocessing.cpu_count() / len(configs), 1),
+        '-j', '%d' % (multiprocessing.cpu_count() + 1),
         'buildtests_c',
         'CONFIG=%s' % cfg]
-       for cfg in configs), check_cancelled):
+       for cfg in build_configs), check_cancelled):
     sys.exit(1)
 
   # run all the tests
-  jobset.run(([x]
-              for x in itertools.chain.from_iterable(
-                  itertools.chain.from_iterable(itertools.repeat(
-                      glob.glob('bins/%s/%s_test' % (config, filt)),
-                      runs_per_test))
-                  for config in configs
-                  for filt in filters)), check_cancelled)
+  jobset.run((
+      config.run_command(x)
+      for config in run_configs
+      for filt in filters
+      for x in itertools.chain.from_iterable(itertools.repeat(
+          glob.glob('bins/%s/%s_test' % (
+              config.build_config, filt)),
+          runs_per_test))), check_cancelled)
 
 
 if forever:

From d4773f51193570d4898cc05eb385f7008da5b1e3 Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Mon, 12 Jan 2015 16:38:47 -0800
Subject: [PATCH 07/18] Fix some C++ test dependencies

---
 Makefile   | 324 +++++++++++++++++++++++++++++++++++++++++++++++++++--
 build.json |   7 +-
 2 files changed, 322 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 2183beb0bf7..98739802890 100644
--- a/Makefile
+++ b/Makefile
@@ -495,7 +495,7 @@ buildtests: buildtests_c buildtests_cxx
 
 buildtests_c: bins_dep_c privatelibs_c bins/$(CONFIG)/grpc_byte_buffer_reader_test bins/$(CONFIG)/gpr_cancellable_test bins/$(CONFIG)/gpr_log_test bins/$(CONFIG)/gpr_useful_test bins/$(CONFIG)/gpr_cmdline_test bins/$(CONFIG)/gpr_histogram_test bins/$(CONFIG)/gpr_host_port_test bins/$(CONFIG)/gpr_slice_buffer_test bins/$(CONFIG)/gpr_slice_test bins/$(CONFIG)/gpr_string_test bins/$(CONFIG)/gpr_sync_test bins/$(CONFIG)/gpr_thd_test bins/$(CONFIG)/gpr_time_test bins/$(CONFIG)/murmur_hash_test bins/$(CONFIG)/grpc_stream_op_test bins/$(CONFIG)/alpn_test bins/$(CONFIG)/time_averaged_stats_test bins/$(CONFIG)/chttp2_stream_encoder_test bins/$(CONFIG)/hpack_table_test bins/$(CONFIG)/chttp2_stream_map_test bins/$(CONFIG)/hpack_parser_test bins/$(CONFIG)/transport_metadata_test bins/$(CONFIG)/chttp2_status_conversion_test bins/$(CONFIG)/chttp2_transport_end2end_test bins/$(CONFIG)/tcp_posix_test bins/$(CONFIG)/dualstack_socket_test bins/$(CONFIG)/no_server_test bins/$(CONFIG)/resolve_address_test bins/$(CONFIG)/sockaddr_utils_test bins/$(CONFIG)/tcp_server_posix_test bins/$(CONFIG)/tcp_client_posix_test bins/$(CONFIG)/grpc_channel_stack_test bins/$(CONFIG)/metadata_buffer_test bins/$(CONFIG)/grpc_completion_queue_test bins/$(CONFIG)/census_window_stats_test bins/$(CONFIG)/census_statistics_quick_test bins/$(CONFIG)/census_statistics_small_log_test bins/$(CONFIG)/census_statistics_performance_test bins/$(CONFIG)/census_statistics_multiple_writers_test bins/$(CONFIG)/census_statistics_multiple_writers_circular_buffer_test bins/$(CONFIG)/census_stub_test bins/$(CONFIG)/census_hash_table_test bins/$(CONFIG)/fling_server bins/$(CONFIG)/fling_client bins/$(CONFIG)/fling_test bins/$(CONFIG)/echo_server bins/$(CONFIG)/echo_client bins/$(CONFIG)/echo_test bins/$(CONFIG)/message_compress_test bins/$(CONFIG)/bin_encoder_test bins/$(CONFIG)/secure_endpoint_test bins/$(CONFIG)/httpcli_format_request_test bins/$(CONFIG)/httpcli_parser_test bins/$(CONFIG)/httpcli_test bins/$(CONFIG)/grpc_credentials_test bins/$(CONFIG)/grpc_base64_test bins/$(CONFIG)/grpc_json_token_test bins/$(CONFIG)/timeout_encoding_test bins/$(CONFIG)/fd_posix_test bins/$(CONFIG)/fling_stream_test bins/$(CONFIG)/lame_client_test bins/$(CONFIG)/alarm_test bins/$(CONFIG)/alarm_list_test bins/$(CONFIG)/alarm_heap_test bins/$(CONFIG)/time_test bins/$(CONFIG)/chttp2_fake_security_cancel_after_accept_test bins/$(CONFIG)/chttp2_fake_security_cancel_after_accept_and_writes_closed_test bins/$(CONFIG)/chttp2_fake_security_cancel_after_invoke_test bins/$(CONFIG)/chttp2_fake_security_cancel_before_invoke_test bins/$(CONFIG)/chttp2_fake_security_cancel_in_a_vacuum_test bins/$(CONFIG)/chttp2_fake_security_census_simple_request_test bins/$(CONFIG)/chttp2_fake_security_disappearing_server_test bins/$(CONFIG)/chttp2_fake_security_early_server_shutdown_finishes_inflight_calls_test bins/$(CONFIG)/chttp2_fake_security_early_server_shutdown_finishes_tags_test bins/$(CONFIG)/chttp2_fake_security_invoke_large_request_test bins/$(CONFIG)/chttp2_fake_security_max_concurrent_streams_test bins/$(CONFIG)/chttp2_fake_security_no_op_test bins/$(CONFIG)/chttp2_fake_security_ping_pong_streaming_test bins/$(CONFIG)/chttp2_fake_security_request_response_with_binary_metadata_and_payload_test bins/$(CONFIG)/chttp2_fake_security_request_response_with_metadata_and_payload_test bins/$(CONFIG)/chttp2_fake_security_request_response_with_payload_test bins/$(CONFIG)/chttp2_fake_security_request_response_with_trailing_metadata_and_payload_test bins/$(CONFIG)/chttp2_fake_security_simple_delayed_request_test bins/$(CONFIG)/chttp2_fake_security_simple_request_test bins/$(CONFIG)/chttp2_fake_security_thread_stress_test bins/$(CONFIG)/chttp2_fake_security_writes_done_hangs_with_pending_read_test bins/$(CONFIG)/chttp2_fullstack_cancel_after_accept_test bins/$(CONFIG)/chttp2_fullstack_cancel_after_accept_and_writes_closed_test bins/$(CONFIG)/chttp2_fullstack_cancel_after_invoke_test bins/$(CONFIG)/chttp2_fullstack_cancel_before_invoke_test bins/$(CONFIG)/chttp2_fullstack_cancel_in_a_vacuum_test bins/$(CONFIG)/chttp2_fullstack_census_simple_request_test bins/$(CONFIG)/chttp2_fullstack_disappearing_server_test bins/$(CONFIG)/chttp2_fullstack_early_server_shutdown_finishes_inflight_calls_test bins/$(CONFIG)/chttp2_fullstack_early_server_shutdown_finishes_tags_test bins/$(CONFIG)/chttp2_fullstack_invoke_large_request_test bins/$(CONFIG)/chttp2_fullstack_max_concurrent_streams_test bins/$(CONFIG)/chttp2_fullstack_no_op_test bins/$(CONFIG)/chttp2_fullstack_ping_pong_streaming_test bins/$(CONFIG)/chttp2_fullstack_request_response_with_binary_metadata_and_payload_test bins/$(CONFIG)/chttp2_fullstack_request_response_with_metadata_and_payload_test bins/$(CONFIG)/chttp2_fullstack_request_response_with_payload_test bins/$(CONFIG)/chttp2_fullstack_request_response_with_trailing_metadata_and_payload_test bins/$(CONFIG)/chttp2_fullstack_simple_delayed_request_test bins/$(CONFIG)/chttp2_fullstack_simple_request_test bins/$(CONFIG)/chttp2_fullstack_thread_stress_test bins/$(CONFIG)/chttp2_fullstack_writes_done_hangs_with_pending_read_test bins/$(CONFIG)/chttp2_simple_ssl_fullstack_cancel_after_accept_test bins/$(CONFIG)/chttp2_simple_ssl_fullstack_cancel_after_accept_and_writes_closed_test bins/$(CONFIG)/chttp2_simple_ssl_fullstack_cancel_after_invoke_test bins/$(CONFIG)/chttp2_simple_ssl_fullstack_cancel_before_invoke_test bins/$(CONFIG)/chttp2_simple_ssl_fullstack_cancel_in_a_vacuum_test bins/$(CONFIG)/chttp2_simple_ssl_fullstack_census_simple_request_test bins/$(CONFIG)/chttp2_simple_ssl_fullstack_disappearing_server_test bins/$(CONFIG)/chttp2_simple_ssl_fullstack_early_server_shutdown_finishes_inflight_calls_test bins/$(CONFIG)/chttp2_simple_ssl_fullstack_early_server_shutdown_finishes_tags_test bins/$(CONFIG)/chttp2_simple_ssl_fullstack_invoke_large_request_test bins/$(CONFIG)/chttp2_simple_ssl_fullstack_max_concurrent_streams_test bins/$(CONFIG)/chttp2_simple_ssl_fullstack_no_op_test bins/$(CONFIG)/chttp2_simple_ssl_fullstack_ping_pong_streaming_test bins/$(CONFIG)/chttp2_simple_ssl_fullstack_request_response_with_binary_metadata_and_payload_test bins/$(CONFIG)/chttp2_simple_ssl_fullstack_request_response_with_metadata_and_payload_test bins/$(CONFIG)/chttp2_simple_ssl_fullstack_request_response_with_payload_test bins/$(CONFIG)/chttp2_simple_ssl_fullstack_request_response_with_trailing_metadata_and_payload_test bins/$(CONFIG)/chttp2_simple_ssl_fullstack_simple_delayed_request_test bins/$(CONFIG)/chttp2_simple_ssl_fullstack_simple_request_test bins/$(CONFIG)/chttp2_simple_ssl_fullstack_thread_stress_test bins/$(CONFIG)/chttp2_simple_ssl_fullstack_writes_done_hangs_with_pending_read_test bins/$(CONFIG)/chttp2_simple_ssl_with_oauth2_fullstack_cancel_after_accept_test bins/$(CONFIG)/chttp2_simple_ssl_with_oauth2_fullstack_cancel_after_accept_and_writes_closed_test bins/$(CONFIG)/chttp2_simple_ssl_with_oauth2_fullstack_cancel_after_invoke_test bins/$(CONFIG)/chttp2_simple_ssl_with_oauth2_fullstack_cancel_before_invoke_test bins/$(CONFIG)/chttp2_simple_ssl_with_oauth2_fullstack_cancel_in_a_vacuum_test bins/$(CONFIG)/chttp2_simple_ssl_with_oauth2_fullstack_census_simple_request_test bins/$(CONFIG)/chttp2_simple_ssl_with_oauth2_fullstack_disappearing_server_test bins/$(CONFIG)/chttp2_simple_ssl_with_oauth2_fullstack_early_server_shutdown_finishes_inflight_calls_test bins/$(CONFIG)/chttp2_simple_ssl_with_oauth2_fullstack_early_server_shutdown_finishes_tags_test bins/$(CONFIG)/chttp2_simple_ssl_with_oauth2_fullstack_invoke_large_request_test bins/$(CONFIG)/chttp2_simple_ssl_with_oauth2_fullstack_max_concurrent_streams_test bins/$(CONFIG)/chttp2_simple_ssl_with_oauth2_fullstack_no_op_test bins/$(CONFIG)/chttp2_simple_ssl_with_oauth2_fullstack_ping_pong_streaming_test bins/$(CONFIG)/chttp2_simple_ssl_with_oauth2_fullstack_request_response_with_binary_metadata_and_payload_test bins/$(CONFIG)/chttp2_simple_ssl_with_oauth2_fullstack_request_response_with_metadata_and_payload_test bins/$(CONFIG)/chttp2_simple_ssl_with_oauth2_fullstack_request_response_with_payload_test bins/$(CONFIG)/chttp2_simple_ssl_with_oauth2_fullstack_request_response_with_trailing_metadata_and_payload_test bins/$(CONFIG)/chttp2_simple_ssl_with_oauth2_fullstack_simple_delayed_request_test bins/$(CONFIG)/chttp2_simple_ssl_with_oauth2_fullstack_simple_request_test bins/$(CONFIG)/chttp2_simple_ssl_with_oauth2_fullstack_thread_stress_test bins/$(CONFIG)/chttp2_simple_ssl_with_oauth2_fullstack_writes_done_hangs_with_pending_read_test bins/$(CONFIG)/chttp2_socket_pair_cancel_after_accept_test bins/$(CONFIG)/chttp2_socket_pair_cancel_after_accept_and_writes_closed_test bins/$(CONFIG)/chttp2_socket_pair_cancel_after_invoke_test bins/$(CONFIG)/chttp2_socket_pair_cancel_before_invoke_test bins/$(CONFIG)/chttp2_socket_pair_cancel_in_a_vacuum_test bins/$(CONFIG)/chttp2_socket_pair_census_simple_request_test bins/$(CONFIG)/chttp2_socket_pair_disappearing_server_test bins/$(CONFIG)/chttp2_socket_pair_early_server_shutdown_finishes_inflight_calls_test bins/$(CONFIG)/chttp2_socket_pair_early_server_shutdown_finishes_tags_test bins/$(CONFIG)/chttp2_socket_pair_invoke_large_request_test bins/$(CONFIG)/chttp2_socket_pair_max_concurrent_streams_test bins/$(CONFIG)/chttp2_socket_pair_no_op_test bins/$(CONFIG)/chttp2_socket_pair_ping_pong_streaming_test bins/$(CONFIG)/chttp2_socket_pair_request_response_with_binary_metadata_and_payload_test bins/$(CONFIG)/chttp2_socket_pair_request_response_with_metadata_and_payload_test bins/$(CONFIG)/chttp2_socket_pair_request_response_with_payload_test bins/$(CONFIG)/chttp2_socket_pair_request_response_with_trailing_metadata_and_payload_test bins/$(CONFIG)/chttp2_socket_pair_simple_delayed_request_test bins/$(CONFIG)/chttp2_socket_pair_simple_request_test bins/$(CONFIG)/chttp2_socket_pair_thread_stress_test bins/$(CONFIG)/chttp2_socket_pair_writes_done_hangs_with_pending_read_test bins/$(CONFIG)/chttp2_socket_pair_one_byte_at_a_time_cancel_after_accept_test bins/$(CONFIG)/chttp2_socket_pair_one_byte_at_a_time_cancel_after_accept_and_writes_closed_test bins/$(CONFIG)/chttp2_socket_pair_one_byte_at_a_time_cancel_after_invoke_test bins/$(CONFIG)/chttp2_socket_pair_one_byte_at_a_time_cancel_before_invoke_test bins/$(CONFIG)/chttp2_socket_pair_one_byte_at_a_time_cancel_in_a_vacuum_test bins/$(CONFIG)/chttp2_socket_pair_one_byte_at_a_time_census_simple_request_test bins/$(CONFIG)/chttp2_socket_pair_one_byte_at_a_time_disappearing_server_test bins/$(CONFIG)/chttp2_socket_pair_one_byte_at_a_time_early_server_shutdown_finishes_inflight_calls_test bins/$(CONFIG)/chttp2_socket_pair_one_byte_at_a_time_early_server_shutdown_finishes_tags_test bins/$(CONFIG)/chttp2_socket_pair_one_byte_at_a_time_invoke_large_request_test bins/$(CONFIG)/chttp2_socket_pair_one_byte_at_a_time_max_concurrent_streams_test bins/$(CONFIG)/chttp2_socket_pair_one_byte_at_a_time_no_op_test bins/$(CONFIG)/chttp2_socket_pair_one_byte_at_a_time_ping_pong_streaming_test bins/$(CONFIG)/chttp2_socket_pair_one_byte_at_a_time_request_response_with_binary_metadata_and_payload_test bins/$(CONFIG)/chttp2_socket_pair_one_byte_at_a_time_request_response_with_metadata_and_payload_test bins/$(CONFIG)/chttp2_socket_pair_one_byte_at_a_time_request_response_with_payload_test bins/$(CONFIG)/chttp2_socket_pair_one_byte_at_a_time_request_response_with_trailing_metadata_and_payload_test bins/$(CONFIG)/chttp2_socket_pair_one_byte_at_a_time_simple_delayed_request_test bins/$(CONFIG)/chttp2_socket_pair_one_byte_at_a_time_simple_request_test bins/$(CONFIG)/chttp2_socket_pair_one_byte_at_a_time_thread_stress_test bins/$(CONFIG)/chttp2_socket_pair_one_byte_at_a_time_writes_done_hangs_with_pending_read_test
 
-buildtests_cxx: bins_dep_cxx privatelibs_cxx bins/thread_pool_test bins/status_test bins/sync_client_async_server_test bins/qps_client bins/qps_server bins/interop_server bins/interop_client bins/end2end_test bins/channel_arguments_test bins/credentials_test
+buildtests_cxx: bins_dep_cxx privatelibs_cxx bins/$(CONFIG)/thread_pool_test bins/$(CONFIG)/status_test bins/$(CONFIG)/sync_client_async_server_test bins/$(CONFIG)/qps_client bins/$(CONFIG)/qps_server bins/$(CONFIG)/interop_server bins/$(CONFIG)/interop_client bins/$(CONFIG)/end2end_test bins/$(CONFIG)/channel_arguments_test bins/$(CONFIG)/credentials_test
 
 test: test_c test_cxx
 
@@ -1339,6 +1339,7 @@ libs/$(CONFIG)/libgrpc.a: $(OPENSSL_DEP) $(LIBGRPC_OBJS)
 	$(E) "[AR]      Creating $@"
 	$(Q) mkdir -p `dirname $@`
 	$(Q) $(AR) rcs libs/$(CONFIG)/libgrpc.a $(LIBGRPC_OBJS)
+	$(Q) rm -rf tmp-merge
 	$(Q) mkdir tmp-merge
 	$(Q) ( cd tmp-merge ; $(AR) x ../libs/$(CONFIG)/libgrpc.a )
 	$(Q) for l in $(OPENSSL_MERGE_LIBS) ; do ( cd tmp-merge ; ar x ../$${l} ) ; done
@@ -2655,6 +2656,8 @@ bins/$(CONFIG)/gen_hpack_tables: $(GEN_HPACK_TABLES_OBJS) libs/$(CONFIG)/libgrpc
 
 endif
 
+objs/$(CONFIG)/src/core/transport/chttp2/gen_hpack_tables.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgpr.a libs/$(CONFIG)/libgrpc.a
+
 deps_gen_hpack_tables: $(GEN_HPACK_TABLES_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -2682,6 +2685,9 @@ bins/$(CONFIG)/cpp_plugin: $(CPP_PLUGIN_OBJS)
 	$(Q) mkdir -p `dirname $@`
 	$(Q) $(HOST_LDXX) $(HOST_LDFLAGS) $(CPP_PLUGIN_OBJS) $(HOST_LDLIBSXX) $(HOST_LDLIBS) $(HOST_LDLIBS_PROTOC) -o bins/$(CONFIG)/cpp_plugin
 
+objs/$(CONFIG)/src/compiler/cpp_plugin.o: 
+objs/$(CONFIG)/src/compiler/cpp_generator.o: 
+
 deps_cpp_plugin: $(CPP_PLUGIN_DEPS)
 
 ifneq ($(NO_DEPS),true)
@@ -2707,6 +2713,9 @@ bins/$(CONFIG)/ruby_plugin: $(RUBY_PLUGIN_OBJS)
 	$(Q) mkdir -p `dirname $@`
 	$(Q) $(HOST_LDXX) $(HOST_LDFLAGS) $(RUBY_PLUGIN_OBJS) $(HOST_LDLIBSXX) $(HOST_LDLIBS) $(HOST_LDLIBS_PROTOC) -o bins/$(CONFIG)/ruby_plugin
 
+objs/$(CONFIG)/src/compiler/ruby_plugin.o: 
+objs/$(CONFIG)/src/compiler/ruby_generator.o: 
+
 deps_ruby_plugin: $(RUBY_PLUGIN_DEPS)
 
 ifneq ($(NO_DEPS),true)
@@ -2732,6 +2741,9 @@ bins/$(CONFIG)/go_plugin: $(GO_PLUGIN_OBJS)
 	$(Q) mkdir -p `dirname $@`
 	$(Q) $(HOST_LDXX) $(HOST_LDFLAGS) $(GO_PLUGIN_OBJS) $(HOST_LDLIBSXX) $(HOST_LDLIBS) $(HOST_LDLIBS_PROTOC) -o bins/$(CONFIG)/go_plugin
 
+objs/$(CONFIG)/src/compiler/go_plugin.o: 
+objs/$(CONFIG)/src/compiler/go_generator.o: 
+
 deps_go_plugin: $(GO_PLUGIN_DEPS)
 
 ifneq ($(NO_DEPS),true)
@@ -2764,6 +2776,8 @@ bins/$(CONFIG)/grpc_byte_buffer_reader_test: $(GRPC_BYTE_BUFFER_READER_TEST_OBJS
 
 endif
 
+objs/$(CONFIG)/test/core/surface/byte_buffer_reader_test.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+
 deps_grpc_byte_buffer_reader_test: $(GRPC_BYTE_BUFFER_READER_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -2798,6 +2812,8 @@ bins/$(CONFIG)/gpr_cancellable_test: $(GPR_CANCELLABLE_TEST_OBJS) libs/$(CONFIG)
 
 endif
 
+objs/$(CONFIG)/test/core/support/cancellable_test.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgpr.a
+
 deps_gpr_cancellable_test: $(GPR_CANCELLABLE_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -2832,6 +2848,8 @@ bins/$(CONFIG)/gpr_log_test: $(GPR_LOG_TEST_OBJS) libs/$(CONFIG)/libgrpc_test_ut
 
 endif
 
+objs/$(CONFIG)/test/core/support/log_test.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgpr.a
+
 deps_gpr_log_test: $(GPR_LOG_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -2866,6 +2884,8 @@ bins/$(CONFIG)/gpr_useful_test: $(GPR_USEFUL_TEST_OBJS) libs/$(CONFIG)/libgrpc_t
 
 endif
 
+objs/$(CONFIG)/test/core/support/useful_test.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgpr.a
+
 deps_gpr_useful_test: $(GPR_USEFUL_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -2900,6 +2920,8 @@ bins/$(CONFIG)/gpr_cmdline_test: $(GPR_CMDLINE_TEST_OBJS) libs/$(CONFIG)/libgrpc
 
 endif
 
+objs/$(CONFIG)/test/core/support/cmdline_test.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgpr.a
+
 deps_gpr_cmdline_test: $(GPR_CMDLINE_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -2934,6 +2956,8 @@ bins/$(CONFIG)/gpr_histogram_test: $(GPR_HISTOGRAM_TEST_OBJS) libs/$(CONFIG)/lib
 
 endif
 
+objs/$(CONFIG)/test/core/support/histogram_test.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgpr.a
+
 deps_gpr_histogram_test: $(GPR_HISTOGRAM_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -2968,6 +2992,8 @@ bins/$(CONFIG)/gpr_host_port_test: $(GPR_HOST_PORT_TEST_OBJS) libs/$(CONFIG)/lib
 
 endif
 
+objs/$(CONFIG)/test/core/support/host_port_test.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgpr.a
+
 deps_gpr_host_port_test: $(GPR_HOST_PORT_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -3002,6 +3028,8 @@ bins/$(CONFIG)/gpr_slice_buffer_test: $(GPR_SLICE_BUFFER_TEST_OBJS) libs/$(CONFI
 
 endif
 
+objs/$(CONFIG)/test/core/support/slice_buffer_test.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgpr.a
+
 deps_gpr_slice_buffer_test: $(GPR_SLICE_BUFFER_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -3036,6 +3064,8 @@ bins/$(CONFIG)/gpr_slice_test: $(GPR_SLICE_TEST_OBJS) libs/$(CONFIG)/libgrpc_tes
 
 endif
 
+objs/$(CONFIG)/test/core/support/slice_test.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgpr.a
+
 deps_gpr_slice_test: $(GPR_SLICE_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -3070,6 +3100,8 @@ bins/$(CONFIG)/gpr_string_test: $(GPR_STRING_TEST_OBJS) libs/$(CONFIG)/libgrpc_t
 
 endif
 
+objs/$(CONFIG)/test/core/support/string_test.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgpr.a
+
 deps_gpr_string_test: $(GPR_STRING_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -3104,6 +3136,8 @@ bins/$(CONFIG)/gpr_sync_test: $(GPR_SYNC_TEST_OBJS) libs/$(CONFIG)/libgrpc_test_
 
 endif
 
+objs/$(CONFIG)/test/core/support/sync_test.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgpr.a
+
 deps_gpr_sync_test: $(GPR_SYNC_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -3138,6 +3172,8 @@ bins/$(CONFIG)/gpr_thd_test: $(GPR_THD_TEST_OBJS) libs/$(CONFIG)/libgrpc_test_ut
 
 endif
 
+objs/$(CONFIG)/test/core/support/thd_test.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgpr.a
+
 deps_gpr_thd_test: $(GPR_THD_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -3172,6 +3208,8 @@ bins/$(CONFIG)/gpr_time_test: $(GPR_TIME_TEST_OBJS) libs/$(CONFIG)/libgrpc_test_
 
 endif
 
+objs/$(CONFIG)/test/core/support/time_test.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgpr.a
+
 deps_gpr_time_test: $(GPR_TIME_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -3206,6 +3244,8 @@ bins/$(CONFIG)/murmur_hash_test: $(MURMUR_HASH_TEST_OBJS) libs/$(CONFIG)/libgrpc
 
 endif
 
+objs/$(CONFIG)/test/core/support/murmur_hash_test.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+
 deps_murmur_hash_test: $(MURMUR_HASH_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -3240,6 +3280,8 @@ bins/$(CONFIG)/grpc_stream_op_test: $(GRPC_STREAM_OP_TEST_OBJS) libs/$(CONFIG)/l
 
 endif
 
+objs/$(CONFIG)/test/core/transport/stream_op_test.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+
 deps_grpc_stream_op_test: $(GRPC_STREAM_OP_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -3274,6 +3316,8 @@ bins/$(CONFIG)/alpn_test: $(ALPN_TEST_OBJS) libs/$(CONFIG)/libgrpc_test_util.a l
 
 endif
 
+objs/$(CONFIG)/test/core/transport/chttp2/alpn_test.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+
 deps_alpn_test: $(ALPN_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -3308,6 +3352,8 @@ bins/$(CONFIG)/time_averaged_stats_test: $(TIME_AVERAGED_STATS_TEST_OBJS) libs/$
 
 endif
 
+objs/$(CONFIG)/test/core/iomgr/time_averaged_stats_test.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+
 deps_time_averaged_stats_test: $(TIME_AVERAGED_STATS_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -3342,6 +3388,8 @@ bins/$(CONFIG)/chttp2_stream_encoder_test: $(CHTTP2_STREAM_ENCODER_TEST_OBJS) li
 
 endif
 
+objs/$(CONFIG)/test/core/transport/chttp2/stream_encoder_test.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+
 deps_chttp2_stream_encoder_test: $(CHTTP2_STREAM_ENCODER_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -3376,6 +3424,8 @@ bins/$(CONFIG)/hpack_table_test: $(HPACK_TABLE_TEST_OBJS) libs/$(CONFIG)/libgrpc
 
 endif
 
+objs/$(CONFIG)/test/core/transport/chttp2/hpack_table_test.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+
 deps_hpack_table_test: $(HPACK_TABLE_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -3410,6 +3460,8 @@ bins/$(CONFIG)/chttp2_stream_map_test: $(CHTTP2_STREAM_MAP_TEST_OBJS) libs/$(CON
 
 endif
 
+objs/$(CONFIG)/test/core/transport/chttp2/stream_map_test.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+
 deps_chttp2_stream_map_test: $(CHTTP2_STREAM_MAP_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -3444,6 +3496,8 @@ bins/$(CONFIG)/hpack_parser_test: $(HPACK_PARSER_TEST_OBJS) libs/$(CONFIG)/libgr
 
 endif
 
+objs/$(CONFIG)/test/core/transport/chttp2/hpack_parser_test.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+
 deps_hpack_parser_test: $(HPACK_PARSER_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -3478,6 +3532,8 @@ bins/$(CONFIG)/transport_metadata_test: $(TRANSPORT_METADATA_TEST_OBJS) libs/$(C
 
 endif
 
+objs/$(CONFIG)/test/core/transport/metadata_test.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+
 deps_transport_metadata_test: $(TRANSPORT_METADATA_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -3512,6 +3568,8 @@ bins/$(CONFIG)/chttp2_status_conversion_test: $(CHTTP2_STATUS_CONVERSION_TEST_OB
 
 endif
 
+objs/$(CONFIG)/test/core/transport/chttp2/status_conversion_test.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+
 deps_chttp2_status_conversion_test: $(CHTTP2_STATUS_CONVERSION_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -3546,6 +3604,8 @@ bins/$(CONFIG)/chttp2_transport_end2end_test: $(CHTTP2_TRANSPORT_END2END_TEST_OB
 
 endif
 
+objs/$(CONFIG)/test/core/transport/chttp2_transport_end2end_test.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+
 deps_chttp2_transport_end2end_test: $(CHTTP2_TRANSPORT_END2END_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -3580,6 +3640,8 @@ bins/$(CONFIG)/tcp_posix_test: $(TCP_POSIX_TEST_OBJS) libs/$(CONFIG)/libgrpc_tes
 
 endif
 
+objs/$(CONFIG)/test/core/iomgr/tcp_posix_test.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+
 deps_tcp_posix_test: $(TCP_POSIX_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -3614,6 +3676,8 @@ bins/$(CONFIG)/dualstack_socket_test: $(DUALSTACK_SOCKET_TEST_OBJS) libs/$(CONFI
 
 endif
 
+objs/$(CONFIG)/test/core/end2end/dualstack_socket_test.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+
 deps_dualstack_socket_test: $(DUALSTACK_SOCKET_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -3648,6 +3712,8 @@ bins/$(CONFIG)/no_server_test: $(NO_SERVER_TEST_OBJS) libs/$(CONFIG)/libgrpc_tes
 
 endif
 
+objs/$(CONFIG)/test/core/end2end/no_server_test.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+
 deps_no_server_test: $(NO_SERVER_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -3682,6 +3748,8 @@ bins/$(CONFIG)/resolve_address_test: $(RESOLVE_ADDRESS_TEST_OBJS) libs/$(CONFIG)
 
 endif
 
+objs/$(CONFIG)/test/core/iomgr/resolve_address_test.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+
 deps_resolve_address_test: $(RESOLVE_ADDRESS_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -3716,6 +3784,8 @@ bins/$(CONFIG)/sockaddr_utils_test: $(SOCKADDR_UTILS_TEST_OBJS) libs/$(CONFIG)/l
 
 endif
 
+objs/$(CONFIG)/test/core/iomgr/sockaddr_utils_test.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+
 deps_sockaddr_utils_test: $(SOCKADDR_UTILS_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -3750,6 +3820,8 @@ bins/$(CONFIG)/tcp_server_posix_test: $(TCP_SERVER_POSIX_TEST_OBJS) libs/$(CONFI
 
 endif
 
+objs/$(CONFIG)/test/core/iomgr/tcp_server_posix_test.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+
 deps_tcp_server_posix_test: $(TCP_SERVER_POSIX_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -3784,6 +3856,8 @@ bins/$(CONFIG)/tcp_client_posix_test: $(TCP_CLIENT_POSIX_TEST_OBJS) libs/$(CONFI
 
 endif
 
+objs/$(CONFIG)/test/core/iomgr/tcp_client_posix_test.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+
 deps_tcp_client_posix_test: $(TCP_CLIENT_POSIX_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -3818,6 +3892,8 @@ bins/$(CONFIG)/grpc_channel_stack_test: $(GRPC_CHANNEL_STACK_TEST_OBJS) libs/$(C
 
 endif
 
+objs/$(CONFIG)/test/core/channel/channel_stack_test.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+
 deps_grpc_channel_stack_test: $(GRPC_CHANNEL_STACK_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -3852,6 +3928,8 @@ bins/$(CONFIG)/metadata_buffer_test: $(METADATA_BUFFER_TEST_OBJS) libs/$(CONFIG)
 
 endif
 
+objs/$(CONFIG)/test/core/channel/metadata_buffer_test.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+
 deps_metadata_buffer_test: $(METADATA_BUFFER_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -3886,6 +3964,8 @@ bins/$(CONFIG)/grpc_completion_queue_test: $(GRPC_COMPLETION_QUEUE_TEST_OBJS) li
 
 endif
 
+objs/$(CONFIG)/test/core/surface/completion_queue_test.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+
 deps_grpc_completion_queue_test: $(GRPC_COMPLETION_QUEUE_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -3920,6 +4000,8 @@ bins/$(CONFIG)/grpc_completion_queue_benchmark: $(GRPC_COMPLETION_QUEUE_BENCHMAR
 
 endif
 
+objs/$(CONFIG)/test/core/surface/completion_queue_benchmark.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+
 deps_grpc_completion_queue_benchmark: $(GRPC_COMPLETION_QUEUE_BENCHMARK_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -3954,6 +4036,8 @@ bins/$(CONFIG)/census_trace_store_test: $(CENSUS_TRACE_STORE_TEST_OBJS) libs/$(C
 
 endif
 
+objs/$(CONFIG)/test/core/statistics/trace_test.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+
 deps_census_trace_store_test: $(CENSUS_TRACE_STORE_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -3988,6 +4072,8 @@ bins/$(CONFIG)/census_stats_store_test: $(CENSUS_STATS_STORE_TEST_OBJS) libs/$(C
 
 endif
 
+objs/$(CONFIG)/test/core/statistics/rpc_stats_test.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+
 deps_census_stats_store_test: $(CENSUS_STATS_STORE_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -4022,6 +4108,8 @@ bins/$(CONFIG)/census_window_stats_test: $(CENSUS_WINDOW_STATS_TEST_OBJS) libs/$
 
 endif
 
+objs/$(CONFIG)/test/core/statistics/window_stats_test.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+
 deps_census_window_stats_test: $(CENSUS_WINDOW_STATS_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -4056,6 +4144,8 @@ bins/$(CONFIG)/census_statistics_quick_test: $(CENSUS_STATISTICS_QUICK_TEST_OBJS
 
 endif
 
+objs/$(CONFIG)/test/core/statistics/quick_test.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+
 deps_census_statistics_quick_test: $(CENSUS_STATISTICS_QUICK_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -4090,6 +4180,8 @@ bins/$(CONFIG)/census_statistics_small_log_test: $(CENSUS_STATISTICS_SMALL_LOG_T
 
 endif
 
+objs/$(CONFIG)/test/core/statistics/small_log_test.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+
 deps_census_statistics_small_log_test: $(CENSUS_STATISTICS_SMALL_LOG_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -4124,6 +4216,8 @@ bins/$(CONFIG)/census_statistics_performance_test: $(CENSUS_STATISTICS_PERFORMAN
 
 endif
 
+objs/$(CONFIG)/test/core/statistics/performance_test.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+
 deps_census_statistics_performance_test: $(CENSUS_STATISTICS_PERFORMANCE_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -4158,6 +4252,8 @@ bins/$(CONFIG)/census_statistics_multiple_writers_test: $(CENSUS_STATISTICS_MULT
 
 endif
 
+objs/$(CONFIG)/test/core/statistics/multiple_writers_test.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+
 deps_census_statistics_multiple_writers_test: $(CENSUS_STATISTICS_MULTIPLE_WRITERS_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -4192,6 +4288,8 @@ bins/$(CONFIG)/census_statistics_multiple_writers_circular_buffer_test: $(CENSUS
 
 endif
 
+objs/$(CONFIG)/test/core/statistics/multiple_writers_circular_buffer_test.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+
 deps_census_statistics_multiple_writers_circular_buffer_test: $(CENSUS_STATISTICS_MULTIPLE_WRITERS_CIRCULAR_BUFFER_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -4226,6 +4324,8 @@ bins/$(CONFIG)/census_stub_test: $(CENSUS_STUB_TEST_OBJS) libs/$(CONFIG)/libgrpc
 
 endif
 
+objs/$(CONFIG)/test/core/statistics/census_stub_test.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+
 deps_census_stub_test: $(CENSUS_STUB_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -4260,6 +4360,8 @@ bins/$(CONFIG)/census_hash_table_test: $(CENSUS_HASH_TABLE_TEST_OBJS) libs/$(CON
 
 endif
 
+objs/$(CONFIG)/test/core/statistics/hash_table_test.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+
 deps_census_hash_table_test: $(CENSUS_HASH_TABLE_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -4294,6 +4396,8 @@ bins/$(CONFIG)/fling_server: $(FLING_SERVER_OBJS) libs/$(CONFIG)/libgrpc_test_ut
 
 endif
 
+objs/$(CONFIG)/test/core/fling/server.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+
 deps_fling_server: $(FLING_SERVER_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -4328,6 +4432,8 @@ bins/$(CONFIG)/fling_client: $(FLING_CLIENT_OBJS) libs/$(CONFIG)/libgrpc_test_ut
 
 endif
 
+objs/$(CONFIG)/test/core/fling/client.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+
 deps_fling_client: $(FLING_CLIENT_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -4362,6 +4468,8 @@ bins/$(CONFIG)/fling_test: $(FLING_TEST_OBJS) libs/$(CONFIG)/libgrpc_test_util.a
 
 endif
 
+objs/$(CONFIG)/test/core/fling/fling_test.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+
 deps_fling_test: $(FLING_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -4396,6 +4504,8 @@ bins/$(CONFIG)/echo_server: $(ECHO_SERVER_OBJS) libs/$(CONFIG)/libgrpc_test_util
 
 endif
 
+objs/$(CONFIG)/test/core/echo/server.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+
 deps_echo_server: $(ECHO_SERVER_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -4430,6 +4540,8 @@ bins/$(CONFIG)/echo_client: $(ECHO_CLIENT_OBJS) libs/$(CONFIG)/libgrpc_test_util
 
 endif
 
+objs/$(CONFIG)/test/core/echo/client.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+
 deps_echo_client: $(ECHO_CLIENT_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -4464,6 +4576,8 @@ bins/$(CONFIG)/echo_test: $(ECHO_TEST_OBJS) libs/$(CONFIG)/libgrpc_test_util.a l
 
 endif
 
+objs/$(CONFIG)/test/core/echo/echo_test.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+
 deps_echo_test: $(ECHO_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -4498,6 +4612,8 @@ bins/$(CONFIG)/low_level_ping_pong_benchmark: $(LOW_LEVEL_PING_PONG_BENCHMARK_OB
 
 endif
 
+objs/$(CONFIG)/test/core/network_benchmarks/low_level_ping_pong.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+
 deps_low_level_ping_pong_benchmark: $(LOW_LEVEL_PING_PONG_BENCHMARK_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -4532,6 +4648,8 @@ bins/$(CONFIG)/message_compress_test: $(MESSAGE_COMPRESS_TEST_OBJS) libs/$(CONFI
 
 endif
 
+objs/$(CONFIG)/test/core/compression/message_compress_test.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+
 deps_message_compress_test: $(MESSAGE_COMPRESS_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -4566,6 +4684,8 @@ bins/$(CONFIG)/bin_encoder_test: $(BIN_ENCODER_TEST_OBJS) libs/$(CONFIG)/libgrpc
 
 endif
 
+objs/$(CONFIG)/test/core/transport/chttp2/bin_encoder_test.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+
 deps_bin_encoder_test: $(BIN_ENCODER_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -4600,6 +4720,8 @@ bins/$(CONFIG)/secure_endpoint_test: $(SECURE_ENDPOINT_TEST_OBJS) libs/$(CONFIG)
 
 endif
 
+objs/$(CONFIG)/test/core/security/secure_endpoint_test.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+
 deps_secure_endpoint_test: $(SECURE_ENDPOINT_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -4634,6 +4756,8 @@ bins/$(CONFIG)/httpcli_format_request_test: $(HTTPCLI_FORMAT_REQUEST_TEST_OBJS)
 
 endif
 
+objs/$(CONFIG)/test/core/httpcli/format_request_test.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+
 deps_httpcli_format_request_test: $(HTTPCLI_FORMAT_REQUEST_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -4668,6 +4792,8 @@ bins/$(CONFIG)/httpcli_parser_test: $(HTTPCLI_PARSER_TEST_OBJS) libs/$(CONFIG)/l
 
 endif
 
+objs/$(CONFIG)/test/core/httpcli/parser_test.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+
 deps_httpcli_parser_test: $(HTTPCLI_PARSER_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -4702,6 +4828,8 @@ bins/$(CONFIG)/httpcli_test: $(HTTPCLI_TEST_OBJS) libs/$(CONFIG)/libgrpc_test_ut
 
 endif
 
+objs/$(CONFIG)/test/core/httpcli/httpcli_test.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+
 deps_httpcli_test: $(HTTPCLI_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -4736,6 +4864,8 @@ bins/$(CONFIG)/grpc_credentials_test: $(GRPC_CREDENTIALS_TEST_OBJS) libs/$(CONFI
 
 endif
 
+objs/$(CONFIG)/test/core/security/credentials_test.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+
 deps_grpc_credentials_test: $(GRPC_CREDENTIALS_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -4770,6 +4900,8 @@ bins/$(CONFIG)/grpc_fetch_oauth2: $(GRPC_FETCH_OAUTH2_OBJS) libs/$(CONFIG)/libgr
 
 endif
 
+objs/$(CONFIG)/test/core/security/fetch_oauth2.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+
 deps_grpc_fetch_oauth2: $(GRPC_FETCH_OAUTH2_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -4804,6 +4936,8 @@ bins/$(CONFIG)/grpc_base64_test: $(GRPC_BASE64_TEST_OBJS) libs/$(CONFIG)/libgrpc
 
 endif
 
+objs/$(CONFIG)/test/core/security/base64_test.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+
 deps_grpc_base64_test: $(GRPC_BASE64_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -4838,6 +4972,8 @@ bins/$(CONFIG)/grpc_json_token_test: $(GRPC_JSON_TOKEN_TEST_OBJS) libs/$(CONFIG)
 
 endif
 
+objs/$(CONFIG)/test/core/security/json_token_test.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+
 deps_grpc_json_token_test: $(GRPC_JSON_TOKEN_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -4872,6 +5008,8 @@ bins/$(CONFIG)/timeout_encoding_test: $(TIMEOUT_ENCODING_TEST_OBJS) libs/$(CONFI
 
 endif
 
+objs/$(CONFIG)/test/core/transport/chttp2/timeout_encoding_test.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+
 deps_timeout_encoding_test: $(TIMEOUT_ENCODING_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -4906,6 +5044,8 @@ bins/$(CONFIG)/fd_posix_test: $(FD_POSIX_TEST_OBJS) libs/$(CONFIG)/libgrpc_test_
 
 endif
 
+objs/$(CONFIG)/test/core/iomgr/fd_posix_test.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+
 deps_fd_posix_test: $(FD_POSIX_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -4940,6 +5080,8 @@ bins/$(CONFIG)/fling_stream_test: $(FLING_STREAM_TEST_OBJS) libs/$(CONFIG)/libgr
 
 endif
 
+objs/$(CONFIG)/test/core/fling/fling_stream_test.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+
 deps_fling_stream_test: $(FLING_STREAM_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -4974,6 +5116,8 @@ bins/$(CONFIG)/lame_client_test: $(LAME_CLIENT_TEST_OBJS) libs/$(CONFIG)/libgrpc
 
 endif
 
+objs/$(CONFIG)/test/core/surface/lame_client_test.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+
 deps_lame_client_test: $(LAME_CLIENT_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -5008,6 +5152,8 @@ bins/$(CONFIG)/thread_pool_test: $(THREAD_POOL_TEST_OBJS) libs/$(CONFIG)/libgrpc
 
 endif
 
+objs/$(CONFIG)/test/cpp/server/thread_pool_test.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc++.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+
 deps_thread_pool_test: $(THREAD_POOL_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -5042,6 +5188,8 @@ bins/$(CONFIG)/status_test: $(STATUS_TEST_OBJS) libs/$(CONFIG)/libgrpc_test_util
 
 endif
 
+objs/$(CONFIG)/test/cpp/util/status_test.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc++.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+
 deps_status_test: $(STATUS_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -5069,13 +5217,15 @@ bins/$(CONFIG)/sync_client_async_server_test: openssl_dep_error
 
 else
 
-bins/$(CONFIG)/sync_client_async_server_test: $(SYNC_CLIENT_ASYNC_SERVER_TEST_OBJS) libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc++.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+bins/$(CONFIG)/sync_client_async_server_test: $(SYNC_CLIENT_ASYNC_SERVER_TEST_OBJS) libs/$(CONFIG)/libgrpc++_test_util.a libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc++.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
 	$(E) "[LD]      Linking $@"
 	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(SYNC_CLIENT_ASYNC_SERVER_TEST_OBJS) $(GTEST_LIB) libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc++.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS) $(LDLIBS_SECURE) -o bins/$(CONFIG)/sync_client_async_server_test
+	$(Q) $(LDXX) $(LDFLAGS) $(SYNC_CLIENT_ASYNC_SERVER_TEST_OBJS) $(GTEST_LIB) libs/$(CONFIG)/libgrpc++_test_util.a libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc++.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS) $(LDLIBS_SECURE) -o bins/$(CONFIG)/sync_client_async_server_test
 
 endif
 
+objs/$(CONFIG)/test/cpp/end2end/sync_client_async_server_test.o:  libs/$(CONFIG)/libgrpc++_test_util.a libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc++.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+
 deps_sync_client_async_server_test: $(SYNC_CLIENT_ASYNC_SERVER_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -5113,6 +5263,11 @@ bins/$(CONFIG)/qps_client: $(QPS_CLIENT_OBJS) libs/$(CONFIG)/libgrpc++_test_util
 
 endif
 
+objs/$(CONFIG)/test/cpp/interop/empty.o:  libs/$(CONFIG)/libgrpc++_test_util.a libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc++.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+objs/$(CONFIG)/test/cpp/interop/messages.o:  libs/$(CONFIG)/libgrpc++_test_util.a libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc++.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+objs/$(CONFIG)/test/cpp/interop/test.o:  libs/$(CONFIG)/libgrpc++_test_util.a libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc++.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+objs/$(CONFIG)/test/cpp/qps/client.o:  libs/$(CONFIG)/libgrpc++_test_util.a libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc++.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+
 deps_qps_client: $(QPS_CLIENT_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -5150,6 +5305,11 @@ bins/$(CONFIG)/qps_server: $(QPS_SERVER_OBJS) libs/$(CONFIG)/libgrpc++_test_util
 
 endif
 
+objs/$(CONFIG)/test/cpp/interop/empty.o:  libs/$(CONFIG)/libgrpc++_test_util.a libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc++.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+objs/$(CONFIG)/test/cpp/interop/messages.o:  libs/$(CONFIG)/libgrpc++_test_util.a libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc++.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+objs/$(CONFIG)/test/cpp/interop/test.o:  libs/$(CONFIG)/libgrpc++_test_util.a libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc++.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+objs/$(CONFIG)/test/cpp/qps/server.o:  libs/$(CONFIG)/libgrpc++_test_util.a libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc++.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+
 deps_qps_server: $(QPS_SERVER_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -5187,6 +5347,11 @@ bins/$(CONFIG)/interop_server: $(INTEROP_SERVER_OBJS) libs/$(CONFIG)/libgrpc++_t
 
 endif
 
+objs/$(CONFIG)/test/cpp/interop/empty.o:  libs/$(CONFIG)/libgrpc++_test_util.a libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc++.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+objs/$(CONFIG)/test/cpp/interop/messages.o:  libs/$(CONFIG)/libgrpc++_test_util.a libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc++.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+objs/$(CONFIG)/test/cpp/interop/test.o:  libs/$(CONFIG)/libgrpc++_test_util.a libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc++.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+objs/$(CONFIG)/test/cpp/interop/server.o:  libs/$(CONFIG)/libgrpc++_test_util.a libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc++.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+
 deps_interop_server: $(INTEROP_SERVER_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -5224,6 +5389,11 @@ bins/$(CONFIG)/interop_client: $(INTEROP_CLIENT_OBJS) libs/$(CONFIG)/libgrpc++_t
 
 endif
 
+objs/$(CONFIG)/test/cpp/interop/empty.o:  libs/$(CONFIG)/libgrpc++_test_util.a libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc++.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+objs/$(CONFIG)/test/cpp/interop/messages.o:  libs/$(CONFIG)/libgrpc++_test_util.a libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc++.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+objs/$(CONFIG)/test/cpp/interop/test.o:  libs/$(CONFIG)/libgrpc++_test_util.a libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc++.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+objs/$(CONFIG)/test/cpp/interop/client.o:  libs/$(CONFIG)/libgrpc++_test_util.a libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc++.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+
 deps_interop_client: $(INTEROP_CLIENT_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -5258,6 +5428,8 @@ bins/$(CONFIG)/end2end_test: $(END2END_TEST_OBJS) libs/$(CONFIG)/libgrpc++_test_
 
 endif
 
+objs/$(CONFIG)/test/cpp/end2end/end2end_test.o:  libs/$(CONFIG)/libgrpc++_test_util.a libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc++.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+
 deps_end2end_test: $(END2END_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -5285,13 +5457,15 @@ bins/$(CONFIG)/channel_arguments_test: openssl_dep_error
 
 else
 
-bins/$(CONFIG)/channel_arguments_test: $(CHANNEL_ARGUMENTS_TEST_OBJS) libs/$(CONFIG)/libgrpc++.a libs/$(CONFIG)/libgrpc.a
+bins/$(CONFIG)/channel_arguments_test: $(CHANNEL_ARGUMENTS_TEST_OBJS) libs/$(CONFIG)/libgrpc++.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
 	$(E) "[LD]      Linking $@"
 	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(CHANNEL_ARGUMENTS_TEST_OBJS) $(GTEST_LIB) libs/$(CONFIG)/libgrpc++.a libs/$(CONFIG)/libgrpc.a $(LDLIBSXX) $(LDLIBS) $(LDLIBS_SECURE) -o bins/$(CONFIG)/channel_arguments_test
+	$(Q) $(LDXX) $(LDFLAGS) $(CHANNEL_ARGUMENTS_TEST_OBJS) $(GTEST_LIB) libs/$(CONFIG)/libgrpc++.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS) $(LDLIBS_SECURE) -o bins/$(CONFIG)/channel_arguments_test
 
 endif
 
+objs/$(CONFIG)/test/cpp/client/channel_arguments_test.o:  libs/$(CONFIG)/libgrpc++.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+
 deps_channel_arguments_test: $(CHANNEL_ARGUMENTS_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -5319,13 +5493,15 @@ bins/$(CONFIG)/credentials_test: openssl_dep_error
 
 else
 
-bins/$(CONFIG)/credentials_test: $(CREDENTIALS_TEST_OBJS) libs/$(CONFIG)/libgrpc++.a libs/$(CONFIG)/libgrpc.a
+bins/$(CONFIG)/credentials_test: $(CREDENTIALS_TEST_OBJS) libs/$(CONFIG)/libgrpc++.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
 	$(E) "[LD]      Linking $@"
 	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(CREDENTIALS_TEST_OBJS) $(GTEST_LIB) libs/$(CONFIG)/libgrpc++.a libs/$(CONFIG)/libgrpc.a $(LDLIBSXX) $(LDLIBS) $(LDLIBS_SECURE) -o bins/$(CONFIG)/credentials_test
+	$(Q) $(LDXX) $(LDFLAGS) $(CREDENTIALS_TEST_OBJS) $(GTEST_LIB) libs/$(CONFIG)/libgrpc++.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS) $(LDLIBS_SECURE) -o bins/$(CONFIG)/credentials_test
 
 endif
 
+objs/$(CONFIG)/test/cpp/client/credentials_test.o:  libs/$(CONFIG)/libgrpc++.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+
 deps_credentials_test: $(CREDENTIALS_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -5360,6 +5536,8 @@ bins/$(CONFIG)/alarm_test: $(ALARM_TEST_OBJS) libs/$(CONFIG)/libgrpc_test_util.a
 
 endif
 
+objs/$(CONFIG)/test/core/iomgr/alarm_test.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+
 deps_alarm_test: $(ALARM_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -5394,6 +5572,8 @@ bins/$(CONFIG)/alarm_list_test: $(ALARM_LIST_TEST_OBJS) libs/$(CONFIG)/libgrpc_t
 
 endif
 
+objs/$(CONFIG)/test/core/iomgr/alarm_list_test.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+
 deps_alarm_list_test: $(ALARM_LIST_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -5428,6 +5608,8 @@ bins/$(CONFIG)/alarm_heap_test: $(ALARM_HEAP_TEST_OBJS) libs/$(CONFIG)/libgrpc_t
 
 endif
 
+objs/$(CONFIG)/test/core/iomgr/alarm_heap_test.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+
 deps_alarm_heap_test: $(ALARM_HEAP_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -5462,6 +5644,8 @@ bins/$(CONFIG)/time_test: $(TIME_TEST_OBJS) libs/$(CONFIG)/libgrpc_test_util.a l
 
 endif
 
+objs/$(CONFIG)/test/core/support/time_test.o:  libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr.a
+
 deps_time_test: $(TIME_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -5495,6 +5679,7 @@ bins/$(CONFIG)/chttp2_fake_security_cancel_after_accept_test: $(CHTTP2_FAKE_SECU
 
 endif
 
+
 deps_chttp2_fake_security_cancel_after_accept_test: $(CHTTP2_FAKE_SECURITY_CANCEL_AFTER_ACCEPT_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -5528,6 +5713,7 @@ bins/$(CONFIG)/chttp2_fake_security_cancel_after_accept_and_writes_closed_test:
 
 endif
 
+
 deps_chttp2_fake_security_cancel_after_accept_and_writes_closed_test: $(CHTTP2_FAKE_SECURITY_CANCEL_AFTER_ACCEPT_AND_WRITES_CLOSED_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -5561,6 +5747,7 @@ bins/$(CONFIG)/chttp2_fake_security_cancel_after_invoke_test: $(CHTTP2_FAKE_SECU
 
 endif
 
+
 deps_chttp2_fake_security_cancel_after_invoke_test: $(CHTTP2_FAKE_SECURITY_CANCEL_AFTER_INVOKE_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -5594,6 +5781,7 @@ bins/$(CONFIG)/chttp2_fake_security_cancel_before_invoke_test: $(CHTTP2_FAKE_SEC
 
 endif
 
+
 deps_chttp2_fake_security_cancel_before_invoke_test: $(CHTTP2_FAKE_SECURITY_CANCEL_BEFORE_INVOKE_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -5627,6 +5815,7 @@ bins/$(CONFIG)/chttp2_fake_security_cancel_in_a_vacuum_test: $(CHTTP2_FAKE_SECUR
 
 endif
 
+
 deps_chttp2_fake_security_cancel_in_a_vacuum_test: $(CHTTP2_FAKE_SECURITY_CANCEL_IN_A_VACUUM_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -5660,6 +5849,7 @@ bins/$(CONFIG)/chttp2_fake_security_census_simple_request_test: $(CHTTP2_FAKE_SE
 
 endif
 
+
 deps_chttp2_fake_security_census_simple_request_test: $(CHTTP2_FAKE_SECURITY_CENSUS_SIMPLE_REQUEST_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -5693,6 +5883,7 @@ bins/$(CONFIG)/chttp2_fake_security_disappearing_server_test: $(CHTTP2_FAKE_SECU
 
 endif
 
+
 deps_chttp2_fake_security_disappearing_server_test: $(CHTTP2_FAKE_SECURITY_DISAPPEARING_SERVER_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -5726,6 +5917,7 @@ bins/$(CONFIG)/chttp2_fake_security_early_server_shutdown_finishes_inflight_call
 
 endif
 
+
 deps_chttp2_fake_security_early_server_shutdown_finishes_inflight_calls_test: $(CHTTP2_FAKE_SECURITY_EARLY_SERVER_SHUTDOWN_FINISHES_INFLIGHT_CALLS_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -5759,6 +5951,7 @@ bins/$(CONFIG)/chttp2_fake_security_early_server_shutdown_finishes_tags_test: $(
 
 endif
 
+
 deps_chttp2_fake_security_early_server_shutdown_finishes_tags_test: $(CHTTP2_FAKE_SECURITY_EARLY_SERVER_SHUTDOWN_FINISHES_TAGS_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -5792,6 +5985,7 @@ bins/$(CONFIG)/chttp2_fake_security_invoke_large_request_test: $(CHTTP2_FAKE_SEC
 
 endif
 
+
 deps_chttp2_fake_security_invoke_large_request_test: $(CHTTP2_FAKE_SECURITY_INVOKE_LARGE_REQUEST_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -5825,6 +6019,7 @@ bins/$(CONFIG)/chttp2_fake_security_max_concurrent_streams_test: $(CHTTP2_FAKE_S
 
 endif
 
+
 deps_chttp2_fake_security_max_concurrent_streams_test: $(CHTTP2_FAKE_SECURITY_MAX_CONCURRENT_STREAMS_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -5858,6 +6053,7 @@ bins/$(CONFIG)/chttp2_fake_security_no_op_test: $(CHTTP2_FAKE_SECURITY_NO_OP_TES
 
 endif
 
+
 deps_chttp2_fake_security_no_op_test: $(CHTTP2_FAKE_SECURITY_NO_OP_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -5891,6 +6087,7 @@ bins/$(CONFIG)/chttp2_fake_security_ping_pong_streaming_test: $(CHTTP2_FAKE_SECU
 
 endif
 
+
 deps_chttp2_fake_security_ping_pong_streaming_test: $(CHTTP2_FAKE_SECURITY_PING_PONG_STREAMING_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -5924,6 +6121,7 @@ bins/$(CONFIG)/chttp2_fake_security_request_response_with_binary_metadata_and_pa
 
 endif
 
+
 deps_chttp2_fake_security_request_response_with_binary_metadata_and_payload_test: $(CHTTP2_FAKE_SECURITY_REQUEST_RESPONSE_WITH_BINARY_METADATA_AND_PAYLOAD_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -5957,6 +6155,7 @@ bins/$(CONFIG)/chttp2_fake_security_request_response_with_metadata_and_payload_t
 
 endif
 
+
 deps_chttp2_fake_security_request_response_with_metadata_and_payload_test: $(CHTTP2_FAKE_SECURITY_REQUEST_RESPONSE_WITH_METADATA_AND_PAYLOAD_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -5990,6 +6189,7 @@ bins/$(CONFIG)/chttp2_fake_security_request_response_with_payload_test: $(CHTTP2
 
 endif
 
+
 deps_chttp2_fake_security_request_response_with_payload_test: $(CHTTP2_FAKE_SECURITY_REQUEST_RESPONSE_WITH_PAYLOAD_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -6023,6 +6223,7 @@ bins/$(CONFIG)/chttp2_fake_security_request_response_with_trailing_metadata_and_
 
 endif
 
+
 deps_chttp2_fake_security_request_response_with_trailing_metadata_and_payload_test: $(CHTTP2_FAKE_SECURITY_REQUEST_RESPONSE_WITH_TRAILING_METADATA_AND_PAYLOAD_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -6056,6 +6257,7 @@ bins/$(CONFIG)/chttp2_fake_security_simple_delayed_request_test: $(CHTTP2_FAKE_S
 
 endif
 
+
 deps_chttp2_fake_security_simple_delayed_request_test: $(CHTTP2_FAKE_SECURITY_SIMPLE_DELAYED_REQUEST_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -6089,6 +6291,7 @@ bins/$(CONFIG)/chttp2_fake_security_simple_request_test: $(CHTTP2_FAKE_SECURITY_
 
 endif
 
+
 deps_chttp2_fake_security_simple_request_test: $(CHTTP2_FAKE_SECURITY_SIMPLE_REQUEST_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -6122,6 +6325,7 @@ bins/$(CONFIG)/chttp2_fake_security_thread_stress_test: $(CHTTP2_FAKE_SECURITY_T
 
 endif
 
+
 deps_chttp2_fake_security_thread_stress_test: $(CHTTP2_FAKE_SECURITY_THREAD_STRESS_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -6155,6 +6359,7 @@ bins/$(CONFIG)/chttp2_fake_security_writes_done_hangs_with_pending_read_test: $(
 
 endif
 
+
 deps_chttp2_fake_security_writes_done_hangs_with_pending_read_test: $(CHTTP2_FAKE_SECURITY_WRITES_DONE_HANGS_WITH_PENDING_READ_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -6188,6 +6393,7 @@ bins/$(CONFIG)/chttp2_fullstack_cancel_after_accept_test: $(CHTTP2_FULLSTACK_CAN
 
 endif
 
+
 deps_chttp2_fullstack_cancel_after_accept_test: $(CHTTP2_FULLSTACK_CANCEL_AFTER_ACCEPT_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -6221,6 +6427,7 @@ bins/$(CONFIG)/chttp2_fullstack_cancel_after_accept_and_writes_closed_test: $(CH
 
 endif
 
+
 deps_chttp2_fullstack_cancel_after_accept_and_writes_closed_test: $(CHTTP2_FULLSTACK_CANCEL_AFTER_ACCEPT_AND_WRITES_CLOSED_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -6254,6 +6461,7 @@ bins/$(CONFIG)/chttp2_fullstack_cancel_after_invoke_test: $(CHTTP2_FULLSTACK_CAN
 
 endif
 
+
 deps_chttp2_fullstack_cancel_after_invoke_test: $(CHTTP2_FULLSTACK_CANCEL_AFTER_INVOKE_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -6287,6 +6495,7 @@ bins/$(CONFIG)/chttp2_fullstack_cancel_before_invoke_test: $(CHTTP2_FULLSTACK_CA
 
 endif
 
+
 deps_chttp2_fullstack_cancel_before_invoke_test: $(CHTTP2_FULLSTACK_CANCEL_BEFORE_INVOKE_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -6320,6 +6529,7 @@ bins/$(CONFIG)/chttp2_fullstack_cancel_in_a_vacuum_test: $(CHTTP2_FULLSTACK_CANC
 
 endif
 
+
 deps_chttp2_fullstack_cancel_in_a_vacuum_test: $(CHTTP2_FULLSTACK_CANCEL_IN_A_VACUUM_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -6353,6 +6563,7 @@ bins/$(CONFIG)/chttp2_fullstack_census_simple_request_test: $(CHTTP2_FULLSTACK_C
 
 endif
 
+
 deps_chttp2_fullstack_census_simple_request_test: $(CHTTP2_FULLSTACK_CENSUS_SIMPLE_REQUEST_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -6386,6 +6597,7 @@ bins/$(CONFIG)/chttp2_fullstack_disappearing_server_test: $(CHTTP2_FULLSTACK_DIS
 
 endif
 
+
 deps_chttp2_fullstack_disappearing_server_test: $(CHTTP2_FULLSTACK_DISAPPEARING_SERVER_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -6419,6 +6631,7 @@ bins/$(CONFIG)/chttp2_fullstack_early_server_shutdown_finishes_inflight_calls_te
 
 endif
 
+
 deps_chttp2_fullstack_early_server_shutdown_finishes_inflight_calls_test: $(CHTTP2_FULLSTACK_EARLY_SERVER_SHUTDOWN_FINISHES_INFLIGHT_CALLS_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -6452,6 +6665,7 @@ bins/$(CONFIG)/chttp2_fullstack_early_server_shutdown_finishes_tags_test: $(CHTT
 
 endif
 
+
 deps_chttp2_fullstack_early_server_shutdown_finishes_tags_test: $(CHTTP2_FULLSTACK_EARLY_SERVER_SHUTDOWN_FINISHES_TAGS_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -6485,6 +6699,7 @@ bins/$(CONFIG)/chttp2_fullstack_invoke_large_request_test: $(CHTTP2_FULLSTACK_IN
 
 endif
 
+
 deps_chttp2_fullstack_invoke_large_request_test: $(CHTTP2_FULLSTACK_INVOKE_LARGE_REQUEST_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -6518,6 +6733,7 @@ bins/$(CONFIG)/chttp2_fullstack_max_concurrent_streams_test: $(CHTTP2_FULLSTACK_
 
 endif
 
+
 deps_chttp2_fullstack_max_concurrent_streams_test: $(CHTTP2_FULLSTACK_MAX_CONCURRENT_STREAMS_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -6551,6 +6767,7 @@ bins/$(CONFIG)/chttp2_fullstack_no_op_test: $(CHTTP2_FULLSTACK_NO_OP_TEST_OBJS)
 
 endif
 
+
 deps_chttp2_fullstack_no_op_test: $(CHTTP2_FULLSTACK_NO_OP_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -6584,6 +6801,7 @@ bins/$(CONFIG)/chttp2_fullstack_ping_pong_streaming_test: $(CHTTP2_FULLSTACK_PIN
 
 endif
 
+
 deps_chttp2_fullstack_ping_pong_streaming_test: $(CHTTP2_FULLSTACK_PING_PONG_STREAMING_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -6617,6 +6835,7 @@ bins/$(CONFIG)/chttp2_fullstack_request_response_with_binary_metadata_and_payloa
 
 endif
 
+
 deps_chttp2_fullstack_request_response_with_binary_metadata_and_payload_test: $(CHTTP2_FULLSTACK_REQUEST_RESPONSE_WITH_BINARY_METADATA_AND_PAYLOAD_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -6650,6 +6869,7 @@ bins/$(CONFIG)/chttp2_fullstack_request_response_with_metadata_and_payload_test:
 
 endif
 
+
 deps_chttp2_fullstack_request_response_with_metadata_and_payload_test: $(CHTTP2_FULLSTACK_REQUEST_RESPONSE_WITH_METADATA_AND_PAYLOAD_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -6683,6 +6903,7 @@ bins/$(CONFIG)/chttp2_fullstack_request_response_with_payload_test: $(CHTTP2_FUL
 
 endif
 
+
 deps_chttp2_fullstack_request_response_with_payload_test: $(CHTTP2_FULLSTACK_REQUEST_RESPONSE_WITH_PAYLOAD_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -6716,6 +6937,7 @@ bins/$(CONFIG)/chttp2_fullstack_request_response_with_trailing_metadata_and_payl
 
 endif
 
+
 deps_chttp2_fullstack_request_response_with_trailing_metadata_and_payload_test: $(CHTTP2_FULLSTACK_REQUEST_RESPONSE_WITH_TRAILING_METADATA_AND_PAYLOAD_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -6749,6 +6971,7 @@ bins/$(CONFIG)/chttp2_fullstack_simple_delayed_request_test: $(CHTTP2_FULLSTACK_
 
 endif
 
+
 deps_chttp2_fullstack_simple_delayed_request_test: $(CHTTP2_FULLSTACK_SIMPLE_DELAYED_REQUEST_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -6782,6 +7005,7 @@ bins/$(CONFIG)/chttp2_fullstack_simple_request_test: $(CHTTP2_FULLSTACK_SIMPLE_R
 
 endif
 
+
 deps_chttp2_fullstack_simple_request_test: $(CHTTP2_FULLSTACK_SIMPLE_REQUEST_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -6815,6 +7039,7 @@ bins/$(CONFIG)/chttp2_fullstack_thread_stress_test: $(CHTTP2_FULLSTACK_THREAD_ST
 
 endif
 
+
 deps_chttp2_fullstack_thread_stress_test: $(CHTTP2_FULLSTACK_THREAD_STRESS_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -6848,6 +7073,7 @@ bins/$(CONFIG)/chttp2_fullstack_writes_done_hangs_with_pending_read_test: $(CHTT
 
 endif
 
+
 deps_chttp2_fullstack_writes_done_hangs_with_pending_read_test: $(CHTTP2_FULLSTACK_WRITES_DONE_HANGS_WITH_PENDING_READ_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -6881,6 +7107,7 @@ bins/$(CONFIG)/chttp2_simple_ssl_fullstack_cancel_after_accept_test: $(CHTTP2_SI
 
 endif
 
+
 deps_chttp2_simple_ssl_fullstack_cancel_after_accept_test: $(CHTTP2_SIMPLE_SSL_FULLSTACK_CANCEL_AFTER_ACCEPT_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -6914,6 +7141,7 @@ bins/$(CONFIG)/chttp2_simple_ssl_fullstack_cancel_after_accept_and_writes_closed
 
 endif
 
+
 deps_chttp2_simple_ssl_fullstack_cancel_after_accept_and_writes_closed_test: $(CHTTP2_SIMPLE_SSL_FULLSTACK_CANCEL_AFTER_ACCEPT_AND_WRITES_CLOSED_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -6947,6 +7175,7 @@ bins/$(CONFIG)/chttp2_simple_ssl_fullstack_cancel_after_invoke_test: $(CHTTP2_SI
 
 endif
 
+
 deps_chttp2_simple_ssl_fullstack_cancel_after_invoke_test: $(CHTTP2_SIMPLE_SSL_FULLSTACK_CANCEL_AFTER_INVOKE_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -6980,6 +7209,7 @@ bins/$(CONFIG)/chttp2_simple_ssl_fullstack_cancel_before_invoke_test: $(CHTTP2_S
 
 endif
 
+
 deps_chttp2_simple_ssl_fullstack_cancel_before_invoke_test: $(CHTTP2_SIMPLE_SSL_FULLSTACK_CANCEL_BEFORE_INVOKE_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -7013,6 +7243,7 @@ bins/$(CONFIG)/chttp2_simple_ssl_fullstack_cancel_in_a_vacuum_test: $(CHTTP2_SIM
 
 endif
 
+
 deps_chttp2_simple_ssl_fullstack_cancel_in_a_vacuum_test: $(CHTTP2_SIMPLE_SSL_FULLSTACK_CANCEL_IN_A_VACUUM_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -7046,6 +7277,7 @@ bins/$(CONFIG)/chttp2_simple_ssl_fullstack_census_simple_request_test: $(CHTTP2_
 
 endif
 
+
 deps_chttp2_simple_ssl_fullstack_census_simple_request_test: $(CHTTP2_SIMPLE_SSL_FULLSTACK_CENSUS_SIMPLE_REQUEST_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -7079,6 +7311,7 @@ bins/$(CONFIG)/chttp2_simple_ssl_fullstack_disappearing_server_test: $(CHTTP2_SI
 
 endif
 
+
 deps_chttp2_simple_ssl_fullstack_disappearing_server_test: $(CHTTP2_SIMPLE_SSL_FULLSTACK_DISAPPEARING_SERVER_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -7112,6 +7345,7 @@ bins/$(CONFIG)/chttp2_simple_ssl_fullstack_early_server_shutdown_finishes_inflig
 
 endif
 
+
 deps_chttp2_simple_ssl_fullstack_early_server_shutdown_finishes_inflight_calls_test: $(CHTTP2_SIMPLE_SSL_FULLSTACK_EARLY_SERVER_SHUTDOWN_FINISHES_INFLIGHT_CALLS_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -7145,6 +7379,7 @@ bins/$(CONFIG)/chttp2_simple_ssl_fullstack_early_server_shutdown_finishes_tags_t
 
 endif
 
+
 deps_chttp2_simple_ssl_fullstack_early_server_shutdown_finishes_tags_test: $(CHTTP2_SIMPLE_SSL_FULLSTACK_EARLY_SERVER_SHUTDOWN_FINISHES_TAGS_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -7178,6 +7413,7 @@ bins/$(CONFIG)/chttp2_simple_ssl_fullstack_invoke_large_request_test: $(CHTTP2_S
 
 endif
 
+
 deps_chttp2_simple_ssl_fullstack_invoke_large_request_test: $(CHTTP2_SIMPLE_SSL_FULLSTACK_INVOKE_LARGE_REQUEST_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -7211,6 +7447,7 @@ bins/$(CONFIG)/chttp2_simple_ssl_fullstack_max_concurrent_streams_test: $(CHTTP2
 
 endif
 
+
 deps_chttp2_simple_ssl_fullstack_max_concurrent_streams_test: $(CHTTP2_SIMPLE_SSL_FULLSTACK_MAX_CONCURRENT_STREAMS_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -7244,6 +7481,7 @@ bins/$(CONFIG)/chttp2_simple_ssl_fullstack_no_op_test: $(CHTTP2_SIMPLE_SSL_FULLS
 
 endif
 
+
 deps_chttp2_simple_ssl_fullstack_no_op_test: $(CHTTP2_SIMPLE_SSL_FULLSTACK_NO_OP_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -7277,6 +7515,7 @@ bins/$(CONFIG)/chttp2_simple_ssl_fullstack_ping_pong_streaming_test: $(CHTTP2_SI
 
 endif
 
+
 deps_chttp2_simple_ssl_fullstack_ping_pong_streaming_test: $(CHTTP2_SIMPLE_SSL_FULLSTACK_PING_PONG_STREAMING_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -7310,6 +7549,7 @@ bins/$(CONFIG)/chttp2_simple_ssl_fullstack_request_response_with_binary_metadata
 
 endif
 
+
 deps_chttp2_simple_ssl_fullstack_request_response_with_binary_metadata_and_payload_test: $(CHTTP2_SIMPLE_SSL_FULLSTACK_REQUEST_RESPONSE_WITH_BINARY_METADATA_AND_PAYLOAD_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -7343,6 +7583,7 @@ bins/$(CONFIG)/chttp2_simple_ssl_fullstack_request_response_with_metadata_and_pa
 
 endif
 
+
 deps_chttp2_simple_ssl_fullstack_request_response_with_metadata_and_payload_test: $(CHTTP2_SIMPLE_SSL_FULLSTACK_REQUEST_RESPONSE_WITH_METADATA_AND_PAYLOAD_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -7376,6 +7617,7 @@ bins/$(CONFIG)/chttp2_simple_ssl_fullstack_request_response_with_payload_test: $
 
 endif
 
+
 deps_chttp2_simple_ssl_fullstack_request_response_with_payload_test: $(CHTTP2_SIMPLE_SSL_FULLSTACK_REQUEST_RESPONSE_WITH_PAYLOAD_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -7409,6 +7651,7 @@ bins/$(CONFIG)/chttp2_simple_ssl_fullstack_request_response_with_trailing_metada
 
 endif
 
+
 deps_chttp2_simple_ssl_fullstack_request_response_with_trailing_metadata_and_payload_test: $(CHTTP2_SIMPLE_SSL_FULLSTACK_REQUEST_RESPONSE_WITH_TRAILING_METADATA_AND_PAYLOAD_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -7442,6 +7685,7 @@ bins/$(CONFIG)/chttp2_simple_ssl_fullstack_simple_delayed_request_test: $(CHTTP2
 
 endif
 
+
 deps_chttp2_simple_ssl_fullstack_simple_delayed_request_test: $(CHTTP2_SIMPLE_SSL_FULLSTACK_SIMPLE_DELAYED_REQUEST_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -7475,6 +7719,7 @@ bins/$(CONFIG)/chttp2_simple_ssl_fullstack_simple_request_test: $(CHTTP2_SIMPLE_
 
 endif
 
+
 deps_chttp2_simple_ssl_fullstack_simple_request_test: $(CHTTP2_SIMPLE_SSL_FULLSTACK_SIMPLE_REQUEST_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -7508,6 +7753,7 @@ bins/$(CONFIG)/chttp2_simple_ssl_fullstack_thread_stress_test: $(CHTTP2_SIMPLE_S
 
 endif
 
+
 deps_chttp2_simple_ssl_fullstack_thread_stress_test: $(CHTTP2_SIMPLE_SSL_FULLSTACK_THREAD_STRESS_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -7541,6 +7787,7 @@ bins/$(CONFIG)/chttp2_simple_ssl_fullstack_writes_done_hangs_with_pending_read_t
 
 endif
 
+
 deps_chttp2_simple_ssl_fullstack_writes_done_hangs_with_pending_read_test: $(CHTTP2_SIMPLE_SSL_FULLSTACK_WRITES_DONE_HANGS_WITH_PENDING_READ_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -7574,6 +7821,7 @@ bins/$(CONFIG)/chttp2_simple_ssl_with_oauth2_fullstack_cancel_after_accept_test:
 
 endif
 
+
 deps_chttp2_simple_ssl_with_oauth2_fullstack_cancel_after_accept_test: $(CHTTP2_SIMPLE_SSL_WITH_OAUTH2_FULLSTACK_CANCEL_AFTER_ACCEPT_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -7607,6 +7855,7 @@ bins/$(CONFIG)/chttp2_simple_ssl_with_oauth2_fullstack_cancel_after_accept_and_w
 
 endif
 
+
 deps_chttp2_simple_ssl_with_oauth2_fullstack_cancel_after_accept_and_writes_closed_test: $(CHTTP2_SIMPLE_SSL_WITH_OAUTH2_FULLSTACK_CANCEL_AFTER_ACCEPT_AND_WRITES_CLOSED_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -7640,6 +7889,7 @@ bins/$(CONFIG)/chttp2_simple_ssl_with_oauth2_fullstack_cancel_after_invoke_test:
 
 endif
 
+
 deps_chttp2_simple_ssl_with_oauth2_fullstack_cancel_after_invoke_test: $(CHTTP2_SIMPLE_SSL_WITH_OAUTH2_FULLSTACK_CANCEL_AFTER_INVOKE_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -7673,6 +7923,7 @@ bins/$(CONFIG)/chttp2_simple_ssl_with_oauth2_fullstack_cancel_before_invoke_test
 
 endif
 
+
 deps_chttp2_simple_ssl_with_oauth2_fullstack_cancel_before_invoke_test: $(CHTTP2_SIMPLE_SSL_WITH_OAUTH2_FULLSTACK_CANCEL_BEFORE_INVOKE_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -7706,6 +7957,7 @@ bins/$(CONFIG)/chttp2_simple_ssl_with_oauth2_fullstack_cancel_in_a_vacuum_test:
 
 endif
 
+
 deps_chttp2_simple_ssl_with_oauth2_fullstack_cancel_in_a_vacuum_test: $(CHTTP2_SIMPLE_SSL_WITH_OAUTH2_FULLSTACK_CANCEL_IN_A_VACUUM_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -7739,6 +7991,7 @@ bins/$(CONFIG)/chttp2_simple_ssl_with_oauth2_fullstack_census_simple_request_tes
 
 endif
 
+
 deps_chttp2_simple_ssl_with_oauth2_fullstack_census_simple_request_test: $(CHTTP2_SIMPLE_SSL_WITH_OAUTH2_FULLSTACK_CENSUS_SIMPLE_REQUEST_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -7772,6 +8025,7 @@ bins/$(CONFIG)/chttp2_simple_ssl_with_oauth2_fullstack_disappearing_server_test:
 
 endif
 
+
 deps_chttp2_simple_ssl_with_oauth2_fullstack_disappearing_server_test: $(CHTTP2_SIMPLE_SSL_WITH_OAUTH2_FULLSTACK_DISAPPEARING_SERVER_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -7805,6 +8059,7 @@ bins/$(CONFIG)/chttp2_simple_ssl_with_oauth2_fullstack_early_server_shutdown_fin
 
 endif
 
+
 deps_chttp2_simple_ssl_with_oauth2_fullstack_early_server_shutdown_finishes_inflight_calls_test: $(CHTTP2_SIMPLE_SSL_WITH_OAUTH2_FULLSTACK_EARLY_SERVER_SHUTDOWN_FINISHES_INFLIGHT_CALLS_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -7838,6 +8093,7 @@ bins/$(CONFIG)/chttp2_simple_ssl_with_oauth2_fullstack_early_server_shutdown_fin
 
 endif
 
+
 deps_chttp2_simple_ssl_with_oauth2_fullstack_early_server_shutdown_finishes_tags_test: $(CHTTP2_SIMPLE_SSL_WITH_OAUTH2_FULLSTACK_EARLY_SERVER_SHUTDOWN_FINISHES_TAGS_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -7871,6 +8127,7 @@ bins/$(CONFIG)/chttp2_simple_ssl_with_oauth2_fullstack_invoke_large_request_test
 
 endif
 
+
 deps_chttp2_simple_ssl_with_oauth2_fullstack_invoke_large_request_test: $(CHTTP2_SIMPLE_SSL_WITH_OAUTH2_FULLSTACK_INVOKE_LARGE_REQUEST_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -7904,6 +8161,7 @@ bins/$(CONFIG)/chttp2_simple_ssl_with_oauth2_fullstack_max_concurrent_streams_te
 
 endif
 
+
 deps_chttp2_simple_ssl_with_oauth2_fullstack_max_concurrent_streams_test: $(CHTTP2_SIMPLE_SSL_WITH_OAUTH2_FULLSTACK_MAX_CONCURRENT_STREAMS_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -7937,6 +8195,7 @@ bins/$(CONFIG)/chttp2_simple_ssl_with_oauth2_fullstack_no_op_test: $(CHTTP2_SIMP
 
 endif
 
+
 deps_chttp2_simple_ssl_with_oauth2_fullstack_no_op_test: $(CHTTP2_SIMPLE_SSL_WITH_OAUTH2_FULLSTACK_NO_OP_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -7970,6 +8229,7 @@ bins/$(CONFIG)/chttp2_simple_ssl_with_oauth2_fullstack_ping_pong_streaming_test:
 
 endif
 
+
 deps_chttp2_simple_ssl_with_oauth2_fullstack_ping_pong_streaming_test: $(CHTTP2_SIMPLE_SSL_WITH_OAUTH2_FULLSTACK_PING_PONG_STREAMING_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -8003,6 +8263,7 @@ bins/$(CONFIG)/chttp2_simple_ssl_with_oauth2_fullstack_request_response_with_bin
 
 endif
 
+
 deps_chttp2_simple_ssl_with_oauth2_fullstack_request_response_with_binary_metadata_and_payload_test: $(CHTTP2_SIMPLE_SSL_WITH_OAUTH2_FULLSTACK_REQUEST_RESPONSE_WITH_BINARY_METADATA_AND_PAYLOAD_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -8036,6 +8297,7 @@ bins/$(CONFIG)/chttp2_simple_ssl_with_oauth2_fullstack_request_response_with_met
 
 endif
 
+
 deps_chttp2_simple_ssl_with_oauth2_fullstack_request_response_with_metadata_and_payload_test: $(CHTTP2_SIMPLE_SSL_WITH_OAUTH2_FULLSTACK_REQUEST_RESPONSE_WITH_METADATA_AND_PAYLOAD_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -8069,6 +8331,7 @@ bins/$(CONFIG)/chttp2_simple_ssl_with_oauth2_fullstack_request_response_with_pay
 
 endif
 
+
 deps_chttp2_simple_ssl_with_oauth2_fullstack_request_response_with_payload_test: $(CHTTP2_SIMPLE_SSL_WITH_OAUTH2_FULLSTACK_REQUEST_RESPONSE_WITH_PAYLOAD_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -8102,6 +8365,7 @@ bins/$(CONFIG)/chttp2_simple_ssl_with_oauth2_fullstack_request_response_with_tra
 
 endif
 
+
 deps_chttp2_simple_ssl_with_oauth2_fullstack_request_response_with_trailing_metadata_and_payload_test: $(CHTTP2_SIMPLE_SSL_WITH_OAUTH2_FULLSTACK_REQUEST_RESPONSE_WITH_TRAILING_METADATA_AND_PAYLOAD_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -8135,6 +8399,7 @@ bins/$(CONFIG)/chttp2_simple_ssl_with_oauth2_fullstack_simple_delayed_request_te
 
 endif
 
+
 deps_chttp2_simple_ssl_with_oauth2_fullstack_simple_delayed_request_test: $(CHTTP2_SIMPLE_SSL_WITH_OAUTH2_FULLSTACK_SIMPLE_DELAYED_REQUEST_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -8168,6 +8433,7 @@ bins/$(CONFIG)/chttp2_simple_ssl_with_oauth2_fullstack_simple_request_test: $(CH
 
 endif
 
+
 deps_chttp2_simple_ssl_with_oauth2_fullstack_simple_request_test: $(CHTTP2_SIMPLE_SSL_WITH_OAUTH2_FULLSTACK_SIMPLE_REQUEST_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -8201,6 +8467,7 @@ bins/$(CONFIG)/chttp2_simple_ssl_with_oauth2_fullstack_thread_stress_test: $(CHT
 
 endif
 
+
 deps_chttp2_simple_ssl_with_oauth2_fullstack_thread_stress_test: $(CHTTP2_SIMPLE_SSL_WITH_OAUTH2_FULLSTACK_THREAD_STRESS_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -8234,6 +8501,7 @@ bins/$(CONFIG)/chttp2_simple_ssl_with_oauth2_fullstack_writes_done_hangs_with_pe
 
 endif
 
+
 deps_chttp2_simple_ssl_with_oauth2_fullstack_writes_done_hangs_with_pending_read_test: $(CHTTP2_SIMPLE_SSL_WITH_OAUTH2_FULLSTACK_WRITES_DONE_HANGS_WITH_PENDING_READ_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -8267,6 +8535,7 @@ bins/$(CONFIG)/chttp2_socket_pair_cancel_after_accept_test: $(CHTTP2_SOCKET_PAIR
 
 endif
 
+
 deps_chttp2_socket_pair_cancel_after_accept_test: $(CHTTP2_SOCKET_PAIR_CANCEL_AFTER_ACCEPT_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -8300,6 +8569,7 @@ bins/$(CONFIG)/chttp2_socket_pair_cancel_after_accept_and_writes_closed_test: $(
 
 endif
 
+
 deps_chttp2_socket_pair_cancel_after_accept_and_writes_closed_test: $(CHTTP2_SOCKET_PAIR_CANCEL_AFTER_ACCEPT_AND_WRITES_CLOSED_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -8333,6 +8603,7 @@ bins/$(CONFIG)/chttp2_socket_pair_cancel_after_invoke_test: $(CHTTP2_SOCKET_PAIR
 
 endif
 
+
 deps_chttp2_socket_pair_cancel_after_invoke_test: $(CHTTP2_SOCKET_PAIR_CANCEL_AFTER_INVOKE_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -8366,6 +8637,7 @@ bins/$(CONFIG)/chttp2_socket_pair_cancel_before_invoke_test: $(CHTTP2_SOCKET_PAI
 
 endif
 
+
 deps_chttp2_socket_pair_cancel_before_invoke_test: $(CHTTP2_SOCKET_PAIR_CANCEL_BEFORE_INVOKE_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -8399,6 +8671,7 @@ bins/$(CONFIG)/chttp2_socket_pair_cancel_in_a_vacuum_test: $(CHTTP2_SOCKET_PAIR_
 
 endif
 
+
 deps_chttp2_socket_pair_cancel_in_a_vacuum_test: $(CHTTP2_SOCKET_PAIR_CANCEL_IN_A_VACUUM_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -8432,6 +8705,7 @@ bins/$(CONFIG)/chttp2_socket_pair_census_simple_request_test: $(CHTTP2_SOCKET_PA
 
 endif
 
+
 deps_chttp2_socket_pair_census_simple_request_test: $(CHTTP2_SOCKET_PAIR_CENSUS_SIMPLE_REQUEST_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -8465,6 +8739,7 @@ bins/$(CONFIG)/chttp2_socket_pair_disappearing_server_test: $(CHTTP2_SOCKET_PAIR
 
 endif
 
+
 deps_chttp2_socket_pair_disappearing_server_test: $(CHTTP2_SOCKET_PAIR_DISAPPEARING_SERVER_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -8498,6 +8773,7 @@ bins/$(CONFIG)/chttp2_socket_pair_early_server_shutdown_finishes_inflight_calls_
 
 endif
 
+
 deps_chttp2_socket_pair_early_server_shutdown_finishes_inflight_calls_test: $(CHTTP2_SOCKET_PAIR_EARLY_SERVER_SHUTDOWN_FINISHES_INFLIGHT_CALLS_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -8531,6 +8807,7 @@ bins/$(CONFIG)/chttp2_socket_pair_early_server_shutdown_finishes_tags_test: $(CH
 
 endif
 
+
 deps_chttp2_socket_pair_early_server_shutdown_finishes_tags_test: $(CHTTP2_SOCKET_PAIR_EARLY_SERVER_SHUTDOWN_FINISHES_TAGS_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -8564,6 +8841,7 @@ bins/$(CONFIG)/chttp2_socket_pair_invoke_large_request_test: $(CHTTP2_SOCKET_PAI
 
 endif
 
+
 deps_chttp2_socket_pair_invoke_large_request_test: $(CHTTP2_SOCKET_PAIR_INVOKE_LARGE_REQUEST_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -8597,6 +8875,7 @@ bins/$(CONFIG)/chttp2_socket_pair_max_concurrent_streams_test: $(CHTTP2_SOCKET_P
 
 endif
 
+
 deps_chttp2_socket_pair_max_concurrent_streams_test: $(CHTTP2_SOCKET_PAIR_MAX_CONCURRENT_STREAMS_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -8630,6 +8909,7 @@ bins/$(CONFIG)/chttp2_socket_pair_no_op_test: $(CHTTP2_SOCKET_PAIR_NO_OP_TEST_OB
 
 endif
 
+
 deps_chttp2_socket_pair_no_op_test: $(CHTTP2_SOCKET_PAIR_NO_OP_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -8663,6 +8943,7 @@ bins/$(CONFIG)/chttp2_socket_pair_ping_pong_streaming_test: $(CHTTP2_SOCKET_PAIR
 
 endif
 
+
 deps_chttp2_socket_pair_ping_pong_streaming_test: $(CHTTP2_SOCKET_PAIR_PING_PONG_STREAMING_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -8696,6 +8977,7 @@ bins/$(CONFIG)/chttp2_socket_pair_request_response_with_binary_metadata_and_payl
 
 endif
 
+
 deps_chttp2_socket_pair_request_response_with_binary_metadata_and_payload_test: $(CHTTP2_SOCKET_PAIR_REQUEST_RESPONSE_WITH_BINARY_METADATA_AND_PAYLOAD_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -8729,6 +9011,7 @@ bins/$(CONFIG)/chttp2_socket_pair_request_response_with_metadata_and_payload_tes
 
 endif
 
+
 deps_chttp2_socket_pair_request_response_with_metadata_and_payload_test: $(CHTTP2_SOCKET_PAIR_REQUEST_RESPONSE_WITH_METADATA_AND_PAYLOAD_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -8762,6 +9045,7 @@ bins/$(CONFIG)/chttp2_socket_pair_request_response_with_payload_test: $(CHTTP2_S
 
 endif
 
+
 deps_chttp2_socket_pair_request_response_with_payload_test: $(CHTTP2_SOCKET_PAIR_REQUEST_RESPONSE_WITH_PAYLOAD_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -8795,6 +9079,7 @@ bins/$(CONFIG)/chttp2_socket_pair_request_response_with_trailing_metadata_and_pa
 
 endif
 
+
 deps_chttp2_socket_pair_request_response_with_trailing_metadata_and_payload_test: $(CHTTP2_SOCKET_PAIR_REQUEST_RESPONSE_WITH_TRAILING_METADATA_AND_PAYLOAD_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -8828,6 +9113,7 @@ bins/$(CONFIG)/chttp2_socket_pair_simple_delayed_request_test: $(CHTTP2_SOCKET_P
 
 endif
 
+
 deps_chttp2_socket_pair_simple_delayed_request_test: $(CHTTP2_SOCKET_PAIR_SIMPLE_DELAYED_REQUEST_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -8861,6 +9147,7 @@ bins/$(CONFIG)/chttp2_socket_pair_simple_request_test: $(CHTTP2_SOCKET_PAIR_SIMP
 
 endif
 
+
 deps_chttp2_socket_pair_simple_request_test: $(CHTTP2_SOCKET_PAIR_SIMPLE_REQUEST_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -8894,6 +9181,7 @@ bins/$(CONFIG)/chttp2_socket_pair_thread_stress_test: $(CHTTP2_SOCKET_PAIR_THREA
 
 endif
 
+
 deps_chttp2_socket_pair_thread_stress_test: $(CHTTP2_SOCKET_PAIR_THREAD_STRESS_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -8927,6 +9215,7 @@ bins/$(CONFIG)/chttp2_socket_pair_writes_done_hangs_with_pending_read_test: $(CH
 
 endif
 
+
 deps_chttp2_socket_pair_writes_done_hangs_with_pending_read_test: $(CHTTP2_SOCKET_PAIR_WRITES_DONE_HANGS_WITH_PENDING_READ_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -8960,6 +9249,7 @@ bins/$(CONFIG)/chttp2_socket_pair_one_byte_at_a_time_cancel_after_accept_test: $
 
 endif
 
+
 deps_chttp2_socket_pair_one_byte_at_a_time_cancel_after_accept_test: $(CHTTP2_SOCKET_PAIR_ONE_BYTE_AT_A_TIME_CANCEL_AFTER_ACCEPT_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -8993,6 +9283,7 @@ bins/$(CONFIG)/chttp2_socket_pair_one_byte_at_a_time_cancel_after_accept_and_wri
 
 endif
 
+
 deps_chttp2_socket_pair_one_byte_at_a_time_cancel_after_accept_and_writes_closed_test: $(CHTTP2_SOCKET_PAIR_ONE_BYTE_AT_A_TIME_CANCEL_AFTER_ACCEPT_AND_WRITES_CLOSED_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -9026,6 +9317,7 @@ bins/$(CONFIG)/chttp2_socket_pair_one_byte_at_a_time_cancel_after_invoke_test: $
 
 endif
 
+
 deps_chttp2_socket_pair_one_byte_at_a_time_cancel_after_invoke_test: $(CHTTP2_SOCKET_PAIR_ONE_BYTE_AT_A_TIME_CANCEL_AFTER_INVOKE_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -9059,6 +9351,7 @@ bins/$(CONFIG)/chttp2_socket_pair_one_byte_at_a_time_cancel_before_invoke_test:
 
 endif
 
+
 deps_chttp2_socket_pair_one_byte_at_a_time_cancel_before_invoke_test: $(CHTTP2_SOCKET_PAIR_ONE_BYTE_AT_A_TIME_CANCEL_BEFORE_INVOKE_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -9092,6 +9385,7 @@ bins/$(CONFIG)/chttp2_socket_pair_one_byte_at_a_time_cancel_in_a_vacuum_test: $(
 
 endif
 
+
 deps_chttp2_socket_pair_one_byte_at_a_time_cancel_in_a_vacuum_test: $(CHTTP2_SOCKET_PAIR_ONE_BYTE_AT_A_TIME_CANCEL_IN_A_VACUUM_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -9125,6 +9419,7 @@ bins/$(CONFIG)/chttp2_socket_pair_one_byte_at_a_time_census_simple_request_test:
 
 endif
 
+
 deps_chttp2_socket_pair_one_byte_at_a_time_census_simple_request_test: $(CHTTP2_SOCKET_PAIR_ONE_BYTE_AT_A_TIME_CENSUS_SIMPLE_REQUEST_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -9158,6 +9453,7 @@ bins/$(CONFIG)/chttp2_socket_pair_one_byte_at_a_time_disappearing_server_test: $
 
 endif
 
+
 deps_chttp2_socket_pair_one_byte_at_a_time_disappearing_server_test: $(CHTTP2_SOCKET_PAIR_ONE_BYTE_AT_A_TIME_DISAPPEARING_SERVER_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -9191,6 +9487,7 @@ bins/$(CONFIG)/chttp2_socket_pair_one_byte_at_a_time_early_server_shutdown_finis
 
 endif
 
+
 deps_chttp2_socket_pair_one_byte_at_a_time_early_server_shutdown_finishes_inflight_calls_test: $(CHTTP2_SOCKET_PAIR_ONE_BYTE_AT_A_TIME_EARLY_SERVER_SHUTDOWN_FINISHES_INFLIGHT_CALLS_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -9224,6 +9521,7 @@ bins/$(CONFIG)/chttp2_socket_pair_one_byte_at_a_time_early_server_shutdown_finis
 
 endif
 
+
 deps_chttp2_socket_pair_one_byte_at_a_time_early_server_shutdown_finishes_tags_test: $(CHTTP2_SOCKET_PAIR_ONE_BYTE_AT_A_TIME_EARLY_SERVER_SHUTDOWN_FINISHES_TAGS_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -9257,6 +9555,7 @@ bins/$(CONFIG)/chttp2_socket_pair_one_byte_at_a_time_invoke_large_request_test:
 
 endif
 
+
 deps_chttp2_socket_pair_one_byte_at_a_time_invoke_large_request_test: $(CHTTP2_SOCKET_PAIR_ONE_BYTE_AT_A_TIME_INVOKE_LARGE_REQUEST_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -9290,6 +9589,7 @@ bins/$(CONFIG)/chttp2_socket_pair_one_byte_at_a_time_max_concurrent_streams_test
 
 endif
 
+
 deps_chttp2_socket_pair_one_byte_at_a_time_max_concurrent_streams_test: $(CHTTP2_SOCKET_PAIR_ONE_BYTE_AT_A_TIME_MAX_CONCURRENT_STREAMS_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -9323,6 +9623,7 @@ bins/$(CONFIG)/chttp2_socket_pair_one_byte_at_a_time_no_op_test: $(CHTTP2_SOCKET
 
 endif
 
+
 deps_chttp2_socket_pair_one_byte_at_a_time_no_op_test: $(CHTTP2_SOCKET_PAIR_ONE_BYTE_AT_A_TIME_NO_OP_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -9356,6 +9657,7 @@ bins/$(CONFIG)/chttp2_socket_pair_one_byte_at_a_time_ping_pong_streaming_test: $
 
 endif
 
+
 deps_chttp2_socket_pair_one_byte_at_a_time_ping_pong_streaming_test: $(CHTTP2_SOCKET_PAIR_ONE_BYTE_AT_A_TIME_PING_PONG_STREAMING_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -9389,6 +9691,7 @@ bins/$(CONFIG)/chttp2_socket_pair_one_byte_at_a_time_request_response_with_binar
 
 endif
 
+
 deps_chttp2_socket_pair_one_byte_at_a_time_request_response_with_binary_metadata_and_payload_test: $(CHTTP2_SOCKET_PAIR_ONE_BYTE_AT_A_TIME_REQUEST_RESPONSE_WITH_BINARY_METADATA_AND_PAYLOAD_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -9422,6 +9725,7 @@ bins/$(CONFIG)/chttp2_socket_pair_one_byte_at_a_time_request_response_with_metad
 
 endif
 
+
 deps_chttp2_socket_pair_one_byte_at_a_time_request_response_with_metadata_and_payload_test: $(CHTTP2_SOCKET_PAIR_ONE_BYTE_AT_A_TIME_REQUEST_RESPONSE_WITH_METADATA_AND_PAYLOAD_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -9455,6 +9759,7 @@ bins/$(CONFIG)/chttp2_socket_pair_one_byte_at_a_time_request_response_with_paylo
 
 endif
 
+
 deps_chttp2_socket_pair_one_byte_at_a_time_request_response_with_payload_test: $(CHTTP2_SOCKET_PAIR_ONE_BYTE_AT_A_TIME_REQUEST_RESPONSE_WITH_PAYLOAD_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -9488,6 +9793,7 @@ bins/$(CONFIG)/chttp2_socket_pair_one_byte_at_a_time_request_response_with_trail
 
 endif
 
+
 deps_chttp2_socket_pair_one_byte_at_a_time_request_response_with_trailing_metadata_and_payload_test: $(CHTTP2_SOCKET_PAIR_ONE_BYTE_AT_A_TIME_REQUEST_RESPONSE_WITH_TRAILING_METADATA_AND_PAYLOAD_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -9521,6 +9827,7 @@ bins/$(CONFIG)/chttp2_socket_pair_one_byte_at_a_time_simple_delayed_request_test
 
 endif
 
+
 deps_chttp2_socket_pair_one_byte_at_a_time_simple_delayed_request_test: $(CHTTP2_SOCKET_PAIR_ONE_BYTE_AT_A_TIME_SIMPLE_DELAYED_REQUEST_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -9554,6 +9861,7 @@ bins/$(CONFIG)/chttp2_socket_pair_one_byte_at_a_time_simple_request_test: $(CHTT
 
 endif
 
+
 deps_chttp2_socket_pair_one_byte_at_a_time_simple_request_test: $(CHTTP2_SOCKET_PAIR_ONE_BYTE_AT_A_TIME_SIMPLE_REQUEST_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -9587,6 +9895,7 @@ bins/$(CONFIG)/chttp2_socket_pair_one_byte_at_a_time_thread_stress_test: $(CHTTP
 
 endif
 
+
 deps_chttp2_socket_pair_one_byte_at_a_time_thread_stress_test: $(CHTTP2_SOCKET_PAIR_ONE_BYTE_AT_A_TIME_THREAD_STRESS_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
@@ -9620,6 +9929,7 @@ bins/$(CONFIG)/chttp2_socket_pair_one_byte_at_a_time_writes_done_hangs_with_pend
 
 endif
 
+
 deps_chttp2_socket_pair_one_byte_at_a_time_writes_done_hangs_with_pending_read_test: $(CHTTP2_SOCKET_PAIR_ONE_BYTE_AT_A_TIME_WRITES_DONE_HANGS_WITH_PENDING_READ_TEST_DEPS)
 
 ifneq ($(NO_SECURE),true)
diff --git a/build.json b/build.json
index 219ff23fe13..f488e8b0fcc 100644
--- a/build.json
+++ b/build.json
@@ -1280,6 +1280,7 @@
         "test/cpp/end2end/sync_client_async_server_test.cc"
       ],
       "deps": [
+        "grpc++_test_util",
         "grpc_test_util",
         "grpc++",
         "grpc",
@@ -1384,7 +1385,8 @@
       ],
       "deps": [
         "grpc++",
-        "grpc"
+        "grpc",
+	"gpr"
       ]
     },
     {
@@ -1396,7 +1398,8 @@
       ],
       "deps": [
         "grpc++",
-        "grpc"
+        "grpc",
+	"gpr"
       ]
     },
     {

From f5371efe65a68738a904090a95b0725397a24a1e Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Mon, 12 Jan 2015 16:40:18 -0800
Subject: [PATCH 08/18] Fix some C++ test dependencies

---
 templates/Makefile.template | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/templates/Makefile.template b/templates/Makefile.template
index 44144c8f7e5..32c2f18b07b 100644
--- a/templates/Makefile.template
+++ b/templates/Makefile.template
@@ -2,6 +2,7 @@
 # This currently builds C and C++ code.
 <%!
   import re
+  import os
 
   proto_re = re.compile('(.*)\\.proto')
 
@@ -355,7 +356,7 @@ buildtests_c: bins_dep_c privatelibs_c\
 buildtests_cxx: bins_dep_cxx privatelibs_cxx\
 % for tgt in targets:
 % if tgt.build == 'test' and tgt.get('c++', False):
- bins/${tgt.name}\
+ bins/$(CONFIG)/${tgt.name}\
 % endif
 % endfor
 
@@ -687,6 +688,7 @@ libs/$(CONFIG)/lib${lib.name}.a: $(LIB${lib.name.upper()}_OBJS)
 	$(Q) $(AR) rcs libs/$(CONFIG)/lib${lib.name}.a $(LIB${lib.name.upper()}_OBJS)
 % if lib.get('baselib', False):
 % if lib.get('secure', True):
+	$(Q) rm -rf tmp-merge
 	$(Q) mkdir tmp-merge
 	$(Q) ( cd tmp-merge ; $(AR) x ../libs/$(CONFIG)/lib${lib.name}.a )
 	$(Q) for l in $(OPENSSL_MERGE_LIBS) ; do ( cd tmp-merge ; <%text>ar x ../$${l}</%text> ) ; done
@@ -836,6 +838,14 @@ bins/$(CONFIG)/${tgt.name}: $(${tgt.name.upper()}_OBJS)\
 endif
 % endif
 
+% for src in tgt.src:
+objs/$(CONFIG)/${os.path.splitext(src)[0]}.o: \
+% for dep in tgt.deps:
+ libs/$(CONFIG)/lib${dep}.a\
+% endfor
+
+% endfor
+
 deps_${tgt.name}: $(${tgt.name.upper()}_DEPS)
 
 % if tgt.get('secure', True):

From edd10d2596259e32d74ffd53ad62b9f0fe450b5e Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Mon, 12 Jan 2015 16:40:51 -0800
Subject: [PATCH 09/18] Make this file usable from C++

---
 test/core/util/port.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/test/core/util/port.h b/test/core/util/port.h
index d06f04731e2..0ba895af433 100644
--- a/test/core/util/port.h
+++ b/test/core/util/port.h
@@ -34,6 +34,10 @@
 #ifndef __GRPC_TEST_UTIL_PORT_H__
 #define __GRPC_TEST_UTIL_PORT_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* pick a port number that is currently unused by either tcp or udp. return
    0 on failure. */
 int grpc_pick_unused_port();
@@ -41,4 +45,8 @@ int grpc_pick_unused_port();
    on failure. */
 int grpc_pick_unused_port_or_die();
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif  /* __GRPC_TEST_UTIL_PORT_H__ */

From 35e3971e899313870c5006ba9a99f2740ce216f6 Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Mon, 12 Jan 2015 16:41:24 -0800
Subject: [PATCH 10/18] Make this file compile

---
 test/cpp/end2end/end2end_test.cc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/cpp/end2end/end2end_test.cc b/test/cpp/end2end/end2end_test.cc
index 73b7025cb36..16be518a3fc 100644
--- a/test/cpp/end2end/end2end_test.cc
+++ b/test/cpp/end2end/end2end_test.cc
@@ -34,7 +34,7 @@
 #include <chrono>
 #include <thread>
 
-#include "net/grpc/cpp/echo_duplicate_proto_cc.pb.h"
+#include "test/cpp/util/echo_duplicate.pb.h"
 #include "test/cpp/util/echo.pb.h"
 #include "src/cpp/util/time.h"
 #include <grpc++/channel_arguments.h>
@@ -47,7 +47,7 @@
 #include <grpc++/server_context.h>
 #include <grpc++/status.h>
 #include <grpc++/stream.h>
-#include "net/util/netutil.h"
+#include "test/core/util/port.h"
 #include <gtest/gtest.h>
 
 #include <grpc/grpc.h>
@@ -141,7 +141,7 @@ class TestServiceImplDupPkg
 class End2endTest : public ::testing::Test {
  protected:
   void SetUp() override {
-    int port = PickUnusedPortOrDie();
+    int port = grpc_pick_unused_port_or_die();
     server_address_ << "localhost:" << port;
     // Setup server
     ServerBuilder builder;
@@ -189,7 +189,7 @@ TEST_F(End2endTest, SimpleRpc) {
 
 TEST_F(End2endTest, MultipleRpcs) {
   ResetStub();
-  vector<std::thread*> threads;
+  std::vector<std::thread*> threads;
   for (int i = 0; i < 10; ++i) {
     threads.push_back(new std::thread(SendRpc, stub_.get(), 10));
   }

From 9608f0f212f847c02f5aa768079ce5dcb04caa04 Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Mon, 12 Jan 2015 16:41:41 -0800
Subject: [PATCH 11/18] Make this file compile

---
 test/cpp/client/channel_arguments_test.cc | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/test/cpp/client/channel_arguments_test.cc b/test/cpp/client/channel_arguments_test.cc
index b94d4788f7c..9dc0ab3d612 100644
--- a/test/cpp/client/channel_arguments_test.cc
+++ b/test/cpp/client/channel_arguments_test.cc
@@ -69,15 +69,12 @@ TEST_F(ChannelArgumentsTest, SetInt) {
   key = "";
   SetChannelArgs(channel_args, &args);
   EXPECT_EQ(2, args.num_args);
-  bool found[2] = {false, false};
   // We do not enforce order on the arguments.
-  for (int i = 0; i < args.num_args; i++) {
+  for (size_t i = 0; i < args.num_args; i++) {
     EXPECT_EQ(GRPC_ARG_INTEGER, args.args[i].type);
     if (grpc::string(args.args[i].key) == "key0") {
-      found[0] = true;
       EXPECT_EQ(0, args.args[i].value.integer);
     } else if (grpc::string(args.args[i].key) == "key1") {
-      found[1] = true;
       EXPECT_EQ(1, args.args[i].value.integer);
     }
   }
@@ -107,15 +104,12 @@ TEST_F(ChannelArgumentsTest, SetString) {
   channel_args.SetString(key, val);
   SetChannelArgs(channel_args, &args);
   EXPECT_EQ(2, args.num_args);
-  bool found[2] = {false, false};
   // We do not enforce order on the arguments.
-  for (int i = 0; i < args.num_args; i++) {
+  for (size_t i = 0; i < args.num_args; i++) {
     EXPECT_EQ(GRPC_ARG_STRING, args.args[i].type);
     if (grpc::string(args.args[i].key) == "key0") {
-      found[0] = true;
       EXPECT_STREQ("val0", args.args[i].value.string);
     } else if (grpc::string(args.args[i].key) == "key1") {
-      found[1] = true;
       EXPECT_STREQ("val1", args.args[i].value.string);
     }
   }

From b2a42f3271a72ed693b36def6c7d5d08beda2dc3 Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Mon, 12 Jan 2015 16:41:56 -0800
Subject: [PATCH 12/18] Make this file compile

---
 test/cpp/end2end/sync_client_async_server_test.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/cpp/end2end/sync_client_async_server_test.cc b/test/cpp/end2end/sync_client_async_server_test.cc
index f4dad60e223..54e7648cb6b 100644
--- a/test/cpp/end2end/sync_client_async_server_test.cc
+++ b/test/cpp/end2end/sync_client_async_server_test.cc
@@ -49,7 +49,7 @@
 #include <grpc++/status.h>
 #include <grpc++/stream.h>
 #include "test/cpp/end2end/async_test_server.h"
-#include "net/util/netutil.h"
+#include "test/core/util/port.h"
 #include <gtest/gtest.h>
 
 using grpc::cpp::test::util::EchoRequest;
@@ -73,7 +73,7 @@ void ServerLoop(void* s) {
 class End2endTest : public ::testing::Test {
  protected:
   void SetUp() override {
-    int port = PickUnusedPortOrDie();
+    int port = grpc_pick_unused_port_or_die();
     // TODO(yangg) protobuf has a StringPrintf, maybe use that
     std::ostringstream oss;
     oss << "[::]:" << port;

From 27715caf6e1f22323d218f0bc2c042c7e17a167f Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Mon, 12 Jan 2015 16:55:59 -0800
Subject: [PATCH 13/18] Allow C++ tests to be built in parallel

---
 Makefile                    | 299 ++++++++++++++++++++++++++++++++++++
 templates/Makefile.template |  12 ++
 2 files changed, 311 insertions(+)

diff --git a/Makefile b/Makefile
index 98739802890..5b2ca353451 100644
--- a/Makefile
+++ b/Makefile
@@ -1212,6 +1212,33 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBGPR_DEPS)
 endif
 
+objs/$(CONFIG)/src/core/support/alloc.o: 
+objs/$(CONFIG)/src/core/support/cancellable.o: 
+objs/$(CONFIG)/src/core/support/cmdline.o: 
+objs/$(CONFIG)/src/core/support/cpu_linux.o: 
+objs/$(CONFIG)/src/core/support/cpu_posix.o: 
+objs/$(CONFIG)/src/core/support/histogram.o: 
+objs/$(CONFIG)/src/core/support/host_port.o: 
+objs/$(CONFIG)/src/core/support/log_android.o: 
+objs/$(CONFIG)/src/core/support/log.o: 
+objs/$(CONFIG)/src/core/support/log_linux.o: 
+objs/$(CONFIG)/src/core/support/log_posix.o: 
+objs/$(CONFIG)/src/core/support/log_win32.o: 
+objs/$(CONFIG)/src/core/support/murmur_hash.o: 
+objs/$(CONFIG)/src/core/support/slice_buffer.o: 
+objs/$(CONFIG)/src/core/support/slice.o: 
+objs/$(CONFIG)/src/core/support/string.o: 
+objs/$(CONFIG)/src/core/support/string_posix.o: 
+objs/$(CONFIG)/src/core/support/string_win32.o: 
+objs/$(CONFIG)/src/core/support/sync.o: 
+objs/$(CONFIG)/src/core/support/sync_posix.o: 
+objs/$(CONFIG)/src/core/support/sync_win32.o: 
+objs/$(CONFIG)/src/core/support/thd_posix.o: 
+objs/$(CONFIG)/src/core/support/thd_win32.o: 
+objs/$(CONFIG)/src/core/support/time.o: 
+objs/$(CONFIG)/src/core/support/time_posix.o: 
+objs/$(CONFIG)/src/core/support/time_win32.o: 
+
 clean_libgpr:
 	$(E) "[CLEAN]   Cleaning libgpr files"
 	$(Q) $(RM) $(LIBGPR_OBJS)
@@ -1377,6 +1404,98 @@ ifneq ($(NO_DEPS),true)
 endif
 endif
 
+objs/$(CONFIG)/src/core/security/auth.o: 
+objs/$(CONFIG)/src/core/security/base64.o: 
+objs/$(CONFIG)/src/core/security/credentials.o: 
+objs/$(CONFIG)/src/core/security/google_root_certs.o: 
+objs/$(CONFIG)/src/core/security/json_token.o: 
+objs/$(CONFIG)/src/core/security/secure_endpoint.o: 
+objs/$(CONFIG)/src/core/security/secure_transport_setup.o: 
+objs/$(CONFIG)/src/core/security/security_context.o: 
+objs/$(CONFIG)/src/core/security/server_secure_chttp2.o: 
+objs/$(CONFIG)/src/core/tsi/fake_transport_security.o: 
+objs/$(CONFIG)/src/core/tsi/ssl_transport_security.o: 
+objs/$(CONFIG)/src/core/tsi/transport_security.o: 
+objs/$(CONFIG)/src/core/channel/call_op_string.o: 
+objs/$(CONFIG)/src/core/channel/census_filter.o: 
+objs/$(CONFIG)/src/core/channel/channel_args.o: 
+objs/$(CONFIG)/src/core/channel/channel_stack.o: 
+objs/$(CONFIG)/src/core/channel/child_channel.o: 
+objs/$(CONFIG)/src/core/channel/client_channel.o: 
+objs/$(CONFIG)/src/core/channel/client_setup.o: 
+objs/$(CONFIG)/src/core/channel/connected_channel.o: 
+objs/$(CONFIG)/src/core/channel/http_client_filter.o: 
+objs/$(CONFIG)/src/core/channel/http_filter.o: 
+objs/$(CONFIG)/src/core/channel/http_server_filter.o: 
+objs/$(CONFIG)/src/core/channel/metadata_buffer.o: 
+objs/$(CONFIG)/src/core/channel/noop_filter.o: 
+objs/$(CONFIG)/src/core/compression/algorithm.o: 
+objs/$(CONFIG)/src/core/compression/message_compress.o: 
+objs/$(CONFIG)/src/core/httpcli/format_request.o: 
+objs/$(CONFIG)/src/core/httpcli/httpcli.o: 
+objs/$(CONFIG)/src/core/httpcli/httpcli_security_context.o: 
+objs/$(CONFIG)/src/core/httpcli/parser.o: 
+objs/$(CONFIG)/src/core/iomgr/alarm.o: 
+objs/$(CONFIG)/src/core/iomgr/alarm_heap.o: 
+objs/$(CONFIG)/src/core/iomgr/endpoint.o: 
+objs/$(CONFIG)/src/core/iomgr/endpoint_pair_posix.o: 
+objs/$(CONFIG)/src/core/iomgr/fd_posix.o: 
+objs/$(CONFIG)/src/core/iomgr/iomgr.o: 
+objs/$(CONFIG)/src/core/iomgr/iomgr_posix.o: 
+objs/$(CONFIG)/src/core/iomgr/pollset_multipoller_with_poll_posix.o: 
+objs/$(CONFIG)/src/core/iomgr/pollset_posix.o: 
+objs/$(CONFIG)/src/core/iomgr/resolve_address_posix.o: 
+objs/$(CONFIG)/src/core/iomgr/sockaddr_utils.o: 
+objs/$(CONFIG)/src/core/iomgr/socket_utils_common_posix.o: 
+objs/$(CONFIG)/src/core/iomgr/socket_utils_linux.o: 
+objs/$(CONFIG)/src/core/iomgr/socket_utils_posix.o: 
+objs/$(CONFIG)/src/core/iomgr/tcp_client_posix.o: 
+objs/$(CONFIG)/src/core/iomgr/tcp_posix.o: 
+objs/$(CONFIG)/src/core/iomgr/tcp_server_posix.o: 
+objs/$(CONFIG)/src/core/iomgr/time_averaged_stats.o: 
+objs/$(CONFIG)/src/core/statistics/census_init.o: 
+objs/$(CONFIG)/src/core/statistics/census_log.o: 
+objs/$(CONFIG)/src/core/statistics/census_rpc_stats.o: 
+objs/$(CONFIG)/src/core/statistics/census_tracing.o: 
+objs/$(CONFIG)/src/core/statistics/hash_table.o: 
+objs/$(CONFIG)/src/core/statistics/window_stats.o: 
+objs/$(CONFIG)/src/core/surface/byte_buffer.o: 
+objs/$(CONFIG)/src/core/surface/byte_buffer_reader.o: 
+objs/$(CONFIG)/src/core/surface/call.o: 
+objs/$(CONFIG)/src/core/surface/channel.o: 
+objs/$(CONFIG)/src/core/surface/channel_create.o: 
+objs/$(CONFIG)/src/core/surface/client.o: 
+objs/$(CONFIG)/src/core/surface/completion_queue.o: 
+objs/$(CONFIG)/src/core/surface/event_string.o: 
+objs/$(CONFIG)/src/core/surface/init.o: 
+objs/$(CONFIG)/src/core/surface/lame_client.o: 
+objs/$(CONFIG)/src/core/surface/secure_channel_create.o: 
+objs/$(CONFIG)/src/core/surface/secure_server_create.o: 
+objs/$(CONFIG)/src/core/surface/server.o: 
+objs/$(CONFIG)/src/core/surface/server_chttp2.o: 
+objs/$(CONFIG)/src/core/surface/server_create.o: 
+objs/$(CONFIG)/src/core/transport/chttp2/alpn.o: 
+objs/$(CONFIG)/src/core/transport/chttp2/bin_encoder.o: 
+objs/$(CONFIG)/src/core/transport/chttp2/frame_data.o: 
+objs/$(CONFIG)/src/core/transport/chttp2/frame_goaway.o: 
+objs/$(CONFIG)/src/core/transport/chttp2/frame_ping.o: 
+objs/$(CONFIG)/src/core/transport/chttp2/frame_rst_stream.o: 
+objs/$(CONFIG)/src/core/transport/chttp2/frame_settings.o: 
+objs/$(CONFIG)/src/core/transport/chttp2/frame_window_update.o: 
+objs/$(CONFIG)/src/core/transport/chttp2/hpack_parser.o: 
+objs/$(CONFIG)/src/core/transport/chttp2/hpack_table.o: 
+objs/$(CONFIG)/src/core/transport/chttp2/huffsyms.o: 
+objs/$(CONFIG)/src/core/transport/chttp2/status_conversion.o: 
+objs/$(CONFIG)/src/core/transport/chttp2/stream_encoder.o: 
+objs/$(CONFIG)/src/core/transport/chttp2/stream_map.o: 
+objs/$(CONFIG)/src/core/transport/chttp2/timeout_encoding.o: 
+objs/$(CONFIG)/src/core/transport/chttp2/varint.o: 
+objs/$(CONFIG)/src/core/transport/chttp2_transport.o: 
+objs/$(CONFIG)/src/core/transport/metadata.o: 
+objs/$(CONFIG)/src/core/transport/stream_op.o: 
+objs/$(CONFIG)/src/core/transport/transport.o: 
+objs/$(CONFIG)/third_party/cJSON/cJSON.o: 
+
 clean_libgrpc:
 	$(E) "[CLEAN]   Cleaning libgrpc files"
 	$(Q) $(RM) $(LIBGRPC_OBJS)
@@ -1506,6 +1625,86 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBGRPC_UNSECURE_DEPS)
 endif
 
+objs/$(CONFIG)/src/core/channel/call_op_string.o: 
+objs/$(CONFIG)/src/core/channel/census_filter.o: 
+objs/$(CONFIG)/src/core/channel/channel_args.o: 
+objs/$(CONFIG)/src/core/channel/channel_stack.o: 
+objs/$(CONFIG)/src/core/channel/child_channel.o: 
+objs/$(CONFIG)/src/core/channel/client_channel.o: 
+objs/$(CONFIG)/src/core/channel/client_setup.o: 
+objs/$(CONFIG)/src/core/channel/connected_channel.o: 
+objs/$(CONFIG)/src/core/channel/http_client_filter.o: 
+objs/$(CONFIG)/src/core/channel/http_filter.o: 
+objs/$(CONFIG)/src/core/channel/http_server_filter.o: 
+objs/$(CONFIG)/src/core/channel/metadata_buffer.o: 
+objs/$(CONFIG)/src/core/channel/noop_filter.o: 
+objs/$(CONFIG)/src/core/compression/algorithm.o: 
+objs/$(CONFIG)/src/core/compression/message_compress.o: 
+objs/$(CONFIG)/src/core/httpcli/format_request.o: 
+objs/$(CONFIG)/src/core/httpcli/httpcli.o: 
+objs/$(CONFIG)/src/core/httpcli/httpcli_security_context.o: 
+objs/$(CONFIG)/src/core/httpcli/parser.o: 
+objs/$(CONFIG)/src/core/iomgr/alarm.o: 
+objs/$(CONFIG)/src/core/iomgr/alarm_heap.o: 
+objs/$(CONFIG)/src/core/iomgr/endpoint.o: 
+objs/$(CONFIG)/src/core/iomgr/endpoint_pair_posix.o: 
+objs/$(CONFIG)/src/core/iomgr/fd_posix.o: 
+objs/$(CONFIG)/src/core/iomgr/iomgr.o: 
+objs/$(CONFIG)/src/core/iomgr/iomgr_posix.o: 
+objs/$(CONFIG)/src/core/iomgr/pollset_multipoller_with_poll_posix.o: 
+objs/$(CONFIG)/src/core/iomgr/pollset_posix.o: 
+objs/$(CONFIG)/src/core/iomgr/resolve_address_posix.o: 
+objs/$(CONFIG)/src/core/iomgr/sockaddr_utils.o: 
+objs/$(CONFIG)/src/core/iomgr/socket_utils_common_posix.o: 
+objs/$(CONFIG)/src/core/iomgr/socket_utils_linux.o: 
+objs/$(CONFIG)/src/core/iomgr/socket_utils_posix.o: 
+objs/$(CONFIG)/src/core/iomgr/tcp_client_posix.o: 
+objs/$(CONFIG)/src/core/iomgr/tcp_posix.o: 
+objs/$(CONFIG)/src/core/iomgr/tcp_server_posix.o: 
+objs/$(CONFIG)/src/core/iomgr/time_averaged_stats.o: 
+objs/$(CONFIG)/src/core/statistics/census_init.o: 
+objs/$(CONFIG)/src/core/statistics/census_log.o: 
+objs/$(CONFIG)/src/core/statistics/census_rpc_stats.o: 
+objs/$(CONFIG)/src/core/statistics/census_tracing.o: 
+objs/$(CONFIG)/src/core/statistics/hash_table.o: 
+objs/$(CONFIG)/src/core/statistics/window_stats.o: 
+objs/$(CONFIG)/src/core/surface/byte_buffer.o: 
+objs/$(CONFIG)/src/core/surface/byte_buffer_reader.o: 
+objs/$(CONFIG)/src/core/surface/call.o: 
+objs/$(CONFIG)/src/core/surface/channel.o: 
+objs/$(CONFIG)/src/core/surface/channel_create.o: 
+objs/$(CONFIG)/src/core/surface/client.o: 
+objs/$(CONFIG)/src/core/surface/completion_queue.o: 
+objs/$(CONFIG)/src/core/surface/event_string.o: 
+objs/$(CONFIG)/src/core/surface/init.o: 
+objs/$(CONFIG)/src/core/surface/lame_client.o: 
+objs/$(CONFIG)/src/core/surface/secure_channel_create.o: 
+objs/$(CONFIG)/src/core/surface/secure_server_create.o: 
+objs/$(CONFIG)/src/core/surface/server.o: 
+objs/$(CONFIG)/src/core/surface/server_chttp2.o: 
+objs/$(CONFIG)/src/core/surface/server_create.o: 
+objs/$(CONFIG)/src/core/transport/chttp2/alpn.o: 
+objs/$(CONFIG)/src/core/transport/chttp2/bin_encoder.o: 
+objs/$(CONFIG)/src/core/transport/chttp2/frame_data.o: 
+objs/$(CONFIG)/src/core/transport/chttp2/frame_goaway.o: 
+objs/$(CONFIG)/src/core/transport/chttp2/frame_ping.o: 
+objs/$(CONFIG)/src/core/transport/chttp2/frame_rst_stream.o: 
+objs/$(CONFIG)/src/core/transport/chttp2/frame_settings.o: 
+objs/$(CONFIG)/src/core/transport/chttp2/frame_window_update.o: 
+objs/$(CONFIG)/src/core/transport/chttp2/hpack_parser.o: 
+objs/$(CONFIG)/src/core/transport/chttp2/hpack_table.o: 
+objs/$(CONFIG)/src/core/transport/chttp2/huffsyms.o: 
+objs/$(CONFIG)/src/core/transport/chttp2/status_conversion.o: 
+objs/$(CONFIG)/src/core/transport/chttp2/stream_encoder.o: 
+objs/$(CONFIG)/src/core/transport/chttp2/stream_map.o: 
+objs/$(CONFIG)/src/core/transport/chttp2/timeout_encoding.o: 
+objs/$(CONFIG)/src/core/transport/chttp2/varint.o: 
+objs/$(CONFIG)/src/core/transport/chttp2_transport.o: 
+objs/$(CONFIG)/src/core/transport/metadata.o: 
+objs/$(CONFIG)/src/core/transport/stream_op.o: 
+objs/$(CONFIG)/src/core/transport/transport.o: 
+objs/$(CONFIG)/third_party/cJSON/cJSON.o: 
+
 clean_libgrpc_unsecure:
 	$(E) "[CLEAN]   Cleaning libgrpc_unsecure files"
 	$(Q) $(RM) $(LIBGRPC_UNSECURE_OBJS)
@@ -1559,6 +1758,20 @@ ifneq ($(NO_DEPS),true)
 endif
 endif
 
+objs/$(CONFIG)/test/core/end2end/cq_verifier.o: 
+objs/$(CONFIG)/test/core/end2end/data/test_root_cert.o: 
+objs/$(CONFIG)/test/core/end2end/data/prod_roots_certs.o: 
+objs/$(CONFIG)/test/core/end2end/data/server1_cert.o: 
+objs/$(CONFIG)/test/core/end2end/data/server1_key.o: 
+objs/$(CONFIG)/test/core/iomgr/endpoint_tests.o: 
+objs/$(CONFIG)/test/core/statistics/census_log_tests.o: 
+objs/$(CONFIG)/test/core/transport/transport_end2end_tests.o: 
+objs/$(CONFIG)/test/core/util/grpc_profiler.o: 
+objs/$(CONFIG)/test/core/util/parse_hexstring.o: 
+objs/$(CONFIG)/test/core/util/port_posix.o: 
+objs/$(CONFIG)/test/core/util/slice_splitter.o: 
+objs/$(CONFIG)/test/core/util/test_config.o: 
+
 clean_libgrpc_test_util:
 	$(E) "[CLEAN]   Cleaning libgrpc_test_util files"
 	$(Q) $(RM) $(LIBGRPC_TEST_UTIL_OBJS)
@@ -1660,6 +1873,27 @@ ifneq ($(NO_DEPS),true)
 endif
 endif
 
+objs/$(CONFIG)/src/cpp/client/channel.o: 
+objs/$(CONFIG)/src/cpp/client/channel_arguments.o: 
+objs/$(CONFIG)/src/cpp/client/client_context.o: 
+objs/$(CONFIG)/src/cpp/client/create_channel.o: 
+objs/$(CONFIG)/src/cpp/client/credentials.o: 
+objs/$(CONFIG)/src/cpp/client/internal_stub.o: 
+objs/$(CONFIG)/src/cpp/proto/proto_utils.o: 
+objs/$(CONFIG)/src/cpp/common/rpc_method.o: 
+objs/$(CONFIG)/src/cpp/server/async_server.o: 
+objs/$(CONFIG)/src/cpp/server/async_server_context.o: 
+objs/$(CONFIG)/src/cpp/server/completion_queue.o: 
+objs/$(CONFIG)/src/cpp/server/server_builder.o: 
+objs/$(CONFIG)/src/cpp/server/server_context_impl.o: 
+objs/$(CONFIG)/src/cpp/server/server.o: 
+objs/$(CONFIG)/src/cpp/server/server_rpc_handler.o: 
+objs/$(CONFIG)/src/cpp/server/server_credentials.o: 
+objs/$(CONFIG)/src/cpp/server/thread_pool.o: 
+objs/$(CONFIG)/src/cpp/stream/stream_context.o: 
+objs/$(CONFIG)/src/cpp/util/status.o: 
+objs/$(CONFIG)/src/cpp/util/time.o: 
+
 clean_libgrpc++:
 	$(E) "[CLEAN]   Cleaning libgrpc++ files"
 	$(Q) $(RM) $(LIBGRPC++_OBJS)
@@ -1705,6 +1939,12 @@ ifneq ($(NO_DEPS),true)
 endif
 endif
 
+
+
+
+objs/$(CONFIG)/test/cpp/util/create_test_channel.o:     gens/test/cpp/util/messages.pb.cc    gens/test/cpp/util/echo.pb.cc    gens/test/cpp/util/echo_duplicate.pb.cc
+objs/$(CONFIG)/test/cpp/end2end/async_test_server.o:     gens/test/cpp/util/messages.pb.cc    gens/test/cpp/util/echo.pb.cc    gens/test/cpp/util/echo_duplicate.pb.cc
+
 clean_libgrpc++_test_util:
 	$(E) "[CLEAN]   Cleaning libgrpc++_test_util files"
 	$(Q) $(RM) $(LIBGRPC++_TEST_UTIL_OBJS)
@@ -1746,6 +1986,8 @@ ifneq ($(NO_DEPS),true)
 endif
 endif
 
+objs/$(CONFIG)/test/core/end2end/fixtures/chttp2_fake_security.o: 
+
 clean_libend2end_fixture_chttp2_fake_security:
 	$(E) "[CLEAN]   Cleaning libend2end_fixture_chttp2_fake_security files"
 	$(Q) $(RM) $(LIBEND2END_FIXTURE_CHTTP2_FAKE_SECURITY_OBJS)
@@ -1787,6 +2029,8 @@ ifneq ($(NO_DEPS),true)
 endif
 endif
 
+objs/$(CONFIG)/test/core/end2end/fixtures/chttp2_fullstack.o: 
+
 clean_libend2end_fixture_chttp2_fullstack:
 	$(E) "[CLEAN]   Cleaning libend2end_fixture_chttp2_fullstack files"
 	$(Q) $(RM) $(LIBEND2END_FIXTURE_CHTTP2_FULLSTACK_OBJS)
@@ -1828,6 +2072,8 @@ ifneq ($(NO_DEPS),true)
 endif
 endif
 
+objs/$(CONFIG)/test/core/end2end/fixtures/chttp2_simple_ssl_fullstack.o: 
+
 clean_libend2end_fixture_chttp2_simple_ssl_fullstack:
 	$(E) "[CLEAN]   Cleaning libend2end_fixture_chttp2_simple_ssl_fullstack files"
 	$(Q) $(RM) $(LIBEND2END_FIXTURE_CHTTP2_SIMPLE_SSL_FULLSTACK_OBJS)
@@ -1869,6 +2115,8 @@ ifneq ($(NO_DEPS),true)
 endif
 endif
 
+objs/$(CONFIG)/test/core/end2end/fixtures/chttp2_simple_ssl_with_oauth2_fullstack.o: 
+
 clean_libend2end_fixture_chttp2_simple_ssl_with_oauth2_fullstack:
 	$(E) "[CLEAN]   Cleaning libend2end_fixture_chttp2_simple_ssl_with_oauth2_fullstack files"
 	$(Q) $(RM) $(LIBEND2END_FIXTURE_CHTTP2_SIMPLE_SSL_WITH_OAUTH2_FULLSTACK_OBJS)
@@ -1910,6 +2158,8 @@ ifneq ($(NO_DEPS),true)
 endif
 endif
 
+objs/$(CONFIG)/test/core/end2end/fixtures/chttp2_socket_pair.o: 
+
 clean_libend2end_fixture_chttp2_socket_pair:
 	$(E) "[CLEAN]   Cleaning libend2end_fixture_chttp2_socket_pair files"
 	$(Q) $(RM) $(LIBEND2END_FIXTURE_CHTTP2_SOCKET_PAIR_OBJS)
@@ -1951,6 +2201,8 @@ ifneq ($(NO_DEPS),true)
 endif
 endif
 
+objs/$(CONFIG)/test/core/end2end/fixtures/chttp2_socket_pair_one_byte_at_a_time.o: 
+
 clean_libend2end_fixture_chttp2_socket_pair_one_byte_at_a_time:
 	$(E) "[CLEAN]   Cleaning libend2end_fixture_chttp2_socket_pair_one_byte_at_a_time files"
 	$(Q) $(RM) $(LIBEND2END_FIXTURE_CHTTP2_SOCKET_PAIR_ONE_BYTE_AT_A_TIME_OBJS)
@@ -1981,6 +2233,8 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_CANCEL_AFTER_ACCEPT_DEPS)
 endif
 
+objs/$(CONFIG)/test/core/end2end/tests/cancel_after_accept.o: 
+
 clean_libend2end_test_cancel_after_accept:
 	$(E) "[CLEAN]   Cleaning libend2end_test_cancel_after_accept files"
 	$(Q) $(RM) $(LIBEND2END_TEST_CANCEL_AFTER_ACCEPT_OBJS)
@@ -2011,6 +2265,8 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_CANCEL_AFTER_ACCEPT_AND_WRITES_CLOSED_DEPS)
 endif
 
+objs/$(CONFIG)/test/core/end2end/tests/cancel_after_accept_and_writes_closed.o: 
+
 clean_libend2end_test_cancel_after_accept_and_writes_closed:
 	$(E) "[CLEAN]   Cleaning libend2end_test_cancel_after_accept_and_writes_closed files"
 	$(Q) $(RM) $(LIBEND2END_TEST_CANCEL_AFTER_ACCEPT_AND_WRITES_CLOSED_OBJS)
@@ -2041,6 +2297,8 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_CANCEL_AFTER_INVOKE_DEPS)
 endif
 
+objs/$(CONFIG)/test/core/end2end/tests/cancel_after_invoke.o: 
+
 clean_libend2end_test_cancel_after_invoke:
 	$(E) "[CLEAN]   Cleaning libend2end_test_cancel_after_invoke files"
 	$(Q) $(RM) $(LIBEND2END_TEST_CANCEL_AFTER_INVOKE_OBJS)
@@ -2071,6 +2329,8 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_CANCEL_BEFORE_INVOKE_DEPS)
 endif
 
+objs/$(CONFIG)/test/core/end2end/tests/cancel_before_invoke.o: 
+
 clean_libend2end_test_cancel_before_invoke:
 	$(E) "[CLEAN]   Cleaning libend2end_test_cancel_before_invoke files"
 	$(Q) $(RM) $(LIBEND2END_TEST_CANCEL_BEFORE_INVOKE_OBJS)
@@ -2101,6 +2361,8 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_CANCEL_IN_A_VACUUM_DEPS)
 endif
 
+objs/$(CONFIG)/test/core/end2end/tests/cancel_in_a_vacuum.o: 
+
 clean_libend2end_test_cancel_in_a_vacuum:
 	$(E) "[CLEAN]   Cleaning libend2end_test_cancel_in_a_vacuum files"
 	$(Q) $(RM) $(LIBEND2END_TEST_CANCEL_IN_A_VACUUM_OBJS)
@@ -2131,6 +2393,8 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_CENSUS_SIMPLE_REQUEST_DEPS)
 endif
 
+objs/$(CONFIG)/test/core/end2end/tests/census_simple_request.o: 
+
 clean_libend2end_test_census_simple_request:
 	$(E) "[CLEAN]   Cleaning libend2end_test_census_simple_request files"
 	$(Q) $(RM) $(LIBEND2END_TEST_CENSUS_SIMPLE_REQUEST_OBJS)
@@ -2161,6 +2425,8 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_DISAPPEARING_SERVER_DEPS)
 endif
 
+objs/$(CONFIG)/test/core/end2end/tests/disappearing_server.o: 
+
 clean_libend2end_test_disappearing_server:
 	$(E) "[CLEAN]   Cleaning libend2end_test_disappearing_server files"
 	$(Q) $(RM) $(LIBEND2END_TEST_DISAPPEARING_SERVER_OBJS)
@@ -2191,6 +2457,8 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_EARLY_SERVER_SHUTDOWN_FINISHES_INFLIGHT_CALLS_DEPS)
 endif
 
+objs/$(CONFIG)/test/core/end2end/tests/early_server_shutdown_finishes_inflight_calls.o: 
+
 clean_libend2end_test_early_server_shutdown_finishes_inflight_calls:
 	$(E) "[CLEAN]   Cleaning libend2end_test_early_server_shutdown_finishes_inflight_calls files"
 	$(Q) $(RM) $(LIBEND2END_TEST_EARLY_SERVER_SHUTDOWN_FINISHES_INFLIGHT_CALLS_OBJS)
@@ -2221,6 +2489,8 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_EARLY_SERVER_SHUTDOWN_FINISHES_TAGS_DEPS)
 endif
 
+objs/$(CONFIG)/test/core/end2end/tests/early_server_shutdown_finishes_tags.o: 
+
 clean_libend2end_test_early_server_shutdown_finishes_tags:
 	$(E) "[CLEAN]   Cleaning libend2end_test_early_server_shutdown_finishes_tags files"
 	$(Q) $(RM) $(LIBEND2END_TEST_EARLY_SERVER_SHUTDOWN_FINISHES_TAGS_OBJS)
@@ -2251,6 +2521,8 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_INVOKE_LARGE_REQUEST_DEPS)
 endif
 
+objs/$(CONFIG)/test/core/end2end/tests/invoke_large_request.o: 
+
 clean_libend2end_test_invoke_large_request:
 	$(E) "[CLEAN]   Cleaning libend2end_test_invoke_large_request files"
 	$(Q) $(RM) $(LIBEND2END_TEST_INVOKE_LARGE_REQUEST_OBJS)
@@ -2281,6 +2553,8 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_MAX_CONCURRENT_STREAMS_DEPS)
 endif
 
+objs/$(CONFIG)/test/core/end2end/tests/max_concurrent_streams.o: 
+
 clean_libend2end_test_max_concurrent_streams:
 	$(E) "[CLEAN]   Cleaning libend2end_test_max_concurrent_streams files"
 	$(Q) $(RM) $(LIBEND2END_TEST_MAX_CONCURRENT_STREAMS_OBJS)
@@ -2311,6 +2585,8 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_NO_OP_DEPS)
 endif
 
+objs/$(CONFIG)/test/core/end2end/tests/no_op.o: 
+
 clean_libend2end_test_no_op:
 	$(E) "[CLEAN]   Cleaning libend2end_test_no_op files"
 	$(Q) $(RM) $(LIBEND2END_TEST_NO_OP_OBJS)
@@ -2341,6 +2617,8 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_PING_PONG_STREAMING_DEPS)
 endif
 
+objs/$(CONFIG)/test/core/end2end/tests/ping_pong_streaming.o: 
+
 clean_libend2end_test_ping_pong_streaming:
 	$(E) "[CLEAN]   Cleaning libend2end_test_ping_pong_streaming files"
 	$(Q) $(RM) $(LIBEND2END_TEST_PING_PONG_STREAMING_OBJS)
@@ -2371,6 +2649,8 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_REQUEST_RESPONSE_WITH_BINARY_METADATA_AND_PAYLOAD_DEPS)
 endif
 
+objs/$(CONFIG)/test/core/end2end/tests/request_response_with_binary_metadata_and_payload.o: 
+
 clean_libend2end_test_request_response_with_binary_metadata_and_payload:
 	$(E) "[CLEAN]   Cleaning libend2end_test_request_response_with_binary_metadata_and_payload files"
 	$(Q) $(RM) $(LIBEND2END_TEST_REQUEST_RESPONSE_WITH_BINARY_METADATA_AND_PAYLOAD_OBJS)
@@ -2401,6 +2681,8 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_REQUEST_RESPONSE_WITH_METADATA_AND_PAYLOAD_DEPS)
 endif
 
+objs/$(CONFIG)/test/core/end2end/tests/request_response_with_metadata_and_payload.o: 
+
 clean_libend2end_test_request_response_with_metadata_and_payload:
 	$(E) "[CLEAN]   Cleaning libend2end_test_request_response_with_metadata_and_payload files"
 	$(Q) $(RM) $(LIBEND2END_TEST_REQUEST_RESPONSE_WITH_METADATA_AND_PAYLOAD_OBJS)
@@ -2431,6 +2713,8 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_REQUEST_RESPONSE_WITH_PAYLOAD_DEPS)
 endif
 
+objs/$(CONFIG)/test/core/end2end/tests/request_response_with_payload.o: 
+
 clean_libend2end_test_request_response_with_payload:
 	$(E) "[CLEAN]   Cleaning libend2end_test_request_response_with_payload files"
 	$(Q) $(RM) $(LIBEND2END_TEST_REQUEST_RESPONSE_WITH_PAYLOAD_OBJS)
@@ -2461,6 +2745,8 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_REQUEST_RESPONSE_WITH_TRAILING_METADATA_AND_PAYLOAD_DEPS)
 endif
 
+objs/$(CONFIG)/test/core/end2end/tests/request_response_with_trailing_metadata_and_payload.o: 
+
 clean_libend2end_test_request_response_with_trailing_metadata_and_payload:
 	$(E) "[CLEAN]   Cleaning libend2end_test_request_response_with_trailing_metadata_and_payload files"
 	$(Q) $(RM) $(LIBEND2END_TEST_REQUEST_RESPONSE_WITH_TRAILING_METADATA_AND_PAYLOAD_OBJS)
@@ -2491,6 +2777,8 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_SIMPLE_DELAYED_REQUEST_DEPS)
 endif
 
+objs/$(CONFIG)/test/core/end2end/tests/simple_delayed_request.o: 
+
 clean_libend2end_test_simple_delayed_request:
 	$(E) "[CLEAN]   Cleaning libend2end_test_simple_delayed_request files"
 	$(Q) $(RM) $(LIBEND2END_TEST_SIMPLE_DELAYED_REQUEST_OBJS)
@@ -2521,6 +2809,8 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_SIMPLE_REQUEST_DEPS)
 endif
 
+objs/$(CONFIG)/test/core/end2end/tests/simple_request.o: 
+
 clean_libend2end_test_simple_request:
 	$(E) "[CLEAN]   Cleaning libend2end_test_simple_request files"
 	$(Q) $(RM) $(LIBEND2END_TEST_SIMPLE_REQUEST_OBJS)
@@ -2551,6 +2841,8 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_THREAD_STRESS_DEPS)
 endif
 
+objs/$(CONFIG)/test/core/end2end/tests/thread_stress.o: 
+
 clean_libend2end_test_thread_stress:
 	$(E) "[CLEAN]   Cleaning libend2end_test_thread_stress files"
 	$(Q) $(RM) $(LIBEND2END_TEST_THREAD_STRESS_OBJS)
@@ -2581,6 +2873,8 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_WRITES_DONE_HANGS_WITH_PENDING_READ_DEPS)
 endif
 
+objs/$(CONFIG)/test/core/end2end/tests/writes_done_hangs_with_pending_read.o: 
+
 clean_libend2end_test_writes_done_hangs_with_pending_read:
 	$(E) "[CLEAN]   Cleaning libend2end_test_writes_done_hangs_with_pending_read files"
 	$(Q) $(RM) $(LIBEND2END_TEST_WRITES_DONE_HANGS_WITH_PENDING_READ_OBJS)
@@ -2625,6 +2919,11 @@ ifneq ($(NO_DEPS),true)
 endif
 endif
 
+objs/$(CONFIG)/test/core/end2end/data/test_root_cert.o: 
+objs/$(CONFIG)/test/core/end2end/data/prod_roots_certs.o: 
+objs/$(CONFIG)/test/core/end2end/data/server1_cert.o: 
+objs/$(CONFIG)/test/core/end2end/data/server1_key.o: 
+
 clean_libend2end_certs:
 	$(E) "[CLEAN]   Cleaning libend2end_certs files"
 	$(Q) $(RM) $(LIBEND2END_CERTS_OBJS)
diff --git a/templates/Makefile.template b/templates/Makefile.template
index 32c2f18b07b..d0ebb102408 100644
--- a/templates/Makefile.template
+++ b/templates/Makefile.template
@@ -762,6 +762,18 @@ endif
 endif
 % endif
 
+% for src in lib.src:
+% if not proto_re.match(src):
+objs/$(CONFIG)/${os.path.splitext(src)[0]}.o: \
+% for src2 in lib.src:
+% if proto_re.match(src2):
+    ${proto_to_cc(src2)}\
+% endif
+% endfor
+% endif
+
+% endfor
+
 clean_lib${lib.name}:
 	$(E) "[CLEAN]   Cleaning lib${lib.name} files"
 	$(Q) $(RM) $(LIB${lib.name.upper()}_OBJS)

From 9b62482e15b9360163ff0d6a8d03cc6e18e97485 Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Mon, 12 Jan 2015 16:59:48 -0800
Subject: [PATCH 14/18] Make the go code generator compile

---
 src/compiler/go_generator.cc | 4 ++--
 src/compiler/go_generator.h  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/compiler/go_generator.cc b/src/compiler/go_generator.cc
index 8beae8dcccf..cf5bb11a19b 100644
--- a/src/compiler/go_generator.cc
+++ b/src/compiler/go_generator.cc
@@ -31,8 +31,6 @@
  *
  */
 
-using namespace std;
-
 #include "src/compiler/go_generator.h"
 
 #include <cctype>
@@ -42,6 +40,8 @@ using namespace std;
 #include <google/protobuf/descriptor.pb.h>
 #include <google/protobuf/descriptor.h>
 
+using namespace std;
+
 namespace grpc_go_generator {
 
 bool NoStreaming(const google::protobuf::MethodDescriptor* method) {
diff --git a/src/compiler/go_generator.h b/src/compiler/go_generator.h
index fd5a05e5374..5744345b563 100644
--- a/src/compiler/go_generator.h
+++ b/src/compiler/go_generator.h
@@ -44,7 +44,7 @@ class FileDescriptor;
 
 namespace grpc_go_generator {
 
-string GetServices(const google::protobuf::FileDescriptor* file);
+std::string GetServices(const google::protobuf::FileDescriptor* file);
 
 }  // namespace grpc_go_generator
 

From de990f915526dacea6896f86fb325274da565e78 Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Mon, 12 Jan 2015 17:07:23 -0800
Subject: [PATCH 15/18] Initialize gtest correctly

---
 test/cpp/client/channel_arguments_test.cc | 2 +-
 test/cpp/client/credentials_test.cc       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/cpp/client/channel_arguments_test.cc b/test/cpp/client/channel_arguments_test.cc
index 9dc0ab3d612..3cd6add167b 100644
--- a/test/cpp/client/channel_arguments_test.cc
+++ b/test/cpp/client/channel_arguments_test.cc
@@ -119,6 +119,6 @@ TEST_F(ChannelArgumentsTest, SetString) {
 }  // namespace grpc
 
 int main(int argc, char** argv) {
-
+  ::testing::InitGoogleTest(&argc, argv);
   return RUN_ALL_TESTS();
 }
diff --git a/test/cpp/client/credentials_test.cc b/test/cpp/client/credentials_test.cc
index 1bc95f9ff8a..ea088b87bd5 100644
--- a/test/cpp/client/credentials_test.cc
+++ b/test/cpp/client/credentials_test.cc
@@ -65,7 +65,7 @@ TEST_F(CredentialsTest, InvalidServiceAccountCreds) {
 }  // namespace grpc
 
 int main(int argc, char **argv) {
-
+  ::testing::InitGoogleTest(&argc, argv);
   grpc_init();
   int ret = RUN_ALL_TESTS();
   grpc_shutdown();

From 7c1d7f7a9a11ff1032bee4e145344a3fc8fe2719 Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Mon, 12 Jan 2015 17:08:33 -0800
Subject: [PATCH 16/18] Run C++ tests and C tests

---
 tools/run_tests/run_tests.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py
index d678721274f..00831d2d746 100755
--- a/tools/run_tests/run_tests.py
+++ b/tools/run_tests/run_tests.py
@@ -13,6 +13,7 @@ import watch_dirs
 
 # flags required for make for each configuration
 _CONFIGS = ['dbg', 'opt', 'tsan', 'msan', 'asan']
+_MAKE_TEST_TARGETS = ['buildtests_c', 'buildtests_cxx']
 
 # parse command line
 argp = argparse.ArgumentParser(description='Run grpc tests.')
@@ -44,9 +45,11 @@ def _build_and_run(check_cancelled):
   if not jobset.run(
       (['make',
         '-j', '%d' % (multiprocessing.cpu_count() + 1),
-        'buildtests_c',
+        target,
         'CONFIG=%s' % cfg]
-       for cfg in configs), check_cancelled, maxjobs=1):
+       for cfg in configs
+       for target in _MAKE_TEST_TARGETS),
+      check_cancelled, maxjobs=1):
     sys.exit(1)
 
   # run all the tests

From e1586a7a11d9e6453ac80b264bfd8ef74d451a64 Mon Sep 17 00:00:00 2001
From: Craig Tiller <craig.tiller@gmail.com>
Date: Mon, 12 Jan 2015 22:05:30 -0800
Subject: [PATCH 17/18] Fix alignment

---
 build.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.json b/build.json
index 27c84dbf876..5402a88de94 100644
--- a/build.json
+++ b/build.json
@@ -1454,7 +1454,7 @@
       "deps": [
         "grpc++",
         "grpc",
-	"gpr"
+        "gpr"
       ]
     },
     {
@@ -1467,7 +1467,7 @@
       "deps": [
         "grpc++",
         "grpc",
-	"gpr"
+        "gpr"
       ]
     },
     {

From bf2659f0b6f00a91913f74f6add78055c1dfb5f9 Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Tue, 13 Jan 2015 12:27:06 -0800
Subject: [PATCH 18/18] Fix qps test.

This was failing to compile.
---
 Makefile                   | 25 +++++++++++++------------
 build.json                 |  8 ++------
 test/cpp/qps/qpstest.proto |  4 ----
 3 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/Makefile b/Makefile
index 53fa4abedff..a102746f4f1 100644
--- a/Makefile
+++ b/Makefile
@@ -960,6 +960,15 @@ gens/test/cpp/interop/test.pb.cc: test/cpp/interop/test.proto protoc_plugins
 	$(Q) mkdir -p `dirname $@`
 	$(Q) $(PROTOC) --cpp_out=gens --grpc_out=gens --plugin=protoc-gen-grpc=bins/$(CONFIG)/cpp_plugin $<
 
+deps/$(CONFIG)/gens/test/cpp/qps/qpstest.pb.dep:
+	$(Q) mkdir -p `dirname $@`
+	$(Q) touch $@
+
+gens/test/cpp/qps/qpstest.pb.cc: test/cpp/qps/qpstest.proto protoc_plugins
+	$(E) "[PROTOC]  Generating protobuf CC file from $<"
+	$(Q) mkdir -p `dirname $@`
+	$(Q) $(PROTOC) --cpp_out=gens --grpc_out=gens --plugin=protoc-gen-grpc=bins/$(CONFIG)/cpp_plugin $<
+
 deps/$(CONFIG)/gens/test/cpp/util/echo.pb.dep:
 	$(Q) mkdir -p `dirname $@`
 	$(Q) touch $@
@@ -5584,9 +5593,7 @@ clean_sync_client_async_server_test:
 
 
 QPS_CLIENT_SRC = \
-    gens/test/cpp/interop/empty.pb.cc \
-    gens/test/cpp/interop/messages.pb.cc \
-    gens/test/cpp/interop/test.pb.cc \
+    gens/test/cpp/qps/qpstest.pb.cc \
     test/cpp/qps/client.cc \
 
 QPS_CLIENT_OBJS = $(addprefix objs/$(CONFIG)/, $(addsuffix .o, $(basename $(QPS_CLIENT_SRC))))
@@ -5605,9 +5612,7 @@ bins/$(CONFIG)/qps_client: $(QPS_CLIENT_OBJS) libs/$(CONFIG)/libgrpc++_test_util
 
 endif
 
-objs/$(CONFIG)/test/cpp/interop/empty.o:  libs/$(CONFIG)/libgrpc++_test_util.a libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc++.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr_test_util.a libs/$(CONFIG)/libgpr.a
-objs/$(CONFIG)/test/cpp/interop/messages.o:  libs/$(CONFIG)/libgrpc++_test_util.a libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc++.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr_test_util.a libs/$(CONFIG)/libgpr.a
-objs/$(CONFIG)/test/cpp/interop/test.o:  libs/$(CONFIG)/libgrpc++_test_util.a libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc++.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr_test_util.a libs/$(CONFIG)/libgpr.a
+objs/$(CONFIG)/test/cpp/qps/qpstest.o:  libs/$(CONFIG)/libgrpc++_test_util.a libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc++.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr_test_util.a libs/$(CONFIG)/libgpr.a
 objs/$(CONFIG)/test/cpp/qps/client.o:  libs/$(CONFIG)/libgrpc++_test_util.a libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc++.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr_test_util.a libs/$(CONFIG)/libgpr.a
 
 deps_qps_client: $(QPS_CLIENT_DEPS)
@@ -5626,9 +5631,7 @@ clean_qps_client:
 
 
 QPS_SERVER_SRC = \
-    gens/test/cpp/interop/empty.pb.cc \
-    gens/test/cpp/interop/messages.pb.cc \
-    gens/test/cpp/interop/test.pb.cc \
+    gens/test/cpp/qps/qpstest.pb.cc \
     test/cpp/qps/server.cc \
 
 QPS_SERVER_OBJS = $(addprefix objs/$(CONFIG)/, $(addsuffix .o, $(basename $(QPS_SERVER_SRC))))
@@ -5647,9 +5650,7 @@ bins/$(CONFIG)/qps_server: $(QPS_SERVER_OBJS) libs/$(CONFIG)/libgrpc++_test_util
 
 endif
 
-objs/$(CONFIG)/test/cpp/interop/empty.o:  libs/$(CONFIG)/libgrpc++_test_util.a libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc++.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr_test_util.a libs/$(CONFIG)/libgpr.a
-objs/$(CONFIG)/test/cpp/interop/messages.o:  libs/$(CONFIG)/libgrpc++_test_util.a libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc++.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr_test_util.a libs/$(CONFIG)/libgpr.a
-objs/$(CONFIG)/test/cpp/interop/test.o:  libs/$(CONFIG)/libgrpc++_test_util.a libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc++.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr_test_util.a libs/$(CONFIG)/libgpr.a
+objs/$(CONFIG)/test/cpp/qps/qpstest.o:  libs/$(CONFIG)/libgrpc++_test_util.a libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc++.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr_test_util.a libs/$(CONFIG)/libgpr.a
 objs/$(CONFIG)/test/cpp/qps/server.o:  libs/$(CONFIG)/libgrpc++_test_util.a libs/$(CONFIG)/libgrpc_test_util.a libs/$(CONFIG)/libgrpc++.a libs/$(CONFIG)/libgrpc.a libs/$(CONFIG)/libgpr_test_util.a libs/$(CONFIG)/libgpr.a
 
 deps_qps_server: $(QPS_SERVER_DEPS)
diff --git a/build.json b/build.json
index f0e80721231..1e11b2aa630 100644
--- a/build.json
+++ b/build.json
@@ -1354,9 +1354,7 @@
       "build": "test",
       "c++": true,
       "src": [
-        "test/cpp/interop/empty.proto",
-        "test/cpp/interop/messages.proto",
-        "test/cpp/interop/test.proto",
+        "test/cpp/qps/qpstest.proto",
         "test/cpp/qps/client.cc"
       ],
       "deps": [
@@ -1373,9 +1371,7 @@
       "build": "test",
       "c++": true,
       "src": [
-        "test/cpp/interop/empty.proto",
-        "test/cpp/interop/messages.proto",
-        "test/cpp/interop/test.proto",
+        "test/cpp/qps/qpstest.proto",
         "test/cpp/qps/server.cc"
       ],
       "deps": [
diff --git a/test/cpp/qps/qpstest.proto b/test/cpp/qps/qpstest.proto
index cd7a5174ed8..8acbe19b19a 100644
--- a/test/cpp/qps/qpstest.proto
+++ b/test/cpp/qps/qpstest.proto
@@ -4,10 +4,6 @@ syntax = "proto2";
 
 package grpc.testing;
 
-option java_api_version = 2;
-option cc_api_version = 2;
-option java_package = "com.google.net.stubby.testing.integration";
-
 enum PayloadType {
   // Compressable text format.
   COMPRESSABLE= 1;