Also allow filtering by RAM size

Author: multiplemonomials

storage/blockdevice/tests/TESTS/blockdevice/heap_block_device/CMakeLists.txt

@@ -8,4 +8,5 @@ mbed_greentea_add_test(
         main.cpp
     TEST_REQUIRED_LIBS
         mbed-storage-blockdevice
+    NEEDED_RAM_KIB 6
 )

storage/blockdevice/tests/TESTS/blockdevice/mbr_block_device/CMakeLists.txt

@@ -8,4 +8,5 @@ mbed_greentea_add_test(
         main.cpp
     TEST_REQUIRED_LIBS
         mbed-storage-blockdevice
+    NEEDED_RAM_KIB 10
 )

storage/blockdevice/tests/TESTS/blockdevice/util_block_device/CMakeLists.txt

@@ -8,4 +8,5 @@ mbed_greentea_add_test(
         main.cpp
     TEST_REQUIRED_LIBS
         mbed-storage-blockdevice
+    NEEDED_RAM_KIB 10
 )

storage/kvstore/tests/TESTS/kvstore/general_tests_phase_1/CMakeLists.txt

@@ -10,7 +10,7 @@ mbed_greentea_add_test(
         mbed-storage-kvstore-general_tests_phase_1
     TEST_SKIPPED
         ${TEST_SKIPPED}
-    MIN_FLASH_BYTES 140000
+    NEEDED_FLASH_KIB 140
     TEST_SOURCES
         main.cpp
     TEST_REQUIRED_LIBS

storage/kvstore/tests/TESTS/kvstore/general_tests_phase_2/CMakeLists.txt

@@ -10,7 +10,7 @@ mbed_greentea_add_test(
         mbed-storage-kvstore-general_tests_phase_2
     TEST_SKIPPED
         ${TEST_SKIPPED}
-    MIN_FLASH_BYTES 140000
+    NEEDED_FLASH_KIB 140
     TEST_SOURCES
         main.cpp
     TEST_REQUIRED_LIBS

tools/cmake/mbed_greentea.cmake

@@ -13,7 +13,9 @@ set(MBED_GREENTEA_SERIAL_PORT "" CACHE STRING "Serial port name to talk to the M
 # HOST_TESTS_DIR - Path to the "host_tests" directory.  If a relative path is provided, it will be
 #    interpreted relative to the source directory.
 # TEST_SKIPPED - Reason if suite is skipped
-# NEEDED_FLASH_BYTES - Minimum flash size, in bytes, needed to run this test. Test will be skipped if flash
+# NEEDED_FLASH_KIB - Minimum flash size, in kiB, needed to run this test. Test will be skipped if flash
+#    size is known and is less than this.
+# NEEDED_RAM_KIB - Minimum RAM size, in kiB, needed to run this test. Test will be skipped if RAM bank 0
 #    size is known and is less than this.
 #
 # calling the macro:
@@ -33,7 +35,8 @@ set(MBED_GREENTEA_SERIAL_PORT "" CACHE STRING "Serial port name to talk to the M
 #         mbed-xyz
 #     HOST_TESTS_DIR
 #         ${CMAKE_CURRENT_LIST_DIR}/host_tests
-#     NEEDED_FLASH_BYTES 140000
+#     NEEDED_FLASH_KIB 130
+#     NEEDED_RAM_KIB 10
 #     TEST_SKIPPED
 #         ${skip_reason}
 # )
@@ -43,7 +46,8 @@ function(mbed_greentea_add_test)
     set(singleValueArgs
         TEST_NAME
         TEST_SKIPPED
-        NEEDED_FLASH_BYTES
+        NEEDED_FLASH_KIB
+        NEEDED_RAM_KIB
     )
     set(multipleValueArgs
         TEST_INCLUDE_DIRS
@@ -62,10 +66,20 @@ function(mbed_greentea_add_test)
         message(FATAL_ERROR "Will not be able to run greentea tests without MBED_GREENTEA_SERIAL_PORT defined!")
     endif()
 
-    if(NOT "${MBED_GREENTEA_NEEDED_FLASH_BYTES}" STREQUAL "")
+    if(NOT "${MBED_GREENTEA_NEEDED_FLASH_KIB}" STREQUAL "")
+        math(EXPR NEEDED_FLASH_BYTES "${MBED_GREENTEA_NEEDED_FLASH_KIB} * 1024")
         if("${MBED_CONFIG_DEFINITIONS}" MATCHES "MBED_ROM_SIZE=((0x[0-9A-Fa-f]+)|([0-9]+))")
-            if(${CMAKE_MATCH_1} LESS ${MBED_GREENTEA_NEEDED_FLASH_BYTES})
-                set(MBED_GREENTEA_TEST_SKIPPED "Not enough flash space!")
+            if(${CMAKE_MATCH_1} LESS NEEDED_FLASH_BYTES)
+                set(MBED_GREENTEA_TEST_SKIPPED "Not enough flash space! Need at least ${MBED_GREENTEA_NEEDED_FLASH_KIB} kiB for this test.")
+            endif()
+        endif()
+    endif()
+
+    if(NOT "${MBED_GREENTEA_NEEDED_RAM_KIB}" STREQUAL "")
+        math(EXPR NEEDED_RAM_BYTES "${MBED_GREENTEA_NEEDED_RAM_KIB} * 1024")
+        if("${MBED_CONFIG_DEFINITIONS}" MATCHES "MBED_RAM_SIZE=((0x[0-9A-Fa-f]+)|([0-9]+))")
+            if(${CMAKE_MATCH_1} LESS NEEDED_RAM_BYTES)
+                set(MBED_GREENTEA_TEST_SKIPPED "Not enough RAM space!  Need at least ${MBED_GREENTEA_NEEDED_RAM_KIB} kiB for this test.")
             endif()
         endif()
     endif()