From 8d4182275c6c344ae37ff090b4721ac087f7ff75 Mon Sep 17 00:00:00 2001 From: Laszlo Csomor Date: Mon, 15 Jan 2018 04:18:43 -0800 Subject: [PATCH] windows,tests: enable some tests on Windows Add ":windows_tests" and ":all_windows_tests" rules to these packages, and include them in the parent packages. Fixes https://github.com/bazelbuild/bazel/issues/4127 See https://github.com/bazelbuild/bazel/issues/4292 Change-Id: I9c454ed21f47feb8e88e1c25b1e4fa216baa38f6 PiperOrigin-RevId: 181951525 --- .../google/devtools/build/android/desugar/BUILD | 1 + .../classes_for_testing_type_inference/BUILD | 17 +++++++++++++++++ .../java/com/google/devtools/build/lib/BUILD | 5 +++++ .../skylark/annotations/processor/BUILD | 17 +++++++++++++++++ .../build/lib/profiler/callcounts/BUILD | 17 +++++++++++++++++ .../devtools/build/lib/profiler/memory/BUILD | 17 +++++++++++++++++ .../google/devtools/build/lib/rules/cpp/BUILD | 17 +++++++++++++++++ .../com/google/devtools/build/lib/shell/BUILD | 17 +++++++++++++++++ .../com/google/devtools/common/options/BUILD | 1 + .../devtools/common/options/processor/BUILD | 17 +++++++++++++++++ 10 files changed, 126 insertions(+) diff --git a/src/test/java/com/google/devtools/build/android/desugar/BUILD b/src/test/java/com/google/devtools/build/android/desugar/BUILD index f33df6b97971ad..b95a07241b3735 100644 --- a/src/test/java/com/google/devtools/build/android/desugar/BUILD +++ b/src/test/java/com/google/devtools/build/android/desugar/BUILD @@ -1968,6 +1968,7 @@ test_suite( name = "all_windows_tests", tests = [ ":windows_tests", + "//src/test/java/com/google/devtools/build/android/desugar/classes_for_testing_type_inference:all_windows_tests", "//src/test/java/com/google/devtools/build/android/desugar/dependencies:all_windows_tests", "//src/test/java/com/google/devtools/build/android/desugar/runtime:all_windows_tests", ], diff --git a/src/test/java/com/google/devtools/build/android/desugar/classes_for_testing_type_inference/BUILD b/src/test/java/com/google/devtools/build/android/desugar/classes_for_testing_type_inference/BUILD index 5d6c6c03770265..b50500e6373c99 100644 --- a/src/test/java/com/google/devtools/build/android/desugar/classes_for_testing_type_inference/BUILD +++ b/src/test/java/com/google/devtools/build/android/desugar/classes_for_testing_type_inference/BUILD @@ -17,3 +17,20 @@ java_import( name = "test_subjects", jars = ["test_subjects.jar"], ) + +test_suite( + name = "windows_tests", + tags = [ + "-no_windows", + "-slow", + ], + visibility = ["//visibility:private"], +) + +test_suite( + name = "all_windows_tests", + tests = [ + ":windows_tests", + ], + visibility = ["//src/test/java/com/google/devtools/build/android/desugar:__pkg__"], +) diff --git a/src/test/java/com/google/devtools/build/lib/BUILD b/src/test/java/com/google/devtools/build/lib/BUILD index 9926aaa5398188..efec300e172d88 100644 --- a/src/test/java/com/google/devtools/build/lib/BUILD +++ b/src/test/java/com/google/devtools/build/lib/BUILD @@ -1477,16 +1477,21 @@ test_suite( tests = [ ":windows_tests", "//src/test/java/com/google/devtools/build/lib/analysis/platform:all_windows_tests", + "//src/test/java/com/google/devtools/build/lib/analysis/skylark/annotations/processor:all_windows_tests", "//src/test/java/com/google/devtools/build/lib/analysis/whitelisting:all_windows_tests", "//src/test/java/com/google/devtools/build/lib/bazel/repository:all_windows_tests", "//src/test/java/com/google/devtools/build/lib/buildeventservice:all_windows_tests", "//src/test/java/com/google/devtools/build/lib/buildeventstream/transports:all_windows_tests", "//src/test/java/com/google/devtools/build/lib/buildtool:all_windows_tests", + "//src/test/java/com/google/devtools/build/lib/profiler/callcounts:all_windows_tests", + "//src/test/java/com/google/devtools/build/lib/profiler/memory:all_windows_tests", "//src/test/java/com/google/devtools/build/lib/rules/android:all_windows_tests", "//src/test/java/com/google/devtools/build/lib/rules/apple:all_windows_tests", "//src/test/java/com/google/devtools/build/lib/rules/config:all_windows_tests", + "//src/test/java/com/google/devtools/build/lib/rules/cpp:all_windows_tests", "//src/test/java/com/google/devtools/build/lib/rules/platform:all_windows_tests", "//src/test/java/com/google/devtools/build/lib/rules/repository:all_windows_tests", + "//src/test/java/com/google/devtools/build/lib/shell:all_windows_tests", "//src/test/java/com/google/devtools/build/lib/skyframe:all_windows_tests", "//src/test/java/com/google/devtools/build/lib/skylark:all_windows_tests", ], diff --git a/src/test/java/com/google/devtools/build/lib/analysis/skylark/annotations/processor/BUILD b/src/test/java/com/google/devtools/build/lib/analysis/skylark/annotations/processor/BUILD index 18cdc374083372..1326161d2d5724 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/skylark/annotations/processor/BUILD +++ b/src/test/java/com/google/devtools/build/lib/analysis/skylark/annotations/processor/BUILD @@ -29,3 +29,20 @@ filegroup( name = "ProcessorTestFiles", srcs = glob(["optiontestsources/*.java"]), ) + +test_suite( + name = "windows_tests", + tags = [ + "-no_windows", + "-slow", + ], + visibility = ["//visibility:private"], +) + +test_suite( + name = "all_windows_tests", + tests = [ + ":windows_tests", + ], + visibility = ["//src/test/java/com/google/devtools/build/lib:__pkg__"], +) diff --git a/src/test/java/com/google/devtools/build/lib/profiler/callcounts/BUILD b/src/test/java/com/google/devtools/build/lib/profiler/callcounts/BUILD index 38fe9d741fa2f0..90dc15680685df 100644 --- a/src/test/java/com/google/devtools/build/lib/profiler/callcounts/BUILD +++ b/src/test/java/com/google/devtools/build/lib/profiler/callcounts/BUILD @@ -22,3 +22,20 @@ java_test( "//third_party/pprof:profile_java_proto", ], ) + +test_suite( + name = "windows_tests", + tags = [ + "-no_windows", + "-slow", + ], + visibility = ["//visibility:private"], +) + +test_suite( + name = "all_windows_tests", + tests = [ + ":windows_tests", + ], + visibility = ["//src/test/java/com/google/devtools/build/lib:__pkg__"], +) diff --git a/src/test/java/com/google/devtools/build/lib/profiler/memory/BUILD b/src/test/java/com/google/devtools/build/lib/profiler/memory/BUILD index 3bfc630795c726..b9c7617ac1e002 100644 --- a/src/test/java/com/google/devtools/build/lib/profiler/memory/BUILD +++ b/src/test/java/com/google/devtools/build/lib/profiler/memory/BUILD @@ -23,3 +23,20 @@ java_test( "//third_party/pprof:profile_java_proto", ], ) + +test_suite( + name = "windows_tests", + tags = [ + "-no_windows", + "-slow", + ], + visibility = ["//visibility:private"], +) + +test_suite( + name = "all_windows_tests", + tests = [ + ":windows_tests", + ], + visibility = ["//src/test/java/com/google/devtools/build/lib:__pkg__"], +) diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/BUILD b/src/test/java/com/google/devtools/build/lib/rules/cpp/BUILD index de5276dc7f9698..848057724b7fef 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/BUILD +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/BUILD @@ -71,3 +71,20 @@ java_library( "//third_party/protobuf/3.4.0:protobuf_java", ], ) + +test_suite( + name = "windows_tests", + tags = [ + "-no_windows", + "-slow", + ], + visibility = ["//visibility:private"], +) + +test_suite( + name = "all_windows_tests", + tests = [ + ":windows_tests", + ], + visibility = ["//src/test/java/com/google/devtools/build/lib:__pkg__"], +) diff --git a/src/test/java/com/google/devtools/build/lib/shell/BUILD b/src/test/java/com/google/devtools/build/lib/shell/BUILD index 79f9d0a847821c..d8098ff0186d37 100644 --- a/src/test/java/com/google/devtools/build/lib/shell/BUILD +++ b/src/test/java/com/google/devtools/build/lib/shell/BUILD @@ -129,3 +129,20 @@ cc_binary( name = "killmyself", srcs = ["killmyself.cc"], ) + +test_suite( + name = "windows_tests", + tags = [ + "-no_windows", + "-slow", + ], + visibility = ["//visibility:private"], +) + +test_suite( + name = "all_windows_tests", + tests = [ + ":windows_tests", + ], + visibility = ["//src/test/java/com/google/devtools/build/lib:__pkg__"], +) diff --git a/src/test/java/com/google/devtools/common/options/BUILD b/src/test/java/com/google/devtools/common/options/BUILD index 27ee1c519564f1..76d843b72e54f7 100644 --- a/src/test/java/com/google/devtools/common/options/BUILD +++ b/src/test/java/com/google/devtools/common/options/BUILD @@ -69,6 +69,7 @@ test_suite( name = "all_windows_tests", tests = [ ":windows_tests", + "//src/test/java/com/google/devtools/common/options/processor:all_windows_tests", "//src/test/java/com/google/devtools/common/options/testing:all_windows_tests", ], visibility = ["//src:__pkg__"], diff --git a/src/test/java/com/google/devtools/common/options/processor/BUILD b/src/test/java/com/google/devtools/common/options/processor/BUILD index ba3476732b11ba..d77813553bbe89 100644 --- a/src/test/java/com/google/devtools/common/options/processor/BUILD +++ b/src/test/java/com/google/devtools/common/options/processor/BUILD @@ -24,3 +24,20 @@ filegroup( name = "OptionTestFiles", srcs = glob(["optiontestsources/*.java"]), ) + +test_suite( + name = "windows_tests", + tags = [ + "-no_windows", + "-slow", + ], + visibility = ["//visibility:private"], +) + +test_suite( + name = "all_windows_tests", + tests = [ + ":windows_tests", + ], + visibility = ["//src/test/java/com/google/devtools/common/options:__pkg__"], +)