Merge pull request #5470 from meteorcloudy/win_test

Exclude command_line_interface_unittest.cc in MSVC build
6 years ago · 6dc1d4353f
parent 6adc3d74fb 073487b302
commit 6dc1d4353f
1 changed files with 7 additions and 2 deletions
--- a/9
+++ b/9
@ -514,7 +514,6 @@ cc_test(
        "src/google/protobuf/arena_unittest.cc",
        "src/google/protobuf/arenastring_unittest.cc",
        "src/google/protobuf/compiler/annotation_test_util.cc",
-        "src/google/protobuf/compiler/command_line_interface_unittest.cc",
        "src/google/protobuf/compiler/cpp/cpp_bootstrap_unittest.cc",
        "src/google/protobuf/compiler/cpp/cpp_move_unittest.cc",
        "src/google/protobuf/compiler/cpp/cpp_plugin_unittest.cc",
@ -583,7 +582,13 @@ cc_test(
        "src/google/protobuf/util/type_resolver_util_test.cc",
        "src/google/protobuf/well_known_types_unittest.cc",
        "src/google/protobuf/wire_format_unittest.cc",
-    ],
+    ] + select({
+        "//conditions:default" : [
+            # Doesn't pass on Windows with MSVC
+            "src/google/protobuf/compiler/command_line_interface_unittest.cc",
+        ],
+        ":msvc": []
+    }),
    copts = COPTS,
    data = [
        ":test_plugin",