Added MBED_15 RPC test to automated test suite

Author: PrzemekWirkus

libraries/tests/mbed/rpc/main.cpp

@@ -1,59 +1,64 @@
 #include "mbed.h"
+#include "test_env.h"
 #include "mbed_rpc.h"
 
+char outbuf[RPC_MAX_STRING] = {0};
 float f = 0;
 
 void foo(Arguments *args, Reply *reply) {
     reply->putData<float>(args->getArg<float>() * 3.3);
 }
 
-char outbuf[RPC_MAX_STRING];
-void test(const char *input, const char *expected) {
-    printf("> %s\n", input);
+bool rpc_test(const char *input, const char *expected) {
+    printf("RPC: %s -> ", input);
     bool result = RPC::call(input, outbuf);
-    
-    if (!result) {
-        printf("[ERROR] The remote procedure call failed\n");
-    } else if (strcmp(outbuf, expected) != 0) {
-        printf("[ERROR] \"%s\" != \"%s\"\n", outbuf, expected);
+
+    if (result == false) {
+        printf("Procedure call ... [FAIL]\r\n");
+    } else if (strncmp(outbuf, expected, RPC_MAX_STRING) != 0) {
+        printf("'%s' != '%s' ... [FAIL]\r\n", outbuf, expected);
+        result = false;
     } else {
-        printf("{%s}\n", outbuf);
+        printf("'%s' ... [OK]\r\n", outbuf);
     }
+    return result;
 }
 
+#define RPC_TEST(INPUT,EXPECTED) result = result && rpc_test(INPUT,EXPECTED); if (result == false) { notify_completion(result); exit(1); }
+
 int main() {
+    bool result = true;
     // Variable
     RPCVariable<float> rpc_f(&f, "f");
-    test("/f/write 1", "");
-    test("/f/read", "1");
-    
+    RPC_TEST("/f/write 1", "");
+    RPC_TEST("/f/read", "1");
+
     // Function
     RPCFunction rpc_foo(&foo, "foo");
-    test("/foo/run 1", "3.2999999523162842");
-    
+    RPC_TEST("/foo/run 1", "3.2999999523162842");
+
     // Class
     RPC::add_rpc_class<RpcDigitalOut>();
-    test("/DigitalOut/new LED2 led2", "led2");
-    test("/led2/write 1", "");
-    test("/led2/read", "1");
-    
+    RPC_TEST("/DigitalOut/new LED2 led2", "led2");
+    RPC_TEST("/led2/write 1", "");
+    RPC_TEST("/led2/read", "1");
+
     // Instance
     RpcDigitalOut rpc_led(LED1, "led1");
-    test("/led1/write 1", "");
-    test("/led1/read", "1");
-    
+    RPC_TEST("/led1/write 1", "");
+    RPC_TEST("/led1/read", "1");
+
     // Introspection
-    test("/", "led1 led2 foo f DigitalOut RPC");
-    test("/f", "read write delete");
-    test("/foo", "run delete");
-    test("/DigitalOut", "new");
-    test("/led1", "write read delete");
-    
+    RPC_TEST("/", "led1 led2 foo f DigitalOut RPC");
+    RPC_TEST("/f", "read write delete");
+    RPC_TEST("/foo", "run delete");
+    RPC_TEST("/DigitalOut", "new");
+    RPC_TEST("/led1", "write read delete");
+
     // Delete instance
-    test("/led2/delete", "");
-    test("/", "led1 foo f DigitalOut RPC");
-    
-    while (true) {
-        wait(1);
-    }
+    RPC_TEST("/led2/delete", "");
+    RPC_TEST("/", "led1 foo f DigitalOut RPC");
+
+    notify_completion(result);
+    return 0;
 }

workspace_tools/tests.py

@@ -346,7 +346,7 @@
     {
         "id": "MBED_15", "description": "RPC",
         "source_dir": join(TEST_DIR, "mbed", "rpc"),
-        "dependencies": [MBED_LIBRARIES, join(LIB_DIR, "rpc")],
+        "dependencies": [MBED_LIBRARIES, join(LIB_DIR, "rpc"), TEST_MBED_LIB],
         "host_test": "rpc",
     },
     {