diff options
author | 2017-09-19 17:12:32 +0200 | |
---|---|---|
committer | 2017-09-19 17:19:14 +0200 | |
commit | 088f6113007d1a341893d915a87b93a4aed9898e (patch) | |
tree | 39efddacd8d0876980e230c3b9cc0bc72ca27b2b /src/test/java/com/google/devtools/build/lib | |
parent | 807a9b236963ff863573050d5aba146a9bbe23db (diff) |
CI,windows: create test_suites for Windows tests
Add recursive test_suite rules for all tests that
ci.bazel.io runs for Windows, and set the
top-level test_suite as the CI test target.
Doing so shortens the command line and works
around https://github.com/bazelbuild/bazel/issues/3742
I verified that the old set of tests are the same
as the new set.
Change-Id: Id8d5da3f0c03c9b8969a9f8e1e9a3096888365aa
PiperOrigin-RevId: 169242858
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib')
19 files changed, 339 insertions, 0 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/BUILD b/src/test/java/com/google/devtools/build/lib/BUILD index 9f0403db1f..55cf407932 100644 --- a/src/test/java/com/google/devtools/build/lib/BUILD +++ b/src/test/java/com/google/devtools/build/lib/BUILD @@ -1387,3 +1387,33 @@ test_suite( name = "others", tags = ["-" + n for n in TEST_SUITES], ) + +test_suite( + name = "windows_tests", + tags = [ + "-no_windows", + "-slow", + ], + visibility = ["//visibility:private"], +) + +test_suite( + name = "all_windows_tests", + 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/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/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/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/skyframe:all_windows_tests", + "//src/test/java/com/google/devtools/build/lib/skylark:all_windows_tests", + ], + visibility = ["//src:__pkg__"], +) diff --git a/src/test/java/com/google/devtools/build/lib/analysis/platform/BUILD b/src/test/java/com/google/devtools/build/lib/analysis/platform/BUILD index 76904e997d..9d652cc0fa 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/platform/BUILD +++ b/src/test/java/com/google/devtools/build/lib/analysis/platform/BUILD @@ -34,3 +34,20 @@ java_test( "//third_party:truth", ], ) + +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/analysis/whitelisting/BUILD b/src/test/java/com/google/devtools/build/lib/analysis/whitelisting/BUILD index 1a193cdd53..042b4bb8c1 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/whitelisting/BUILD +++ b/src/test/java/com/google/devtools/build/lib/analysis/whitelisting/BUILD @@ -35,3 +35,20 @@ java_test( "//third_party:truth", ], ) + +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/bazel/repository/BUILD b/src/test/java/com/google/devtools/build/lib/bazel/repository/BUILD index db3cdd42ef..fa1777c11b 100644 --- a/src/test/java/com/google/devtools/build/lib/bazel/repository/BUILD +++ b/src/test/java/com/google/devtools/build/lib/bazel/repository/BUILD @@ -62,3 +62,21 @@ java_test( "//third_party:truth", ], ) + +test_suite( + name = "windows_tests", + tags = [ + "-no_windows", + "-slow", + ], + visibility = ["//visibility:private"], +) + +test_suite( + name = "all_windows_tests", + tests = [ + ":windows_tests", + "//src/test/java/com/google/devtools/build/lib/bazel/repository/cache:all_windows_tests", + ], + visibility = ["//src/test/java/com/google/devtools/build/lib:__pkg__"], +) diff --git a/src/test/java/com/google/devtools/build/lib/bazel/repository/cache/BUILD b/src/test/java/com/google/devtools/build/lib/bazel/repository/cache/BUILD index 5e772f7e07..56d69981ff 100644 --- a/src/test/java/com/google/devtools/build/lib/bazel/repository/cache/BUILD +++ b/src/test/java/com/google/devtools/build/lib/bazel/repository/cache/BUILD @@ -27,3 +27,20 @@ java_test( "//third_party:truth", ], ) + +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/bazel/repository:__pkg__"], +) diff --git a/src/test/java/com/google/devtools/build/lib/bazel/repository/downloader/BUILD b/src/test/java/com/google/devtools/build/lib/bazel/repository/downloader/BUILD index 3c860a906f..4d04980ddc 100644 --- a/src/test/java/com/google/devtools/build/lib/bazel/repository/downloader/BUILD +++ b/src/test/java/com/google/devtools/build/lib/bazel/repository/downloader/BUILD @@ -30,3 +30,20 @@ java_test( "//third_party:truth", ], ) + +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/bazel/repository:__pkg__"], +) diff --git a/src/test/java/com/google/devtools/build/lib/buildeventservice/BUILD b/src/test/java/com/google/devtools/build/lib/buildeventservice/BUILD index 7d6a71c3bf..44af15ac93 100644 --- a/src/test/java/com/google/devtools/build/lib/buildeventservice/BUILD +++ b/src/test/java/com/google/devtools/build/lib/buildeventservice/BUILD @@ -37,3 +37,20 @@ java_test( "@googleapis//:google_devtools_build_v1_publish_build_event_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/buildeventstream/transports/BUILD b/src/test/java/com/google/devtools/build/lib/buildeventstream/transports/BUILD index b9e58164d2..f8d35d5f20 100644 --- a/src/test/java/com/google/devtools/build/lib/buildeventstream/transports/BUILD +++ b/src/test/java/com/google/devtools/build/lib/buildeventstream/transports/BUILD @@ -30,3 +30,20 @@ java_test( "//third_party/protobuf:protobuf_java_util", ], ) + +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/buildtool/BUILD b/src/test/java/com/google/devtools/build/lib/buildtool/BUILD index 56860300da..7eccb66870 100644 --- a/src/test/java/com/google/devtools/build/lib/buildtool/BUILD +++ b/src/test/java/com/google/devtools/build/lib/buildtool/BUILD @@ -40,3 +40,20 @@ java_test( "//third_party:truth", ], ) + +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/android/BUILD b/src/test/java/com/google/devtools/build/lib/rules/android/BUILD index 521877663f..c4b4721bd4 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/android/BUILD +++ b/src/test/java/com/google/devtools/build/lib/rules/android/BUILD @@ -301,3 +301,20 @@ java_test( "//third_party:truth", ], ) + +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/apple/BUILD b/src/test/java/com/google/devtools/build/lib/rules/apple/BUILD index e39e653bf5..3265ba636a 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/apple/BUILD +++ b/src/test/java/com/google/devtools/build/lib/rules/apple/BUILD @@ -65,3 +65,20 @@ java_test( "//src/test/java/com/google/devtools/build/lib:testutil", ], ) + +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/config/BUILD b/src/test/java/com/google/devtools/build/lib/rules/config/BUILD index ddb355c0ee..4e115e79e0 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/config/BUILD +++ b/src/test/java/com/google/devtools/build/lib/rules/config/BUILD @@ -45,3 +45,20 @@ java_test( "//src/test/java/com/google/devtools/build/lib:testutil", ], ) + +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/objc/BUILD b/src/test/java/com/google/devtools/build/lib/rules/objc/BUILD index f9d3c1279f..84534ff782 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/objc/BUILD +++ b/src/test/java/com/google/devtools/build/lib/rules/objc/BUILD @@ -87,3 +87,20 @@ java_test( "//src/test/java/com/google/devtools/build/lib:testutil", ], ) + +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/rules:__pkg__"], +) diff --git a/src/test/java/com/google/devtools/build/lib/rules/platform/BUILD b/src/test/java/com/google/devtools/build/lib/rules/platform/BUILD index 206a1e539c..6a3bab0083 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/platform/BUILD +++ b/src/test/java/com/google/devtools/build/lib/rules/platform/BUILD @@ -50,3 +50,20 @@ java_library( "//third_party:truth", ], ) + +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/repository/BUILD b/src/test/java/com/google/devtools/build/lib/rules/repository/BUILD index 32718a18d5..ab293444dc 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/repository/BUILD +++ b/src/test/java/com/google/devtools/build/lib/rules/repository/BUILD @@ -57,3 +57,20 @@ filegroup( exclude = ["CompressedTarFunctionTest.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/skyframe/BUILD b/src/test/java/com/google/devtools/build/lib/skyframe/BUILD index 559c8ff448..a25cdbd575 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/BUILD +++ b/src/test/java/com/google/devtools/build/lib/skyframe/BUILD @@ -96,3 +96,22 @@ java_test( "//third_party:truth", ], ) + +test_suite( + name = "windows_tests", + tags = [ + "-no_windows", + "-slow", + ], + visibility = ["//visibility:private"], +) + +test_suite( + name = "all_windows_tests", + tests = [ + ":windows_tests", + "//src/test/java/com/google/devtools/build/lib/skyframe/packages:all_windows_tests", + "//src/test/java/com/google/devtools/build/lib/skyframe/serialization:all_windows_tests", + ], + visibility = ["//src/test/java/com/google/devtools/build/lib:__pkg__"], +) diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/packages/BUILD b/src/test/java/com/google/devtools/build/lib/skyframe/packages/BUILD index 4a16738046..105843b6de 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/packages/BUILD +++ b/src/test/java/com/google/devtools/build/lib/skyframe/packages/BUILD @@ -29,3 +29,20 @@ java_test( "//third_party:truth", ], ) + +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/skyframe:__pkg__"], +) diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/serialization/BUILD b/src/test/java/com/google/devtools/build/lib/skyframe/serialization/BUILD index b59c774273..21fa4c5795 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/serialization/BUILD +++ b/src/test/java/com/google/devtools/build/lib/skyframe/serialization/BUILD @@ -70,3 +70,20 @@ java_test( "//src/test/java/com/google/devtools/build/lib:test_runner", ], ) + +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/skyframe:__pkg__"], +) diff --git a/src/test/java/com/google/devtools/build/lib/skylark/BUILD b/src/test/java/com/google/devtools/build/lib/skylark/BUILD index ac1df1ea95..dc4201d33f 100644 --- a/src/test/java/com/google/devtools/build/lib/skylark/BUILD +++ b/src/test/java/com/google/devtools/build/lib/skylark/BUILD @@ -78,3 +78,20 @@ java_test( "//third_party:truth", ], ) + +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__"], +) |