Skip to content

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

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Jul 17, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0bcf967
Storage directory restructure:
rajkan01 Jul 6, 2020
aafdb8a
Update the header reference from feature/storage to stroage
rajkan01 Jul 6, 2020
fdaaffd
Stroage unittest directory restructure
rajkan01 Jul 6, 2020
3f080df
update the path in license, readme markdown, astyleignore
rajkan01 Jul 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .astyleignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
^features/netsocket/ppp/include
^features/netsocket/ppp/polarssl
^features/netsocket/ppp/source
^features/storage/filesystem/fat/ChaN
^features/storage/filesystem/littlefs/littlefs/
^features/storage/filesystem/littlefsv2/littlefs/
^storage/filesystem/fat/ChaN
^storage/filesystem/littlefs/littlefs/
^storage/filesystem/littlefsv2/littlefs/
^features/unsupported/
^hal/storage_abstraction
^platform/cxxsupport
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ matrix:

- <<: *extended-vm
name: "littlefs"
env: NAME=littlefs LITTLEFS=features/storage/filesystem/littlefs
env: NAME=littlefs LITTLEFS=storage/filesystem/littlefs
install:
# Install gcc
- source_pkg gcc
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ Folders containing files under different permissive license than Apache 2.0 are
- [features/lorawan](./features/lorawan) - Revised BSD
- [features/lwipstack](./features/lwipstack) - BSD-style, MIT-style
- [features/nanostack/sal-stack-nanostack](./features/nanostack/sal-stack-nanostack) - BSD-3-Clause
- [features/storage](./features/storage) - BSD-style, MIT
- [features/netsocket/emac-drivers](./features/netsocket/emac-drivers) - BSD-style
- [features/frameworks/unity/unity](./features/frameworks/unity/unity) - MIT
- [features/unsupported](./features/unsupported) - MIT-style, BSD-style
- [storage](./storage) - BSD-style, MIT
- [rtos](./rtos) - MIT
- [drivers](./drivers) - MIT
- [TESTS/mbed_hal/trng/pithy](./TESTS/mbed_hal/trng/pithy) - BSD-3-Clause
Expand Down
3 changes: 2 additions & 1 deletion UNITTESTS/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ set(unittest-includes-base
"${PROJECT_SOURCE_DIR}/../features"
"${PROJECT_SOURCE_DIR}/../features/netsocket"
"${PROJECT_SOURCE_DIR}/../platform"
"${PROJECT_SOURCE_DIR}/../storage"
"${PROJECT_SOURCE_DIR}/../drivers"
"${PROJECT_SOURCE_DIR}/../hal"
"${PROJECT_SOURCE_DIR}/../events"
Expand Down Expand Up @@ -144,7 +145,7 @@ set(unittest-includes-base
"${PROJECT_SOURCE_DIR}/../features/lorawan/system"
"${PROJECT_SOURCE_DIR}/../features/mbedtls"
"${PROJECT_SOURCE_DIR}/../features/mbedtls/inc"
"${PROJECT_SOURCE_DIR}/../features/storage/kvstore/conf"
"${PROJECT_SOURCE_DIR}/../storage/kvstore/conf"
)

# Create a list for test suites.
Expand Down
54 changes: 27 additions & 27 deletions UNITTESTS/empty_baseline/unittest.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,33 +13,33 @@ set(unittest-includes ${unittest-includes}

set(unittest-sources
../features/device_key/source/DeviceKey.cpp
../components/storage/blockdevice/COMPONENT_SPIF/SPIFBlockDevice.cpp
../components/storage/blockdevice/COMPONENT_I2CEE/I2CEEBlockDevice.cpp
../components/storage/blockdevice/COMPONENT_DATAFLASH/DataFlashBlockDevice.cpp
../components/storage/blockdevice/COMPONENT_FLASHIAP/FlashIAPBlockDevice.cpp
../components/storage/blockdevice/COMPONENT_SD/SDBlockDevice.cpp
../components/storage/blockdevice/COMPONENT_QSPIF/QSPIFBlockDevice.cpp
../features/storage/filesystem/Dir.cpp
../features/storage/filesystem/FileSystem.cpp
../features/storage/filesystem/File.cpp
../features/storage/kvstore/global_api/kvstore_global_api.cpp
../features/storage/kvstore/securestore/SecureStore.cpp
../features/storage/kvstore/kv_map/KVMap.cpp
../features/storage/kvstore/tdbstore/TDBStore.cpp
../features/storage/kvstore/direct_access_devicekey/DirectAccessDevicekey.cpp
../features/storage/kvstore/conf/kv_config.cpp
../features/storage/kvstore/filesystemstore/FileSystemStore.cpp
../features/storage/system_storage/SystemStorage.cpp
../features/storage/blockdevice/ChainingBlockDevice.cpp
../features/storage/blockdevice/ReadOnlyBlockDevice.cpp
../features/storage/blockdevice/SlicingBlockDevice.cpp
../features/storage/blockdevice/MBRBlockDevice.cpp
../features/storage/blockdevice/HeapBlockDevice.cpp
../features/storage/blockdevice/FlashSimBlockDevice.cpp
../features/storage/blockdevice/ObservingBlockDevice.cpp
../features/storage/blockdevice/ProfilingBlockDevice.cpp
../features/storage/blockdevice/BufferedBlockDevice.cpp
../features/storage/blockdevice/ExhaustibleBlockDevice.cpp
../storage/blockdevice/COMPONENT_SPIF/SPIFBlockDevice.cpp
../storage/blockdevice/COMPONENT_I2CEE/I2CEEBlockDevice.cpp
../storage/blockdevice/COMPONENT_DATAFLASH/DataFlashBlockDevice.cpp
../storage/blockdevice/COMPONENT_FLASHIAP/FlashIAPBlockDevice.cpp
../storage/blockdevice/COMPONENT_SD/SDBlockDevice.cpp
../storage/blockdevice/COMPONENT_QSPIF/QSPIFBlockDevice.cpp
../storage/filesystem/Dir.cpp
../storage/filesystem/FileSystem.cpp
../storage/filesystem/File.cpp
../storage/kvstore/global_api/kvstore_global_api.cpp
../storage/kvstore/securestore/SecureStore.cpp
../storage/kvstore/kv_map/KVMap.cpp
../storage/kvstore/tdbstore/TDBStore.cpp
../storage/kvstore/direct_access_devicekey/DirectAccessDevicekey.cpp
../storage/kvstore/conf/kv_config.cpp
../storage/kvstore/filesystemstore/FileSystemStore.cpp
../storage/system_storage/SystemStorage.cpp
../storage/blockdevice/ChainingBlockDevice.cpp
../storage/blockdevice/ReadOnlyBlockDevice.cpp
../storage/blockdevice/SlicingBlockDevice.cpp
../storage/blockdevice/MBRBlockDevice.cpp
../storage/blockdevice/HeapBlockDevice.cpp
../storage/blockdevice/FlashSimBlockDevice.cpp
../storage/blockdevice/ObservingBlockDevice.cpp
../storage/blockdevice/ProfilingBlockDevice.cpp
../storage/blockdevice/BufferedBlockDevice.cpp
../storage/blockdevice/ExhaustibleBlockDevice.cpp
)

set(unittest-test-sources
Expand Down
20 changes: 0 additions & 20 deletions UNITTESTS/features/storage/blockdevice/ChainingBlockDevice/unittest.cmake
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions UNITTESTS/moduletests/storage/blockdevice/SlicingBlockDevice/moduletest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
*/

#include "gtest/gtest.h"
#include "features/storage/blockdevice/HeapBlockDevice.h"
#include "features/storage/blockdevice/SlicingBlockDevice.h"
#include "storage/blockdevice/HeapBlockDevice.h"
#include "storage/blockdevice/SlicingBlockDevice.h"

#define BLOCK_SIZE (512)
#define DEVICE_SIZE (BLOCK_SIZE*10)
Expand Down
4 changes: 2 additions & 2 deletions UNITTESTS/moduletests/storage/blockdevice/SlicingBlockDevice/unittest.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ set(unittest-includes ${unittest-includes}
)

set(unittest-sources
../features/storage/blockdevice/SlicingBlockDevice.cpp
../features/storage/blockdevice/HeapBlockDevice.cpp
../storage/blockdevice/SlicingBlockDevice.cpp
../storage/blockdevice/HeapBlockDevice.cpp
stubs/mbed_atomic_stub.c
stubs/mbed_assert_stub.cpp
)
Expand Down
6 changes: 3 additions & 3 deletions UNITTESTS/moduletests/storage/kvstore/FileSystemStore/moduletest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
*/

#include "gtest/gtest.h"
#include "features/storage/blockdevice/HeapBlockDevice.h"
#include "features/storage/kvstore/filesystemstore/FileSystemStore.h"
#include "features/storage/filesystem/littlefs/LittleFileSystem.h"
#include "storage/blockdevice/HeapBlockDevice.h"
#include "storage/kvstore/filesystemstore/FileSystemStore.h"
#include "storage/filesystem/littlefs/LittleFileSystem.h"
#include "mbed_error.h"
#include <stdlib.h>

Expand Down
16 changes: 8 additions & 8 deletions UNITTESTS/moduletests/storage/kvstore/FileSystemStore/unittest.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ set(unittest-includes ${unittest-includes}
)

set(unittest-sources
../features/storage/blockdevice/HeapBlockDevice.cpp
../features/storage/kvstore/filesystemstore/FileSystemStore.cpp
../features/storage/filesystem/littlefs/LittleFileSystem.cpp
../features/storage/filesystem/Dir.cpp
../features/storage/filesystem/File.cpp
../features/storage/filesystem/FileSystem.cpp
../storage/blockdevice/HeapBlockDevice.cpp
../storage/kvstore/filesystemstore/FileSystemStore.cpp
../storage/filesystem/littlefs/LittleFileSystem.cpp
../storage/filesystem/Dir.cpp
../storage/filesystem/File.cpp
../storage/filesystem/FileSystem.cpp
../features/frameworks/mbed-trace/source/mbed_trace.c
../features/storage/filesystem/littlefs/littlefs/lfs_util.c
../features/storage/filesystem/littlefs/littlefs/lfs.c
../storage/filesystem/littlefs/littlefs/lfs_util.c
../storage/filesystem/littlefs/littlefs/lfs.c
../platform/source/FileBase.cpp
../platform/source/FileSystemHandle.cpp
../platform/source/FileHandle.cpp
Expand Down
6 changes: 3 additions & 3 deletions UNITTESTS/moduletests/storage/kvstore/TDBStore/moduletest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
*/

#include "gtest/gtest.h"
#include "features/storage/blockdevice/HeapBlockDevice.h"
#include "features/storage/blockdevice/FlashSimBlockDevice.h"
#include "features/storage/kvstore/tdbstore/TDBStore.h"
#include "storage/blockdevice/HeapBlockDevice.h"
#include "storage/blockdevice/FlashSimBlockDevice.h"
#include "storage/kvstore/tdbstore/TDBStore.h"
#include <stdlib.h>

#define BLOCK_SIZE (512)
Expand Down
8 changes: 4 additions & 4 deletions UNITTESTS/moduletests/storage/kvstore/TDBStore/unittest.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ set(unittest-includes ${unittest-includes}
)

set(unittest-sources
../features/storage/blockdevice/FlashSimBlockDevice.cpp
../features/storage/blockdevice/HeapBlockDevice.cpp
../features/storage/blockdevice/BufferedBlockDevice.cpp
../features/storage/kvstore/tdbstore/TDBStore.cpp
../storage/blockdevice/FlashSimBlockDevice.cpp
../storage/blockdevice/HeapBlockDevice.cpp
../storage/blockdevice/BufferedBlockDevice.cpp
../storage/kvstore/tdbstore/TDBStore.cpp
../features/frameworks/mbed-trace/source/mbed_trace.c
stubs/mbed_atomic_stub.c
stubs/mbed_assert_stub.cpp
Expand Down
2 changes: 1 addition & 1 deletion ...dBlockDevice/test_BufferedBlockDevice.cpp → ...dBlockDevice/test_BufferedBlockDevice.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

#include "gtest/gtest.h"
#include "features/storage/blockdevice/BufferedBlockDevice.h"
#include "storage/blockdevice/BufferedBlockDevice.h"
#include "stubs/BlockDevice_mock.h"

using ::testing::_;
Expand Down
4 changes: 2 additions & 2 deletions ...device/BufferedBlockDevice/unittest.cmake → ...device/BufferedBlockDevice/unittest.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ set(unittest-includes ${unittest-includes}
)

set(unittest-sources
../features/storage/blockdevice/BufferedBlockDevice.cpp
../storage/blockdevice/BufferedBlockDevice.cpp
stubs/mbed_atomic_stub.c
stubs/mbed_assert_stub.cpp
)

set(unittest-test-sources
features/storage/blockdevice/BufferedBlockDevice/test_BufferedBlockDevice.cpp
storage/blockdevice/BufferedBlockDevice/test_BufferedBlockDevice.cpp
stubs/BlockDevice_mock.h
)
2 changes: 1 addition & 1 deletion ...gBlockDevice/test_ChainingBlockDevice.cpp → ...gBlockDevice/test_ChainingBlockDevice.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

#include "gtest/gtest.h"
#include "features/storage/blockdevice/ChainingBlockDevice.cpp"
#include "storage/blockdevice/ChainingBlockDevice.cpp"
#include "stubs/BlockDevice_mock.h"

using ::testing::_;
Expand Down
20 changes: 20 additions & 0 deletions UNITTESTS/storage/blockdevice/ChainingBlockDevice/unittest.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@

####################
# UNIT TESTS
####################

set(unittest-includes ${unittest-includes}
.
..
)

set(unittest-sources
../storage/blockdevice/ChainingBlockDevice.cpp
../storage/blockdevice/HeapBlockDevice.cpp
stubs/mbed_atomic_stub.c
stubs/mbed_assert_stub.cpp
)

set(unittest-test-sources
storage/blockdevice/ChainingBlockDevice/test_ChainingBlockDevice.cpp
)
2 changes: 1 addition & 1 deletion ...ockDevice/test_ExhaustibleBlockDevice.cpp → ...ockDevice/test_ExhaustibleBlockDevice.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

#include "gtest/gtest.h"
#include "features/storage/blockdevice/ExhaustibleBlockDevice.h"
#include "storage/blockdevice/ExhaustibleBlockDevice.h"
#include "stubs/BlockDevice_mock.h"

#define BLOCK_SIZE (512)
Expand Down
4 changes: 2 additions & 2 deletions ...device/FlashSimBlockDevice/unittest.cmake → ...ice/ExhaustibleBlockDevice/unittest.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ set(unittest-includes ${unittest-includes}
)

set(unittest-sources
../features/storage/blockdevice/FlashSimBlockDevice.cpp
../storage/blockdevice/ExhaustibleBlockDevice.cpp
stubs/mbed_atomic_stub.c
stubs/mbed_assert_stub.cpp
)

set(unittest-test-sources
features/storage/blockdevice/FlashSimBlockDevice/test_FlashSimBlockDevice.cpp
storage/blockdevice/ExhaustibleBlockDevice/test_ExhaustibleBlockDevice.cpp
)
2 changes: 1 addition & 1 deletion ...mBlockDevice/test_FlashSimBlockDevice.cpp → ...mBlockDevice/test_FlashSimBlockDevice.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

#include "gtest/gtest.h"
#include "features/storage/blockdevice/FlashSimBlockDevice.h"
#include "storage/blockdevice/FlashSimBlockDevice.h"
#include "stubs/BlockDevice_mock.h"

#define BLOCK_SIZE (512)
Expand Down
4 changes: 2 additions & 2 deletions ...blockdevice/MBRBlockDevice/unittest.cmake → ...device/FlashSimBlockDevice/unittest.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ set(unittest-includes ${unittest-includes}
)

set(unittest-sources
../features/storage/blockdevice/MBRBlockDevice.cpp
../storage/blockdevice/FlashSimBlockDevice.cpp
stubs/mbed_atomic_stub.c
stubs/mbed_assert_stub.cpp
)

set(unittest-test-sources
features/storage/blockdevice/MBRBlockDevice/test_MBRBlockDevice.cpp
storage/blockdevice/FlashSimBlockDevice/test_FlashSimBlockDevice.cpp
)
2 changes: 1 addition & 1 deletion ...rage/blockdevice/HeapBlockDevice/test.cpp → ...rage/blockdevice/HeapBlockDevice/test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

#include "gtest/gtest.h"
#include "features/storage/blockdevice/HeapBlockDevice.h"
#include "storage/blockdevice/HeapBlockDevice.h"
#include <string.h>
#include "mbed_assert.h"

Expand Down
4 changes: 2 additions & 2 deletions ...lockdevice/HeapBlockDevice/unittest.cmake → ...lockdevice/HeapBlockDevice/unittest.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ set(unittest-includes ${unittest-includes}
)

set(unittest-sources
../features/storage/blockdevice/HeapBlockDevice.cpp
../storage/blockdevice/HeapBlockDevice.cpp
stubs/mbed_atomic_stub.c
stubs/mbed_assert_stub.cpp
)

set(unittest-test-sources
features/storage/blockdevice/HeapBlockDevice/test.cpp
storage/blockdevice/HeapBlockDevice/test.cpp
)

set(unittest-test-flags
Expand Down
2 changes: 1 addition & 1 deletion ...ce/MBRBlockDevice/test_MBRBlockDevice.cpp → ...ce/MBRBlockDevice/test_MBRBlockDevice.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

#include "gtest/gtest.h"
#include "features/storage/blockdevice/MBRBlockDevice.h"
#include "storage/blockdevice/MBRBlockDevice.h"
#include "stubs/BlockDevice_mock.h"

#define BLOCK_SIZE (512)
Expand Down
4 changes: 2 additions & 2 deletions ...ice/ExhaustibleBlockDevice/unittest.cmake → ...blockdevice/MBRBlockDevice/unittest.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ set(unittest-includes ${unittest-includes}
)

set(unittest-sources
../features/storage/blockdevice/ExhaustibleBlockDevice.cpp
../storage/blockdevice/MBRBlockDevice.cpp
stubs/mbed_atomic_stub.c
stubs/mbed_assert_stub.cpp
)

set(unittest-test-sources
features/storage/blockdevice/ExhaustibleBlockDevice/test_ExhaustibleBlockDevice.cpp
storage/blockdevice/MBRBlockDevice/test_MBRBlockDevice.cpp
)
4 changes: 2 additions & 2 deletions ...BlockDevice/test_ObservingBlockDevice.cpp → ...BlockDevice/test_ObservingBlockDevice.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
*/

#include "gtest/gtest.h"
#include "features/storage/blockdevice/ObservingBlockDevice.h"
#include "features/storage/blockdevice/ReadOnlyBlockDevice.h"
#include "storage/blockdevice/ObservingBlockDevice.h"
#include "storage/blockdevice/ReadOnlyBlockDevice.h"
#include "stubs/BlockDevice_mock.h"

using ::testing::_;
Expand Down
6 changes: 3 additions & 3 deletions ...evice/ObservingBlockDevice/unittest.cmake → ...evice/ObservingBlockDevice/unittest.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ set(unittest-includes ${unittest-includes}
)

set(unittest-sources
../features/storage/blockdevice/ObservingBlockDevice.cpp
../features/storage/blockdevice/ReadOnlyBlockDevice.cpp
../storage/blockdevice/ObservingBlockDevice.cpp
../storage/blockdevice/ReadOnlyBlockDevice.cpp
stubs/mbed_atomic_stub.c
stubs/mbed_assert_stub.cpp
stubs/mbed_error.c
)

set(unittest-test-sources
features/storage/blockdevice/ObservingBlockDevice/test_ObservingBlockDevice.cpp
storage/blockdevice/ObservingBlockDevice/test_ObservingBlockDevice.cpp
stubs/BlockDevice_mock.h
)
Loading