From de91fc1d67582dcfef82489d7dc9ab7548539d3c Mon Sep 17 00:00:00 2001
From: Craig Tiller <craig.tiller@gmail.com>
Date: Mon, 18 May 2015 14:42:15 -0700
Subject: [PATCH] Run qps smoke tests on Travis

---
 Makefile                   |  8 ++++++++
 build.json                 |  4 ----
 tools/run_tests/tests.json | 36 ++++++++++++++++++++++++++++++++++++
 3 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 4591071413..ef3cb353be 100644
--- a/Makefile
+++ b/Makefile
@@ -1845,6 +1845,10 @@ test_c: buildtests_c
 test_cxx: buildtests_cxx
 	$(E) "[RUN]     Testing async_end2end_test"
 	$(Q) $(BINDIR)/$(CONFIG)/async_end2end_test || ( echo test async_end2end_test failed ; exit 1 )
+	$(E) "[RUN]     Testing async_streaming_ping_pong_test"
+	$(Q) $(BINDIR)/$(CONFIG)/async_streaming_ping_pong_test || ( echo test async_streaming_ping_pong_test failed ; exit 1 )
+	$(E) "[RUN]     Testing async_unary_ping_pong_test"
+	$(Q) $(BINDIR)/$(CONFIG)/async_unary_ping_pong_test || ( echo test async_unary_ping_pong_test failed ; exit 1 )
 	$(E) "[RUN]     Testing channel_arguments_test"
 	$(Q) $(BINDIR)/$(CONFIG)/channel_arguments_test || ( echo test channel_arguments_test failed ; exit 1 )
 	$(E) "[RUN]     Testing cli_call_test"
@@ -1863,6 +1867,10 @@ test_cxx: buildtests_cxx
 	$(Q) $(BINDIR)/$(CONFIG)/mock_test || ( echo test mock_test failed ; exit 1 )
 	$(E) "[RUN]     Testing status_test"
 	$(Q) $(BINDIR)/$(CONFIG)/status_test || ( echo test status_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"
+	$(Q) $(BINDIR)/$(CONFIG)/sync_unary_ping_pong_test || ( echo test sync_unary_ping_pong_test failed ; exit 1 )
 	$(E) "[RUN]     Testing thread_pool_test"
 	$(Q) $(BINDIR)/$(CONFIG)/thread_pool_test || ( echo test thread_pool_test failed ; exit 1 )
 	$(E) "[RUN]     Testing thread_stress_test"
diff --git a/build.json b/build.json
index 18c0eb1211..8a7e65b99a 100644
--- a/build.json
+++ b/build.json
@@ -1813,7 +1813,6 @@
     {
       "name": "async_streaming_ping_pong_test",
       "build": "test",
-      "run": false,
       "language": "c++",
       "src": [
         "test/cpp/qps/async_streaming_ping_pong_test.cc"
@@ -1831,7 +1830,6 @@
     {
       "name": "async_unary_ping_pong_test",
       "build": "test",
-      "run": false,
       "language": "c++",
       "src": [
         "test/cpp/qps/async_unary_ping_pong_test.cc"
@@ -2207,7 +2205,6 @@
     {
       "name": "sync_streaming_ping_pong_test",
       "build": "test",
-      "run": false,
       "language": "c++",
       "src": [
         "test/cpp/qps/sync_streaming_ping_pong_test.cc"
@@ -2225,7 +2222,6 @@
     {
       "name": "sync_unary_ping_pong_test",
       "build": "test",
-      "run": false,
       "language": "c++",
       "src": [
         "test/cpp/qps/sync_unary_ping_pong_test.cc"
diff --git a/tools/run_tests/tests.json b/tools/run_tests/tests.json
index d161041c1f..398672f309 100644
--- a/tools/run_tests/tests.json
+++ b/tools/run_tests/tests.json
@@ -596,6 +596,24 @@
       "posix"
     ]
   }, 
+  {
+    "flaky": false, 
+    "language": "c++", 
+    "name": "async_streaming_ping_pong_test", 
+    "platforms": [
+      "windows", 
+      "posix"
+    ]
+  }, 
+  {
+    "flaky": false, 
+    "language": "c++", 
+    "name": "async_unary_ping_pong_test", 
+    "platforms": [
+      "windows", 
+      "posix"
+    ]
+  }, 
   {
     "flaky": false, 
     "language": "c++", 
@@ -677,6 +695,24 @@
       "posix"
     ]
   }, 
+  {
+    "flaky": false, 
+    "language": "c++", 
+    "name": "sync_streaming_ping_pong_test", 
+    "platforms": [
+      "windows", 
+      "posix"
+    ]
+  }, 
+  {
+    "flaky": false, 
+    "language": "c++", 
+    "name": "sync_unary_ping_pong_test", 
+    "platforms": [
+      "windows", 
+      "posix"
+    ]
+  }, 
   {
     "flaky": false, 
     "language": "c++", 
-- 
GitLab