1 files changed, 47 insertions, 28 deletions
diff --git a/tools/run_tests/generated/sources_and_headers.json b/tools/run_tests/generated/sources_and_headers.json
index edeb5a7002..f61288b70d 100644
--- a/tools/run_tests/generated/sources_and_headers.json
+++ b/tools/run_tests/generated/sources_and_headers.json
@@ -687,7 +687,7 @@
     "language": "c", 
     "name": "gpr_manual_constructor_test", 
     "src": [
-      "test/core/gpr++/manual_constructor_test.cc"
+      "test/core/gprpp/manual_constructor_test.cc"
     ], 
     "third_party": false, 
     "type": "target"
@@ -3542,7 +3542,7 @@
     "language": "c++", 
     "name": "inlined_vector_test", 
     "src": [
-      "test/core/gpr++/inlined_vector_test.cc"
+      "test/core/gprpp/inlined_vector_test.cc"
     ], 
     "third_party": false, 
     "type": "target"
@@ -3662,7 +3662,7 @@
     "language": "c++", 
     "name": "memory_test", 
     "src": [
-      "test/core/gpr++/memory_test.cc"
+      "test/core/gprpp/memory_test.cc"
     ], 
     "third_party": false, 
     "type": "target"
@@ -3740,7 +3740,7 @@
     "language": "c++", 
     "name": "orphanable_test", 
     "src": [
-      "test/core/gpr++/orphanable_test.cc"
+      "test/core/gprpp/orphanable_test.cc"
     ], 
     "third_party": false, 
     "type": "target"
@@ -3951,7 +3951,7 @@
     "language": "c++", 
     "name": "ref_counted_ptr_test", 
     "src": [
-      "test/core/gpr++/ref_counted_ptr_test.cc"
+      "test/core/gprpp/ref_counted_ptr_test.cc"
     ], 
     "third_party": false, 
     "type": "target"
@@ -3970,7 +3970,7 @@
     "language": "c++", 
     "name": "ref_counted_test", 
     "src": [
-      "test/core/gpr++/ref_counted_test.cc"
+      "test/core/gprpp/ref_counted_test.cc"
     ], 
     "third_party": false, 
     "type": "target"
@@ -4122,6 +4122,25 @@
     "deps": [
       "gpr", 
       "gpr_test_util", 
+      "grpc", 
+      "grpc++", 
+      "grpc++_test_util", 
+      "grpc_test_util"
+    ], 
+    "headers": [], 
+    "is_filegroup": false, 
+    "language": "c++", 
+    "name": "server_early_return_test", 
+    "src": [
+      "test/cpp/end2end/server_early_return_test.cc"
+    ], 
+    "third_party": false, 
+    "type": "target"
+  }, 
+  {
+    "deps": [
+      "gpr", 
+      "gpr_test_util", 
       "grpc++_test_util_unsecure", 
       "grpc++_unsecure", 
       "grpc_test_util_unsecure", 
@@ -7906,12 +7925,6 @@
       "include/grpc/support/tls_msvc.h", 
       "include/grpc/support/tls_pthread.h", 
       "include/grpc/support/useful.h", 
-      "src/core/lib/gpr++/abstract.h", 
-      "src/core/lib/gpr++/atomic.h", 
-      "src/core/lib/gpr++/atomic_with_atm.h", 
-      "src/core/lib/gpr++/atomic_with_std.h", 
-      "src/core/lib/gpr++/manual_constructor.h", 
-      "src/core/lib/gpr++/memory.h", 
       "src/core/lib/gpr/arena.h", 
       "src/core/lib/gpr/env.h", 
       "src/core/lib/gpr/fork.h", 
@@ -7923,6 +7936,12 @@
       "src/core/lib/gpr/thd_internal.h", 
       "src/core/lib/gpr/time_precise.h", 
       "src/core/lib/gpr/tmpfile.h", 
+      "src/core/lib/gprpp/abstract.h", 
+      "src/core/lib/gprpp/atomic.h", 
+      "src/core/lib/gprpp/atomic_with_atm.h", 
+      "src/core/lib/gprpp/atomic_with_std.h", 
+      "src/core/lib/gprpp/manual_constructor.h", 
+      "src/core/lib/gprpp/memory.h", 
       "src/core/lib/profiling/timers.h"
     ], 
     "is_filegroup": true, 
@@ -7955,12 +7974,6 @@
       "include/grpc/support/tls_msvc.h", 
       "include/grpc/support/tls_pthread.h", 
       "include/grpc/support/useful.h", 
-      "src/core/lib/gpr++/abstract.h", 
-      "src/core/lib/gpr++/atomic.h", 
-      "src/core/lib/gpr++/atomic_with_atm.h", 
-      "src/core/lib/gpr++/atomic_with_std.h", 
-      "src/core/lib/gpr++/manual_constructor.h", 
-      "src/core/lib/gpr++/memory.h", 
       "src/core/lib/gpr/arena.h", 
       "src/core/lib/gpr/env.h", 
       "src/core/lib/gpr/fork.h", 
@@ -7972,6 +7985,12 @@
       "src/core/lib/gpr/thd_internal.h", 
       "src/core/lib/gpr/time_precise.h", 
       "src/core/lib/gpr/tmpfile.h", 
+      "src/core/lib/gprpp/abstract.h", 
+      "src/core/lib/gprpp/atomic.h", 
+      "src/core/lib/gprpp/atomic_with_atm.h", 
+      "src/core/lib/gprpp/atomic_with_std.h", 
+      "src/core/lib/gprpp/manual_constructor.h", 
+      "src/core/lib/gprpp/memory.h", 
       "src/core/lib/profiling/timers.h"
     ], 
     "third_party": false, 
@@ -8233,11 +8252,11 @@
       "src/core/lib/compression/stream_compression_identity.h", 
       "src/core/lib/debug/stats.h", 
       "src/core/lib/debug/stats_data.h", 
-      "src/core/lib/gpr++/debug_location.h", 
-      "src/core/lib/gpr++/inlined_vector.h", 
-      "src/core/lib/gpr++/orphanable.h", 
-      "src/core/lib/gpr++/ref_counted.h", 
-      "src/core/lib/gpr++/ref_counted_ptr.h", 
+      "src/core/lib/gprpp/debug_location.h", 
+      "src/core/lib/gprpp/inlined_vector.h", 
+      "src/core/lib/gprpp/orphanable.h", 
+      "src/core/lib/gprpp/ref_counted.h", 
+      "src/core/lib/gprpp/ref_counted_ptr.h", 
       "src/core/lib/http/format_request.h", 
       "src/core/lib/http/httpcli.h", 
       "src/core/lib/http/parser.h", 
@@ -8376,11 +8395,11 @@
       "src/core/lib/compression/stream_compression_identity.h", 
       "src/core/lib/debug/stats.h", 
       "src/core/lib/debug/stats_data.h", 
-      "src/core/lib/gpr++/debug_location.h", 
-      "src/core/lib/gpr++/inlined_vector.h", 
-      "src/core/lib/gpr++/orphanable.h", 
-      "src/core/lib/gpr++/ref_counted.h", 
-      "src/core/lib/gpr++/ref_counted_ptr.h", 
+      "src/core/lib/gprpp/debug_location.h", 
+      "src/core/lib/gprpp/inlined_vector.h", 
+      "src/core/lib/gprpp/orphanable.h", 
+      "src/core/lib/gprpp/ref_counted.h", 
+      "src/core/lib/gprpp/ref_counted_ptr.h", 
       "src/core/lib/http/format_request.h", 
       "src/core/lib/http/httpcli.h", 
       "src/core/lib/http/parser.h",