CMake : Refactor Mbed OS drivers UNITTESTS #14285
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,66 +1,35 @@ | ||
| # Copyright (c) 2021 ARM Limited. All rights reserved. | ||
| # SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| set(MBED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/.. CACHE INTERNAL "") | ||
|
|
||
| # Setup c++ standard | ||
| set(CMAKE_CXX_STANDARD 14) | ||
| set(CMAKE_CXX_STANDARD_REQUIRED ON) | ||
|
|
||
| if (MINGW) | ||
| # enable PRIx formatting globally | ||
| set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__STDC_FORMAT_MACROS") | ||
| set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__STDC_FORMAT_MACROS") | ||
| endif (MINGW) | ||
|
|
||
| #################### | ||
| # GTEST | ||
| #################### | ||
| include(FetchContent) | ||
| # Download and unpack googletest | ||
| if(NOT GTEST_FOUND) | ||
| FetchContent_Declare(googletest | ||
| GIT_REPOSITORY https://github.com/google/googletest.git | ||
| GIT_TAG release-1.10.0 | ||
| ) | ||
| FetchContent_MakeAvailable(googletest) | ||
| endif() | ||
|
|
||
| # Prevent overriding the parent project's compiler/linker | ||
| # settings on Windows | ||
| set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) | ||
|
|
||
|
|
||
| #################### | ||
| # TESTING | ||
|
|
@@ -69,28 +38,28 @@ target_include_directories(gmock_main SYSTEM BEFORE INTERFACE | |
| include(CTest) | ||
|
|
||
| set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES | ||
| "${CMAKE_BINARY_DIR}/Testing" | ||
| ) | ||
|
|
||
| #################### | ||
| # CODE COVERAGE SETUP | ||
| #################### | ||
|
|
||
| if (COVERAGE) | ||
|
|
||
| if (NOT CMAKE_BUILD_TYPE STREQUAL "Debug") | ||
| message(WARNING "Non-debug build may result misleading code coverage results.") | ||
| endif() | ||
|
|
||
| # Append coverage compiler flags | ||
| set(COVERAGE_COMPILER_FLAGS "-g -O0 --coverage") | ||
| set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COVERAGE_COMPILER_FLAGS}") | ||
| set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COVERAGE_COMPILER_FLAGS}") | ||
|
|
||
| endif(COVERAGE) | ||
|
|
||
| if (VALGRIND) | ||
| find_program(MEMORYCHECK_COMMAND valgrind) | ||
| endif(VALGRIND) | ||
|
|
||
| #################### | ||
|
|
@@ -100,141 +69,14 @@ endif(VALGRIND) | |
| set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DUNITTEST") | ||
| set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUNITTEST") | ||
|
|
||
| macro( mbed_add_all_subdirectories subdirectories_list ) | ||
|
There was a problem hiding this comment. Where is this used , I can't find a reference. There was a problem hiding this comment. it's no longer used since we're not globbing the dirs any more There was a problem hiding this comment. I have used this macro in storage unittest refactoring #14319 as we have more number of subdirectories to add There was a problem hiding this comment. OK lets look at 14319 once t his get in and we can get back to this macro usability and if it should stay or be removed. |
||
| foreach(dir ${subdirectories_list}) | ||
| if(IS_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/${dir}) | ||
| add_subdirectory(${dir}) | ||
| endif() | ||
| endforeach() | ||
| endmacro() | ||
|
|
||
| add_subdirectory(stubs) | ||
| add_subdirectory(fakes) | ||
|
|
||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| # Copyright (c) 2021 ARM Limited. All rights reserved. | ||
| # SPDX-License-Identifier: Apache-2.0 | ||
|
|
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should we be more specific to avoid clashes with a users (if they want to run their unittests only, not ours and they might have the same macro ? https://cliutils.gitlab.io/modern-cmake/chapters/testing.html (using BUILD_TESTING and project name):
BUILD_TESTINGis already provided, shall we use it ? Or rather to useMBED_BUILD_TESTINGto be able to distinguish build testing in Mbed OS only or everywhere (if everywhere, a user would set MBED_BUILD_TESTING and BUILD_TESTING) ? Reading some issues around this (enable_testing is a global thing), I would go withMBED_BUILD_TESTING.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
oh yeah, if there's already an option for that then that'd be perfect