Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bare metal green tea test for storage component #11825

Merged
merged 2 commits into from
Nov 12, 2019
Merged

Bare metal green tea test for storage component #11825

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ecce14
Skip Bare metal green tea test for storage related components or the …
rajkan01 Nov 6, 2019
d8e2dd5
Incorporated the review comments
rajkan01 Nov 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions components/storage/blockdevice/COMPONENT_SD/SDBlockDevice.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -872,7 +872,9 @@ uint32_t SDBlockDevice::_go_idle_state()
if (R1_IDLE_STATE == response) {
break;
}
#if defined(MBED_CONF_RTOS_PRESENT)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ThisThread::sleep_for() is not requiring RTOS, so no need to guard.

rajkan01 marked this conversation as resolved.
Show resolved Hide resolved
rtos::ThisThread::sleep_for(1);
#endif
}
return response;
}
Expand Down
4 changes: 4 additions & 0 deletions components/storage/blockdevice/COMPONENT_SD/TESTS/filesystem/parallel/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#if !defined(MBED_CONF_RTOS_PRESENT)
#error [NOT_SUPPORTED] filesystem test cases requires RTOS to run
#else

#include "mbed.h"
#include "greentea-client/test_env.h"
Expand Down Expand Up @@ -207,3 +210,4 @@ int main()
{
return !Harness::run(specification);
}
#endif // !defined(MBED_CONF_RTOS_PRESENT)
8 changes: 4 additions & 4 deletions features/device_key/TESTS/device_key/functionality/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
* limitations under the License.
*/

#if !DEVICEKEY_ENABLED
#error [NOT_SUPPORTED] DeviceKey needs to be enabled for this test
#else

#include "DeviceKey.h"
#include "mbedtls/config.h"
#include "utest/utest.h"
Expand All @@ -28,10 +32,6 @@
using namespace utest::v1;
using namespace mbed;

#if !DEVICEKEY_ENABLED
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

DEVICEKEY_ENABLED macro is coming from DeviceKey.h so this test should not be before the #include

#error [NOT_SUPPORTED] DeviceKey needs to be enabled for this test
#else

#define MSG_VALUE_DUMMY "0"
#define MSG_VALUE_LEN 32
#define MSG_KEY_LEN 32
Expand Down
7 changes: 6 additions & 1 deletion features/storage/TESTS/blockdevice/general_block_device/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,7 @@ void test_random_program_read_erase()

static void test_thread_job()
{
#if defined(MBED_CONF_RTOS_PRESENT)
static int thread_num = 0;
_mutex->lock();
int block_num = thread_num++ % TEST_NUM_OF_THREADS;
Expand All @@ -335,10 +336,12 @@ static void test_thread_job()
end:
delete[] read_block;
delete[] write_block;
#endif
}

void test_multi_threads()
{
#if defined(MBED_CONF_RTOS_PRESENT)
utest_printf("\nTest Multi Threaded Erase/Program/Read Starts..\n");

TEST_SKIP_UNLESS_MESSAGE(block_device != NULL, "no block device found.");
Expand Down Expand Up @@ -392,7 +395,7 @@ void test_multi_threads()

delete[] bd_thread;
}

#endif
}

void test_erase_functionality()
Expand Down Expand Up @@ -727,7 +730,9 @@ typedef struct {
template_case_t template_cases[] = {
{"Testing Init block device", test_init_bd, greentea_failure_handler},
{"Testing read write random blocks", test_random_program_read_erase, greentea_failure_handler},
#if defined(MBED_CONF_RTOS_PRESENT)
{"Testing multi threads erase program read", test_multi_threads, greentea_failure_handler},
#endif
{"Testing contiguous erase, write and read", test_contiguous_erase_write_read, greentea_failure_handler},
{"Testing BlockDevice erase functionality", test_erase_functionality, greentea_failure_handler},
{"Testing program read small data sizes", test_program_read_small_data_sizes, greentea_failure_handler},
Expand Down
4 changes: 4 additions & 0 deletions features/storage/TESTS/kvstore/filesystemstore_tests/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#if !defined(MBED_CONF_RTOS_PRESENT)
#error [NOT_SUPPORTED] Kvstore API test cases requires RTOS to run
#else

#include "rtos/Thread.h"
#include "mbed_trace.h"
Expand Down Expand Up @@ -522,3 +525,4 @@ int main()
}

#endif // !defined(TARGET_K64F) && !defined(TARGET_ARM_FM)
#endif // !defined(MBED_CONF_RTOS_PRESENT)
4 changes: 4 additions & 0 deletions features/storage/TESTS/kvstore/general_tests_phase_1/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#if !defined(MBED_CONF_RTOS_PRESENT)
#error [NOT_SUPPORTED] Kvstore API test cases requires RTOS to run
#else

#include "SecureStore.h"
#include "TDBStore.h"
Expand Down Expand Up @@ -857,3 +860,4 @@ int main()
}

#endif // !defined(TARGET_K64F) && !defined(TARGET_ARM_FM)
#endif // !defined(MBED_CONF_RTOS_PRESENT)
4 changes: 4 additions & 0 deletions features/storage/TESTS/kvstore/general_tests_phase_2/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#if !defined(MBED_CONF_RTOS_PRESENT)
#error [NOT_SUPPORTED] Kvstore API test cases requires RTOS to run
#else

#include "SecureStore.h"
#include "TDBStore.h"
Expand Down Expand Up @@ -860,3 +863,4 @@ int main()
}

#endif // !defined(TARGET_K64F) && !defined(TARGET_ARM_FM)
#endif // !defined(MBED_CONF_RTOS_PRESENT)
17 changes: 14 additions & 3 deletions features/storage/TESTS/kvstore/static_tests/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@
* limitations under the License.
*/

#if defined(MBED_CONF_RTOS_PRESENT)
#include "Thread.h"
#endif
#include "mbed_error.h"
#include "greentea-client/test_env.h"
#include "unity/unity.h"
Expand All @@ -33,10 +35,10 @@ static size_t actual_size = 0;
static const size_t buffer_size = 20;
static const int num_of_threads = 3;
static const char num_of_keys = 3;

#if defined(MBED_CONF_RTOS_PRESENT)
/* Forked 3 threads plus misc, so minimum (4 * OS_STACK_SIZE) heap are required. */
static const int heap_alloc_threshold_size = 4 * OS_STACK_SIZE;

#endif
static const char *keys[] = {"key1", "key2", "key3"};

static int init_res = MBED_ERROR_NOT_READY;
Expand Down Expand Up @@ -67,6 +69,7 @@ static void parse_default_kv()
//init the blockdevice
static void kvstore_init()
{
#if defined(MBED_CONF_RTOS_PRESENT)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If init is skipped, then why is not the whole .cpp skipped on the compilation phase? Rest of the test cases are not working anyway.

uint8_t *dummy = new (std::nothrow) uint8_t[heap_alloc_threshold_size];
TEST_SKIP_UNLESS_MESSAGE(dummy, "Not enough heap to run test");
delete[] dummy;
Expand All @@ -76,6 +79,7 @@ static void kvstore_init()
init_res = kv_reset(def_kv);
TEST_SKIP_UNLESS_MESSAGE(init_res != MBED_ERROR_UNSUPPORTED, "Unsupported configuration. Test skipped.");
TEST_ASSERT_EQUAL_ERROR_CODE(MBED_SUCCESS, init_res);
#endif
}

/*----------------set()------------------*/
Expand Down Expand Up @@ -144,6 +148,7 @@ static void test_thread_set(char *th_key)
//get several keys multithreaded
static void set_several_keys_multithreaded()
{
#if defined(MBED_CONF_RTOS_PRESENT)
TEST_SKIP_UNLESS(!init_res);
rtos::Thread kvstore_thread[num_of_threads];
osStatus threadStatus;
Expand All @@ -169,6 +174,7 @@ static void set_several_keys_multithreaded()
res = kv_remove(keys[i]);
TEST_ASSERT_EQUAL_ERROR_CODE(MBED_SUCCESS, res);
}
#endif
}

//set key "write once" and try to set it again
Expand Down Expand Up @@ -464,6 +470,7 @@ static void test_thread_get(const void *th_key)
//get several keys multithreaded
static void get_several_keys_multithreaded()
{
#if defined(MBED_CONF_RTOS_PRESENT)
TEST_SKIP_UNLESS(!init_res);
int i = 0, res = 0;
rtos::Thread kvstore_thread[num_of_threads];
Expand All @@ -489,6 +496,7 @@ static void get_several_keys_multithreaded()
res = kv_remove(keys[i]);
TEST_ASSERT_EQUAL_ERROR_CODE(MBED_SUCCESS, res);
}
#endif
}

/*----------------remove()------------------*/
Expand Down Expand Up @@ -924,7 +932,9 @@ Case cases[] = {
Case("set_buffer_null_size_not_zero", set_buffer_null_size_not_zero, greentea_failure_handler),
Case("set_buffer_size_is_zero", set_buffer_size_is_zero, greentea_failure_handler),
Case("set_same_key_several_time", set_same_key_several_time, greentea_failure_handler),
#if defined(MBED_CONF_RTOS_PRESENT)
Case("set_several_keys_multithreaded", set_several_keys_multithreaded, greentea_failure_handler),
#endif
Case("set_write_once_flag_try_set_twice", set_write_once_flag_try_set_twice, greentea_failure_handler),
Case("set_write_once_flag_try_remove", set_write_once_flag_try_remove, greentea_failure_handler),
Case("set_key_value_one_byte_size", set_key_value_one_byte_size, greentea_failure_handler),
Expand All @@ -944,8 +954,9 @@ Case cases[] = {
Case("get_non_existing_key", get_non_existing_key, greentea_failure_handler),
Case("get_removed_key", get_removed_key, greentea_failure_handler),
Case("get_key_that_was_set_twice", get_key_that_was_set_twice, greentea_failure_handler),
#if defined(MBED_CONF_RTOS_PRESENT)
Case("get_several_keys_multithreaded", get_several_keys_multithreaded, greentea_failure_handler),

#endif
Case("remove_key_null", remove_key_null, greentea_failure_handler),
Case("remove_key_length_exceeds_max", remove_key_length_exceeds_max, greentea_failure_handler),
Case("remove_non_existing_key", remove_non_existing_key, greentea_failure_handler),
Expand Down
8 changes: 4 additions & 4 deletions features/storage/nvstore/TESTS/nvstore/functionality/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
* limitations under the License.
*/

#if !NVSTORE_ENABLED
#error [NOT_SUPPORTED] NVSTORE needs to be enabled for this test
#else

#include "nvstore.h"
#ifdef MBED_CONF_RTOS_PRESENT
#include "Thread.h"
Expand All @@ -27,10 +31,6 @@
#include <stdio.h>
#include <algorithm>

#if !NVSTORE_ENABLED
#error [NOT_SUPPORTED] NVSTORE needs to be enabled for this test
#else
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Again, I don't see the point of moving the #if to before #include as nvstore.h might disable that flag.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This macro comes from "features/storage/nvstore/mbed_lib.json".i think this is fine to keep at the beginning

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not totally true. It can be disabled, if FLASH is not enabled:
https://github.com/ARMmbed/mbed-os/blob/master/features/storage/nvstore/source/nvstore.h#L23

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I noticed, I will move this after nvstore.h file


using namespace utest::v1;

static const uint16_t max_test_keys = 20;
Expand Down