CMake: Add CMake to platform greentea test #14072
Merged
Conversation
This file contains hidden or 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
rajkan01
force-pushed
the
add_cmake_greentea_platform
branch
2 times, most recently
from
babdb45 to
5d4f694
Compare
rajkan01
changed the title
|
@rajkan01, thank you for your changes. |
hugueskamba
reviewed
Dec 18, 2020
|
The changes seem to be a lot of copy/paste with only one line changing. Why not use a macro instead? This way, if we need to modify, we can do it only once instead of 25 times. something like this: # calling the macro
mbed_config_greentea(TEST_NAME mbed-platform-system-reset EXTRA_SOURCES foo.cpp bar.cpp EXTRA_LIBS mbed-kvstore mbed-xyz)
# the macro
macro(mbed_config_greentea)
set(options)
set(singleValueArgs TEST_NAME)
set(multipleValueArgs EXTRA_SOURCES EXTRA_LIBS)
cmake_parse_arguments(MBED_CONFIG_GREENTEA "${options}" "${singleValueArgs}"
"${multipleValueArgs}" ${ARGN} )
cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR)
set(MBED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../../.. CACHE INTERNAL "")
set(MBED_CONFIG_PATH ${CMAKE_CURRENT_SOURCE_DIR}/.mbedbuild CACHE INTERNAL "")
set(TEST_NAME ${MBED_CONFIG_GREENTEA_TEST_NAME})
include(${MBED_PATH}/tools/cmake/app.cmake)
add_subdirectory(${MBED_PATH} build)
add_executable(${TEST_NAME})
mbed_configure_app_target(${TEST_NAME})
mbed_set_mbed_target_linker_script(${TEST_NAME})
project(${TEST_NAME})
target_sources(${TEST_NAME}
PRIVATE
main.cpp
${MBED_CONFIG_GREENTEA_EXTRA_SOURCES}
)
if(MBED_BAREMETAL_GREENTEA_TEST)
set(USE_LIB mbed-baremetal)
else()
set(USE_LIB mbed-os)
endif()
target_link_libraries(${TEST_NAME}
PRIVATE
${USE_LIB}
mbed-greentea
${MBED_CONFIG_GREENTEA_EXTRA_LIBS}
)
mbed_set_post_build(${TEST_NAME})
option(VERBOSE_BUILD "Have a verbose build process")
if(VERBOSE_BUILD)
set(CMAKE_VERBOSE_MAKEFILE ON)
endif()
endmacro() |
rajkan01
force-pushed
the
add_cmake_greentea_platform
branch
from
5d4f694 to
8704da8
Compare
rajkan01
force-pushed
the
add_cmake_greentea_platform
branch
from
8704da8 to
a9eda7c
Compare
ladislas
reviewed
Dec 22, 2020
rajkan01
force-pushed
the
add_cmake_greentea_platform
branch
from
ee50d24 to
f27e924
Compare
hugueskamba
reviewed
Dec 23, 2020
hugueskamba
reviewed
Dec 23, 2020
rajkan01
force-pushed
the
add_cmake_greentea_platform
branch
from
7c88447 to
95d3716
Compare
hugueskamba
reviewed
Dec 23, 2020
hugueskamba
reviewed
Dec 23, 2020
hugueskamba
reviewed
Dec 23, 2020
rajkan01
force-pushed
the
add_cmake_greentea_platform
branch
from
934e346 to
360f693
Compare
rwalton-arm
reviewed
Jan 4, 2021
0xc0170
previously approved these changes
Jan 5, 2021
There was a problem hiding this comment.
Two steps required:
- rebase to fix travis failure
- commit requested edits from @hugueskamba
We will fix the macro name in the following PR asap.
I approved but should be as request for changes (travis is red anyway).
mergify
bot
dismissed stale reviews from hugueskamba and 0xc0170
Pull request has been modified.
|
CI started |
rajkan01
force-pushed
the
add_cmake_greentea_platform
branch
from
3b19991 to
eb9bb7b
Compare
Jenkins CI Test : ✔️ SUCCESSBuild Number: 1 | 🔒 Jenkins CI Job | 🌐 Logs & ArtifactsCLICK for Detailed Summary
|
|
@0xc0170 This PR is ready for CI, could you start the CI |
|
CI restarted |
|
@hugueskamba happy with the current state? |
hugueskamba
approved these changes
Jan 5, 2021
Jenkins CI Test : ✔️ SUCCESSBuild Number: 2 | 🔒 Jenkins CI Job | 🌐 Logs & ArtifactsCLICK for Detailed Summary
|
mbedmain
added
release-version: 6.7.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_cmake_macrowith configurable argumentsTEST_NAME,TEST_INCLUDE_DIRS,TEST_SOURCES,TEST_REQUIRED_LIBSso that it can be used across all the greentea test suite by passing their includes, sources required libraries.MBED_BAREMETAL_GREENTEA_TESTwhich canON/OFFvia CMake command-line argument at the configuration time to select/unselect baremetal greentea testImpact of changes
None.
Migration actions required
Note
Documentation
None.
Pull request type
Test results
Manual testing:
Successfully able to build the test suite with below manual steps
-- Generated .mbed_build config for DISCO target from blinky example and copied into the atomic test directory.
-- Manually created test_spec.json, which is required by mbetgt to flash and initiate the test.
-- Reused host_tests python scripts
-- Manually created
runtests.cmakewhere it callsmbedgtcommand via execute_process()-- CTest -S runtests.cmake
Reviewers
@hugueskamba @0xc0170