Added test config for simulated block devices

geky · geky · commit 47684d89a502 · 2017-11-27T19:48:56.000-06:00
Not all devices have enough heap to fit a simulated heap block device,
however using a simulated heap block device is preferred if available
(reduced flash wear, faster testing).

Added MBED_TEST_SIM_BLOCKDEVICE for tests that only need a simulated
block device (wear_leveling + resilience), and added support for targets
that are known to have enough heap.
diff --git a/features/filesystem/littlefs/TESTS/filesystem_recovery/resilience/main.cpp b/features/filesystem/littlefs/TESTS/filesystem_recovery/resilience/main.cpp
@@ -24,13 +24,12 @@
 using namespace utest::v1;
 
 // test configuration
-#ifndef MBED_TEST_BLOCKDEVICE
-#define MBED_TEST_BLOCKDEVICE HeapBlockDevice
-#define MBED_TEST_BLOCKDEVICE_DECL MBED_TEST_BLOCKDEVICE bd(MBED_TEST_BLOCK_COUNT*512, 1, 1, 512)
+#ifndef MBED_TEST_SIM_BLOCKDEVICE
+#error [NOT_SUPPORTED] Simulation block device required for resilience tests
 #endif
 
-#ifndef MBED_TEST_BLOCKDEVICE_DECL
-#define MBED_TEST_BLOCKDEVICE_DECL MBED_TEST_BLOCKDEVICE bd
+#ifndef MBED_TEST_SIM_BLOCKDEVICE_DECL
+#define MBED_TEST_SIM_BLOCKDEVICE_DECL MBED_TEST_SIM_BLOCKDEVICE bd(MBED_TEST_BLOCK_COUNT*512, 1, 1, 512)
 #endif
 
 #ifndef MBED_TEST_BLOCK_COUNT
@@ -50,7 +49,7 @@ using namespace utest::v1;
 #define STRINGIZE2(x) #x
 #define INCLUDE(x) STRINGIZE(x.h)
 
-#include INCLUDE(MBED_TEST_BLOCKDEVICE)
+#include INCLUDE(MBED_TEST_SIM_BLOCKDEVICE)
 
 
 /**
@@ -62,7 +61,7 @@ using namespace utest::v1;
  */
 void test_resilience()
 {
-    MBED_TEST_BLOCKDEVICE_DECL;
+    MBED_TEST_SIM_BLOCKDEVICE_DECL;
 
     // bring up to get block size
     bd.init();
diff --git a/features/filesystem/littlefs/TESTS/filesystem_recovery/wear_leveling/main.cpp b/features/filesystem/littlefs/TESTS/filesystem_recovery/wear_leveling/main.cpp
@@ -25,13 +25,12 @@
 using namespace utest::v1;
 
 // test configuration
-#ifndef MBED_TEST_BLOCKDEVICE
-#define MBED_TEST_BLOCKDEVICE HeapBlockDevice
-#define MBED_TEST_BLOCKDEVICE_DECL MBED_TEST_BLOCKDEVICE bd(MBED_TEST_BLOCK_COUNT*512, 1, 1, 512)
+#ifndef MBED_TEST_SIM_BLOCKDEVICE
+#error [NOT_SUPPORTED] Simulation block device required for wear leveling tests
 #endif
 
-#ifndef MBED_TEST_BLOCKDEVICE_DECL
-#define MBED_TEST_BLOCKDEVICE_DECL MBED_TEST_BLOCKDEVICE bd
+#ifndef MBED_TEST_SIM_BLOCKDEVICE_DECL
+#define MBED_TEST_SIM_BLOCKDEVICE_DECL MBED_TEST_SIM_BLOCKDEVICE bd(MBED_TEST_BLOCK_COUNT*512, 1, 1, 512)
 #endif
 
 #ifndef MBED_TEST_BLOCK_COUNT
@@ -51,12 +50,12 @@ using namespace utest::v1;
 #define STRINGIZE2(x) #x
 #define INCLUDE(x) STRINGIZE(x.h)
 
-#include INCLUDE(MBED_TEST_BLOCKDEVICE)
+#include INCLUDE(MBED_TEST_SIM_BLOCKDEVICE)
 
 
 static uint32_t test_wear_leveling_size(uint32_t block_count)
 {
-    MBED_TEST_BLOCKDEVICE_DECL;
+    MBED_TEST_SIM_BLOCKDEVICE_DECL;
 
     // bring up to get block size
     bd.init();
diff --git a/tools/test_configs/HeapBlockDevice.json b/tools/test_configs/HeapBlockDevice.json
@@ -0,0 +1,9 @@
+{
+    "config": {
+        "sim-blockdevice": {
+            "help": "Simulated block device, requires sufficient heap",
+            "macro_name": "MBED_TEST_SIM_BLOCKDEVICE",
+            "value": "HeapBlockDevice"
+        }
+    }
+}
diff --git a/tools/test_configs/HeapBlockDeviceAndEthernetInterface.json b/tools/test_configs/HeapBlockDeviceAndEthernetInterface.json
@@ -0,0 +1,32 @@
+{
+    "config": {
+        "header-file": {
+            "help" : "String for including your driver header file",
+            "value" : "\"EthernetInterface.h\""
+        },
+        "object-construction" : {
+            "value" : "new EthernetInterface()"
+        },
+        "connect-statement" : {
+            "help" : "Must use 'net' variable name",
+            "value" : "((EthernetInterface *)net)->connect()"
+        },
+        "echo-server-addr" : {
+            "help" : "IP address of echo server",
+            "value" : "\"195.34.89.241\""
+        },
+        "echo-server-port" : {
+            "help" : "Port of echo server",
+            "value" : "7"
+        },
+        "tcp-echo-prefix" : {
+            "help" : "Some servers send a prefix before echoed message",
+            "value" : "\"u-blox AG TCP/UDP test service\\n\""
+        },
+        "sim-blockdevice": {
+            "help": "Simulated block device, requires sufficient heap",
+            "macro_name": "MBED_TEST_SIM_BLOCKDEVICE",
+            "value": "HeapBlockDevice"
+        }
+    }
+}
diff --git a/tools/test_configs/OdinInterface.json b/tools/test_configs/OdinInterface.json
@@ -22,6 +22,11 @@
         "tcp-echo-prefix" : {
             "help" : "Some servers send a prefix before echoed message",
             "value" : "\"u-blox AG TCP/UDP test service\\n\""
+        },
+        "sim-blockdevice": {
+            "help": "Simulated block device, requires sufficient heap",
+            "macro_name": "MBED_TEST_SIM_BLOCKDEVICE",
+            "value": "HeapBlockDevice"
         }
     }
 }
diff --git a/tools/test_configs/Odin_EthernetInterface.json b/tools/test_configs/Odin_EthernetInterface.json
@@ -22,6 +22,11 @@
         "tcp-echo-prefix" : {
             "help" : "Some servers send a prefix before echoed message",
             "value" : "\"u-blox AG TCP/UDP test service\\n\""
+        },
+        "sim-blockdevice": {
+            "help": "Simulated block device, requires sufficient heap",
+            "macro_name": "MBED_TEST_SIM_BLOCKDEVICE",
+            "value": "HeapBlockDevice"
         }
     },
      "target_overrides": {
diff --git a/tools/test_configs/RealtekInterface.json b/tools/test_configs/RealtekInterface.json
@@ -22,6 +22,11 @@
         "tcp-echo-prefix" : {
             "help" : "Some servers send a prefix before echoed message",
             "value" : "\"Realtek Ameba TCP/UDP test service\\n\""
+        },
+        "sim-blockdevice": {
+            "help": "Simulated block device, requires sufficient heap",
+            "macro_name": "MBED_TEST_SIM_BLOCKDEVICE",
+            "value": "HeapBlockDevice"
         }
     }
 }
diff --git a/tools/test_configs/config_paths.json b/tools/test_configs/config_paths.json
@@ -1,6 +1,8 @@
 {
     "ETHERNET" : "EthernetInterface.json",
+    "HEAPBLOCKDEVICE": "HeapBlockDevice.json",
+    "HEAPBLOCKDEVICE_AND_ETHERNET": "HeapBlockDeviceAndEthernetInterface.json",
     "ODIN_WIFI" : "OdinInterface.json",
     "ODIN_ETHERNET" : "Odin_EthernetInterface.json",
-    "REALTEK_WIFI" : "RealtekInterface.json"	
+    "REALTEK_WIFI" : "RealtekInterface.json"
 }
diff --git a/tools/test_configs/target_configs.json b/tools/test_configs/target_configs.json
@@ -6,5 +6,13 @@
     "REALTEK_RTL8195AM": {
         "default_test_configuration": "NONE",
         "test_configurations": ["REALTEK_WIFI"]
+    },
+    "K64F": {
+        "default_test_configuration": "HEAPBLOCKDEVICE_AND_ETHERNET",
+        "test_configurations": ["HEAPBLOCKDEVICE_AND_ETHERNET"]
+    },
+    "NUCLEO_F429ZI": {
+        "default_test_configuration": "HEAPBLOCKDEVICE_AND_ETHERNET",
+        "test_configurations": ["HEAPBLOCKDEVICE_AND_ETHERNET"]
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,11 @@`
`22`	`22`	`"tcp-echo-prefix" : {`
`23`	`23`	`"help" : "Some servers send a prefix before echoed message",`
`24`	`24`	`"value" : "\"u-blox AG TCP/UDP test service\\n\""`
	`25`	`+ },`
	`26`	`+ "sim-blockdevice": {`
	`27`	`+ "help": "Simulated block device, requires sufficient heap",`
	`28`	`+ "macro_name": "MBED_TEST_SIM_BLOCKDEVICE",`
	`29`	`+ "value": "HeapBlockDevice"`
`25`	`30`	`}`
`26`	`31`	`}`
`27`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,8 @@`
`1`	`1`	`{`
`2`	`2`	`"ETHERNET" : "EthernetInterface.json",`
	`3`	`+ "HEAPBLOCKDEVICE": "HeapBlockDevice.json",`
	`4`	`+ "HEAPBLOCKDEVICE_AND_ETHERNET": "HeapBlockDeviceAndEthernetInterface.json",`
`3`	`5`	`"ODIN_WIFI" : "OdinInterface.json",`
`4`	`6`	`"ODIN_ETHERNET" : "Odin_EthernetInterface.json",`
`5`		`- "REALTEK_WIFI" : "RealtekInterface.json"`
	`7`	`+ "REALTEK_WIFI" : "RealtekInterface.json"`
`6`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,13 @@`
`6`	`6`	`"REALTEK_RTL8195AM": {`
`7`	`7`	`"default_test_configuration": "NONE",`
`8`	`8`	`"test_configurations": ["REALTEK_WIFI"]`
	`9`	`+ },`
	`10`	`+ "K64F": {`
	`11`	`+ "default_test_configuration": "HEAPBLOCKDEVICE_AND_ETHERNET",`
	`12`	`+ "test_configurations": ["HEAPBLOCKDEVICE_AND_ETHERNET"]`
	`13`	`+ },`
	`14`	`+ "NUCLEO_F429ZI": {`
	`15`	`+ "default_test_configuration": "HEAPBLOCKDEVICE_AND_ETHERNET",`
	`16`	`+ "test_configurations": ["HEAPBLOCKDEVICE_AND_ETHERNET"]`
`9`	`17`	`}`
`10`	`18`	`}`