Remove kvstore's mbed_lib.json file (not relevant any more)

In addition, use the NOT_SUPPORTED directive to skip the tests.

Author: David Saada

features/storage/TESTS/kvstore/filesystemstore_tests/main.cpp

@@ -27,8 +27,8 @@
 #include "utest.h"
 #include <stdlib.h>
 
-#if !KVSTORE_ENABLED
-#error [NOT_SUPPORTED] KVStore needs to be enabled for this test
+#if !defined(TARGET_K64F)
+#error [NOT_SUPPORTED] Kvstore API tests run only on K64F devices
 #endif
 
 #define FSST_TEST_NUM_OF_THREADS 5
@@ -38,11 +38,7 @@ static const int heap_alloc_threshold_size = 4096;
 using namespace utest::v1;
 using namespace mbed;
 
-BlockDevice *bd = NULL;
-
-#if defined(TARGET_K64F)
-bd = BlockDevice::get_default_instance();
-#endif
+BlockDevice *bd = BlockDevice::get_default_instance();
 
 typedef struct {
     int thread_num;

features/storage/TESTS/kvstore/general_tests_phase_1/main.cpp

@@ -26,13 +26,13 @@
 #include "utest/utest.h"
 #include "FileSystemStore.h"
 
-#if !KVSTORE_ENABLED
-#error [NOT_SUPPORTED] KVStore needs to be enabled for this test
-#endif
-
 using namespace utest::v1;
 using namespace mbed;
 
+#if !defined(TARGET_K64F)
+#error [NOT_SUPPORTED] Kvstore API tests run only on K64F devices
+#endif
+
 static const char   data[] = "data";
 static const char   key[] = "key";
 static char         buffer[20] = {};
@@ -73,11 +73,6 @@ static const int heap_alloc_threshold_size = 4096;
 //init the blockdevice
 static void kvstore_init()
 {
-
-#if !defined(TARGET_K64F)
-    TEST_SKIP_MESSAGE("Kvstore API tests run only on K64F devices");
-#endif
-
     int res;
 
     res = bd->init();

features/storage/TESTS/kvstore/general_tests_phase_2/main.cpp

@@ -26,13 +26,13 @@
 #include "utest/utest.h"
 #include "FileSystemStore.h"
 
-#if !KVSTORE_ENABLED
-#error [NOT_SUPPORTED] KVStore needs to be enabled for this test
-#endif
-
 using namespace utest::v1;
 using namespace mbed;
 
+#if !defined(TARGET_K64F)
+#error [NOT_SUPPORTED] Kvstore API tests run only on K64F devices
+#endif
+
 static const char   data[] = "data";
 static const char   key[] = "key";
 static char         buffer[20] = {};
@@ -73,11 +73,6 @@ static const int heap_alloc_threshold_size = 4096;
 //init the blockdevice
 static void kvstore_init()
 {
-
-#if !defined(TARGET_K64F)
-    TEST_SKIP_MESSAGE("Kvstore API tests run only on K64F devices");
-#endif
-
     int res;
 
     res = bd->init();

features/storage/TESTS/kvstore/securestore_whitebox/main.cpp

@@ -34,7 +34,11 @@
 #include <stdio.h>
 #include <algorithm>
 
-#if !SECURESTORE_ENABLED || !KVSTORE_ENABLED
+#if !defined(TARGET_K64F)
+#error [NOT_SUPPORTED] Kvstore API tests run only on K64F devices
+#endif
+
+#if !SECURESTORE_ENABLED
 #error [NOT_SUPPORTED] KVStore & SecureStore need to be enabled for this test
 #endif
 
@@ -92,11 +96,6 @@ static const char *const key7_val1 = "7 is a lucky number";
 
 static void white_box_test()
 {
-
-#if !defined(TARGET_K64F)
-    TEST_SKIP_MESSAGE("Kvstore API tests run only on K64F devices");
-#endif
-
     uint8_t get_buf[256];
     size_t actual_data_size;
     int result;

features/storage/TESTS/kvstore/static_tests/main.cpp

@@ -22,10 +22,6 @@
 #include "utest/utest.h"
 #include "kvstore_global_api.h"
 
-#if !KVSTORE_ENABLED
-#error [NOT_SUPPORTED] KVStore needs to be enabled for this test
-#endif
-
 using namespace utest::v1;
 using namespace mbed;
 

features/storage/TESTS/kvstore/tdbstore_whitebox/main.cpp

@@ -33,10 +33,6 @@
 #include <stdio.h>
 #include <algorithm>
 
-#if !KVSTORE_ENABLED
-#error [NOT_SUPPORTED] KVStore needs to be enabled for this test
-#endif
-
 using namespace mbed;
 using namespace utest::v1;