diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2018-11-30 23:26:26 +0100 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2018-11-30 23:27:24 +0100 |
| commit | dc4b538c4d86d39d7fcdffa57bf50e5897ed2542 (patch) | |
| tree | 5d3fdcad7c6590dd786379fd6ae615fdc0f20e7b /bazel/grpc_build_system.bzl | |
| parent | f0fbee59326402e6c1f0a7c6a1f8899fd2b0025a (diff) | |
| parent | a9e3e4c9409646e8b4025f70f9fd3b6006f81a01 (diff) | |
Merge branch 'master' of https://github.com/grpc/grpc into fix-bazel-0.20
Diffstat (limited to 'bazel/grpc_build_system.bzl')
| -rw-r--r-- | bazel/grpc_build_system.bzl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/bazel/grpc_build_system.bzl b/bazel/grpc_build_system.bzl index 159ebd5d1f..65fe5a10aa 100644 --- a/bazel/grpc_build_system.bzl +++ b/bazel/grpc_build_system.bzl @@ -131,7 +131,7 @@ def grpc_proto_library( generate_mocks = generate_mocks, ) -def grpc_cc_test(name, srcs = [], deps = [], external_deps = [], args = [], data = [], uses_polling = True, language = "C++", size = "medium", timeout = "moderate", tags = []): +def grpc_cc_test(name, srcs = [], deps = [], external_deps = [], args = [], data = [], uses_polling = True, language = "C++", size = "medium", timeout = "moderate", tags = [], exec_compatible_with = []): copts = [] if language.upper() == "C": copts = if_not_windows(["-std=c99"]) @@ -145,6 +145,7 @@ def grpc_cc_test(name, srcs = [], deps = [], external_deps = [], args = [], data "linkopts": if_not_windows(["-pthread"]), "size": size, "timeout": timeout, + "exec_compatible_with": exec_compatible_with, } if uses_polling: native.cc_test(testonly = True, tags = ["manual"], **args) @@ -162,6 +163,7 @@ def grpc_cc_test(name, srcs = [], deps = [], external_deps = [], args = [], data "$(location %s)" % name, ] + args["args"], tags = tags, + exec_compatible_with = exec_compatible_with, ) else: native.cc_test(**args) |