From dcf3af6b4e755a5da76eeea91332ca3dce17810f Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Tue, 28 Oct 2025 13:33:09 +0100 Subject: modules: rust: invoke subprojects automatically from dependencies() Signed-off-by: Paolo Bonzini --- test cases/rust/31 rust.workspace package/meson.build | 14 +++++++------- test cases/rust/32 rust.workspace workspace/meson.build | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) (limited to 'test cases') diff --git a/test cases/rust/31 rust.workspace package/meson.build b/test cases/rust/31 rust.workspace package/meson.build index ec17a00f5..d00a6096a 100644 --- a/test cases/rust/31 rust.workspace package/meson.build +++ b/test cases/rust/31 rust.workspace package/meson.build @@ -20,13 +20,6 @@ assert(hello_rs.api() == '1') assert(hello_rs.all_features() == ['default', 'goodbye']) assert(hello_rs.features() == ['default', 'goodbye']) -answer_rs = cargo_ws.subproject('answer', '2') -assert(answer_rs.name() == 'answer') -assert(answer_rs.version() == '2.1.0') -assert(answer_rs.api() == '2') -assert(answer_rs.all_features() == ['default', 'large']) -assert(answer_rs.features() == ['default', 'large']) - e = executable('package-test', 'src/main.rs', dependencies: main_pkg.dependencies(), rust_args: main_pkg.rust_args(), @@ -34,6 +27,13 @@ e = executable('package-test', 'src/main.rs', ) test('package-test', e) +answer_rs = cargo_ws.subproject('answer', '2') +assert(answer_rs.name() == 'answer') +assert(answer_rs.version() == '2.1.0') +assert(answer_rs.api() == '2') +assert(answer_rs.all_features() == ['default', 'large']) +assert(answer_rs.features() == ['default', 'large']) + # failure test cases for package() testcase expect_error('argument to package() cannot be a subproject') cargo_ws.package('hello') diff --git a/test cases/rust/32 rust.workspace workspace/meson.build b/test cases/rust/32 rust.workspace workspace/meson.build index 63df7b1c4..d54abd89b 100644 --- a/test cases/rust/32 rust.workspace workspace/meson.build +++ b/test cases/rust/32 rust.workspace workspace/meson.build @@ -20,13 +20,6 @@ assert(hello_rs.api() == '1') assert(hello_rs.all_features() == ['default', 'goodbye']) assert(hello_rs.features() == ['default', 'goodbye']) -answer_rs = cargo_ws.subproject('answer', '2') -assert(answer_rs.name() == 'answer') -assert(answer_rs.version() == '2.1.0') -assert(answer_rs.api() == '2') -assert(answer_rs.all_features() == ['default', 'large']) -assert(answer_rs.features() == ['default', 'large']) - subdir('more') e = executable('workspace-test', 'src/main.rs', @@ -36,6 +29,13 @@ e = executable('workspace-test', 'src/main.rs', ) test('workspace-test', e) +answer_rs = cargo_ws.subproject('answer', '2') +assert(answer_rs.name() == 'answer') +assert(answer_rs.version() == '2.1.0') +assert(answer_rs.api() == '2') +assert(answer_rs.all_features() == ['default', 'large']) +assert(answer_rs.features() == ['default', 'large']) + # failure test cases for package() testcase expect_error('argument to package() cannot be a subproject') cargo_ws.package('hello') -- cgit v1.2.3