diff options
| author | Ivan Lozano <ivanlozano@google.com> | 2020-12-11 15:25:59 -0500 |
|---|---|---|
| committer | Ivan Lozano <ivanlozano@google.com> | 2020-12-11 16:19:02 -0500 |
| commit | 6eff900b67a0ed7e639ae304b1d453b620e9b79d (patch) | |
| tree | 12d379cc2cdb8c9f6d95f13c9a38eb37a49a686d /rust/rust_test.go | |
| parent | 30530a9e34405e6bf7df4a40e9c3dfc97da9efd6 (diff) | |
Merge rust_protobuf and rust_grpcio module types.
To allow grpc protobufs to include non-grpc protos in a singular
library, we need to allow them to be defined as part of the same module.
This CL merges the two previously distinct module types into
rust_protobuf, and adds a new property for declaring which protos
contain grpc definitions.
Bug: 172952239
Test: rust_grpcio modules converted to rust_protobuf modules and build.
Test: Example rust_protobuf module with both proto types builds.
Change-Id: I0e627fd97bc6f74de89d309e3344694a1e76586d
Diffstat (limited to 'rust/rust_test.go')
| -rw-r--r-- | rust/rust_test.go | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/rust/rust_test.go b/rust/rust_test.go index 4edc6cd85..48c8d74f6 100644 --- a/rust/rust_test.go +++ b/rust/rust_test.go @@ -106,14 +106,16 @@ func newTestRustCtx(t *testing.T, bp string) *testRustCtx { // useMockedFs setup a default mocked filesystem for the test environment. func (tctx *testRustCtx) useMockedFs() { tctx.fs = map[string][]byte{ - "foo.rs": nil, - "foo.c": nil, - "src/bar.rs": nil, - "src/any.h": nil, - "proto.proto": nil, - "buf.proto": nil, - "liby.so": nil, - "libz.so": nil, + "foo.rs": nil, + "foo.c": nil, + "src/bar.rs": nil, + "src/any.h": nil, + "proto.proto": nil, + "proto/buf.proto": nil, + "buf.proto": nil, + "foo.proto": nil, + "liby.so": nil, + "libz.so": nil, } } |