aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar ulfjack <ulfjack@google.com>2017-08-28 12:30:44 +0200
committerGravatar Vladimir Moskva <vladmos@google.com>2017-08-28 16:09:47 +0200
commit26ad43dff2fb326f2674cafcf511ba8d9c9142c2 (patch)
tree257d371bfe26a7b3a80cf89671db2dd730b3fcec
parentcb45790b2f79823c4bc7ad7ffe9f2bba0a984725 (diff)
Auto-generate BUILD files for src/java_tools/junitrunner
This and further changes may contain minor modifications to BUILD files that don't serve any apparent purpose. The reason for these changes is that we're switching from checked-in BUILD files to generated BUILD files, and there may be small differences between these files. PiperOrigin-RevId: 166684362
-rw-r--r--src/BUILD13
-rw-r--r--src/java_tools/junitrunner/BUILD15
-rw-r--r--src/java_tools/junitrunner/java/com/google/testing/coverage/BUILD17
-rw-r--r--src/java_tools/junitrunner/java/com/google/testing/junit/junit4/BUILD5
-rw-r--r--src/java_tools/junitrunner/java/com/google/testing/junit/runner/BUILD10
-rw-r--r--src/java_tools/junitrunner/java/com/google/testing/junit/runner/internal/BUILD3
-rw-r--r--src/java_tools/junitrunner/java/com/google/testing/junit/runner/junit4/BUILD3
-rw-r--r--src/java_tools/junitrunner/java/com/google/testing/junit/runner/model/BUILD3
-rw-r--r--src/java_tools/junitrunner/java/com/google/testing/junit/runner/sharding/BUILD7
-rw-r--r--src/java_tools/junitrunner/java/com/google/testing/junit/runner/sharding/api/BUILD3
-rw-r--r--src/java_tools/junitrunner/java/com/google/testing/junit/runner/sharding/testing/BUILD3
-rw-r--r--src/java_tools/junitrunner/java/com/google/testing/junit/runner/util/BUILD3
-rw-r--r--src/java_tools/junitrunner/javatests/com/google/testing/junit/junit4/runner/BUILD18
-rw-r--r--src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/BUILD19
-rw-r--r--src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/testbed/BUILD9
15 files changed, 69 insertions, 62 deletions
diff --git a/src/BUILD b/src/BUILD
index e0ad2c84a5..ccdcec76e5 100644
--- a/src/BUILD
+++ b/src/BUILD
@@ -390,18 +390,7 @@ filegroup(
name = "srcs",
srcs = glob(["**"]) + [
"//src/java_tools/buildjar:srcs",
- "//src/java_tools/junitrunner/java/com/google/testing/coverage:srcs",
- "//src/java_tools/junitrunner/java/com/google/testing/junit/junit4:srcs",
- "//src/java_tools/junitrunner/java/com/google/testing/junit/runner:srcs",
- "//src/java_tools/junitrunner/java/com/google/testing/junit/runner/internal:srcs",
- "//src/java_tools/junitrunner/java/com/google/testing/junit/runner/junit4:srcs",
- "//src/java_tools/junitrunner/java/com/google/testing/junit/runner/model:srcs",
- "//src/java_tools/junitrunner/java/com/google/testing/junit/runner/sharding:srcs",
- "//src/java_tools/junitrunner/java/com/google/testing/junit/runner/sharding/api:srcs",
- "//src/java_tools/junitrunner/java/com/google/testing/junit/runner/sharding/testing:srcs",
- "//src/java_tools/junitrunner/java/com/google/testing/junit/runner/util:srcs",
- "//src/java_tools/junitrunner/javatests/com/google/testing/junit/runner:srcs",
- "//src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/testbed:srcs",
+ "//src/java_tools/junitrunner:srcs",
"//src/java_tools/singlejar:srcs",
"//src/main/cpp:srcs",
"//src/main/java/com/google/devtools/build/docgen:srcs",
diff --git a/src/java_tools/junitrunner/BUILD b/src/java_tools/junitrunner/BUILD
new file mode 100644
index 0000000000..725f4d36df
--- /dev/null
+++ b/src/java_tools/junitrunner/BUILD
@@ -0,0 +1,15 @@
+# Description:
+# Run JUnit tests in a controlled environment.
+package(default_visibility = ["//src:__subpackages__"])
+
+filegroup(
+ name = "srcs",
+ srcs = [
+ "BUILD",
+ "//src/java_tools/junitrunner/java/com/google/testing/coverage:srcs",
+ "//src/java_tools/junitrunner/java/com/google/testing/junit/junit4:srcs",
+ "//src/java_tools/junitrunner/java/com/google/testing/junit/runner:srcs",
+ "//src/java_tools/junitrunner/javatests/com/google/testing/junit/junit4/runner:srcs",
+ "//src/java_tools/junitrunner/javatests/com/google/testing/junit/runner:srcs",
+ ],
+)
diff --git a/src/java_tools/junitrunner/java/com/google/testing/coverage/BUILD b/src/java_tools/junitrunner/java/com/google/testing/coverage/BUILD
index ccaccc6819..3ff8249e1d 100644
--- a/src/java_tools/junitrunner/java/com/google/testing/coverage/BUILD
+++ b/src/java_tools/junitrunner/java/com/google/testing/coverage/BUILD
@@ -1,21 +1,10 @@
-package(
- default_visibility = ["//visibility:legacy_public"],
-)
+package(default_visibility = ["//src:__subpackages__"])
licenses(["notice"])
filegroup(
- name = "bazel-srcs",
- testonly = 0,
- srcs = glob(
- ["**"],
- exclude = ["BUILD"],
- ),
- visibility = ["//third_party/bazel:__subpackages__"],
-)
-
-filegroup(
name = "srcs",
+ testonly = 0,
srcs = glob(["**"]),
)
@@ -24,6 +13,7 @@ filegroup(
srcs = [
"JacocoCoverage_jarjar_deploy.jar",
],
+ tags = ["manual"],
)
filegroup(
@@ -80,6 +70,7 @@ genrule(
"\"$(JAVA)\" -jar \"$(location //src/java_tools/singlejar:SingleJar_deploy.jar)\" --normalize --sources \"$${JARJAR}\" --output \"$@\"",
"rm -fr \"$${JARJAR}\"",
]),
+ tags = ["manual"],
tools = [
"//src/java_tools/singlejar:SingleJar_deploy.jar",
"//third_party/java/jarjar:jarjar_bin_deploy.jar",
diff --git a/src/java_tools/junitrunner/java/com/google/testing/junit/junit4/BUILD b/src/java_tools/junitrunner/java/com/google/testing/junit/junit4/BUILD
index 9ebfd89b8b..8ddeb9ffc0 100644
--- a/src/java_tools/junitrunner/java/com/google/testing/junit/junit4/BUILD
+++ b/src/java_tools/junitrunner/java/com/google/testing/junit/junit4/BUILD
@@ -1,5 +1,4 @@
# Description:
-#
# JUnit 4.x extensions
package(
@@ -23,6 +22,6 @@ java_library(
filegroup(
name = "srcs",
- testonly = 0, # All srcs should be not test only, overwrite package default.
- srcs = glob(["**"]),
+ testonly = 0,
+ srcs = glob(["**/*.java"]) + ["BUILD"],
)
diff --git a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/BUILD b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/BUILD
index f772b24136..eaeb69a3fe 100644
--- a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/BUILD
+++ b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/BUILD
@@ -61,6 +61,12 @@ java_binary(
filegroup(
name = "srcs",
- testonly = 0, # All srcs should be not test only, overwrite package default.
- srcs = glob(["**"]),
+ srcs = glob(["**/*.java"]) + [
+ "BUILD",
+ "//src/java_tools/junitrunner/java/com/google/testing/junit/runner/internal:srcs",
+ "//src/java_tools/junitrunner/java/com/google/testing/junit/runner/junit4:srcs",
+ "//src/java_tools/junitrunner/java/com/google/testing/junit/runner/model:srcs",
+ "//src/java_tools/junitrunner/java/com/google/testing/junit/runner/sharding:srcs",
+ "//src/java_tools/junitrunner/java/com/google/testing/junit/runner/util:srcs",
+ ],
)
diff --git a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/internal/BUILD b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/internal/BUILD
index aa2934363a..8b35f54758 100644
--- a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/internal/BUILD
+++ b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/internal/BUILD
@@ -30,6 +30,5 @@ java_library(
filegroup(
name = "srcs",
- testonly = 0, # All srcs should be not test only, overwrite package default.
- srcs = glob(["**"]),
+ srcs = glob(["**/*.java"]) + ["BUILD"],
)
diff --git a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/junit4/BUILD b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/junit4/BUILD
index 62af4fcf33..f7ff60f439 100644
--- a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/junit4/BUILD
+++ b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/junit4/BUILD
@@ -20,6 +20,5 @@ java_library(
filegroup(
name = "srcs",
- testonly = 0, # All srcs should be not test only, overwrite package default.
- srcs = glob(["**"]),
+ srcs = glob(["**/*.java"]) + ["BUILD"],
)
diff --git a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/model/BUILD b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/model/BUILD
index 68434281f9..c8501b5cd6 100644
--- a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/model/BUILD
+++ b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/model/BUILD
@@ -15,6 +15,5 @@ java_library(
filegroup(
name = "srcs",
- testonly = 0, # All srcs should be not test only, overwrite package default.
- srcs = glob(["**"]),
+ srcs = glob(["**/*.java"]) + ["BUILD"],
)
diff --git a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/sharding/BUILD b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/sharding/BUILD
index 1fd5f3fa23..3f68bd2200 100644
--- a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/sharding/BUILD
+++ b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/sharding/BUILD
@@ -15,6 +15,9 @@ java_library(
filegroup(
name = "srcs",
- testonly = 0, # All srcs should be not test only, overwrite package default.
- srcs = glob(["**"]),
+ srcs = glob(["**/*.java"]) + [
+ "BUILD",
+ "//src/java_tools/junitrunner/java/com/google/testing/junit/runner/sharding/api:srcs",
+ "//src/java_tools/junitrunner/java/com/google/testing/junit/runner/sharding/testing:srcs",
+ ],
)
diff --git a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/sharding/api/BUILD b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/sharding/api/BUILD
index d0dc5c4a12..c63f78824e 100644
--- a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/sharding/api/BUILD
+++ b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/sharding/api/BUILD
@@ -11,6 +11,5 @@ java_library(
filegroup(
name = "srcs",
- testonly = 0, # All srcs should be not test only, overwrite package default.
- srcs = glob(["**"]),
+ srcs = glob(["**/*.java"]) + ["BUILD"],
)
diff --git a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/sharding/testing/BUILD b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/sharding/testing/BUILD
index 016ac78046..c9027de4aa 100644
--- a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/sharding/testing/BUILD
+++ b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/sharding/testing/BUILD
@@ -15,6 +15,5 @@ java_library(
filegroup(
name = "srcs",
- testonly = 0, # All srcs should be not test only, overwrite package default.
- srcs = glob(["**"]),
+ srcs = glob(["**/*.java"]) + ["BUILD"],
)
diff --git a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/util/BUILD b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/util/BUILD
index 3a05b6e429..2dc4d68d9e 100644
--- a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/util/BUILD
+++ b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/util/BUILD
@@ -11,6 +11,5 @@ java_library(
filegroup(
name = "srcs",
- testonly = 0, # All srcs should be not test only, overwrite package default.
- srcs = glob(["**"]),
+ srcs = glob(["**/*.java"]) + ["BUILD"],
)
diff --git a/src/java_tools/junitrunner/javatests/com/google/testing/junit/junit4/runner/BUILD b/src/java_tools/junitrunner/javatests/com/google/testing/junit/junit4/runner/BUILD
new file mode 100644
index 0000000000..8e593dd5fe
--- /dev/null
+++ b/src/java_tools/junitrunner/javatests/com/google/testing/junit/junit4/runner/BUILD
@@ -0,0 +1,18 @@
+package(default_visibility = ["//src:__subpackages__"])
+
+filegroup(
+ name = "srcs",
+ srcs = glob(["*"]),
+)
+
+java_test(
+ name = "RegExTestCaseFilterTest",
+ size = "small",
+ srcs = ["RegExTestCaseFilterTest.java"],
+ deps = [
+ "//src/java_tools/junitrunner/java/com/google/testing/junit/junit4:runner",
+ "//third_party:guava",
+ "//third_party:junit4",
+ "//third_party:truth",
+ ],
+)
diff --git a/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/BUILD b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/BUILD
index a465b447ac..4feb953ae5 100644
--- a/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/BUILD
+++ b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/BUILD
@@ -1,6 +1,4 @@
-DEFAULT_VISIBILITY = [
- "//src/java_tools/junitrunner:__subpackages__",
-]
+package(default_visibility = ["//src:__subpackages__"])
# Libraries
# =========================================================
@@ -12,7 +10,6 @@ java_library(
exclude = ["testbed/*.java"],
),
deps = [
- "//src/java_tools/junitrunner/java/com/google/testing/junit/runner:test_runner",
"//src/java_tools/junitrunner/java/com/google/testing/junit/runner/internal",
"//src/java_tools/junitrunner/java/com/google/testing/junit/runner/internal:junit4",
"//src/java_tools/junitrunner/java/com/google/testing/junit/runner/junit4",
@@ -22,7 +19,6 @@ java_library(
"//src/java_tools/junitrunner/java/com/google/testing/junit/runner/sharding/testing",
"//src/java_tools/junitrunner/java/com/google/testing/junit/runner/util",
"//src/test/java/com/google/devtools/build/lib:testutil",
- "//third_party:dagger",
"//third_party:guava",
"//third_party:jsr305",
"//third_party:jsr330_inject",
@@ -53,6 +49,13 @@ java_test(
runtime_deps = [":tests"],
)
+filegroup(
+ name = "srcs",
+ srcs = glob(["**"]) + [
+ "//src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/testbed:srcs",
+ ],
+)
+
# BazelTestRunner integration tests
sh_test(
name = "junit4_testbridge_integration_test",
@@ -120,12 +123,6 @@ sh_test(
],
)
-filegroup(
- name = "srcs",
- srcs = glob(["**"]),
- visibility = ["//src:__pkg__"],
-)
-
exports_files([
"stack_trace_integration_tests.sh",
"junit4_testbridge_integration_tests.sh",
diff --git a/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/testbed/BUILD b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/testbed/BUILD
index d48306f2af..d5df0df0dd 100644
--- a/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/testbed/BUILD
+++ b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/testbed/BUILD
@@ -1,8 +1,4 @@
-DEFAULT_VISIBILITY = [
- "//src/java_tools/junitrunner:__subpackages__",
-]
-
-package(default_visibility = DEFAULT_VISIBILITY)
+package(default_visibility = ["//src:__subpackages__"])
java_library(
name = "testbed",
@@ -22,8 +18,7 @@ exports_files([
filegroup(
name = "srcs",
srcs = glob(["*.java"]) + [
- "XmlOutputExercises.ant.xml",
"BUILD",
+ "XmlOutputExercises.ant.xml",
],
- visibility = ["//src:__pkg__"],
)