Skip to content

Commit 829e90a

Browse files
committed
Incorporated review comments
1 parent f30dd1c commit 829e90a

File tree

12 files changed

+28
-23
lines changed

12 files changed

+28
-23
lines changed

TESTS/psa/attestation/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*/
1818

1919
#if !defined(MBED_CONF_RTOS_PRESENT)
20-
#error [NOT_SUPPORTED] PSA attestation test case requires RTOS to run.
20+
#error [NOT_SUPPORTED] PSA attestation test cases require RTOS to run.
2121
#else
2222

2323
#include "psa/crypto.h"

TESTS/psa/its_ps/main.cpp

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,12 @@
1616
* limitations under the License.
1717
*/
1818

19-
#if !defined(TARGET_PSA) || !defined(MBED_CONF_RTOS_PRESENT)
20-
#error [NOT_SUPPORTED] ITS/PS tests can run only on PSA-enabled targets and RTOS.
19+
#if !defined(MBED_CONF_RTOS_PRESENT)
20+
#error [NOT_SUPPORTED] ITS/PS test cases require RTOS to run.
21+
#else
22+
23+
#ifndef TARGET_PSA
24+
#error [NOT_SUPPORTED] ITS/PS tests can run only on PSA-enabled targets.
2125
#else
2226

2327
#include "greentea-client/test_env.h"
@@ -238,4 +242,5 @@ int main()
238242
return !Harness::run(specification);
239243
}
240244

241-
#endif // TARGET_PSA || !defined(MBED_CONF_RTOS_PRESENT)
245+
#endif // TARGET_PSA
246+
#endif // !defined(MBED_CONF_RTOS_PRESENT)

components/TARGET_PSA/TESTS/compliance_attestation/test_a001/main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#include "pal_mbed_os_intf.h"
33

44
#if !defined(MBED_CONF_RTOS_PRESENT)
5-
#error [NOT_SUPPORTED] PSA compliance attestation test cases requires RTOS to run.
5+
#error [NOT_SUPPORTED] PSA compliance attestation test cases require RTOS to run.
66
#else
77
void test_entry_a001(val_api_t *val_api, psa_api_t *psa_api);
88

components/TARGET_PSA/TESTS/compliance_its/test_s001/main.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#include "pal_mbed_os_intf.h"
33

44
#if !defined(MBED_CONF_RTOS_PRESENT)
5-
#error [NOT_SUPPORTED] PSA compliance its test cases requires RTOS to run
5+
#error [NOT_SUPPORTED] PSA compliance its test cases require RTOS to run
66
#else
77

88
#ifdef ITS_TEST
@@ -19,4 +19,4 @@ int main(void)
1919
test_start(test_entry_p001, COMPLIANCE_TEST_STORAGE);
2020
#endif
2121
}
22-
#endif
22+
#endif // !defined(MBED_CONF_RTOS_PRESENT)

components/TARGET_PSA/TESTS/compliance_its/test_s002/main.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#include "pal_mbed_os_intf.h"
33
#include "lifecycle.h"
44
#if !defined(MBED_CONF_RTOS_PRESENT)
5-
#error [NOT_SUPPORTED] PSA compliance its test cases requires RTOS to run
5+
#error [NOT_SUPPORTED] PSA compliance its test cases require RTOS to run
66
#else
77

88
#ifdef ITS_TEST
@@ -19,4 +19,4 @@ int main(void)
1919
test_start(test_entry_p002, COMPLIANCE_TEST_STORAGE);
2020
#endif
2121
}
22-
#endif
22+
#endif // !defined(MBED_CONF_RTOS_PRESENT)

components/TARGET_PSA/TESTS/compliance_its/test_s004/main.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include "val_interfaces.h"
22
#include "pal_mbed_os_intf.h"
33
#if !defined(MBED_CONF_RTOS_PRESENT)
4-
#error [NOT_SUPPORTED] PSA compliance its test cases requires RTOS to run
4+
#error [NOT_SUPPORTED] PSA compliance its test cases require RTOS to run
55
#else
66

77
#ifdef ITS_TEST
@@ -18,4 +18,4 @@ int main(void)
1818
test_start(test_entry_p004, COMPLIANCE_TEST_STORAGE);
1919
#endif
2020
}
21-
#endif
21+
#endif // !defined(MBED_CONF_RTOS_PRESENT)

components/TARGET_PSA/TESTS/compliance_its/test_s005/main.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#include "pal_mbed_os_intf.h"
33

44
#if !defined(MBED_CONF_RTOS_PRESENT)
5-
#error [NOT_SUPPORTED] PSA compliance its test cases requires RTOS to run
5+
#error [NOT_SUPPORTED] PSA compliance its test cases require RTOS to run
66
#else
77

88
#ifdef ITS_TEST
@@ -19,4 +19,4 @@ int main(void)
1919
test_start(test_entry_p005, COMPLIANCE_TEST_STORAGE);
2020
#endif
2121
}
22-
#endif
22+
#endif // !defined(MBED_CONF_RTOS_PRESENT)

components/TARGET_PSA/TESTS/compliance_its/test_s006/main.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#include "pal_mbed_os_intf.h"
33

44
#if !defined(MBED_CONF_RTOS_PRESENT)
5-
#error [NOT_SUPPORTED] PSA compliance its test cases requires RTOS to run
5+
#error [NOT_SUPPORTED] PSA compliance its test cases require RTOS to run
66
#else
77

88
#ifdef ITS_TEST
@@ -19,4 +19,4 @@ int main(void)
1919
test_start(test_entry_p006, COMPLIANCE_TEST_STORAGE);
2020
#endif
2121
}
22-
#endif
22+
#endif // !defined(MBED_CONF_RTOS_PRESENT)

components/TARGET_PSA/TESTS/compliance_its/test_s007/main.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#include "pal_mbed_os_intf.h"
33

44
#if !defined(MBED_CONF_RTOS_PRESENT)
5-
#error [NOT_SUPPORTED] PSA compliance its test cases requires RTOS to run
5+
#error [NOT_SUPPORTED] PSA compliance its test cases require RTOS to run
66
#else
77

88
#ifdef ITS_TEST
@@ -19,4 +19,4 @@ int main(void)
1919
test_start(test_entry_p007, COMPLIANCE_TEST_STORAGE);
2020
#endif
2121
}
22-
#endif
22+
#endif // !defined(MBED_CONF_RTOS_PRESENT)

components/TARGET_PSA/TESTS/compliance_its/test_s008/main.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#include "pal_mbed_os_intf.h"
33

44
#if !defined(MBED_CONF_RTOS_PRESENT)
5-
#error [NOT_SUPPORTED] PSA compliance its test cases requires RTOS to run
5+
#error [NOT_SUPPORTED] PSA compliance its test cases require RTOS to run
66
#else
77

88
#ifdef ITS_TEST
@@ -19,4 +19,4 @@ int main(void)
1919
test_start(test_entry_p008, COMPLIANCE_TEST_STORAGE);
2020
#endif
2121
}
22-
#endif
22+
#endif // !defined(MBED_CONF_RTOS_PRESENT)

components/TARGET_PSA/TESTS/compliance_its/test_s009/main.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#include "pal_mbed_os_intf.h"
33

44
#if !defined(MBED_CONF_RTOS_PRESENT)
5-
#error [NOT_SUPPORTED] PSA compliance its test cases requires RTOS to run
5+
#error [NOT_SUPPORTED] PSA compliance its test cases require RTOS to run
66
#else
77

88
#ifdef ITS_TEST
@@ -19,4 +19,4 @@ int main(void)
1919
test_start(test_entry_p009, COMPLIANCE_TEST_STORAGE);
2020
#endif
2121
}
22-
#endif
22+
#endif // !defined(MBED_CONF_RTOS_PRESENT)

components/TARGET_PSA/TESTS/compliance_its/test_s010/main.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#include "pal_mbed_os_intf.h"
33

44
#if !defined(MBED_CONF_RTOS_PRESENT)
5-
#error [NOT_SUPPORTED] PSA compliance its test cases requires RTOS to run
5+
#error [NOT_SUPPORTED] PSA compliance its test cases require RTOS to run
66
#else
77

88
#ifdef ITS_TEST
@@ -19,4 +19,4 @@ int main(void)
1919
test_start(test_entry_p010, COMPLIANCE_TEST_STORAGE);
2020
#endif
2121
}
22-
#endif
22+
#endif // !defined(MBED_CONF_RTOS_PRESENT)

0 commit comments

Comments
 (0)