diff options
author | ThiƩbaud Weksteen <tweek@google.com> | 2020-08-06 07:50:31 +0000 |
---|---|---|
committer | ThiƩbaud Weksteen <tweek@google.com> | 2020-08-06 12:27:56 +0000 |
commit | 246e69c586ff1d98518435f03051d9a91d0e5cdc (patch) | |
tree | 31fcc4612407cd8f3624b89875efd9cfeea25dc7 /rust/project_json_test.go | |
parent | 8c69770ff009c60ae44d354e5b050f8000f4eeac (diff) |
Revert "rust: handle modules with same crate_name"
Revert submission 1391076
Reason for revert: Broken downstream Darwin build (b/162975597)
Reverted Changes:
I275f04639:rust: handle modules with same crate_name
Ie736d7ebb:rust: validate existence of library source
Change-Id: I995923153c11db26b4af985f2eabe94912fb04d3
Diffstat (limited to 'rust/project_json_test.go')
-rw-r--r-- | rust/project_json_test.go | 52 |
1 files changed, 0 insertions, 52 deletions
diff --git a/rust/project_json_test.go b/rust/project_json_test.go index 85219404a..89ba8d352 100644 --- a/rust/project_json_test.go +++ b/rust/project_json_test.go @@ -117,55 +117,3 @@ func TestProjectJsonBindGen(t *testing.T) { jsonContent := testProjectJson(t, bp, fs) validateJsonCrates(t, jsonContent) } - -func TestProjectJsonMultiVersion(t *testing.T) { - bp := ` - rust_library { - name: "liba1", - srcs: ["a1/src/lib.rs"], - crate_name: "a" - } - rust_library { - name: "liba2", - srcs: ["a2/src/lib.rs"], - crate_name: "a", - } - rust_library { - name: "libb", - srcs: ["b/src/lib.rs"], - crate_name: "b", - rustlibs: ["liba1", "liba2"], - } - ` + GatherRequiredDepsForTest() - fs := map[string][]byte{ - "a1/src/lib.rs": nil, - "a2/src/lib.rs": nil, - "b/src/lib.rs": nil, - } - jsonContent := testProjectJson(t, bp, fs) - crates := validateJsonCrates(t, jsonContent) - for _, crate := range crates { - c := crate.(map[string]interface{}) - if c["root_module"] == "b/src/lib.rs" { - deps, ok := c["deps"].([]interface{}) - if !ok { - t.Errorf("Unexpected format for deps: %v", c["deps"]) - } - aCount := 0 - for _, dep := range deps { - d, ok := dep.(map[string]interface{}) - if !ok { - t.Errorf("Unexpected format for dep: %v", dep) - } - if d["name"] == "a" { - aCount++ - } - } - if aCount != 2 { - t.Errorf("Unexpected number of liba dependencies want %v, got %v: %v", 2, aCount, deps) - } - return - } - } - t.Errorf("libb crate has not been found: %v", crates) -} |