ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove 'PSA' check from test spec conversion 

This is unnecessary because all TZ targets must follow the naming rule: PLATFORM_[NPSA_]S/NS
pull/11487/head
ccli8 2019-09-16 23:25:44 +08:00 committed by GitHub
parent ad5e94a9c6
commit 82f60d913e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/test_api.py
View File

@ -2274,9 +2274,9 @@ def test_spec_from_test_builds(test_builds):
for build in test_builds: for build in test_builds:
# Convert TZ target name to test spec platform name # Convert TZ target name to test spec platform name
# #
# 1. All TZ targets should have name pattern: PLATFORM_[PSA_/NPSA_]S/NS, where: # 1. All TZ targets should have name pattern: PLATFORM_[NPSA_]S/NS, where:
# (1) 'PLATFORM' for test spec platform name # (1) 'PLATFORM' for test spec platform name
# (2) 'PSA/NPSA' for PSA/non-PSA targets. Defaults to PSA target on absent. # (2) 'NPSA' for non-PSA targets. Defaults to PSA target if absent.
# (3) 'S'/'NS' for secure/non-secure targets # (3) 'S'/'NS' for secure/non-secure targets
# 2. Secure target may participate in Greentea, so its name is also truncated here. # 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 Target.get_target(test_builds[build]['platform']).is_TrustZone_target:
@ -2285,9 +2285,7 @@ def test_spec_from_test_builds(test_builds):
elif test_builds[build]['platform'].endswith('_S'): elif test_builds[build]['platform'].endswith('_S'):
test_builds[build]['platform'] = test_builds[build]['platform'][:-2] test_builds[build]['platform'] = test_builds[build]['platform'][:-2]
if test_builds[build]['platform'].endswith('_PSA'): if test_builds[build]['platform'].endswith('_NPSA'):
test_builds[build]['platform'] = test_builds[build]['platform'][:-4]
elif test_builds[build]['platform'].endswith('_NPSA'):
test_builds[build]['platform'] = test_builds[build]['platform'][:-5] test_builds[build]['platform'] = test_builds[build]['platform'][:-5]
return { return {
"builds": test_builds "builds": test_builds