Merge pull request #9244 from theamirocohen/kvstore_tests_api

Kvstore tests api change to run on K64F only
ARMmbed · Jan 10, 2019 · d20b591 · d20b591
2 parents e25611a + 5d19850
commit d20b591
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 46 deletions.
diff --git a/features/storage/TESTS/kvstore/filesystemstore_tests/main.cpp b/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

diff --git a/features/storage/TESTS/kvstore/general_tests_phase_1/main.cpp b/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] = {};

diff --git a/features/storage/TESTS/kvstore/general_tests_phase_2/main.cpp b/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] = {};

diff --git a/features/storage/TESTS/kvstore/securestore_whitebox/main.cpp b/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
 

diff --git a/features/storage/TESTS/kvstore/static_tests/main.cpp b/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;
 

diff --git a/features/storage/TESTS/kvstore/tdbstore_whitebox/main.cpp b/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;
 
@@ -95,6 +91,11 @@ static const char *const res_val2  = "This should surely not be saved as the res
 
 static void white_box_test()
 {
+
+#if !defined(TARGET_K64F)
+    TEST_SKIP_MESSAGE("Kvstore API tests run only on K64F devices");
+#endif
+
     bd_params_t bd_params[] = {
         {8192,     1,  16, 4096}, // Standard
         {4096 * 4, 1,   1, 4096}, // K82F like
@@ -332,6 +333,11 @@ static void white_box_test()
 
 static void multi_set_test()
 {
+
+#if !defined(TARGET_K64F)
+    TEST_SKIP_MESSAGE("Kvstore API tests run only on K64F devices");
+#endif
+
     char *key;
     uint8_t *get_buf, *set_buf;
     size_t key_size = 32;
@@ -451,6 +457,11 @@ static void multi_set_test()
 
 static void error_inject_test()
 {
+
+#if !defined(TARGET_K64F)
+    TEST_SKIP_MESSAGE("Kvstore API tests run only on K64F devices");
+#endif
+
     char *key;
     uint8_t *get_buf, *set_buf, *exists;
     size_t key_size = 8;

diff --git a/features/storage/kvstore/mbed_lib.json b/features/storage/kvstore/mbed_lib.json