From 9a5841ad00805923ce0638e2edfcaf3816a159c6 Mon Sep 17 00:00:00 2001
From: Amir Cohen <the.amiro.cohen@gmail.com>
Date: Wed, 9 Jan 2019 14:52:11 +0200
Subject: [PATCH] Kvstore tests api change to run on K64F only

Change KVStore API tests to run only on K64F, these tests check the KVStore functionality without actually testing the board's storage,
Thus they should produce the same results for each device they run on.
K64F was selected for no special technical reason but only because of it being available and convenient to use.
---
 .../TESTS/kvstore/filesystemstore_tests/main.cpp  |  6 +++++-
 .../TESTS/kvstore/general_tests_phase_1/main.cpp  |  5 +++++
 .../TESTS/kvstore/general_tests_phase_2/main.cpp  |  5 +++++
 .../TESTS/kvstore/securestore_whitebox/main.cpp   |  5 +++++
 .../TESTS/kvstore/tdbstore_whitebox/main.cpp      | 15 +++++++++++++++
 5 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/features/storage/TESTS/kvstore/filesystemstore_tests/main.cpp b/features/storage/TESTS/kvstore/filesystemstore_tests/main.cpp
index 60b27e52a2..184ca7b121 100644
--- a/features/storage/TESTS/kvstore/filesystemstore_tests/main.cpp
+++ b/features/storage/TESTS/kvstore/filesystemstore_tests/main.cpp
@@ -38,7 +38,11 @@ static const int heap_alloc_threshold_size = 4096;
 using namespace utest::v1;
 using namespace mbed;
 
-BlockDevice *bd = BlockDevice::get_default_instance();
+BlockDevice *bd = NULL;
+
+#if defined(TARGET_K64F)
+bd = BlockDevice::get_default_instance();
+#endif
 
 typedef struct {
     int thread_num;
diff --git a/features/storage/TESTS/kvstore/general_tests_phase_1/main.cpp b/features/storage/TESTS/kvstore/general_tests_phase_1/main.cpp
index 2dab435e7b..6260e5e98a 100644
--- a/features/storage/TESTS/kvstore/general_tests_phase_1/main.cpp
+++ b/features/storage/TESTS/kvstore/general_tests_phase_1/main.cpp
@@ -73,6 +73,11 @@ 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();
diff --git a/features/storage/TESTS/kvstore/general_tests_phase_2/main.cpp b/features/storage/TESTS/kvstore/general_tests_phase_2/main.cpp
index ebce63a19a..0e1c777ea0 100644
--- a/features/storage/TESTS/kvstore/general_tests_phase_2/main.cpp
+++ b/features/storage/TESTS/kvstore/general_tests_phase_2/main.cpp
@@ -73,6 +73,11 @@ 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();
diff --git a/features/storage/TESTS/kvstore/securestore_whitebox/main.cpp b/features/storage/TESTS/kvstore/securestore_whitebox/main.cpp
index ea619f0c16..364deb94fa 100644
--- a/features/storage/TESTS/kvstore/securestore_whitebox/main.cpp
+++ b/features/storage/TESTS/kvstore/securestore_whitebox/main.cpp
@@ -92,6 +92,11 @@ 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;
diff --git a/features/storage/TESTS/kvstore/tdbstore_whitebox/main.cpp b/features/storage/TESTS/kvstore/tdbstore_whitebox/main.cpp
index 4075a46642..af99aee851 100644
--- a/features/storage/TESTS/kvstore/tdbstore_whitebox/main.cpp
+++ b/features/storage/TESTS/kvstore/tdbstore_whitebox/main.cpp
@@ -95,6 +95,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 +337,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 +461,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;