mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-02-10 02:33:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

ptest-cargo.bbclass: Support of cargo workspaces

Browse Source 
For complex project, it is very common to have multiple
sub artifacts and so use workspaces, sometimes it has
even no root artifacts (but several bin or lib) and
virtual manifest is used for that.

Long story short, support this case in ptest-cargo class
to look for all test binaries in the current project
and no more those generated by the root Cargo.toml

(From OE-Core rev: 67644c3fa7d012ad03d0a876a281d5abd5edf7fe)

Signed-off-by: Frederic Martinsons <frederic.martinsons@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Frederic Martinsons
2023-07-29 07:09:21 +02:00
committed by Richard Purdie
parent c2d0ac3f0d
commit 80cec38c0c
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
meta/classes-recipe/ptest-cargo.bbclass
View File

@@ -16,6 +16,8 @@ python do_compile_ptest_cargo() {
cargo_build_flags = d.getVar("CARGO_BUILD_FLAGS", True)
rust_flags = d.getVar("RUSTFLAGS", True)
manifest_path = d.getVar("MANIFEST_PATH", True)
project_manifest_path = os.path.normpath(manifest_path)
manifest_dir = os.path.dirname(manifest_path)
env = os.environ.copy()
env['RUSTFLAGS'] = rust_flags
@@ -46,13 +48,15 @@ python do_compile_ptest_cargo() {
pass
else:
try:
# Filter the test packages coming from the current manifest
# Filter the test packages coming from the current project:
# - test binaries from the root manifest
# - test binaries from sub manifest of the current project if any
current_manifest_path = os.path.normpath(data['manifest_path'])
project_manifest_path = os.path.normpath(manifest_path)
if current_manifest_path == project_manifest_path:
common_path = os.path.commonpath([current_manifest_path, project_manifest_path])
if common_path in [manifest_dir, current_manifest_path]:
if (data['target']['test'] or data['target']['doctest']) and data['executable']:
test_bins.append(data['executable'])
except KeyError as e:
except (KeyError, ValueError) as e:
# skip lines that do not meet the requirements
pass