From 5f026f96118e76c8a6357c61e5710e0bd1bf0f54 Mon Sep 17 00:00:00 2001 From: Damien Martin-Guillerez Date: Wed, 19 Oct 2016 13:49:54 +0000 Subject: Rollback of commit e6191f7209ebf3f67480bc7aa9db5ac58beb2156. *** Reason for rollback *** Roll-forward with fix. Tested with `bazel build src:srcs //src/test/...` using a bootstrapped bazel. Fixes #1923. RELNOTES[INC]: Non test-only targets can no longer depends on test-only targets. *** Original change description *** Automated [] rollback of commit a9f20b0d6459d395444c45cf5e94a899f3443633. *** Reason for rollback *** Broke Bazel CI: ERROR: /home/ci/workspace/Bazel/JAVA_VERSION/1.8/PLATFORM_NAME/linux-x86_64/src/BUILD:284:1: in filegroup rule //src:srcs: non-test target '//src:srcs' depends on testonly target '//src/java_tools/junitrunner/java/com/google/testing/junit/junit4:srcs' and doesn't have testonly attribute set. ERROR: Analysis of target '//scripts/packages:packages' failed; build aborted. http://ci.bazel.io/view/Bazel%20b... *** -- MOS_MIGRATED_REVID=136589937 --- src/java_tools/junitrunner/java/com/google/testing/junit/junit4/BUILD | 1 + src/java_tools/junitrunner/java/com/google/testing/junit/runner/BUILD | 1 + .../junitrunner/java/com/google/testing/junit/runner/internal/BUILD | 1 + .../junitrunner/java/com/google/testing/junit/runner/junit4/BUILD | 1 + .../junitrunner/java/com/google/testing/junit/runner/model/BUILD | 1 + .../junitrunner/java/com/google/testing/junit/runner/sharding/BUILD | 1 + .../junitrunner/java/com/google/testing/junit/runner/sharding/api/BUILD | 1 + .../java/com/google/testing/junit/runner/sharding/testing/BUILD | 1 + .../java/com/google/testing/junit/runner/sharding/weighted/BUILD | 1 + .../junitrunner/java/com/google/testing/junit/runner/util/BUILD | 1 + src/java_tools/singlejar/java/com/google/devtools/build/zip/BUILD | 1 + 11 files changed, 11 insertions(+) (limited to 'src/java_tools') 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 ddbdd4a288..9ebfd89b8b 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 @@ -23,5 +23,6 @@ java_library( filegroup( name = "srcs", + testonly = 0, # All srcs should be not test only, overwrite package default. srcs = glob(["**"]), ) 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 da524ca071..1699cb882b 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 @@ -29,5 +29,6 @@ java_binary( filegroup( name = "srcs", + testonly = 0, # All srcs should be not test only, overwrite package default. srcs = glob(["**"]), ) 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 7e3fa4d644..aa2934363a 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,5 +30,6 @@ java_library( filegroup( name = "srcs", + testonly = 0, # All srcs should be not test only, overwrite package default. srcs = glob(["**"]), ) 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 bd9f7875f4..d78784745e 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 @@ -25,5 +25,6 @@ java_library( filegroup( name = "srcs", + testonly = 0, # All srcs should be not test only, overwrite package default. srcs = glob(["**"]), ) 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 03908930c1..68434281f9 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,5 +15,6 @@ java_library( filegroup( name = "srcs", + testonly = 0, # All srcs should be not test only, overwrite package default. srcs = glob(["**"]), ) 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 0614ccb62d..be289180df 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 @@ -22,5 +22,6 @@ java_library( filegroup( name = "srcs", + testonly = 0, # All srcs should be not test only, overwrite package default. srcs = glob(["**"]), ) 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 6c1ed767e0..0d758079c0 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 @@ -18,5 +18,6 @@ java_library( filegroup( name = "srcs", + testonly = 0, # All srcs should be not test only, overwrite package default. srcs = glob(["**"]), ) 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 ea352960f2..77df30ead8 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 @@ -21,5 +21,6 @@ java_library( filegroup( name = "srcs", + testonly = 0, # All srcs should be not test only, overwrite package default. srcs = glob(["**"]), ) diff --git a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/sharding/weighted/BUILD b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/sharding/weighted/BUILD index a35ed2357c..b4edbe0999 100644 --- a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/sharding/weighted/BUILD +++ b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/sharding/weighted/BUILD @@ -20,5 +20,6 @@ java_library( filegroup( name = "srcs", + testonly = 0, # All srcs should be not test only, overwrite package default. srcs = glob(["**"]), ) 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 ab65e19f9c..c579531ff0 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 @@ -19,5 +19,6 @@ java_library( filegroup( name = "srcs", + testonly = 0, # All srcs should be not test only, overwrite package default. srcs = glob(["**"]), ) diff --git a/src/java_tools/singlejar/java/com/google/devtools/build/zip/BUILD b/src/java_tools/singlejar/java/com/google/devtools/build/zip/BUILD index 66002cb4ce..db88908acc 100644 --- a/src/java_tools/singlejar/java/com/google/devtools/build/zip/BUILD +++ b/src/java_tools/singlejar/java/com/google/devtools/build/zip/BUILD @@ -19,5 +19,6 @@ java_library( filegroup( name = "srcs", + testonly = 0, # All srcs should be not test only, overwrite package default. srcs = glob(["**"]), ) -- cgit v1.2.3