From df16c77a501ba634b30a1e3d6f76023ac9ea93a9 Mon Sep 17 00:00:00 2001 From: Laszlo Csomor Date: Thu, 9 Aug 2018 23:36:39 -0700 Subject: Windows: add //tools/... tests to test suite Add all tests under //tools/... to //src:all_windows_tests, to run them on Bazel CI. See https://github.com/bazelbuild/bazel/issues/4292 Closes #5839. Change-Id: Iae647f561683cc50ef62416c4b834576ae918486 PiperOrigin-RevId: 208167743 --- tools/BUILD | 29 ++++++++++------- tools/android/BUILD | 37 +++++++++++++++++++++- tools/bash/BUILD | 8 +++++ tools/bash/runfiles/BUILD | 2 +- tools/build_defs/BUILD | 34 ++++++++++++++++++++ tools/build_defs/apple/BUILD | 22 +++++++++++-- tools/build_defs/apple/test/BUILD | 2 +- tools/build_defs/cc/BUILD | 2 +- tools/build_defs/docker/BUILD | 17 +++++++++- tools/build_defs/hash/BUILD | 19 +++++++++-- tools/build_defs/pkg/BUILD | 33 ++++++++++++++++--- tools/build_defs/repo/BUILD | 2 +- tools/cpp/runfiles/BUILD | 16 ++++++++++ tools/java/BUILD | 8 +++++ tools/java/runfiles/BUILD | 16 ++++++++++ tools/jdk/BUILD | 15 +++++++++ tools/python/BUILD | 8 +++++ tools/python/runfiles/BUILD | 16 ++++++++++ tools/test/BUILD | 18 +++++++++++ .../javatests/com/google/devtools/lcovmerger/BUILD | 19 +++++++++++ 20 files changed, 296 insertions(+), 27 deletions(-) create mode 100644 tools/build_defs/BUILD (limited to 'tools') diff --git a/tools/BUILD b/tools/BUILD index e1f4641629..25cd5b26da 100644 --- a/tools/BUILD +++ b/tools/BUILD @@ -10,13 +10,7 @@ filegroup( "//tools/android:srcs", "//tools/bash:srcs", "//tools/buildstamp:srcs", - "//tools/build_defs/apple:srcs", - "//tools/build_defs/cc:srcs", - "//tools/build_defs/apple/test:srcs", - "//tools/build_defs/docker:srcs", - "//tools/build_defs/hash:srcs", - "//tools/build_defs/pkg:srcs", - "//tools/build_defs/repo:srcs", + "//tools/build_defs:srcs", "//tools/build_rules:srcs", "//tools/coverage:srcs", "//tools/java:srcs", @@ -47,11 +41,7 @@ filegroup( srcs = glob(["**"]) + [ "//tools/android:embedded_tools", "//tools/bash:embedded_tools", - "//tools/build_defs/apple:srcs", - "//tools/build_defs/cc:srcs", - "//tools/build_defs/hash:srcs", - "//tools/build_defs/pkg:srcs", - "//tools/build_defs/repo:srcs", + "//tools/build_defs:embedded_tools", "//tools/build_rules:embedded_tools_srcs", "//tools/buildstamp:srcs", "//tools/coverage:srcs", @@ -77,3 +67,18 @@ filegroup( "//tools/zip:srcs", ], ) + +test_suite( + name = "all_windows_tests", + tests = [ + "//tools/android:all_windows_tests", + "//tools/bash:all_windows_tests", + "//tools/build_defs:all_windows_tests", + "//tools/cpp/runfiles:all_windows_tests", + "//tools/java:all_windows_tests", + "//tools/jdk:all_windows_tests", + "//tools/python:all_windows_tests", + "//tools/test:all_windows_tests", + ], + visibility = ["//src:__pkg__"], +) diff --git a/tools/android/BUILD b/tools/android/BUILD index f7355fba49..5c793a9665 100644 --- a/tools/android/BUILD +++ b/tools/android/BUILD @@ -15,6 +15,10 @@ sh_test( ":build_incremental_dexmanifest", "//tools/zip:zipper", ], + tags = [ + # TODO(laszlocsomor): fix on Windows or describe why it cannot pass. + "no_windows", + ], ) py_binary( @@ -45,6 +49,10 @@ py_binary( py_test( name = "incremental_install_test", srcs = ["incremental_install_test.py"], + tags = [ + # TODO(laszlocsomor): fix on Windows or describe why it cannot pass. + "no_windows", + ], deps = [ ":incremental_install", "//third_party/py/mock", @@ -65,6 +73,10 @@ sh_test( ":strip_resources", "//tools/zip:zipper", ], + tags = [ + # TODO(laszlocsomor): fix on Windows or describe why it cannot pass. + "no_windows", + ], ) py_binary( @@ -190,7 +202,13 @@ genrule( filegroup( name = "srcs", - srcs = glob(["**"]) + ["//tools/android/emulator:srcs"], + srcs = glob( + ["**"], + exclude = [ + "*~", + ".*", + ], + ) + ["//tools/android/emulator:srcs"], ) filegroup( @@ -200,6 +218,8 @@ filegroup( exclude = [ "*_test.py", "*_test.sh", + "*~", + ".*", ], ) + [ ":desugar_jdk_libs.jar", @@ -209,3 +229,18 @@ filegroup( # Exported for AndroidSdkRepositoryTest to use it instead of mocking it out. exports_files(["android_sdk_repository_template.bzl"]) + +test_suite( + name = "windows_tests", + tags = [ + "-no_windows", + "-slow", + ], + visibility = ["//visibility:private"], +) + +test_suite( + name = "all_windows_tests", + tests = [":windows_tests"], + visibility = ["//tools:__pkg__"], +) diff --git a/tools/bash/BUILD b/tools/bash/BUILD index 2d0c314e46..ae28be9e9c 100644 --- a/tools/bash/BUILD +++ b/tools/bash/BUILD @@ -19,3 +19,11 @@ filegroup( srcs = ["//tools/bash/runfiles:embedded_tools"], visibility = ["//tools:__pkg__"], ) + +test_suite( + name = "all_windows_tests", + tests = [ + "//tools/bash/runfiles:all_windows_tests", + ], + visibility = ["//tools:__pkg__"], +) diff --git a/tools/bash/runfiles/BUILD b/tools/bash/runfiles/BUILD index adec4cef86..124d38f8e2 100644 --- a/tools/bash/runfiles/BUILD +++ b/tools/bash/runfiles/BUILD @@ -46,5 +46,5 @@ test_suite( tests = [ ":windows_tests", ], - visibility = ["//src:__pkg__"], + visibility = ["//tools/bash:__pkg__"], ) diff --git a/tools/build_defs/BUILD b/tools/build_defs/BUILD new file mode 100644 index 0000000000..db1127aea6 --- /dev/null +++ b/tools/build_defs/BUILD @@ -0,0 +1,34 @@ +filegroup( + name = "srcs", + srcs = glob(["**"]) + [ + "//tools/build_defs/apple:srcs", + "//tools/build_defs/cc:srcs", + "//tools/build_defs/docker:srcs", + "//tools/build_defs/hash:srcs", + "//tools/build_defs/pkg:srcs", + "//tools/build_defs/repo:srcs", + ], + visibility = ["//tools:__pkg__"], +) + +filegroup( + name = "embedded_tools", + srcs = glob(["**"]) + [ + "//tools/build_defs/apple:srcs", + "//tools/build_defs/cc:srcs", + "//tools/build_defs/hash:srcs", + "//tools/build_defs/pkg:srcs", + "//tools/build_defs/repo:srcs", + ], + visibility = ["//tools:__pkg__"], +) + +test_suite( + name = "all_windows_tests", + tests = [ + "//tools/build_defs/docker:all_windows_tests", + "//tools/build_defs/hash:all_windows_tests", + "//tools/build_defs/pkg:all_windows_tests", + ], + visibility = ["//tools:__pkg__"], +) diff --git a/tools/build_defs/apple/BUILD b/tools/build_defs/apple/BUILD index 4c1f6ab112..f102fef3b1 100644 --- a/tools/build_defs/apple/BUILD +++ b/tools/build_defs/apple/BUILD @@ -2,6 +2,24 @@ package(default_visibility = ["//visibility:public"]) filegroup( name = "srcs", - srcs = glob(["*.bzl"]) + ["BUILD"], - visibility = ["//tools:__pkg__"], + srcs = glob(["*.bzl"]) + [ + "BUILD", + "//tools/build_defs/apple/test:srcs", + ], + visibility = ["//tools/build_defs:__pkg__"], +) + +test_suite( + name = "windows_tests", + tags = [ + "-no_windows", + "-slow", + ], + visibility = ["//visibility:private"], +) + +test_suite( + name = "all_windows_tests", + tests = [":windows_tests"], + visibility = ["//tools/build_defs:__pkg__"], ) diff --git a/tools/build_defs/apple/test/BUILD b/tools/build_defs/apple/test/BUILD index 053bb1652a..8729718f21 100644 --- a/tools/build_defs/apple/test/BUILD +++ b/tools/build_defs/apple/test/BUILD @@ -3,6 +3,6 @@ filegroup( srcs = glob(["**"]), visibility = [ "//src/test/shell/bazel/apple:__pkg__", - "//tools:__pkg__", + "//tools/build_defs/apple:__pkg__", ], ) diff --git a/tools/build_defs/cc/BUILD b/tools/build_defs/cc/BUILD index 5e6ca3c90a..c0e9019cc7 100644 --- a/tools/build_defs/cc/BUILD +++ b/tools/build_defs/cc/BUILD @@ -8,7 +8,7 @@ filegroup( visibility = [ "//devtools/blaze/integration:__pkg__", "//:__pkg__", - "//tools:__pkg__", + "//tools/build_defs:__pkg__", ], ) diff --git a/tools/build_defs/docker/BUILD b/tools/build_defs/docker/BUILD index d3b6f3e13b..faec356862 100644 --- a/tools/build_defs/docker/BUILD +++ b/tools/build_defs/docker/BUILD @@ -3,7 +3,7 @@ licenses(["notice"]) # Apache 2.0 filegroup( name = "srcs", srcs = glob(["**"]), - visibility = ["//tools:__pkg__"], + visibility = ["//tools/build_defs:__pkg__"], ) exports_files( @@ -84,3 +84,18 @@ filegroup( srcs = ["incremental_load.sh.tpl"], visibility = ["//visibility:public"], ) + +test_suite( + name = "windows_tests", + tags = [ + "-no_windows", + "-slow", + ], + visibility = ["//visibility:private"], +) + +test_suite( + name = "all_windows_tests", + tests = [":windows_tests"], + visibility = ["//tools/build_defs:__pkg__"], +) diff --git a/tools/build_defs/hash/BUILD b/tools/build_defs/hash/BUILD index fc966173b6..ea90ca7d58 100644 --- a/tools/build_defs/hash/BUILD +++ b/tools/build_defs/hash/BUILD @@ -3,7 +3,7 @@ licenses(["notice"]) # Apache 2.0 filegroup( name = "srcs", srcs = glob(["**"]), - visibility = ["//tools:__pkg__"], + visibility = ["//tools/build_defs:__pkg__"], ) exports_files( @@ -29,5 +29,20 @@ sh_test( data = ["sha256"], # TODO(laszlocsomor): use the runfiles library after # https://github.com/bazelbuild/bazel/issues/4460 is fixed for sh_* - tags = ["-no_windows"], + tags = ["no_windows"], +) + +test_suite( + name = "windows_tests", + tags = [ + "-no_windows", + "-slow", + ], + visibility = ["//visibility:private"], +) + +test_suite( + name = "all_windows_tests", + tests = [":windows_tests"], + visibility = ["//tools/build_defs:__pkg__"], ) diff --git a/tools/build_defs/pkg/BUILD b/tools/build_defs/pkg/BUILD index cae1a4a03a..2f4052e713 100644 --- a/tools/build_defs/pkg/BUILD +++ b/tools/build_defs/pkg/BUILD @@ -3,7 +3,7 @@ licenses(["notice"]) # Apache 2.0 filegroup( name = "srcs", srcs = glob(["**"]), - visibility = ["//tools:__pkg__"], + visibility = ["//tools/build_defs:__pkg__"], ) exports_files( @@ -32,8 +32,12 @@ py_test( ], data = [":archive_testdata"], srcs_version = "PY2AND3", - # archive.py requires xzcat, which is not available by default on Mac - tags = ["noci"], + tags = [ + # archive.py requires xzcat, which is not available by default on Mac + "noci", + # TODO(laszlocsomor): fix on Windows or describe why it cannot pass. + "no_windows", + ], deps = [":archive"], ) @@ -240,9 +244,28 @@ sh_test( ":test-tar-xz.tar.xz", ":titi_test_all.changes", ], - # archive.py requires xzcat, which is not available by default on Mac - tags = ["noci"], + tags = [ + # archive.py requires xzcat, which is not available by default on Mac + "noci", + # TODO(laszlocsomor): fix on Windows or describe why it cannot pass. + "no_windows", + ], deps = [ "//src/test/shell:bashunit", ], ) + +test_suite( + name = "windows_tests", + tags = [ + "-no_windows", + "-slow", + ], + visibility = ["//visibility:private"], +) + +test_suite( + name = "all_windows_tests", + tests = [":windows_tests"], + visibility = ["//tools/build_defs:__pkg__"], +) diff --git a/tools/build_defs/repo/BUILD b/tools/build_defs/repo/BUILD index 1184bb1895..971acc1ae3 100644 --- a/tools/build_defs/repo/BUILD +++ b/tools/build_defs/repo/BUILD @@ -3,5 +3,5 @@ licenses(["notice"]) # Apache 2.0 filegroup( name = "srcs", srcs = glob(["**"]), - visibility = ["//tools:__pkg__"], + visibility = ["//tools/build_defs:__pkg__"], ) diff --git a/tools/cpp/runfiles/BUILD b/tools/cpp/runfiles/BUILD index 4a79245c04..dae87c911a 100644 --- a/tools/cpp/runfiles/BUILD +++ b/tools/cpp/runfiles/BUILD @@ -39,3 +39,19 @@ cc_test( "@com_google_googletest//:gtest_main", ], ) + +test_suite( + name = "windows_tests", + tags = [ + "-no_windows", + "-slow", + ], +) + +test_suite( + name = "all_windows_tests", + tests = [ + ":windows_tests", + ], + visibility = ["//tools:__pkg__"], +) diff --git a/tools/java/BUILD b/tools/java/BUILD index fba8a23d34..6b2351708b 100644 --- a/tools/java/BUILD +++ b/tools/java/BUILD @@ -14,3 +14,11 @@ filegroup( srcs = ["//tools/java/runfiles:embedded_tools"], visibility = ["//tools:__pkg__"], ) + +test_suite( + name = "all_windows_tests", + tests = [ + "//tools/java/runfiles:all_windows_tests", + ], + visibility = ["//tools:__pkg__"], +) diff --git a/tools/java/runfiles/BUILD b/tools/java/runfiles/BUILD index a0d2c018af..f81acb3e15 100644 --- a/tools/java/runfiles/BUILD +++ b/tools/java/runfiles/BUILD @@ -14,3 +14,19 @@ filegroup( srcs = ["BUILD.tools"], visibility = ["//tools/java:__pkg__"], ) + +test_suite( + name = "windows_tests", + tags = [ + "-no_windows", + "-slow", + ], +) + +test_suite( + name = "all_windows_tests", + tests = [ + ":windows_tests", + ], + visibility = ["//tools/java:__pkg__"], +) diff --git a/tools/jdk/BUILD b/tools/jdk/BUILD index f1202e5bc5..8598fdfa9a 100644 --- a/tools/jdk/BUILD +++ b/tools/jdk/BUILD @@ -263,3 +263,18 @@ java_import( name = "JacocoCoverage", jars = [":JacocoCoverage_deploy.jar"], ) + +test_suite( + name = "windows_tests", + tags = [ + "-no_windows", + "-slow", + ], + visibility = ["//visibility:private"], +) + +test_suite( + name = "all_windows_tests", + tests = [":windows_tests"], + visibility = ["//tools:__pkg__"], +) diff --git a/tools/python/BUILD b/tools/python/BUILD index ab09128e0c..a344b44287 100644 --- a/tools/python/BUILD +++ b/tools/python/BUILD @@ -31,3 +31,11 @@ filegroup( ], visibility = ["//tools:__pkg__"], ) + +test_suite( + name = "all_windows_tests", + tests = [ + "//tools/python/runfiles:all_windows_tests", + ], + visibility = ["//tools:__pkg__"], +) diff --git a/tools/python/runfiles/BUILD b/tools/python/runfiles/BUILD index 79273e85ce..08cec716cb 100644 --- a/tools/python/runfiles/BUILD +++ b/tools/python/runfiles/BUILD @@ -33,3 +33,19 @@ py_test( visibility = ["//visibility:public"], deps = [":runfiles"], ) + +test_suite( + name = "windows_tests", + tags = [ + "-no_windows", + "-slow", + ], +) + +test_suite( + name = "all_windows_tests", + tests = [ + ":windows_tests", + ], + visibility = ["//tools/python:__pkg__"], +) diff --git a/tools/test/BUILD b/tools/test/BUILD index 59c872e8b2..18dc71b493 100644 --- a/tools/test/BUILD +++ b/tools/test/BUILD @@ -48,3 +48,21 @@ filegroup( ] + glob(["LcovMerger/**"]), visibility = ["//tools:__pkg__"], ) + +test_suite( + name = "windows_tests", + tags = [ + "-no_windows", + "-slow", + ], + visibility = ["//visibility:private"], +) + +test_suite( + name = "all_windows_tests", + tests = [ + ":windows_tests", + "//tools/test/LcovMerger/javatests/com/google/devtools/lcovmerger:all_windows_tests", + ], + visibility = ["//tools:__pkg__"], +) diff --git a/tools/test/LcovMerger/javatests/com/google/devtools/lcovmerger/BUILD b/tools/test/LcovMerger/javatests/com/google/devtools/lcovmerger/BUILD index 51a6e0bcf8..66df9fef91 100644 --- a/tools/test/LcovMerger/javatests/com/google/devtools/lcovmerger/BUILD +++ b/tools/test/LcovMerger/javatests/com/google/devtools/lcovmerger/BUILD @@ -41,6 +41,10 @@ java_test( java_test( name = "LcovPrinterTest", srcs = ["LcovPrinterTest.java"], + tags = [ + # TODO(laszlocsomor): fix on Windows or describe why it cannot pass. + "no_windows", + ], deps = [ ":LcovMergerTestUtils", "//third_party:guava", @@ -127,3 +131,18 @@ filegroup( srcs = glob(["**"]), visibility = ["//visibility:public"], ) + +test_suite( + name = "windows_tests", + tags = [ + "-no_windows", + "-slow", + ], + visibility = ["//visibility:private"], +) + +test_suite( + name = "all_windows_tests", + tests = [":windows_tests"], + visibility = ["//tools/test:__pkg__"], +) -- cgit v1.2.3