diff options
| author |  Carmi Grushko <carmi@google.com> | 2016-12-07 21:15:22 +0000 |
|---|---|---|
| committer |  Kristina Chodorow <kchodorow@google.com> | 2016-12-07 22:21:13 +0000 |
| commit | 2856008a8ee47d1c9ba376e548a1fdb7b064f130 (patch) | |
| tree | 6c8f672ea62a2f38bb201ee7dc82bc4b72b6d813 /src/test/java/com/google/devtools/build/lib/rules/proto | |
| parent | eeb9297643bc9fc33979bd2f2825159fa0854d20 (diff) | |
Clean up after transition of java_xxx_proto_library rules to proto-toolchains.
This hardcodes usage of proto-toolchains, which triggers strict-proto-deps.
Since strict-proto-deps relies on a proto-compiler feature which doesn't exist yet, I've also changed the default of --strict_proto_deps to 'default', which won't trigger the check unless specifically requested.
--
PiperOrigin-RevId: 141347426
MOS_MIGRATED_REVID=141347426
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/rules/proto')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/proto/BazelProtoLibraryTest.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/rules/proto/BazelProtoLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/proto/BazelProtoLibraryTest.java index 03edbf5d60..0202623d71 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/proto/BazelProtoLibraryTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/proto/BazelProtoLibraryTest.java @@ -77,6 +77,7 @@ public class BazelProtoLibraryTest extends BuildViewTestCase { @Test public void testDescriptorSetOutput_strictDeps() throws Exception { + useConfiguration("--strict_proto_deps=error"); scratch.file( "x/BUILD", "proto_library(name='nodeps', srcs=['nodeps.proto'])", @@ -101,6 +102,7 @@ public class BazelProtoLibraryTest extends BuildViewTestCase { @Test public void testDescriptorSetOutput_strictDeps_aliasLibrary() throws Exception { + useConfiguration("--strict_proto_deps=error"); scratch.file( "x/BUILD", "proto_library(name='alias', deps=[':dep1', ':subalias'])", |