summaryrefslogtreecommitdiff
path: root/test cases
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2025-10-28 13:33:09 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2025-12-22 12:01:05 +0100
commitdcf3af6b4e755a5da76eeea91332ca3dce17810f (patch)
treec631924f7eafc241806c9d8eb713f1df29f2fd95 /test cases
parent013121d3dda42b2bf70cb53675e3f3fe432b1d97 (diff)
downloadmeson-dcf3af6b4e755a5da76eeea91332ca3dce17810f.tar.gz
modules: rust: invoke subprojects automatically from dependencies()
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'test cases')
-rw-r--r--test cases/rust/31 rust.workspace package/meson.build14
-rw-r--r--test cases/rust/32 rust.workspace workspace/meson.build14
2 files changed, 14 insertions, 14 deletions
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')