Skip to content

Commit 4edb6da

Browse files
author
Nir Sonnenschein
committed
removed redundant code + added comment
Thanks @cmonr.
1 parent 376e7ff commit 4edb6da

File tree

1 file changed

+56
-69
lines changed

1 file changed

+56
-69
lines changed

features/frameworks/TARGET_PSA/val_greentea.cpp

Lines changed: 56 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ void mbed_val_test_exit(void)
3636
if (IS_TEST_FAIL(status) || IS_TEST_SKIP(status))
3737
{
3838
GREENTEA_TESTSUITE_RESULT(false);
39-
return;
4039
}
4140
else
4241
{
@@ -58,93 +57,81 @@ val_status_t mbed_val_execute_non_secure_tests(uint32_t test_num, client_test_t
5857
{
5958
val_status_t status = VAL_STATUS_SUCCESS;
6059
int32_t test_status = VAL_STATUS_SUCCESS;
61-
boot_t boot = {.state = BOOT_NOT_EXPECTED};
6260
psa_handle_t handle;
6361
uint32_t i = 1;
6462
test_info_t test_info;
6563
char testcase_name[100] = "";
6664
bool continue_test = true;
6765

6866
test_info.test_num = test_num;
69-
if (boot.state == BOOT_NOT_EXPECTED || boot.state == BOOT_EXPECTED_CRYPTO)
67+
68+
mbed_val_print(PRINT_TEST, "[Info] Executing tests from non-secure\n", 0);
69+
while (tests_list[i] != NULL)
7070
{
71-
mbed_val_print(PRINT_TEST, "[Info] Executing tests from non-secure\n", 0);
72-
while (tests_list[i] != NULL)
71+
memset(testcase_name, 0, 100);
72+
sprintf(testcase_name, "Check%d", i);
73+
GREENTEA_TESTCASE_START(testcase_name);
74+
if (server_hs == TRUE)
7375
{
74-
memset(testcase_name, 0, 100);
75-
sprintf(testcase_name, "Check%d", i);
76-
GREENTEA_TESTCASE_START(testcase_name);
77-
if (server_hs == TRUE)
78-
{
79-
/* Handshake with server tests */
80-
test_info.block_num = i;
81-
status = mbed_val_execute_secure_test_func(&handle, test_info,
82-
SERVER_TEST_DISPATCHER_SID);
83-
if (VAL_ERROR(status))
84-
{
85-
mbed_val_set_status(RESULT_FAIL(status));
86-
mbed_val_print(PRINT_ERROR, "[Check%d] START\n", i);
87-
return status;
88-
}
89-
else
90-
{
91-
mbed_val_print(PRINT_DEBUG, "[Check%d] START\n", i);
92-
}
93-
}
94-
95-
/* Execute client tests */
96-
test_status = tests_list[i](NONSECURE);
97-
98-
if (server_hs == TRUE)
99-
{
100-
/* Retrive Server test status */
101-
status = mbed_val_get_secure_test_result(&handle);
102-
}
103-
104-
if (test_status != VAL_STATUS_SUCCESS)
105-
{
106-
status = VAL_STATUS_ERROR;
107-
}
108-
109-
if (IS_TEST_SKIP(status))
110-
{
111-
mbed_val_set_status(status);
112-
mbed_val_print(PRINT_DEBUG, "[Check%d] SKIPPED\n", i);
113-
GREENTEA_TESTCASE_FINISH(testcase_name, 1, 0);
114-
continue_test = false;
115-
}
116-
else if (VAL_ERROR(status))
76+
/* Handshake with server tests */
77+
test_info.block_num = i;
78+
status = mbed_val_execute_secure_test_func(&handle, test_info,
79+
SERVER_TEST_DISPATCHER_SID);
80+
if (VAL_ERROR(status))
11781
{
11882
mbed_val_set_status(RESULT_FAIL(status));
119-
if (server_hs == TRUE)
120-
mbed_val_print(PRINT_ERROR, "[Check%d] FAILED\n", i);
121-
GREENTEA_TESTCASE_FINISH(testcase_name, 0, 1);
122-
continue_test = false;
83+
mbed_val_print(PRINT_ERROR, "[Check%d] START\n", i);
84+
return status;
12385
}
12486
else
12587
{
126-
if (server_hs == TRUE)
127-
mbed_val_print(PRINT_DEBUG, "[Check%d] PASSED\n", i);
128-
GREENTEA_TESTCASE_FINISH(testcase_name, 1, 0);
129-
continue_test = true;
88+
mbed_val_print(PRINT_DEBUG, "[Check%d] START\n", i);
13089
}
90+
}
13191

132-
if (!continue_test)
133-
{
134-
return status;
135-
}
92+
/* Execute client tests */
93+
test_status = tests_list[i](NONSECURE);
13694

137-
i++;
95+
if (server_hs == TRUE)
96+
{
97+
/* Retrive Server test status */
98+
status = mbed_val_get_secure_test_result(&handle);
13899
}
139-
}
140-
else
141-
{
142-
/* If we are here means, we are in second run of this test */
143-
status = VAL_STATUS_SUCCESS;
144-
if (boot.state != BOOT_EXPECTED_S)
100+
101+
if (test_status != VAL_STATUS_SUCCESS)
145102
{
146-
mbed_val_print(PRINT_DEBUG, "[Check1] PASSED\n", 0);
103+
status = VAL_STATUS_ERROR;
147104
}
105+
106+
if (IS_TEST_SKIP(status))
107+
{
108+
mbed_val_set_status(status);
109+
mbed_val_print(PRINT_DEBUG, "[Check%d] SKIPPED\n", i);
110+
GREENTEA_TESTCASE_FINISH(testcase_name, 1, 0);
111+
continue_test = false;
112+
}
113+
else if (VAL_ERROR(status))
114+
{
115+
mbed_val_set_status(RESULT_FAIL(status));
116+
if (server_hs == TRUE)
117+
mbed_val_print(PRINT_ERROR, "[Check%d] FAILED\n", i);
118+
GREENTEA_TESTCASE_FINISH(testcase_name, 0, 1);
119+
continue_test = false;
120+
}
121+
else
122+
{
123+
if (server_hs == TRUE)
124+
mbed_val_print(PRINT_DEBUG, "[Check%d] PASSED\n", i);
125+
GREENTEA_TESTCASE_FINISH(testcase_name, 1, 0);
126+
continue_test = true;
127+
}
128+
129+
if (!continue_test)
130+
{
131+
return status;
132+
}
133+
134+
i++;
148135
}
149136
return status;
150137
}
@@ -325,6 +312,6 @@ val_status_t mbed_val_wd_reprogram_timer(wd_timeout_type_t timeout_type)
325312
}
326313

327314

328-
}
315+
} // extern "C"
329316

330317

0 commit comments

Comments
 (0)