From eed7fd4c1c952d69daa9969c4c5662bb0785631e Mon Sep 17 00:00:00 2001
From: Sree Kuchibhotla <sreek@google.com>
Date: Mon, 26 Oct 2015 15:15:37 -0700
Subject: [PATCH] File changes after re-running generate_projects.sh after my
 previous commit: 117c8af8d327455e6

---
 Makefile                   |  2 --
 tools/run_tests/tests.json | 18 ------------------
 2 files changed, 20 deletions(-)

diff --git a/Makefile b/Makefile
index c4183914e63..38d0adb796a 100644
--- a/Makefile
+++ b/Makefile
@@ -3560,8 +3560,6 @@ test_cxx: test_zookeeper buildtests_cxx
 	$(Q) $(BINDIR)/$(CONFIG)/status_test || ( echo test status_test failed ; exit 1 )
 	$(E) "[RUN]     Testing streaming_throughput_test"
 	$(Q) $(BINDIR)/$(CONFIG)/streaming_throughput_test || ( echo test streaming_throughput_test failed ; exit 1 )
-	$(E) "[RUN]     Testing stress_test"
-	$(Q) $(BINDIR)/$(CONFIG)/stress_test || ( echo test stress_test failed ; exit 1 )
 	$(E) "[RUN]     Testing sync_streaming_ping_pong_test"
 	$(Q) $(BINDIR)/$(CONFIG)/sync_streaming_ping_pong_test || ( echo test sync_streaming_ping_pong_test failed ; exit 1 )
 	$(E) "[RUN]     Testing sync_unary_ping_pong_test"
diff --git a/tools/run_tests/tests.json b/tools/run_tests/tests.json
index b03e952c893..2f91844f441 100644
--- a/tools/run_tests/tests.json
+++ b/tools/run_tests/tests.json
@@ -1617,24 +1617,6 @@
       "posix"
     ]
   }, 
-  {
-    "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
-    ], 
-    "exclude_configs": [], 
-    "flaky": false, 
-    "language": "c++", 
-    "name": "stress_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix", 
-      "windows"
-    ]
-  }, 
   {
     "ci_platforms": [
       "linux",