Convert TZ target name 'NPSA' to test spec platform name

1.  All TZ targets should have name pattern: PLATFORM_[PSA_/NPSA_]S/NS, where:
    (1) 'PLATFORM' for test spec platform name
    (2) 'PSA/NPSA' for PSA/non-PSA targets. Defaults to PSA target on absent.
    (3) 'S'/'NS' for secure/non-secure targets
2. Secure target may participate in Greentea, so its name is also truncated here.
pull/11524/head
Chun-Chieh Li 2019-09-16 09:34:52 +08:00 committed by adbridge
parent eb36cfeaa6
commit 6d8606fe4d
1 changed files with 5 additions and 4 deletions

View File

@ -2274,10 +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_]S/NS, where: # 1. All TZ targets should have name pattern: PLATFORM_[PSA_/NPSA_]S/NS, where:
# (1) 'PLATFORM' for test spec platform name # (1) 'PLATFORM' for test spec platform name
# (2) 'PSA' is optional to distinguish PSA/non-PSA targets, especially when # (2) 'PSA/NPSA' for PSA/non-PSA targets. Defaults to PSA target on absent.
# both PSA/non-PSA targets are supported
# (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:
@ -2288,6 +2287,8 @@ def test_spec_from_test_builds(test_builds):
if test_builds[build]['platform'].endswith('_PSA'): if test_builds[build]['platform'].endswith('_PSA'):
test_builds[build]['platform'] = test_builds[build]['platform'][:-4] 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]
return { return {
"builds": test_builds "builds": test_builds
} }