diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2025-10-27 14:21:20 +0100 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2025-10-29 11:34:19 -0700 |
| commit | fd3416f0799bedaa143c7a8ad6996dc220e53c96 (patch) | |
| tree | 4d5a0f1a2675b60ff251e6aa64f193b6951074ee /test cases | |
| parent | 940361f4596b5b12d10df28de2cca0f892135746 (diff) | |
| download | meson-fd3416f0799bedaa143c7a8ad6996dc220e53c96.tar.gz | |
cargo: use subproject() if a workspace member is in subprojects/
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'test cases')
| -rw-r--r-- | test cases/rust/30 cargo workspace/subprojects/foo/Cargo.toml | 2 | ||||
| -rw-r--r-- | test cases/rust/30 cargo workspace/subprojects/foo/subprojects/member2-1-rs.wrap | 6 | ||||
| -rw-r--r-- | test cases/rust/30 cargo workspace/subprojects/foo/subprojects/member2-1.0/Cargo.toml (renamed from test cases/rust/30 cargo workspace/subprojects/foo/src/member2/Cargo.toml) | 0 | ||||
| -rw-r--r-- | test cases/rust/30 cargo workspace/subprojects/foo/subprojects/member2-1.0/src/lib.rs (renamed from test cases/rust/30 cargo workspace/subprojects/foo/src/member2/src/lib.rs) | 0 | ||||
| -rw-r--r-- | test cases/rust/30 cargo workspace/subprojects/member2.wrap | 2 |
5 files changed, 9 insertions, 1 deletions
diff --git a/test cases/rust/30 cargo workspace/subprojects/foo/Cargo.toml b/test cases/rust/30 cargo workspace/subprojects/foo/Cargo.toml index 54fff4815..52f28d821 100644 --- a/test cases/rust/30 cargo workspace/subprojects/foo/Cargo.toml +++ b/test cases/rust/30 cargo workspace/subprojects/foo/Cargo.toml @@ -12,4 +12,4 @@ version = "1.0.0" [workspace.dependencies] member1 = { path="./src/member1" } -member2 = { path="src/member2", features = ["f1"] } +member2 = { path="subprojects/member2-1.0", features = ["f1"] } diff --git a/test cases/rust/30 cargo workspace/subprojects/foo/subprojects/member2-1-rs.wrap b/test cases/rust/30 cargo workspace/subprojects/foo/subprojects/member2-1-rs.wrap new file mode 100644 index 000000000..57ae2faa6 --- /dev/null +++ b/test cases/rust/30 cargo workspace/subprojects/foo/subprojects/member2-1-rs.wrap @@ -0,0 +1,6 @@ +[wrap-file] +directory=member2-1.0 +method=cargo + +[provide] +dependency_names=member2-1-rs diff --git a/test cases/rust/30 cargo workspace/subprojects/foo/src/member2/Cargo.toml b/test cases/rust/30 cargo workspace/subprojects/foo/subprojects/member2-1.0/Cargo.toml index 059120a1e..059120a1e 100644 --- a/test cases/rust/30 cargo workspace/subprojects/foo/src/member2/Cargo.toml +++ b/test cases/rust/30 cargo workspace/subprojects/foo/subprojects/member2-1.0/Cargo.toml diff --git a/test cases/rust/30 cargo workspace/subprojects/foo/src/member2/src/lib.rs b/test cases/rust/30 cargo workspace/subprojects/foo/subprojects/member2-1.0/src/lib.rs index 75703a957..75703a957 100644 --- a/test cases/rust/30 cargo workspace/subprojects/foo/src/member2/src/lib.rs +++ b/test cases/rust/30 cargo workspace/subprojects/foo/subprojects/member2-1.0/src/lib.rs diff --git a/test cases/rust/30 cargo workspace/subprojects/member2.wrap b/test cases/rust/30 cargo workspace/subprojects/member2.wrap new file mode 100644 index 000000000..3d43da646 --- /dev/null +++ b/test cases/rust/30 cargo workspace/subprojects/member2.wrap @@ -0,0 +1,2 @@ +[wrap-redirect] +filename = foo/subprojects/member2-1-rs.wrap |