Revert "Start on fixing some unintentionally skipped tests"

multiplemonomials · multiplemonomials · commit 3ffd18260316 · 2024-10-03T22:56:34.000-07:00
diff --git a/TESTS/integration/COMMON/common_defines_fs_test.h b/TESTS/integration/COMMON/common_defines_fs_test.h
@@ -34,7 +34,7 @@
 #elif COMPONENT_NUSD
 #define TEST_BLOCK_DEVICE_TYPE "NUSD"
 #define TEST_USE_FILESYSTEM FS_FAT
-#elif DEVICE_FLASH && MBED_CONF_FLASHIAP_BLOCK_DEVICE_SIZE
+#elif COMPONENT_FLASHIAP && MBED_CONF_FLASHIAP_BLOCK_DEVICE_SIZE
 #define TEST_BLOCK_DEVICE_TYPE "FLASHIAP"
 #else
 #define TEST_BLOCK_DEVICE_TYPE "UNKNOWN"
diff --git a/drivers/device_key/include/device_key/DeviceKey.h b/drivers/device_key/include/device_key/DeviceKey.h
@@ -25,7 +25,7 @@
 
 // Whole class is not supported if entropy is not enabled
 // Flash device is required as Device Key is currently depending on it
-#if !DEVICE_FLASH
+#if !DEVICE_FLASH || !defined(COMPONENT_FLASHIAP)
 #undef DEVICEKEY_ENABLED
 #define DEVICEKEY_ENABLED 0
 #endif
diff --git a/drivers/device_key/tests/TESTS/device_key/functionality/CMakeLists.txt b/drivers/device_key/tests/TESTS/device_key/functionality/CMakeLists.txt
@@ -5,7 +5,7 @@ if(NOT "DEVICE_TRNG=1" IN_LIST MBED_TARGET_DEFINITIONS)
 	set(TEST_SKIPPED "True RNG is not supported for this target so device key cannot be used")
 endif()
 
-if(NOT "DEVICE_FLASH=1" IN_LIST MBED_TARGET_DEFINITIONS)
+if(NOT ("DEVICE_FLASH=1" IN_LIST MBED_TARGET_DEFINITIONS AND "COMPONENT_FLASHIAP=1" IN_LIST MBED_TARGET_DEFINITIONS))
 	set(TEST_SKIPPED "Flash IAP is not supported for this target so device key cannot be used")
 endif()
 
diff --git a/platform/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_MBED_PSA_SRV/TESTS/its_ps/test/main.cpp b/platform/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_MBED_PSA_SRV/TESTS/its_ps/test/main.cpp
@@ -220,7 +220,7 @@ utest::v1::status_t case_its_setup_handler(const Case *const source, const size_
 Case cases[] = {
     Case("PSA prot internal storage - Basic", case_its_setup_handler<its>, pits_ps_test<its>, case_its_teardown_handler),
     Case("PSA prot internal storage - Write-once", case_its_setup_handler<its>, pits_ps_write_once_test<its>, case_its_teardown_handler),
-#if DEVICE_FLASH
+#if COMPONENT_FLASHIAP
     Case("PSA protected storage - Basic", case_its_setup_handler<ps>, pits_ps_test<ps>),
     Case("PSA protected storage - Write-once", case_its_setup_handler<ps>, pits_ps_write_once_test<ps>)
 #endif
diff --git a/platform/tests/TESTS/mbed_platform/crash_reporting/CMakeLists.txt b/platform/tests/TESTS/mbed_platform/crash_reporting/CMakeLists.txt
@@ -1,8 +1,10 @@
 # Copyright (c) 2020-2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-if(NOT "MBED_CONF_PLATFORM_CRASH_CAPTURE_ENABLED=1" IN_LIST MBED_CONFIG_DEFINITIONS)
-	set(TEST_SKIPPED "CRC is not supported for this target")
+include(mbed_greentea)
+
+if(NOT DEFINED MBED_CONF_PLATFORM_CRASH_CAPTURE_ENABLED)
+    set(TEST_SKIPPED "crash_reporting test not supported.")
 endif()
 
 mbed_greentea_add_test(
diff --git a/platform/tests/TESTS/mbed_platform/stats_cpu/CMakeLists.txt b/platform/tests/TESTS/mbed_platform/stats_cpu/CMakeLists.txt
@@ -3,14 +3,11 @@
 
 include(mbed_greentea)
 
-if(NOT "DEVICE_LPTICKER=1" IN_LIST MBED_TARGET_DEFINITIONS OR NOT "DEVICE_SLEEP=1" IN_LIST MBED_TARGET_DEFINITIONS)
+if(NOT DEFINED MBED_CPU_STATS_ENABLED OR NOT "DEVICE_LPTICKER=1" IN_LIST MBED_TARGET_DEFINITIONS
+   OR NOT "DEVICE_SLEEP=1" IN_LIST MBED_TARGET_DEFINITIONS)
     set(TEST_SKIPPED "Stats cpu test not supported.")
 endif()
 
-if(NOT "MBED_CPU_STATS_ENABLED=1" IN_LIST MBED_CONFIG_DEFINITIONS)
-	set(TEST_SKIPPED "CPU stats not enabled")
-endif()
-
 mbed_greentea_add_test(
     TEST_NAME
         mbed-platform-stats-cpu
diff --git a/platform/tests/TESTS/mbed_platform/stats_heap/CMakeLists.txt b/platform/tests/TESTS/mbed_platform/stats_heap/CMakeLists.txt
@@ -3,11 +3,10 @@
 
 include(mbed_greentea)
 
-if(NOT "MBED_HEAP_STATS_ENABLED=1" IN_LIST MBED_CONFIG_DEFINITIONS)
-	set(TEST_SKIPPED "heap stats not enabled")
+if(NOT DEFINED MBED_HEAP_STATS_ENABLED)
+    set(TEST_SKIPPED "Stats heap test not supported.")
 endif()
 
-
 mbed_greentea_add_test(
     TEST_NAME
         mbed-platform-stats-heap
diff --git a/platform/tests/TESTS/mbed_platform/stats_sys/CMakeLists.txt b/platform/tests/TESTS/mbed_platform/stats_sys/CMakeLists.txt
@@ -3,8 +3,8 @@
 
 include(mbed_greentea)
 
-if(NOT "MBED_SYS_STATS_ENABLED=1" IN_LIST MBED_CONFIG_DEFINITIONS)
-	set(TEST_SKIPPED "System stats not enabled")
+if(NOT DEFINED MBED_SYS_STATS_ENABLED)
+    set(TEST_SKIPPED "System stats test not supported.")
 endif()
 
 mbed_greentea_add_test(
diff --git a/storage/kvstore/direct_access_devicekey/tests/TESTS/direct_access_devicekey/tdb/main.cpp b/storage/kvstore/direct_access_devicekey/tests/TESTS/direct_access_devicekey/tdb/main.cpp
@@ -15,7 +15,7 @@
 * limitations under the License.
 */
 
-#ifndef DEVICE_FLASH
+#ifndef COMPONENT_FLASHIAP
 #error [NOT_SUPPORTED] Target must have internal FlashIAP for this test
 #else
 
@@ -323,4 +323,4 @@ int main()
     return !Harness::run(specification);
 }
 
-#endif // DEVICE_FLASH
+#endif // COMPONENT_FLASHIAP
diff --git a/storage/kvstore/kv_config/CMakeLists.txt b/storage/kvstore/kv_config/CMakeLists.txt
@@ -26,7 +26,3 @@ target_link_libraries(mbed-storage-kv-config
         mbed-storage-littlefs-v2
         mbed-storage-fat
 )
-
-if("DEVICE_FLASH=1" IN_LIST MBED_TARGET_DEFINITIONS)
-    target_link_libraries(mbed-storage-kv-config PUBLIC mbed-storage-flashiap)
-endif()
diff --git a/storage/kvstore/kv_config/source/kv_config.cpp b/storage/kvstore/kv_config/source/kv_config.cpp
@@ -30,7 +30,7 @@
 #include "securestore/SecureStore.h"
 #define TRACE_GROUP "KVCFG"
 
-#if DEVICE_FLASH
+#if COMPONENT_FLASHIAP
 #include "FlashIAPBlockDevice.h"
 #endif
 
@@ -284,7 +284,7 @@ FileSystem *_get_filesystem_default(const char *mount)
 
 BlockDevice *_get_blockdevice_FLASHIAP(bd_addr_t start_address, bd_size_t size)
 {
-#if DEVICE_FLASH
+#if COMPONENT_FLASHIAP
     int ret = kv_get_flash_bounds_from_config(&start_address, &size);
     if (ret != 0) {
         tr_error("KV Config: Determination of internal block device bounds failed. The configured start address/size is likely invalid.");
@@ -677,7 +677,7 @@ int _create_internal_tdb(BlockDevice **internal_bd, KVStore **internal_tdb, bd_s
 
 int _storage_config_TDB_INTERNAL()
 {
-#if DEVICE_FLASH
+#if COMPONENT_FLASHIAP
     bd_size_t internal_size = MBED_CONF_STORAGE_TDB_INTERNAL_INTERNAL_SIZE;
     bd_addr_t internal_start_address = MBED_CONF_STORAGE_TDB_INTERNAL_INTERNAL_BASE_ADDRESS;
 
@@ -999,7 +999,7 @@ MBED_WEAK int kv_init_storage_config()
     int ret = MBED_SUCCESS;
 
     // We currently have no supported configuration without internal storage
-#ifndef DEVICE_FLASH
+#ifndef COMPONENT_FLASHIAP
     return MBED_ERROR_UNSUPPORTED;
 #endif
 
@@ -1026,7 +1026,7 @@ int kv_get_default_flash_addresses(bd_addr_t *start_address, bd_size_t *size)
 {
     int ret = MBED_SUCCESS;
 
-#if DEVICE_FLASH
+#if COMPONENT_FLASHIAP
     FlashIAP flash;
     if (flash.init() != 0) {
         return MBED_ERROR_INITIALIZATION_FAILED;
@@ -1072,7 +1072,7 @@ int kv_get_default_flash_addresses(bd_addr_t *start_address, bd_size_t *size)
 
 int kv_get_flash_bounds_from_config(bd_addr_t *start_address, bd_size_t *size)
 {
-#if DEVICE_FLASH
+#if COMPONENT_FLASHIAP
 
     bd_addr_t flash_end_address;
     bd_addr_t flash_start_address;
diff --git a/storage/kvstore/tdbstore/source/TDBStore.cpp b/storage/kvstore/tdbstore/source/TDBStore.cpp
@@ -1490,6 +1490,7 @@ int TDBStore::check_erase_before_write(uint8_t area, uint32_t offset, uint32_t s
     uint32_t end_offset;
     while (size) {
         uint32_t dist, offset_from_start;
+        int ret;
         offset_in_erase_unit(area, offset, offset_from_start, dist);
         uint32_t chunk = std::min(size, dist);
 
diff --git a/storage/kvstore/tests/TESTS/kvstore/general_tests_phase_1/main.cpp b/storage/kvstore/tests/TESTS/kvstore/general_tests_phase_1/main.cpp
@@ -99,7 +99,7 @@ static void kvstore_init()
     TEST_ASSERT_EQUAL_ERROR_CODE(0, res);
 
     if (kv_setup == TDBStoreSet) {
-#if DEVICE_FLASH && !COMPONENT_SPIF && !COMPONENT_QSPIF && !COMPONENT_DATAFLASH && !COMPONENT_SD
+#if COMPONENT_FLASHIAP && !COMPONENT_SPIF && !COMPONENT_QSPIF && !COMPONENT_DATAFLASH && !COMPONENT_SD
         // TDBStore requires two areas of equal size, do the check for FlashIAP
         TEST_SKIP_UNLESS(MBED_CONF_TARGET_INTERNAL_FLASH_UNIFORM_SECTORS ||
                          (MBED_CONF_FLASHIAP_BLOCK_DEVICE_SIZE != 0) && (MBED_CONF_FLASHIAP_BLOCK_DEVICE_BASE_ADDRESS != 0xFFFFFFFF))
diff --git a/storage/kvstore/tests/TESTS/kvstore/general_tests_phase_2/main.cpp b/storage/kvstore/tests/TESTS/kvstore/general_tests_phase_2/main.cpp
@@ -95,7 +95,7 @@ static void kvstore_init()
     TEST_ASSERT_EQUAL_ERROR_CODE(0, res);
 
     if (kv_setup == TDBStoreSet) {
-#if DEVICE_FLASH && !COMPONENT_SPIF && !COMPONENT_QSPIF && !COMPONENT_DATAFLASH && !COMPONENT_SD
+#if COMPONENT_FLASHIAP && !COMPONENT_SPIF && !COMPONENT_QSPIF && !COMPONENT_DATAFLASH && !COMPONENT_SD
         // TDBStore requires two areas of equal size
         TEST_SKIP_UNLESS(MBED_CONF_TARGET_INTERNAL_FLASH_UNIFORM_SECTORS ||
                          (MBED_CONF_FLASHIAP_BLOCK_DEVICE_SIZE != 0) && (MBED_CONF_FLASHIAP_BLOCK_DEVICE_BASE_ADDRESS != 0xFFFFFFFF))
diff --git a/storage/platform/CMakeLists.txt b/storage/platform/CMakeLists.txt
@@ -14,27 +14,27 @@ list(APPEND mbed-storage-libs
     mbed-storage-littlefs-v2
 )
 
-if("COMPONENT_DATAFLASH=1" IN_LIST MBED_TARGET_DEFINITIONS)
+if("DATAFLASH" IN_LIST MBED_TARGET_LABELS)
     list(APPEND mbed-storage-libs mbed-storage-dataflash)
 endif()
 
-if("DEVICE_FLASH=1" IN_LIST MBED_TARGET_DEFINITIONS)
+if("FLASHIAP" IN_LIST MBED_TARGET_LABELS)
     list(APPEND mbed-storage-libs mbed-storage-flashiap)
 endif()
 
-if("COMPONENT_QSPIF=1" IN_LIST MBED_TARGET_DEFINITIONS)
+if("QSPIF" IN_LIST MBED_TARGET_LABELS)
     list(APPEND mbed-storage-libs mbed-storage-qspif)
 endif()
 
-if("COMPONENT_OSPIF=1" IN_LIST MBED_TARGET_DEFINITIONS)
+if("OSPIF" IN_LIST MBED_TARGET_LABELS)
     list(APPEND mbed-storage-libs mbed-storage-ospif)
 endif()
 
-if("COMPONENT_SD=1" IN_LIST MBED_TARGET_DEFINITIONS)
+if("SD" IN_LIST MBED_TARGET_LABELS)
     list(APPEND mbed-storage-libs mbed-storage-sd)
 endif()
 
-if("COMPONENT_SPIF=1" IN_LIST MBED_TARGET_DEFINITIONS)
+if("SPIF" IN_LIST MBED_TARGET_LABELS)
     list(APPEND mbed-storage-libs mbed-storage-spif)
 endif()
 
diff --git a/storage/platform/source/PlatformStorage.cpp b/storage/platform/source/PlatformStorage.cpp
@@ -44,7 +44,7 @@ const spi_pinmap_t static_spi_pinmap = get_spi_pinmap(MBED_CONF_SD_SPI_MOSI, MBE
 #endif
 #endif
 
-#if DEVICE_FLASH
+#if COMPONENT_FLASHIAP
 #include "FlashIAPBlockDevice.h"
 #endif
 
@@ -104,7 +104,7 @@ MBED_WEAK BlockDevice *BlockDevice::get_default_instance()
 
     return &default_bd;
 
-#elif DEVICE_FLASH
+#elif COMPONENT_FLASHIAP
 
 #if (MBED_CONF_FLASHIAP_BLOCK_DEVICE_SIZE == 0) && (MBED_CONF_FLASHIAP_BLOCK_DEVICE_BASE_ADDRESS == 0xFFFFFFFF)
 
@@ -164,7 +164,7 @@ MBED_WEAK FileSystem *FileSystem::get_default_instance()
 
     return &sdcard;
 
-#elif DEVICE_FLASH
+#elif COMPONENT_FLASHIAP
 
 // To avoid alignment issues, initialize a filesystem if all sectors have the same size
 // OR the user has specified an address range

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,3 @@ target_link_libraries(mbed-storage-kv-config`
`26`	`26`	`mbed-storage-littlefs-v2`
`27`	`27`	`mbed-storage-fat`
`28`	`28`	`)`
`29`		`-`
`30`		`-if("DEVICE_FLASH=1" IN_LIST MBED_TARGET_DEFINITIONS)`
`31`		`- target_link_libraries(mbed-storage-kv-config PUBLIC mbed-storage-flashiap)`
`32`		`-endif()`