ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

In addition, use the NOT_SUPPORTED directive to skip the tests.
pull/9244/head
David Saada 2019-01-09 16:25:13 +02:00
parent 9a5841ad00
commit 5d1985019f
7 changed files with 16 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
features/storage/TESTS/kvstore/filesystemstore_tests/main.cpp
View File

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

13
features/storage/TESTS/kvstore/general_tests_phase_1/main.cpp
View File

@ -26,13 +26,13 @@
#include "utest/utest.h" #include "utest/utest.h"
#include "FileSystemStore.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 utest::v1;
using namespace mbed; 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 data[] = "data";
static const char key[] = "key"; static const char key[] = "key";
static char buffer[20] = {}; static char buffer[20] = {};
@ -73,11 +73,6 @@ static const int heap_alloc_threshold_size = 4096;
//init the blockdevice //init the blockdevice
static void kvstore_init() static void kvstore_init()
{ {
#if !defined(TARGET_K64F)
TEST_SKIP_MESSAGE("Kvstore API tests run only on K64F devices");
#endif
int res; int res;
res = bd->init(); res = bd->init();

13
features/storage/TESTS/kvstore/general_tests_phase_2/main.cpp
View File

@ -26,13 +26,13 @@
#include "utest/utest.h" #include "utest/utest.h"
#include "FileSystemStore.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 utest::v1;
using namespace mbed; 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 data[] = "data";
static const char key[] = "key"; static const char key[] = "key";
static char buffer[20] = {}; static char buffer[20] = {};
@ -73,11 +73,6 @@ static const int heap_alloc_threshold_size = 4096;
//init the blockdevice //init the blockdevice
static void kvstore_init() static void kvstore_init()
{ {
#if !defined(TARGET_K64F)
TEST_SKIP_MESSAGE("Kvstore API tests run only on K64F devices");
#endif
int res; int res;
res = bd->init(); res = bd->init();

11
features/storage/TESTS/kvstore/securestore_whitebox/main.cpp
View File

@ -34,7 +34,11 @@
#include <stdio.h> #include <stdio.h>
#include <algorithm> #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 #error [NOT_SUPPORTED] KVStore & SecureStore need to be enabled for this test
#endif #endif
@ -92,11 +96,6 @@ static const char *const key7_val1 = "7 is a lucky number";
static void white_box_test() 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]; uint8_t get_buf[256];
size_t actual_data_size; size_t actual_data_size;
int result; int result;

4
features/storage/TESTS/kvstore/static_tests/main.cpp
View File

@ -22,10 +22,6 @@
#include "utest/utest.h" #include "utest/utest.h"
#include "kvstore_global_api.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 utest::v1;
using namespace mbed; using namespace mbed;

4
features/storage/TESTS/kvstore/tdbstore_whitebox/main.cpp
View File

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

27
features/storage/kvstore/mbed_lib.json
View File

@ -1,27 +0,0 @@
{
"name": "kvstore",
"config": {
"enabled": {
"macro_name": "KVSTORE_ENABLED",
"value": true,
"help": "Enabled"
}
},
"target_overrides": {
"REALTEK_RTL8195AM": {
"enabled": false
},
"NRF51_DK": {
"enabled": false
},
"KL82Z": {
"enabled": false
},
"USENSE": {
"enabled": false
},
"NCS36510": {
"enabled": false
}
}
}