Revert "Windows builds for gRPC C++ tests"

6 years ago · cf6a311761
parent c28d35dc1c
commit cf6a311761
19 changed files with 29 additions and 81 deletions
--- a/bazel/grpc_build_system.bzl
+++ b/bazel/grpc_build_system.bzl
@ -28,12 +28,6 @@ load("//bazel:cc_grpc_library.bzl", "cc_grpc_library")
 # The set of pollers to test against if a test exercises polling
 POLLERS = ["epollex", "epoll1", "poll"]

-def is_msvc():
-    return select({
-        "//:windows_msvc": True,
-        "//conditions:default": False,
-    })
-
 def if_not_windows(a):
    return select({
        "//:windows": [],
@ -86,8 +80,7 @@ def grpc_cc_library(
        visibility = None,
        alwayslink = 0,
        data = [],
-        use_cfstream = False,
-        tags = []):
+        use_cfstream = False):
    copts = []
    if use_cfstream:
        copts = if_mac(["-DGRPC_CFSTREAM"])
@ -124,7 +117,6 @@ def grpc_cc_library(
        ],
        alwayslink = alwayslink,
        data = data,
-        tags = tags,
    )

 def grpc_proto_plugin(name, srcs = [], deps = []):
@ -167,9 +159,8 @@ 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 and not is_msvc():
+    if uses_polling:
        native.cc_test(testonly = True, tags = ["manual"], **args)
        for poller in POLLERS:
            native.sh_test(
@ -190,7 +181,7 @@ def grpc_cc_test(name, srcs = [], deps = [], external_deps = [], args = [], data
    else:
        native.cc_test(**args)

-def grpc_cc_binary(name, srcs = [], deps = [], external_deps = [], args = [], data = [], language = "C++", testonly = False, linkshared = False, linkopts = [], tags = []):
+def grpc_cc_binary(name, srcs = [], deps = [], external_deps = [], args = [], data = [], language = "C++", testonly = False, linkshared = False, linkopts = []):
    copts = []
    if language.upper() == "C":
        copts = ["-std=c99"]
@ -204,7 +195,6 @@ def grpc_cc_binary(name, srcs = [], deps = [], external_deps = [], args = [], da
        deps = deps + _get_external_deps(external_deps),
        copts = copts,
        linkopts = if_not_windows(["-pthread"]) + linkopts,
-        tags = tags,
    )

 def grpc_generate_one_off_targets():
--- a/bazel/grpc_deps.bzl
+++ b/bazel/grpc_deps.bzl
@ -147,15 +147,16 @@ def grpc_deps():
    if "com_github_gflags_gflags" not in native.existing_rules():
        http_archive(
            name = "com_github_gflags_gflags",
-            strip_prefix = "gflags-28f50e0fed19872e0fd50dd23ce2ee8cd759338e",
-            url = "https://github.com/gflags/gflags/archive/28f50e0fed19872e0fd50dd23ce2ee8cd759338e.tar.gz",
+            strip_prefix = "gflags-30dbc81fb5ffdc98ea9b14b1918bfe4e8779b26e",
+            url = "https://github.com/gflags/gflags/archive/30dbc81fb5ffdc98ea9b14b1918bfe4e8779b26e.tar.gz",
        )

    if "com_github_google_benchmark" not in native.existing_rules():
        http_archive(
            name = "com_github_google_benchmark",
-            strip_prefix = "benchmark-e776aa0275e293707b6a0901e0e8d8a8a3679508",
-            url = "https://github.com/google/benchmark/archive/e776aa0275e293707b6a0901e0e8d8a8a3679508.tar.gz",
+            build_file = "@com_github_grpc_grpc//third_party:benchmark.BUILD",
+            strip_prefix = "benchmark-9913418d323e64a0111ca0da81388260c2bbe1e9",
+            url = "https://github.com/google/benchmark/archive/9913418d323e64a0111ca0da81388260c2bbe1e9.tar.gz",
        )

    if "com_github_cares_cares" not in native.existing_rules():
--- a/test/core/bad_connection/BUILD
+++ b/test/core/bad_connection/BUILD
@ -29,5 +29,4 @@ grpc_cc_binary(
        "//:grpc",
        "//test/core/util:grpc_test_util",
    ],
-    tags = ["no_windows"],
 )
--- a/test/core/client_channel/BUILD
+++ b/test/core/client_channel/BUILD
@ -52,7 +52,6 @@ grpc_cc_test(
        "//:grpc",
        "//test/core/util:grpc_test_util",
    ],
-    tags = ["no_windows"],
 )

 grpc_cc_test(
--- a/test/core/end2end/generate_tests.bzl
+++ b/test/core/end2end/generate_tests.bzl
@ -15,7 +15,7 @@

 """Generates the appropriate build.json data for all the end2end tests."""

-load("//bazel:grpc_build_system.bzl", "grpc_cc_binary", "grpc_cc_library", "is_msvc")
+load("//bazel:grpc_build_system.bzl", "grpc_cc_binary", "grpc_cc_library")

 POLLERS = ["epollex", "epoll1", "poll"]

@ -31,8 +31,7 @@ def _fixture_options(
        is_http2 = True,
        supports_proxy_auth = False,
        supports_write_buffering = True,
-        client_channel = True,
-        supports_msvc = True,):
+        client_channel = True):
    return struct(
        fullstack = fullstack,
        includes_proxy = includes_proxy,
@ -45,7 +44,6 @@ def _fixture_options(
        supports_proxy_auth = supports_proxy_auth,
        supports_write_buffering = supports_write_buffering,
        client_channel = client_channel,
-        supports_msvc = supports_msvc,
        #_platforms=_platforms,
    )

@ -121,11 +119,10 @@ END2END_NOSEC_FIXTURES = {
        client_channel = False,
        secure = False,
        _platforms = ["linux", "mac", "posix"],
-        supports_msvc = False,
    ),
    "h2_full": _fixture_options(secure = False),
-    "h2_full+pipe": _fixture_options(secure = False, _platforms = ["linux"], supports_msvc = False),
-    "h2_full+trace": _fixture_options(secure = False, tracing = True, supports_msvc = False),
+    "h2_full+pipe": _fixture_options(secure = False, _platforms = ["linux"]),
+    "h2_full+trace": _fixture_options(secure = False, tracing = True),
    "h2_full+workarounds": _fixture_options(secure = False),
    "h2_http_proxy": _fixture_options(secure = False, supports_proxy_auth = True),
    "h2_proxy": _fixture_options(secure = False, includes_proxy = True),
@ -154,7 +151,6 @@ END2END_NOSEC_FIXTURES = {
        dns_resolver = False,
        _platforms = ["linux", "mac", "posix"],
        secure = False,
-        supports_msvc = False,
    ),
 }

@ -333,9 +329,6 @@ END2END_TESTS = {
 }

 def _compatible(fopt, topt):
-    if is_msvc:
-        if not fopt.supports_msvc:
-            return False
    if topt.needs_fullstack:
        if not fopt.fullstack:
            return False
--- a/test/core/iomgr/BUILD
+++ b/test/core/iomgr/BUILD
@ -81,7 +81,6 @@ grpc_cc_test(
        "//:grpc",
        "//test/core/util:grpc_test_util",
    ],
-    tags = ["no_windows"],
 )

 grpc_cc_test(
@ -93,7 +92,6 @@ grpc_cc_test(
        "//:grpc",
        "//test/core/util:grpc_test_util",
    ],
-    tags = ["no_windows"],
 )

 grpc_cc_test(
@ -105,7 +103,6 @@ grpc_cc_test(
        "//:grpc",
        "//test/core/util:grpc_test_util",
    ],
-    tags = ["no_windows"],
 )

 grpc_cc_test(
@ -142,7 +139,6 @@ grpc_cc_test(
        "//:grpc",
        "//test/core/util:grpc_test_util",
    ],
-    tags = ["no_windows"],
 )

 grpc_cc_test(
@ -157,7 +153,6 @@ grpc_cc_test(
        "//:grpc",
        "//test/core/util:grpc_test_util",
    ],
-    tags = ["no_windows"],
 )

 grpc_cc_test(
@ -219,7 +214,6 @@ grpc_cc_test(
        "//:grpc",
        "//test/core/util:grpc_test_util",
    ],
-    tags = ["no_windows"],
 )

 grpc_cc_test(
@ -231,7 +225,6 @@ grpc_cc_test(
        "//:grpc",
        "//test/core/util:grpc_test_util",
    ],
-    tags = ["no_windows"],
 )

 grpc_cc_test(
@ -244,7 +237,6 @@ grpc_cc_test(
        "//:grpc",
        "//test/core/util:grpc_test_util",
    ],
-    tags = ["no_windows"],
 )

 grpc_cc_test(
@ -267,7 +259,6 @@ grpc_cc_test(
        "//:grpc",
        "//test/core/util:grpc_test_util",
    ],
-    tags = ["no_windows"],
 )

 grpc_cc_test(
@ -312,5 +303,4 @@ grpc_cc_test(
        "//:grpc",
        "//test/core/util:grpc_test_util",
    ],
-    tags = ["no_windows"],
 )
--- a/test/cpp/common/BUILD
+++ b/test/cpp/common/BUILD
@ -28,7 +28,6 @@ grpc_cc_test(
        "//:grpc++_unsecure",
        "//test/core/util:grpc_test_util_unsecure",
    ],
-    tags = ["no_windows"],
 )

 grpc_cc_test(
--- a/test/cpp/end2end/BUILD
+++ b/test/cpp/end2end/BUILD
@ -99,7 +99,6 @@ grpc_cc_test(
        "//test/core/util:grpc_test_util",
        "//test/cpp/util:test_util",
    ],
-    tags = ["no_windows"],
 )

 grpc_cc_test(
@ -631,7 +630,6 @@ grpc_cc_test(
        "//test/core/util:grpc_test_util",
        "//test/cpp/util:test_util",
    ],
-    tags = ["no_windows"],
 )

 grpc_cc_test(
--- a/test/cpp/interop/BUILD
+++ b/test/cpp/interop/BUILD
@ -161,5 +161,4 @@ grpc_cc_test(
        "//test/cpp/util:test_config",
        "//test/cpp/util:test_util",
    ],
-    tags = ["no_windows"],
 )
--- a/test/cpp/microbenchmarks/BUILD
+++ b/test/cpp/microbenchmarks/BUILD
@ -45,7 +45,6 @@ grpc_cc_library(
        "//test/core/util:grpc_test_util_unsecure",
        "//test/cpp/util:test_config",
    ],
-    tags = ["no_windows"],
 )

 grpc_cc_binary(
@ -53,7 +52,6 @@ grpc_cc_binary(
    testonly = 1,
    srcs = ["bm_closure.cc"],
    deps = [":helpers"],
-    tags = ["no_windows"],
 )

 grpc_cc_binary(
@ -61,7 +59,6 @@ grpc_cc_binary(
    testonly = 1,
    srcs = ["bm_alarm.cc"],
    deps = [":helpers"],
-    tags = ["no_windows"],
 )

 grpc_cc_binary(
@ -69,7 +66,6 @@ grpc_cc_binary(
    testonly = 1,
    srcs = ["bm_arena.cc"],
    deps = [":helpers"],
-    tags = ["no_windows"],
 )

 grpc_cc_binary(
@ -77,7 +73,6 @@ grpc_cc_binary(
    testonly = 1,
    srcs = ["bm_byte_buffer.cc"],
    deps = [":helpers"],
-    tags = ["no_windows"],
 )

 grpc_cc_binary(
@ -85,7 +80,6 @@ grpc_cc_binary(
    testonly = 1,
    srcs = ["bm_channel.cc"],
    deps = [":helpers"],
-    tags = ["no_windows"],
 )

 grpc_cc_binary(
@ -93,7 +87,6 @@ grpc_cc_binary(
    testonly = 1,
    srcs = ["bm_call_create.cc"],
    deps = [":helpers"],
-    tags = ["no_windows"],
 )

 grpc_cc_binary(
@ -101,7 +94,6 @@ grpc_cc_binary(
    testonly = 1,
    srcs = ["bm_cq.cc"],
    deps = [":helpers"],
-    tags = ["no_windows"],
 )

 grpc_cc_binary(
@ -109,7 +101,6 @@ grpc_cc_binary(
    testonly = 1,
    srcs = ["bm_cq_multiple_threads.cc"],
    deps = [":helpers"],
-    tags = ["no_windows"],
 )

 grpc_cc_binary(
@ -117,7 +108,6 @@ grpc_cc_binary(
    testonly = 1,
    srcs = ["bm_error.cc"],
    deps = [":helpers"],
-    tags = ["no_windows"],
 )

 grpc_cc_library(
@ -127,7 +117,6 @@ grpc_cc_library(
        "fullstack_streaming_ping_pong.h",
    ],
    deps = [":helpers"],
-    tags = ["no_windows"],
 )

 grpc_cc_binary(
@ -137,7 +126,6 @@ grpc_cc_binary(
        "bm_fullstack_streaming_ping_pong.cc",
    ],
    deps = [":fullstack_streaming_ping_pong_h"],
-    tags = ["no_windows"],
 )

 grpc_cc_library(
@ -156,7 +144,6 @@ grpc_cc_binary(
        "bm_fullstack_streaming_pump.cc",
    ],
    deps = [":fullstack_streaming_pump_h"],
-    tags = ["no_windows"],
 )

 grpc_cc_binary(
@ -164,7 +151,6 @@ grpc_cc_binary(
    testonly = 1,
    srcs = ["bm_fullstack_trickle.cc"],
    deps = [":helpers"],
-    tags = ["no_windows"],
 )

 grpc_cc_library(
@ -183,7 +169,6 @@ grpc_cc_binary(
        "bm_fullstack_unary_ping_pong.cc",
    ],
    deps = [":fullstack_unary_ping_pong_h"],
-    tags = ["no_windows"],
 )

 grpc_cc_binary(
@ -191,7 +176,6 @@ grpc_cc_binary(
    testonly = 1,
    srcs = ["bm_metadata.cc"],
    deps = [":helpers"],
-    tags = ["no_windows"],
 )

 grpc_cc_binary(
@ -199,7 +183,6 @@ grpc_cc_binary(
    testonly = 1,
    srcs = ["bm_chttp2_hpack.cc"],
    deps = [":helpers"],
-    tags = ["no_windows"],
 )

 grpc_cc_binary(
@ -219,5 +202,4 @@ grpc_cc_binary(
    testonly = 1,
    srcs = ["bm_timer.cc"],
    deps = [":helpers"],
-    tags = ["no_windows"],
 )
--- a/test/cpp/naming/generate_resolver_component_tests.bzl
+++ b/test/cpp/naming/generate_resolver_component_tests.bzl
@ -33,7 +33,6 @@ def generate_resolver_component_tests():
            "//:gpr",
            "//test/cpp/util:test_config",
        ],
-        tags = ["no_windows"],
    )
    # meant to be invoked only through the top-level shell script driver
    grpc_cc_binary(
@ -53,7 +52,6 @@ def generate_resolver_component_tests():
            "//:gpr",
            "//test/cpp/util:test_config",
        ],
-        tags = ["no_windows"],
    )
    grpc_cc_test(
        name = "resolver_component_tests_runner_invoker%s" % unsecure_build_config_suffix,
@ -79,6 +77,5 @@ def generate_resolver_component_tests():
        args = [
            "--test_bin_name=resolver_component_test%s" % unsecure_build_config_suffix,
            "--running_under_bazel=true",
-        ],
-        tags = ["no_windows"],
+        ]
    )
--- a/test/cpp/performance/BUILD
+++ b/test/cpp/performance/BUILD
@ -31,5 +31,4 @@ grpc_cc_test(
        "//src/proto/grpc/testing:echo_proto",
        "//test/core/util:grpc_test_util_base",
    ],
-    tags = ["no_windows"],
 )
--- a/test/cpp/qps/qps_benchmark_script.bzl
+++ b/test/cpp/qps/qps_benchmark_script.bzl
@ -75,6 +75,5 @@ def json_run_localhost_batch():
            ],
            tags = [
                "json_run_localhost",
-                "no_windows",
            ],
        )
--- a/test/cpp/server/BUILD
+++ b/test/cpp/server/BUILD
@ -29,7 +29,6 @@ grpc_cc_test(
        "//src/proto/grpc/testing:echo_proto",
        "//test/core/util:grpc_test_util_unsecure",
    ],
-    tags = ["no_windows"],
 )

 grpc_cc_test(
@ -43,7 +42,6 @@ grpc_cc_test(
        "//src/proto/grpc/testing:echo_proto",
        "//test/core/util:grpc_test_util_unsecure",
    ],
-    tags = ["no_windows"],
 )

 grpc_cc_test(
@ -57,5 +55,4 @@ grpc_cc_test(
        "//src/proto/grpc/testing:echo_proto",
        "//test/core/util:grpc_test_util_unsecure",
    ],
-    tags = ["no_windows"],
 )
--- a/test/cpp/server/load_reporter/BUILD
+++ b/test/cpp/server/load_reporter/BUILD
@ -45,7 +45,6 @@ grpc_cc_test(
        "//:lb_server_load_reporting_filter",
        "//test/core/util:grpc_test_util",
    ],
-    tags = ["no_windows"],
 )

 grpc_cc_test(
--- a/third_party/BUILD
+++ b/third_party/BUILD
@ -1,4 +1,5 @@
 exports_files([
+    "benchmark.BUILD",
    "gtest.BUILD",
    "objective_c/Cronet/bidirectional_stream_c.h",
    "zlib.BUILD",
--- a/third_party/benchmark.BUILD
+++ b/third_party/benchmark.BUILD
@ -0,0 +1,15 @@
+cc_library(
+    name = "benchmark",
+    srcs = glob(["src/*.cc"]),
+    hdrs = glob(["include/**/*.h", "src/*.h"]),
+    includes = [
+        "include", "."
+    ],
+    copts = [
+        "-DHAVE_POSIX_REGEX"
+    ],
+    linkstatic = 1,
+    visibility = [
+        "//visibility:public",
+    ],
+)
--- a/tools/remote_build/README.md
+++ b/tools/remote_build/README.md
@ -29,11 +29,5 @@ Sanitizer runs (asan, msan, tsan, ubsan):
 bazel --bazelrc=tools/remote_build/manual.bazelrc test --config=asan //test/...
 ```

-Run on Windows MSVC:
-```
-# local manual run only for C++ targets (RBE to be supported)
-bazel --bazelrc=tools/remote_build/windows.bazelrc test //test/cpp/...
-```
-
 Available command line options can be found in
 [Bazel command line reference](https://docs.bazel.build/versions/master/command-line-reference.html)
--- a/tools/remote_build/windows.bazelrc
+++ b/tools/remote_build/windows.bazelrc
@ -1,3 +0,0 @@
-# TODO(yfen): Merge with rbe_common.bazelrc and enable Windows RBE
-build --test_tag_filters=-no_windows
-build --build_tag_filters=-no_windows