Skip to content

Commit e629971

Browse files
authored
Enforce a Specific Execution Order for E2E cbuildgen Tests in the SimpleTrustZone Example (#622)
## Fixes - #623 ## Checklist <!-- Put an `x` in the boxes. All tasks must be completed and boxes checked before merging. --> - [x] 🤖 This change is covered by unit tests (if applicable). - [x] 🤹 Manual testing has been performed (if necessary). - [x] 🛡️ Security impacts have been considered (if relevant). - [x] 📖 Documentation updates are complete (if required). - [x] 🧠 Third-party dependencies and TPIP updated (if required).
1 parent 2b9198d commit e629971

1 file changed

Lines changed: 11 additions & 1 deletion

File tree

test/e2e/resources/exec.resource

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,18 @@ Run Csolution Project
111111
${filecontexts}= Convert And Filter Contexts ${contexts}
112112
@{args_ex} Create List @{args} @{filecontexts}
113113

114+
# For SimpleTZ solution, explicitly build the TrustZone contexts in order
115+
${file_name}= Evaluate os.path.basename(r'''${input_file}''') modules=os
116+
@{args_cbuildgen}= Copy List ${args_ex}
117+
IF '${file_name}' == 'SimpleTZ.csolution.yml'
118+
Append To List ${args_cbuildgen} -c CM33_s.Debug+AVH
119+
Append To List ${args_cbuildgen} -c CM33_ns.Debug+AVH
120+
Append To List ${args_cbuildgen} -c CM33_s.Release+AVH
121+
Append To List ${args_cbuildgen} -c CM33_ns.Release+AVH
122+
END
123+
114124
${res_cbuildgen}= Run Keyword And Ignore Error
115-
... Build Example With cbuildgen ${input_file} ${expect} ${args_ex}
125+
... Build Example With cbuildgen ${input_file} ${expect} ${args_cbuildgen}
116126
${res_cbuild2cmake}= Run Keyword And Ignore Error
117127
... Build Example with cbuild2cmake ${input_file} ${expect} ${args_ex}
118128

0 commit comments

Comments
 (0)