CMake: QSPIFBlockDevice: Guard unit test directory #15073
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
In the QSPIFBlockDevice component we checked if BUILD_TESTING was enabled before adding the QSPIFBlockDevice/UNITTESTS subdirectory. In the parent blockdevice/CMakeLists.txt we added the QSPIFBlockDevice subdirectory to the build under two separate conditions: * when "QSPIF" is present in MBED_TARGET_LABELS * when building only unit tests This wasn't quite enough, as when we build greentea tests for some targets QSPIF is enabled in MBED_TARGET_LABELS, causing the QSPIFBlockDevice subdirectory and its unit tests to be added when building greentea tests. This caused a test failure on targets which enable QSPIF: ``` The following tests FAILED: 40 - qspif-unittest_NOT_BUILT (Not Run) ``` To fix this we need to specifically check that we're not building greentea tests before adding the QSPIFBlockDevice/UNITTESTS directory to the project. Part of this issue is our reliance on MBED_TARGET_LABELS to pull features in to the build. We should refactor our usage of MBED_TARGET_LABELS and use CMake target dependencies where possible. Then we wouldn't need to add subdirectories under various, often conflicting, scenarios. Instead the targets would always be available and we would just choose which ones to actually build in different cases using CMake target linking.
ciarmcom
added
the
release-type: patch
|
@rwalton-arm, thank you for your changes. |
LDong-Arm
approved these changes
Sep 15, 2021
LDong-Arm
moved this from In progress (8)
to Reviewer approved & awaiting CI & merge (3)
in Mbed Core
Patater
approved these changes
Sep 15, 2021
|
CI started |
Jenkins CI Test : ✔️ SUCCESSBuild Number: 1 | 🔒 Jenkins CI Job | 🌐 Logs & ArtifactsCLICK for Detailed Summary
|
Mbed Core
automation
moved this from Reviewer approved & awaiting CI & merge (3)
to Done
Sep 15, 2021
mbedmain
removed
release-type: patch
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
In the QSPIFBlockDevice component we checked if BUILD_TESTING was
enabled before adding the QSPIFBlockDevice/UNITTESTS subdirectory. In
the parent blockdevice/CMakeLists.txt we added the QSPIFBlockDevice
subdirectory to the build under two separate conditions:
This wasn't quite enough, as when we build greentea tests for some
targets QSPIF is enabled in MBED_TARGET_LABELS, causing the
QSPIFBlockDevice subdirectory and its unit tests to be added when
building greentea tests. This caused a test failure on targets which
enable QSPIF:
To fix this we need to specifically check that we're not building
greentea tests before adding the QSPIFBlockDevice/UNITTESTS directory to
the project.
Part of this issue is our reliance on MBED_TARGET_LABELS to pull
features in to the build. We should refactor our usage of
MBED_TARGET_LABELS and use CMake target dependencies where possible.
Then we wouldn't need to add subdirectories under various, often
conflicting, scenarios. Instead the targets would always be available
and we would just choose which ones to actually build in different cases
using CMake target linking.
Impact of changes
Migration actions required
Documentation
Pull request type
Test results
Reviewers