Make Grpc.mak more useful for run_tests.py

1 files changed, 10 insertions, 14 deletions

diff --git a/templates/vsprojects/vs2013/Grpc.mak.template b/templates/vsprojects/vs2013/Grpc.mak.template
index 8e1b33bba7..fd2b048247 100644
--- a/templates/vsprojects/vs2013/Grpc.mak.template
+++ b/templates/vsprojects/vs2013/Grpc.mak.template
@@ -33,7 +33,8 @@
 <%
   allowed_dependencies = set(['gpr', 'grpc', 'gpr_test_util', 'grpc_test_util'])
   buildable_targets = [ target for target in targets if set(target.deps).issubset(allowed_dependencies) and all([src.endswith('.c') for src in target.src])]
-  test_targets = [ target for target in buildable_targets if target.name.endswith('_test') ]
+  c_test_targets = [ target for target in buildable_targets if target.build == 'test' and not target.language == 'c++' ]
+  cxx_test_targets = [ target for target in buildable_targets if target.build == 'test' and target.language == 'c++' ]
 %>\
 # NMake file to build secondary gRPC targets on Windows.
 # Use grpc.sln to solution to build the gRPC libraries.
@@ -62,26 +63,21 @@ grpc_test_util:
 $(OUT_DIR):
 	mkdir $(OUT_DIR)
 
-buildtests: \
-% for target in test_targets:
+buildtests: buildtests_c buildtests_cxx
+
+buildtests_c: \
+% for target in c_test_targets:
 ${target.name}.exe \
 % endfor
 
 	echo All tests built.
 
-test: \
-% for target in test_targets:
-${target.name} \
-% endfor
-
-	echo All tests ran.
-
-test_gpr: \
-% for target in [ tgt for tgt in test_targets if tgt.name.startswith('gpr_')]:
-${target.name} \
+buildtests_cxx: \
+% for target in cxx_test_targets:
+${target.name}.exe \
 % endfor
 
-	echo All tests ran.
+	echo All tests built.
 
 % for target in buildable_targets:
 ${target.name}.exe: grpc_test_util