-
Notifications
You must be signed in to change notification settings - Fork 3k
Restructure storage blockdevice directory #13273
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
@rajkan01, thank you for your changes. |
a794899
to
c1df660
Compare
UNITTESTS/CMakeLists.txt
Outdated
@@ -175,10 +176,11 @@ foreach(testfile ${unittest-file-list}) | |||
include("${testfile}") | |||
|
|||
get_filename_component(TEST_SUITE_DIR ${testfile} DIRECTORY) | |||
message( STATUS ${PROJECT_SOURCE_DIR} ) |
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.
Is it a debug message?
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.
Sorry, I missed this one. I will update
@@ -27,3 +27,4 @@ | |||
^TESTS/mbed_hal/trng/pithy | |||
^tools | |||
^UNITTESTS | |||
^storage/blockdevice/tests/UNITTESTS |
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.
I wonder if it's possible to match all UNITTESTS in mbed-os
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.
LGTM
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.
Code change is fine.
(You could squash the last commit with the commit that introduced the issue)
fc3a412
to
2d98fd8
Compare
@evedon I squashed last commit as suggested, please re-review |
I would also suggest to simplify the path for greentea tests by removing one |
Current Mbed OS build tools to build the greentea test looks for an
|
Alas, let's leave this for another day then... |
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.
Just have one question regarding the COMPONENT_*
"sub" libraries to discuss.
storage/kvstore/conf/kv_config.cpp
Outdated
#if COMPONENT_FLASHIAP | ||
#include "components/storage/blockdevice/COMPONENT_FLASHIAP/FlashIAPBlockDevice.h" | ||
#include "storage/blockdevice/COMPONENT_FLASHIAP/FlashIAPBlockDevice.h" | ||
#endif | ||
|
||
#if COMPONENT_QSPIF | ||
#include "components/storage/blockdevice/COMPONENT_QSPIF/QSPIFBlockDevice.h" | ||
#include "storage/blockdevice/COMPONENT_QSPIF/QSPIFBlockDevice.h" | ||
#endif |
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.
Just realised we haven't refactored the include paths for COMPONENT_*/*BlockDevice.h
- they are public APIs but don't follow the "include" proposal in this PR.
Shall we use the same path name **/include/blockdevice/**
inside each of them, so we would have a consistent
#include "blockdevice/FlashIAPBlockDevice.h"
#include "blockdevice/QSPIFBlockDevice.h"
...
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.
Initial blockdevice directory restructure proposal, just to move the source COMPONENT_xxx directly into storage/blockdevice and no refactoring. if we would like to changes on COMPONENT_XXX then we will do it incremental changes
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.
I agree that we should do in a subsequent PR.
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.
In the proposal we didn't explicit document some of the sub libraries under blockdevice, but anything that's public API requires refactoring.
- Update the header reference and source reference in cmake - Update astyleignore to ignore blockdevice UNITTESTS - Removed the redundant debug log
2d98fd8
to
3bcb4eb
Compare
@adbridge Rebased this PR to resolve the merge conflicts, Could you start the CI |
@evedon @LDong-Arm are you happy with this PR? If so please approve so we can get it into CI |
@adbridge I am pretty sure this PR was approved by both of us but the rebase has dismissed the approvals. |
CI started |
Test run: SUCCESSSummary: 6 of 6 test jobs passed |
This PR does not contain release version label after merging. |
Summary of changes
Preceding PR: #13253 #13244
Restructured
storage/blockdevice
as per the new directory structure proposal:Note:
Impact of changes
None.
Migration actions required
None.
Documentation
To Be Updated.
Pull request type
Test results
Manual testing: (Build for K64F target with ARMC6 and GCC_ARM toolchain)
Reviewers
@bulislaw @0xc0170 @ARMmbed/mbed-os-core