Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Convert TZ target name to test spec platform name #11467

Merged
merged 1 commit into from
Sep 12, 2019
Merged

Convert TZ target name to test spec platform name #11467

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion tools/test_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2272,9 +2272,20 @@ def build_tests(tests, base_source_paths, build_path, target, toolchain_name,

def test_spec_from_test_builds(test_builds):
for build in test_builds:
if Target.get_target(test_builds[build]['platform']).is_PSA_non_secure_target:
# Convert TZ target name to test spec platform name
#
# 1. All TZ targets should have name pattern: PLATFORM_[PSA_]S/NS, where:
# (1) 'PLATFORM' for test spec platform name
# (2) 'PSA' is optional to distinguish PSA/non-PSA targets, especially when
# both PSA/non-PSA targets are supported
# (3) 'S'/'NS' for secure/non-secure targets
# 2. Secure target may participate in Greentea, so its name is also truncated here.
if Target.get_target(test_builds[build]['platform']).is_TrustZone_target:
if test_builds[build]['platform'].endswith('_NS'):
test_builds[build]['platform'] = test_builds[build]['platform'][:-3]
elif test_builds[build]['platform'].endswith('_S'):
test_builds[build]['platform'] = test_builds[build]['platform'][:-2]

if test_builds[build]['platform'].endswith('_PSA'):
test_builds[build]['platform'] = test_builds[build]['platform'][:-4]
return {
Expand Down