Skip to content

Commit a155013

Browse files
authored
Merge pull request #415 from janos-meggyesi-arm/fix_print_test
Replace remaining PRINT_TEST with TEST
2 parents 82ad7d4 + 482822c commit a155013

File tree

4 files changed

+7
-9
lines changed

4 files changed

+7
-9
lines changed

api-tests/dev_apis/crypto/test_c078/test_c078.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ int32_t psa_pake_jpake_test(caller_security_t caller __UNUSED)
325325
return VAL_STATUS_SUCCESS;
326326

327327
#else
328-
val->print(PRINT_TEST, "No test available for the selected crypto configuration\n", 0);
328+
val->print(TEST, "No test available for the selected crypto configuration\n", 0);
329329
return RESULT_SKIP(VAL_STATUS_NO_TESTS);
330330
#endif
331331
}

api-tests/dev_apis/crypto/test_c079/test_c079.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ int32_t psa_pake_spake2p_test(caller_security_t caller __UNUSED)
121121

122122
if (num_checks == 0)
123123
{
124-
val->print(PRINT_TEST, "No test available for the selected crypto configuration\n", 0);
124+
val->print(TEST, "No test available for the selected crypto configuration\n", 0);
125125
return RESULT_SKIP(VAL_STATUS_NO_TESTS);
126126
}
127127

api-tests/dev_apis/crypto/test_c080/test_c080.c

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
**/
1717

1818
#include "val_interfaces.h"
19-
#include "val_target.h"
2019
#include "test_c080.h"
2120
#include "test_data.h"
2221

@@ -42,7 +41,7 @@ int32_t psa_key_agreement_test(caller_security_t caller __UNUSED)
4241

4342
if (num_checks == 0)
4443
{
45-
val->print(PRINT_TEST, "No test available for the selected crypto configuration\n", 0);
44+
val->print(TEST, "No test available for the selected crypto configuration\n", 0);
4645
return RESULT_SKIP(VAL_STATUS_NO_TESTS);
4746
}
4847

@@ -56,8 +55,8 @@ int32_t psa_key_agreement_test(caller_security_t caller __UNUSED)
5655

5756
for (i = 0; i < num_checks; i++)
5857
{
59-
val->print(PRINT_TEST, "Check %d: ", g_test_count++);
60-
val->print(PRINT_TEST, check1[i].test_desc, 0);
58+
val->print(TEST, "Check %d: ", g_test_count++);
59+
val->print(TEST, check1[i].test_desc, 0);
6160

6261
/* Setting up the watchdog timer for each check */
6362
status = val->wd_reprogram_timer(WD_CRYPTO_TIMEOUT);
@@ -152,7 +151,7 @@ if (valid_test_input_index < 0)
152151
val->crypto_function(VAL_CRYPTO_SET_KEY_USAGE_FLAGS, &attributes,
153152
check1[valid_test_input_index].derv_flag);
154153

155-
val->print(PRINT_TEST, "Check %d: Test psa_key_agreement - Invalid key handle\n",
154+
val->print(TEST, "Check %d: Test psa_key_agreement - Invalid key handle\n",
156155
g_test_count++);
157156
/* Set up a key agreement operation */
158157
status = val->crypto_function(VAL_CRYPTO_KEY_AGREEMENT, key,
@@ -162,7 +161,7 @@ if (valid_test_input_index < 0)
162161
&attributes, &derv_key);
163162
TEST_ASSERT_EQUAL(status, PSA_ERROR_INVALID_HANDLE, TEST_CHECKPOINT_NUM(3));
164163

165-
val->print(PRINT_TEST, "Check %d: Test psa_key_agreement - Zero as key handle\n",
164+
val->print(TEST, "Check %d: Test psa_key_agreement - Zero as key handle\n",
166165
g_test_count++);
167166

168167
status = val->crypto_function(VAL_CRYPTO_KEY_AGREEMENT, 0,

api-tests/dev_apis/crypto/test_c080/test_entry_c080.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
**/
1717

1818
#include "val_interfaces.h"
19-
#include "val_target.h"
2019
#include "test_c080.h"
2120

2221
#define TEST_NUM VAL_CREATE_TEST_ID(VAL_CRYPTO_BASE, 80)

0 commit comments

Comments
 (0)