ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Reactivate block device tests (#270) 

* Reactivate block device tests

* Oops missed some CMake files
pull/15530/head
Jamie Smith 2024-04-25 00:43:08 -07:00 committed by GitHub
parent 3fcfbbdb57
commit 04db467b3a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 32 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
storage/blockdevice/CMakeLists.txt
View File

@ -3,7 +3,7 @@
if(MBED_ENABLE_OS_INTERNAL_TESTS)
if(MBED_BUILD_GREENTEA_TESTS)
# add greentea test
add_subdirectory(tests/TESTS)
else()
add_subdirectory(COMPONENT_QSPIF)
add_subdirectory(tests/UNITTESTS)

4
storage/blockdevice/tests/TESTS/CMakeLists.txt Normal file
View File

@ -0,0 +1,4 @@
# Copyright (c) 2024 ARM Limited. All rights reserved.
# SPDX-License-Identifier: Apache-2.0
add_subdirectory(blockdevice)

9
storage/blockdevice/tests/TESTS/blockdevice/CMakeLists.txt Normal file
View File

@ -0,0 +1,9 @@
# Copyright (c) 2024 ARM Limited. All rights reserved.
# SPDX-License-Identifier: Apache-2.0
add_subdirectory(buffered_block_device)
add_subdirectory(flashsim_block_device)
add_subdirectory(general_block_device)
add_subdirectory(heap_block_device)
add_subdirectory(mbr_block_device)
add_subdirectory(util_block_device)

11
storage/blockdevice/tests/TESTS/blockdevice/buffered_block_device/CMakeLists.txt
View File

@ -1,18 +1,9 @@
# Copyright (c) 2020 ARM Limited. All rights reserved.
# SPDX-License-Identifier: Apache-2.0
cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR)
set(MBED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../.. CACHE INTERNAL "")
set(TEST_TARGET mbed-storage-blockdevice-buffered_block_device)
include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
project(${TEST_TARGET})
mbed_greentea_add_test(
TEST_NAME
${TEST_TARGET}
mbed-storage-blockdevice-buffered_block_device
TEST_SOURCES
main.cpp
TEST_REQUIRED_LIBS

11
storage/blockdevice/tests/TESTS/blockdevice/flashsim_block_device/CMakeLists.txt
View File

@ -1,18 +1,9 @@
# Copyright (c) 2020 ARM Limited. All rights reserved.
# SPDX-License-Identifier: Apache-2.0
cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR)
set(MBED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../.. CACHE INTERNAL "")
set(TEST_TARGET mbed-storage-blockdevice-flashsim_block_device)
include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
project(${TEST_TARGET})
mbed_greentea_add_test(
TEST_NAME
${TEST_TARGET}
mbed-storage-blockdevice-flashsim_block_device
TEST_SOURCES
main.cpp
TEST_REQUIRED_LIBS

25
storage/blockdevice/tests/TESTS/blockdevice/general_block_device/CMakeLists.txt
View File

@ -1,46 +1,37 @@
# Copyright (c) 2020 ARM Limited. All rights reserved.
# SPDX-License-Identifier: Apache-2.0
cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR)
set(MBED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../.. CACHE INTERNAL "")
set(TEST_TARGET mbed-storage-blockdevice-general_block_device)
include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
project(${TEST_TARGET})
if("DATAFLASH" IN_LIST MBED_TARGET_LABELS)
if("COMPONENT_DATAFLASH=1" IN_LIST MBED_TARGET_DEFINITIONS)
list(APPEND mbed_blockdevice_libs mbed-storage-dataflash)
endif()
if("FLASHIAP" IN_LIST MBED_TARGET_LABELS)
if("DEVICE_FLASH=1" IN_LIST MBED_TARGET_DEFINITIONS)
list(APPEND mbed_blockdevice_libs mbed-storage-flashiap)
endif()
if("I2CEE" IN_LIST MBED_TARGET_LABELS)
if("COMPONENT_I2CEE=1" IN_LIST MBED_TARGET_DEFINITIONS)
list(APPEND mbed_blockdevice_libs mbed-storage-i2cee)
endif()
if("OSPIF" IN_LIST MBED_TARGET_LABELS)
if("COMPONENT_OSPIF=1" IN_LIST MBED_TARGET_DEFINITIONS)
list(APPEND mbed_blockdevice_libs mbed-storage-ospif)
endif()
if("QSPIF" IN_LIST MBED_TARGET_LABELS)
if("COMPONENT_QSPIF=1" IN_LIST MBED_TARGET_DEFINITIONS)
list(APPEND mbed_blockdevice_libs mbed-storage-qspif)
endif()
if("SD" IN_LIST MBED_TARGET_LABELS)
if("COMPONENT_SD=1" IN_LIST MBED_TARGET_DEFINITIONS)
list(APPEND mbed_blockdevice_libs mbed-storage-sd)
endif()
if("SPIF" IN_LIST MBED_TARGET_LABELS)
if("COMPONENT_SPIF=1" IN_LIST MBED_TARGET_DEFINITIONS)
list(APPEND mbed_blockdevice_libs mbed-storage-spif)
endif()
mbed_greentea_add_test(
TEST_NAME
${TEST_TARGET}
mbed-storage-blockdevice-general_block_device
TEST_SOURCES
main.cpp
TEST_REQUIRED_LIBS

10
storage/blockdevice/tests/TESTS/blockdevice/general_block_device/main.cpp
View File

@ -49,7 +49,7 @@
#include "SDBlockDevice.h"
#endif
#if COMPONENT_FLASHIAP
#if DEVICE_FLASH
#include "FlashIAPBlockDevice.h"
#endif
@ -108,7 +108,7 @@ static SingletonPtr<rtos::Mutex> _mutex;
BlockDevice *block_device = NULL;
#if COMPONENT_FLASHIAP
#if DEVICE_FLASH
static inline uint32_t align_up(uint32_t val, uint32_t size)
{
return (((val - 1) / size) + 1) * size;
@ -210,7 +210,7 @@ static BlockDevice *get_bd_instance(uint8_t bd_type)
break;
}
case flashiap: {
#if COMPONENT_FLASHIAP
#if DEVICE_FLASH
#if (MBED_CONF_FLASHIAP_BLOCK_DEVICE_SIZE == 0) && (MBED_CONF_FLASHIAP_BLOCK_DEVICE_BASE_ADDRESS == 0xFFFFFFFF)
size_t flash_size;
@ -907,7 +907,7 @@ void test_get_type_functionality()
TEST_ASSERT_EQUAL(0, strcmp(bd_type, "DATAFLASH"));
#elif COMPONENT_SD
TEST_ASSERT_EQUAL(0, strcmp(bd_type, "SD"));
#elif COMPONENT_FLASHIAP
#elif DEVICE_FLASH
TEST_ASSERT_EQUAL(0, strcmp(bd_type, "FLASHIAP"));
#elif COMPONENT_SPINAND
TEST_ASSERT_EQUAL(0, strcmp(bd_type, "SPINAND"));
@ -966,7 +966,7 @@ int get_bd_count()
#if COMPONENT_SD
bd_arr[count++] = sd; //3
#endif
#if COMPONENT_FLASHIAP
#if DEVICE_FLASH
bd_arr[count++] = flashiap; //4
#endif
#if COMPONENT_OSPIF

11
storage/blockdevice/tests/TESTS/blockdevice/heap_block_device/CMakeLists.txt
View File

@ -1,18 +1,9 @@
# Copyright (c) 2020 ARM Limited. All rights reserved.
# SPDX-License-Identifier: Apache-2.0
cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR)
set(MBED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../.. CACHE INTERNAL "")
set(TEST_TARGET mbed-storage-blockdevice-heap_block_device)
include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
project(${TEST_TARGET})
mbed_greentea_add_test(
TEST_NAME
${TEST_TARGET}
mbed-storage-blockdevice-heap_block_device
TEST_SOURCES
main.cpp
TEST_REQUIRED_LIBS

11
storage/blockdevice/tests/TESTS/blockdevice/mbr_block_device/CMakeLists.txt
View File

@ -1,18 +1,9 @@
# Copyright (c) 2020 ARM Limited. All rights reserved.
# SPDX-License-Identifier: Apache-2.0
cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR)
set(MBED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../.. CACHE INTERNAL "")
set(TEST_TARGET mbed-storage-blockdevice-mbr_block_device)
include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
project(${TEST_TARGET})
mbed_greentea_add_test(
TEST_NAME
${TEST_TARGET}
mbed-storage-blockdevice-mbr_block_device
TEST_SOURCES
main.cpp
TEST_REQUIRED_LIBS

11
storage/blockdevice/tests/TESTS/blockdevice/util_block_device/CMakeLists.txt
View File

@ -1,18 +1,9 @@
# Copyright (c) 2020 ARM Limited. All rights reserved.
# SPDX-License-Identifier: Apache-2.0
cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR)
set(MBED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../.. CACHE INTERNAL "")
set(TEST_TARGET mbed-storage-blockdevice-util_block_device)
include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
project(${TEST_TARGET})
mbed_greentea_add_test(
TEST_NAME
${TEST_TARGET}
mbed-storage-blockdevice-util_block_device
TEST_SOURCES
main.cpp
TEST_REQUIRED_LIBS