Skip to content

Commit bb14b9f

Browse files
committed
move greentea and UNITTESTS closure to library
1 parent 72b4a14 commit bb14b9f

File tree

12 files changed

+19
-18
lines changed

12 files changed

+19
-18
lines changed

storage/TESTS/kvstore/direct_access_devicekey_test/main.cpp renamed to storage/kvstore/direct_access_devicekey/tests/TESTS/direct_access_devicekey/direct_access_devicekey_tdb/main.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@
2323
#include <stdio.h>
2424
#include <string.h>
2525
#include "DeviceKey.h"
26-
#include "KVStore.h"
27-
#include "KVMap.h"
28-
#include "kv_config.h"
29-
#include "TDBStore.h"
26+
#include "kvstore/KVStore.h"
27+
#include "kvstore/KVMap.h"
28+
#include "kv_config/kv_config.h"
29+
#include "kvstore/TDBStore.h"
3030
#include "FlashIAP.h"
3131
#include "FlashIAPBlockDevice.h"
32-
#include "DirectAccessDevicekey.h"
32+
#include "direct_access_devicekey/DirectAccessDevicekey.h"
3333
#include "greentea-client/test_env.h"
3434
#include "unity.h"
3535
#include "utest.h"

storage/TESTS/kvstore/securestore_whitebox/main.cpp renamed to storage/kvstore/securestore/tests/TESTS/securestore/securestore_whitebox/main.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
* limitations under the License.
1717
*/
1818

19-
#include "SecureStore.h"
20-
#include "TDBStore.h"
19+
#include "securestore/SecureStore.h"
20+
#include "kvstore/TDBStore.h"
2121
#ifdef MBED_CONF_RTOS_PRESENT
2222
#include "Thread.h"
2323
#endif

storage/TESTS/kvstore/general_tests_phase_1/main.cpp renamed to storage/kvstore/tests/TESTS/kvstore/general_tests_phase_1/main.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
#include "SecureStore.h"
18-
#include "TDBStore.h"
17+
#include "securestore/SecureStore.h"
18+
#include "kvstore/TDBStore.h"
1919
#ifdef MBED_CONF_RTOS_PRESENT
2020
#include "Thread.h"
2121
#endif

storage/TESTS/kvstore/general_tests_phase_2/main.cpp renamed to storage/kvstore/tests/TESTS/kvstore/general_tests_phase_2/main.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
#include "SecureStore.h"
18-
#include "TDBStore.h"
17+
#include "securestore/SecureStore.h"
18+
#include "kvstore/TDBStore.h"
1919
#include "mbed_error.h"
2020
#include "FlashSimBlockDevice.h"
2121
#include "SlicingBlockDevice.h"
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*

UNITTESTS/moduletests/storage/kvstore/FileSystemStore/moduletest.cpp renamed to storage/kvstore/tests/UNITTESTS/FileSystemStore/moduletest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
#include "gtest/gtest.h"
1818
#include "blockdevice/HeapBlockDevice.h"
19-
#include "storage/kvstore/filesystemstore/FileSystemStore.h"
19+
#include "kvstore/FileSystemStore.h"
2020
#include "littlefs/LittleFileSystem.h"
2121
#include "mbed_error.h"
2222
#include <stdlib.h>

UNITTESTS/moduletests/storage/kvstore/FileSystemStore/unittest.cmake renamed to storage/kvstore/tests/UNITTESTS/FileSystemStore/unittest.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ set(unittest-includes ${unittest-includes}
1010

1111
set(unittest-sources
1212
../storage/blockdevice/source/HeapBlockDevice.cpp
13-
../storage/kvstore/filesystemstore/FileSystemStore.cpp
13+
../storage/kvstore/source/FileSystemStore.cpp
1414
../storage/filesystem/littlefs/source/LittleFileSystem.cpp
1515
../storage/filesystem/source/Dir.cpp
1616
../storage/filesystem/source/File.cpp
@@ -24,7 +24,7 @@ set(unittest-sources
2424
)
2525

2626
set(unittest-test-sources
27-
moduletests/storage/kvstore/FileSystemStore/moduletest.cpp
27+
${CMAKE_CURRENT_LIST_DIR}/moduletest.cpp
2828
stubs/mbed_atomic_stub.c
2929
stubs/mbed_assert_stub.cpp
3030
stubs/mbed_error.c
@@ -37,4 +37,4 @@ set(unittest-test-flags
3737
-DMBED_LFS_PROG_SIZE=64
3838
-DMBED_LFS_BLOCK_SIZE=512
3939
-DMBED_LFS_LOOKAHEAD=512
40-
)
40+
)

0 commit comments

Comments
 (0)