Skip to content
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

Move storage from features into mbed-os root directory #13244

Merged
merged 4 commits into from
Jul 17, 2020

Conversation

rajkan01
Copy link
Contributor

@rajkan01 rajkan01 commented Jul 7, 2020

Summary of changes

We are going to soon migrate storage to below new directory structure

storage
├── blockdevice
│   ├── include
│   │   └── blockdevice
│   │       └── [...]
│   ├── source
│   │   └── [...]
│   ├── tests
│   ├── COMPONENT_DATAFLASH    // each component from components/storage/blockdevice
│   ├── COMPONENT_FLASHIAP
│   └── [...]
├── filesystem
│   ├── [....]
├── kvstore
│   ├── [....]
├── platform
│   ├── [....]

This PR Changes:

  • Moved mbed-os/features/storage to mbed-os/storage
  • Moved components/storage/blockdevice to storage/blockdevice/COMPONENT_xxx

Note:

  • A further individual directory (A block device, filesystem etc.,) restructuring to be covered in separate activity and PRs.

Impact of changes

None.

Migration actions required

None.

Documentation

None.


Pull request type

[x] Patch update (Bug fix / Target update / Docs update / Test update / Refactor)
[] Feature update (New feature / Functionality change / New API)
[] Major update (Breaking change E.g. Return code change / API behaviour change)

Test results

[] No Tests required for this change (E.g docs only update)
[x] Covered by existing mbed-os tests (Greentea or Unittest)
[x] Tests / results supplied as part of this PR

Manual testing: (Build for K64F target with ARMC6 toolchain)

  • mbed-os-example-filesystem
  • mbed-os-example-kvstore
  • mbed-os-example-blockdevice
  • Greentea tests: Full profile and Bare metal profile
  • Unit tests build and run

Reviewers

@bulislaw @0xc0170 @ARMmbed/mbed-os-core


@ciarmcom ciarmcom requested review from 0xc0170, bulislaw and a team July 7, 2020 17:00
@ciarmcom
Copy link
Member

ciarmcom commented Jul 7, 2020

@rajkan01, thank you for your changes.
@bulislaw @0xc0170 @ARMmbed/mbed-os-core @ARMmbed/mbed-os-storage @ARMmbed/mbed-os-maintainers please review.

@rajkan01 rajkan01 force-pushed the storage_restructure_initial branch 6 times, most recently from 2d7f833 to 30a98ac Compare July 7, 2020 22:18
Copy link
Contributor

@LDong-Arm LDong-Arm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me, but we propose to move unit tests from the top-level UNITTESTS into individual libraries. This can happen in a future PR after we have finished refactoring libraries IMO.

A CI run would verify that we haven't missed anything here.

@jeromecoutant
Copy link
Collaborator

Could this correct #11993?

@rajkan01
Copy link
Contributor Author

rajkan01 commented Jul 9, 2020

Could this correct #11993?

This PR will not solve this #11993 issue as just we moved one directory up from mbed-os/features/storage to mbed-os/storage and long path file extension issue should be fixed by @ARMmbed/mbed-os-tools

- Move mbed-os/features/storage to mbed-os/storage
- Move components/storage/blockdevice to storage/blockdevice/COMPONENT_xxx
- Move UNITTESTS/features/storage to UNITTESTS/storage
- update the .cmake files to refer the new directory
@rajkan01 rajkan01 force-pushed the storage_restructure_initial branch from b4dfcae to 3f080df Compare July 13, 2020 12:25
Copy link
Contributor

@evedon evedon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good for a first PR.
UNITTESTS and greentea tests will be sorted in a subsequent PR.

@0xc0170
Copy link
Contributor

0xc0170 commented Jul 16, 2020

CI started

@0xc0170
Copy link
Contributor

0xc0170 commented Jul 16, 2020

I've noticed 100755 → 100644 changes in some files, was this intentional ? Looks like executable bit should not be set so fine.

File https://github.com/ARMmbed/mbed-os/blob/3f080dfd650fc9a97280c98742b1209185480383/storage/filesystem/littlefs/TESTS/util/clean.sh has it for instance, visible in the diff here on Github.

@mbed-ci
Copy link

mbed-ci commented Jul 16, 2020

Test run: SUCCESS

Summary: 6 of 6 test jobs passed
Build number : 1
Build artifacts

@adbridge adbridge merged commit ab5af1e into ARMmbed:master Jul 17, 2020
@adbridge adbridge added release-type: patch Indentifies a PR as containing just a patch and removed ready for merge labels Jul 17, 2020
@mbedmain mbedmain added release-version: 6.2.1 Release-pending and removed release-type: patch Indentifies a PR as containing just a patch Release-pending labels Aug 16, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants