diff options
author | Bill Feng <yfen@google.com> | 2019-03-22 11:27:24 -0700 |
---|---|---|
committer | Bill Feng <yfen@google.com> | 2019-03-22 11:27:24 -0700 |
commit | d7e5cb70febcdc3f0ec267e2d5b01dc3e152c1d6 (patch) | |
tree | e2d799dd4221b19303ab45ae05003eb4e0a825a4 /bazel | |
parent | 1a09899d3e5c8f7e489a25d92ff0e5f6ae00ec81 (diff) | |
download | grpc-grpc-d7e5cb70febcdc3f0ec267e2d5b01dc3e152c1d6.tar.gz |
flipped logic for is_msvc()
Diffstat (limited to 'bazel')
-rw-r--r-- | bazel/grpc_build_system.bzl | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/bazel/grpc_build_system.bzl b/bazel/grpc_build_system.bzl index a2f3c200fa..ca87428f37 100644 --- a/bazel/grpc_build_system.bzl +++ b/bazel/grpc_build_system.bzl @@ -167,22 +167,12 @@ def grpc_cc_test(name, srcs = [], deps = [], external_deps = [], args = [], data "size": size, "timeout": timeout, "exec_compatible_with": exec_compatible_with, - "tags": tags, } if uses_polling: native.cc_test( testonly = True, - tags = (["manual"] if not is_msvc() else tags), - name = name, - srcs = srcs, - args = args["args"], - data = data, - deps = deps + _get_external_deps(external_deps), - copts = copts, - linkopts = if_not_windows(["-pthread"]), - size = size, - timeout = timeout, - exec_compatible_with = exec_compatible_with, + tags = (["manual"] if is_msvc() else tags), + **args ) for poller in POLLERS: native.sh_test( @@ -197,11 +187,11 @@ def grpc_cc_test(name, srcs = [], deps = [], external_deps = [], args = [], data poller, "$(location %s)" % name, ] + args["args"], - tags = tags if is_msvc() else tags + ["no_windows"], + tags = (tags + ["no_windows"]) if is_msvc() else tags, exec_compatible_with = exec_compatible_with, ) else: - native.cc_test(**args) + native.cc_test(tags = tags, **args) def grpc_cc_binary(name, srcs = [], deps = [], external_deps = [], args = [], data = [], language = "C++", testonly = False, linkshared = False, linkopts = [], tags = []): copts = [] |