Skip to content

Commit 82f60d9

Browse files
authored
Remove 'PSA' check from test spec conversion
This is unnecessary because all TZ targets must follow the naming rule: PLATFORM_[NPSA_]S/NS
1 parent ad5e94a commit 82f60d9

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

tools/test_api.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2274,9 +2274,9 @@ def test_spec_from_test_builds(test_builds):
22742274
for build in test_builds:
22752275
# Convert TZ target name to test spec platform name
22762276
#
2277-
# 1. All TZ targets should have name pattern: PLATFORM_[PSA_/NPSA_]S/NS, where:
2277+
# 1. All TZ targets should have name pattern: PLATFORM_[NPSA_]S/NS, where:
22782278
# (1) 'PLATFORM' for test spec platform name
2279-
# (2) 'PSA/NPSA' for PSA/non-PSA targets. Defaults to PSA target on absent.
2279+
# (2) 'NPSA' for non-PSA targets. Defaults to PSA target if absent.
22802280
# (3) 'S'/'NS' for secure/non-secure targets
22812281
# 2. Secure target may participate in Greentea, so its name is also truncated here.
22822282
if Target.get_target(test_builds[build]['platform']).is_TrustZone_target:
@@ -2285,9 +2285,7 @@ def test_spec_from_test_builds(test_builds):
22852285
elif test_builds[build]['platform'].endswith('_S'):
22862286
test_builds[build]['platform'] = test_builds[build]['platform'][:-2]
22872287

2288-
if test_builds[build]['platform'].endswith('_PSA'):
2289-
test_builds[build]['platform'] = test_builds[build]['platform'][:-4]
2290-
elif test_builds[build]['platform'].endswith('_NPSA'):
2288+
if test_builds[build]['platform'].endswith('_NPSA'):
22912289
test_builds[build]['platform'] = test_builds[build]['platform'][:-5]
22922290
return {
22932291
"builds": test_builds

0 commit comments

Comments
 (0)