Ensure interop tests are run as part of run_tests

I'm honestly a little shocked this wasn't done previously.

1 files changed, 62 insertions, 48 deletions

diff --git a/build.json b/build.json
index 8fdca5a255..5bd16c54a6 100644
--- a/build.json
+++ b/build.json
@@ -342,19 +342,6 @@
       "vs_project_guid": "{29D16885-7228-4C31-81ED-5F9187C7F2A9}"
     },
     {
-      "name": "grpc_csharp_ext",
-      "build": "all",
-      "language": "csharp",
-      "src": [
-        "src/csharp/ext/grpc_csharp_ext.c"
-      ],
-      "deps": [
-        "gpr",
-        "grpc"
-      ],
-      "vs_project_guid": "{D64C6D63-4458-4A88-AB38-35678384A7E4}"
-    },
-    {
       "name": "grpc_test_util",
       "build": "private",
       "language": "c",
@@ -479,6 +466,19 @@
         "grpc",
         "gpr"
       ]
+    },
+    {
+      "name": "grpc_csharp_ext",
+      "build": "all",
+      "language": "csharp",
+      "src": [
+        "src/csharp/ext/grpc_csharp_ext.c"
+      ],
+      "deps": [
+        "gpr",
+        "grpc"
+      ],
+      "vs_project_guid": "{D64C6D63-4458-4A88-AB38-35678384A7E4}"
     }
   ],
   "targets": [
@@ -1256,6 +1256,20 @@
       ]
     },
     {
+      "name": "interop_test",
+      "build": "test",
+      "language": "c",
+      "src": [
+        "test/cpp/interop/interop_test.c"
+      ],
+      "deps": [
+        "grpc_test_util",
+        "grpc",
+        "gpr_test_util",
+        "gpr"
+      ]
+    },
+    {
       "name": "json_rewrite",
       "build": "test",
       "run": false,
@@ -1577,6 +1591,35 @@
       ]
     },
     {
+      "name": "credentials_test",
+      "build": "test",
+      "language": "c++",
+      "src": [
+        "test/cpp/client/credentials_test.cc"
+      ],
+      "deps": [
+        "grpc++",
+        "grpc",
+        "gpr"
+      ]
+    },
+    {
+      "name": "end2end_test",
+      "build": "test",
+      "language": "c++",
+      "src": [
+        "test/cpp/end2end/end2end_test.cc"
+      ],
+      "deps": [
+        "grpc++_test_util",
+        "grpc_test_util",
+        "grpc++",
+        "grpc",
+        "gpr_test_util",
+        "gpr"
+      ]
+    },
+    {
       "name": "grpc_cpp_plugin",
       "build": "protoc",
       "language": "c++",
@@ -1592,17 +1635,6 @@
       "secure": false
     },
     {
-      "name": "grpc_ruby_plugin",
-      "build": "protoc",
-      "language": "c++",
-      "src": [
-        "src/compiler/ruby_generator.cc",
-        "src/compiler/ruby_plugin.cc"
-      ],
-      "deps": [],
-      "secure": false
-    },
-    {
       "name": "grpc_python_plugin",
       "build": "protoc",
       "language": "c++",
@@ -1617,33 +1649,15 @@
       "secure": false
     },
     {
-      "name": "credentials_test",
-      "build": "test",
-      "language": "c++",
-      "src": [
-        "test/cpp/client/credentials_test.cc"
-      ],
-      "deps": [
-        "grpc++",
-        "grpc",
-        "gpr"
-      ]
-    },
-    {
-      "name": "end2end_test",
-      "build": "test",
+      "name": "grpc_ruby_plugin",
+      "build": "protoc",
       "language": "c++",
       "src": [
-        "test/cpp/end2end/end2end_test.cc"
+        "src/compiler/ruby_generator.cc",
+        "src/compiler/ruby_plugin.cc"
       ],
-      "deps": [
-        "grpc++_test_util",
-        "grpc_test_util",
-        "grpc++",
-        "grpc",
-        "gpr_test_util",
-        "gpr"
-      ]
+      "deps": [],
+      "secure": false
     },
     {
       "name": "interop_client",