CMake: Add CMake to mbed-psa greentea tests #14828
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
hazzlim
changed the title
hazzlim
changed the title
hazzlim
changed the title
|
@hazzlim, thank you for your changes. |
LDong-Arm
reviewed
Jun 24, 2021
...ATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_MBED_PSA_SRV/TESTS/attestation/test/CMakeLists.txt
Outdated
Show resolved
Hide resolved
...AL_API/FEATURE_PSA/TARGET_MBED_PSA_SRV/TESTS/compliance_attestation/test_a001/CMakeLists.txt
Outdated
Show resolved
Hide resolved
...ATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_MBED_PSA_SRV/TESTS/crypto_init/test/CMakeLists.txt
Outdated
Show resolved
Hide resolved
hazzlim
force-pushed
the
add-cmake-supports-psa-tests
branch
2 times, most recently
from
341080e
to
49e3182
Compare
hazzlim
force-pushed
the
add-cmake-supports-psa-tests
branch
from
49e3182
to
53d9e7f
Compare
Patater
previously requested changes
Jun 29, 2021
...PERIMENTAL_API/FEATURE_PSA/TARGET_MBED_PSA_SRV/TESTS/compliance_attestation/test_a001/main.c
Outdated
Show resolved
Hide resolved
0xc0170
reviewed
Jun 29, 2021
| @@ -11,6 +11,11 @@ include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake) | |||
| project(${TEST_TARGET}) | |||
|
|
|||
| mbed_greentea_add_test( | |||
| TEST_NAME ${TEST_TARGET} | |||
| TEST_REQUIRED_LIBS mbed-ble mbed-events | |||
| TEST_NAME | |||
There was a problem hiding this comment.
The style change - was it done by a tool or just follow CMake docs style?
There was a problem hiding this comment.
Was done to follow style pointers from Lingkai for previous commits
There was a problem hiding this comment.
Possibly a bit of an over-interpretation - is it best as it was?
There was a problem hiding this comment.
This is the kind of indentation we have when calling a macro function with parameters, so it looks good to me. I guess what @0xc0170 means is whether it was done manually or by some tool, and the former is the case.
There was a problem hiding this comment.
We should set-up cmake-format as a pre-commit check and specify the style we want to use. It would be great to run the cmake-format check as part of the CI. That way we will auto-enforce the style and it will always be consistent. We can add a new issue to add cmake-format to the CI in a separate PR.
hazzlim
force-pushed
the
add-cmake-supports-psa-tests
branch
from
53d9e7f
to
b4fdb5d
Compare
Patater
previously requested changes
Jun 29, 2021
MBED_PATH set to /platform directory incorrectly. Updated to set to /mbed-os directory.
CMakeLists.txt file in /hal/tests/TESTS/mbed_hal_fpga_ci_test_shield directory was non-functional as it used the greentea_add_test macro, which expects a main.cpp in current directory, but no main.cpp exists there. I checked with @rajkan01 who confirmed that this CMake file is serving no purpose and is there erroneously. All tests in subdirectories of this directory have their own CMakeLists.txt that successfully build them.
The mbed_greentea_add_test macro previously set a variable in order to use the un-prefixed TEST_NAME to refer to the argument in the macro body. Whilst pair-programming with LDong, this was identified and determined to be unecessary (maybe it was a failed attempt to fix something, that was never reversed?) and so it has been removed.
Assumption that greentea test file is always named main.cpp is incorrect. Updated mbed_greentea_add_test() macro to make TEST_SOURCES parameter compulsory, which is used to specify greentea test file(s). This allows tests to use C, or have a different name. Therefore also updated all pre-existing greentea test CMake files to explicity add main.cpp to TEST_SOURCES.
The greentea test for mbed-psa attestation can now be built with CMake.
The greentea test for mbed-psa crypto_init can now be built with CMake.
The greentea test for mbed-psa its_ps can now be built with CMake.
The greentea test for PSA entropy_inject can now be built with CMake. Note: requires MBEDTLS_ENTROPY_NV_SEED enabled, so not tested on target.
Move /val and /pal directories into /test_abstraction_layers directory and combine into one CMake target, mbed-psa-tal. Moved into seperate directory in order to have own CMakeLists.txt, rather than adding to /TARGET_MBED_PSA_SRV CMake file.
Greentea test for PSA compliance_attestation can now build with CMake.
PSA compliance_its tests can now be built with CMake.
hazzlim
force-pushed
the
add-cmake-supports-psa-tests
branch
from
b4fdb5d
to
f69a375
Compare
LDong-Arm
approved these changes
Jun 29, 2021
0xc0170
approved these changes
Jun 29, 2021
|
CI started |
Jenkins CI Test : ✔️ SUCCESSBuild Number: 1 | 🔒 Jenkins CI Job | 🌐 Logs & ArtifactsCLICK for Detailed Summary
|
mbedmain
added
release-version: 6.13.0
Release-pending
and removed
release-type: feature
Release-pending
labels
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary of changes
mbed_greentea_add_testmacro to require TEST_SOURCES for all files, removing assumption of main.cppFixes #14680
Impact of changes
None.
Migration actions required
None.
Documentation
None.
Pull request type
Test results
Manual testing for pre-existing greentea tests:
All pre-existing tests built successfully using below commands, or fail as expected due to a [NOT_SUPPORTED] error.
Manual testing for PSA tests:
Successfully able to build the test suite with below manual steps:
mbedtools configure -t <toolchain> -m <target> --mbed-os-path <path-to-mbed-os> --app-config TESTS/configs/experimental.json(requires this PR)cd cmake_build/<target>/develop/<toolchain>/ && cmake ../../../.. -G Ninja -DMBED_TEST_LINK_LIBRARIES=mbed-os && cmake --build .mbedhtrun -f <path/to/image> -p <port> -d <mount>All built successfully with both GCC_ARM and ARMC6, and run successfully on target K66F, except:
#error [NOT_SUPPORTED] PSA entropy injection tests can run only with MBEDTLS_ENTROPY_NV_SEED enabled.(Build successful if the macro is defined, but test crashes when run on K66F)#error [NOT_SUPPORTED] Test is too long for CI, thus always fails on timeout.(Build successful if the macro is defined, and test runs to {{result;success}})Reviewers
@Patater @LDong-Arm