diff options
author | Googler <noreply@google.com> | 2018-08-13 04:00:32 -0700 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-08-13 04:02:40 -0700 |
commit | 5d46f327041ade0a6314ba0859baef919730c796 (patch) | |
tree | 90476b5313a7771d0c686332dba3cefa502d7c49 /src/test/java/com/google/devtools/build/lib/rules | |
parent | 08968ed56a0d5ff7f983edc7f5ebbfe85a72b8e0 (diff) |
bazel: handle proto_src_root when dealing with proto includes, generated files and C++ headers
This change completes the handling of proto_src_root when it comes to inclusion of protos, generating the proto files in the right place and adding the generated headers to the include paths.
WANT_LGTM=elenairina
RELNOTES: None.
PiperOrigin-RevId: 208457740
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/rules')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilderTest.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilderTest.java b/src/test/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilderTest.java index 1e2311fa84..2044f279ad 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilderTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilderTest.java @@ -83,6 +83,7 @@ public class ProtoCompileActionBuilderTest { artifact("//:dont-care", "import1.proto"), artifact("//:dont-care", "import2.proto")), /*transitiveProtoPathFlags=*/ NestedSetBuilder.<String>emptySet(STABLE_ORDER), + /*protoSourceRoot=*/ "", /*directProtoSourceRoots=*/ NestedSetBuilder.<String>stableOrder().build(), /* hasProtoSources= */ true); @@ -122,6 +123,7 @@ public class ProtoCompileActionBuilderTest { /* protosInDirectDeps= */ NestedSetBuilder.<Artifact>emptySet(STABLE_ORDER), /* transitiveImports= */ NestedSetBuilder.<Artifact>emptySet(STABLE_ORDER), /*transitiveProtoPathFlags=*/ NestedSetBuilder.<String>emptySet(STABLE_ORDER), + /*protoSourceRoot=*/ "", /*directProtoSourceRoots=*/ NestedSetBuilder.<String>stableOrder().build(), /* hasProtoSources= */ true); @@ -159,6 +161,7 @@ public class ProtoCompileActionBuilderTest { artifact("//:dont-care", "import1.proto"), artifact("//:dont-care", "import2.proto")), /*transitiveProtoPathFlags=*/ NestedSetBuilder.<String>emptySet(STABLE_ORDER), + /*protoSourceRoot=*/ "", /*directProtoSourceRoots=*/ NestedSetBuilder.<String>stableOrder().build(), /* hasProtoSources= */ true); @@ -195,6 +198,7 @@ public class ProtoCompileActionBuilderTest { /* protosInDirectDeps= */ NestedSetBuilder.<Artifact>emptySet(STABLE_ORDER), NestedSetBuilder.<Artifact>emptySet(STABLE_ORDER), /*transitiveProtoPathFlags=*/ NestedSetBuilder.<String>emptySet(STABLE_ORDER), + /*protoSourceRoot=*/ "", /*directProtoSourceRoots=*/ NestedSetBuilder.<String>stableOrder().build(), /* hasProtoSources= */ true); @@ -241,6 +245,7 @@ public class ProtoCompileActionBuilderTest { /* protosInDirectDeps= */ NestedSetBuilder.<Artifact>emptySet(STABLE_ORDER), NestedSetBuilder.<Artifact>emptySet(STABLE_ORDER), /*transitiveProtoPathFlags=*/ NestedSetBuilder.<String>emptySet(STABLE_ORDER), + /*protoSourceRoot=*/ "", /*directProtoSourceRoots=*/ NestedSetBuilder.<String>stableOrder().build(), /* hasProtoSources= */ true); @@ -274,6 +279,7 @@ public class ProtoCompileActionBuilderTest { /* protosInDirectDeps= */ NestedSetBuilder.<Artifact>emptySet(STABLE_ORDER), NestedSetBuilder.<Artifact>emptySet(STABLE_ORDER), /*transitiveProtoPathFlags=*/ NestedSetBuilder.<String>emptySet(STABLE_ORDER), + /*protoSourceRoot=*/ "", /*directProtoSourceRoots=*/ NestedSetBuilder.<String>stableOrder().build(), /* hasProtoSources= */ true); |