aboutsummaryrefslogtreecommitdiffhomepage
path: root/templates
diff options
context:
space:
mode:
authorGravatar Craig Tiller <ctiller@google.com>2015-04-30 14:13:29 -0700
committerGravatar Craig Tiller <ctiller@google.com>2015-04-30 14:13:29 -0700
commit26dfbb2d15d8bb01506748260b531ad21f1e5642 (patch)
tree3897e1187a36e246094ddfe93243f7b71af05e2f /templates
parentc1469c4e7959b3a6d648f54d7d96603bd522d0d5 (diff)
parent74bbc41175d73033f68ce86d5a3ed84fe503820f (diff)
Merge branch 'fix-windows-tests' into delete-the-old-api
Diffstat (limited to 'templates')
-rw-r--r--templates/vsprojects/Grpc.mak.template4
1 files changed, 2 insertions, 2 deletions
diff --git a/templates/vsprojects/Grpc.mak.template b/templates/vsprojects/Grpc.mak.template
index 95a28d0f98..2c39ec8ca3 100644
--- a/templates/vsprojects/Grpc.mak.template
+++ b/templates/vsprojects/Grpc.mak.template
@@ -32,9 +32,9 @@
<%namespace file="packages.include" import="get_openssl,get_zlib"/>\
<%def name="to_windows_path(path)">${path.replace('/','\\')}</%def>\
<%
- allowed_dependencies = set(['gpr', 'grpc', 'gpr_test_util', 'grpc_test_util'])
+ disallowed_dependencies = set(['end2end_certs'])
buildable_targets = [ target for target in targets
- if set(target.deps).issubset(allowed_dependencies) and
+ if not disallowed_dependencies.intersection(target.deps) and
all([src.endswith('.c') for src in target.src]) and
'windows' in target.platforms ]
c_test_targets = [ target for target in buildable_targets if target.build == 'test' and not target.language == 'c++' ]