From 98ed9af727ec6342206d181fcd465e3e83980c52 Mon Sep 17 00:00:00 2001 From: elenairina Date: Tue, 27 Feb 2018 08:28:59 -0800 Subject: Expose ProtoSourcesProvider.transitive_proto_path_flags to Skylark. Progress on #4544. RELNOTES: None. PiperOrigin-RevId: 187179454 --- .../build/lib/rules/proto/BazelProtoLibraryTest.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/test/java/com/google/devtools/build') 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 7e283a546f..51484ae952 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 @@ -251,11 +251,11 @@ public class BazelProtoLibraryTest extends BuildViewTestCase { ); ConfiguredTarget protoTarget = getConfiguredTarget("//x/foo:nodeps"); ProtoSourcesProvider sourcesProvider = protoTarget.getProvider(ProtoSourcesProvider.class); - assertThat(sourcesProvider.getTransitiveProtoPathFlags()).containsExactly("--proto_path=x/foo"); + assertThat(sourcesProvider.getTransitiveProtoPathFlags()).containsExactly("x/foo"); SupportData supportData = protoTarget.getProvider(ProtoSupportDataProvider.class).getSupportData(); - assertThat(supportData.getTransitiveProtoPathFlags()).containsExactly("--proto_path=x/foo"); + assertThat(supportData.getTransitiveProtoPathFlags()).containsExactly("x/foo"); assertThat(getGeneratingSpawnAction(getDescriptorOutput("//x/foo:nodeps")) .getRemainingArguments()) @@ -304,11 +304,11 @@ public class BazelProtoLibraryTest extends BuildViewTestCase { ); ConfiguredTarget protoTarget = getConfiguredTarget("//x/foo:withdeps"); ProtoSourcesProvider sourcesProvider = protoTarget.getProvider(ProtoSourcesProvider.class); - assertThat(sourcesProvider.getTransitiveProtoPathFlags()).containsExactly("--proto_path=x/foo"); + assertThat(sourcesProvider.getTransitiveProtoPathFlags()).containsExactly("x/foo"); SupportData supportData = protoTarget.getProvider(ProtoSupportDataProvider.class).getSupportData(); - assertThat(supportData.getTransitiveProtoPathFlags()).containsExactly("--proto_path=x/foo"); + assertThat(supportData.getTransitiveProtoPathFlags()).containsExactly("x/foo"); assertThat(getGeneratingSpawnAction(getDescriptorOutput("//x/foo:withdeps")) .getRemainingArguments()) @@ -342,12 +342,12 @@ public class BazelProtoLibraryTest extends BuildViewTestCase { ConfiguredTarget protoTarget = getConfiguredTarget("//x/foo:withdeps"); ProtoSourcesProvider sourcesProvider = protoTarget.getProvider(ProtoSourcesProvider.class); assertThat(sourcesProvider.getTransitiveProtoPathFlags()) - .containsExactly("--proto_path=x/foo", "--proto_path=x/bar"); + .containsExactly("x/foo", "x/bar"); SupportData supportData = protoTarget.getProvider(ProtoSupportDataProvider.class).getSupportData(); assertThat(supportData.getTransitiveProtoPathFlags()) - .containsExactly("--proto_path=x/foo", "--proto_path=x/bar"); + .containsExactly("x/foo", "x/bar"); assertThat(getGeneratingSpawnAction(getDescriptorOutput("//x/foo:withdeps")) .getRemainingArguments()) -- cgit v1.2.3