From 43c84c616b245792a875da42e656c4cb877d77e4 Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Wed, 24 Feb 2021 18:33:05 +0100 Subject: [PATCH 1/3] tests/pkg_littlefs*: increase timeout for test It takes more that 2 minutes when run on the nrf52840dk --- tests/pkg_littlefs/tests/01-run.py | 5 ++++- tests/pkg_littlefs2/tests/01-run.py | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/tests/pkg_littlefs/tests/01-run.py b/tests/pkg_littlefs/tests/01-run.py index 8b4e23f2e7..85279db08b 100755 --- a/tests/pkg_littlefs/tests/01-run.py +++ b/tests/pkg_littlefs/tests/01-run.py @@ -10,5 +10,8 @@ import sys from testrunner import run_check_unittests +TIMEOUT = 180 # takes more than 2 minutes to complete on nrf52840dk + + if __name__ == "__main__": - sys.exit(run_check_unittests()) + sys.exit(run_check_unittests(timeout=TIMEOUT)) diff --git a/tests/pkg_littlefs2/tests/01-run.py b/tests/pkg_littlefs2/tests/01-run.py index 8b4e23f2e7..85279db08b 100755 --- a/tests/pkg_littlefs2/tests/01-run.py +++ b/tests/pkg_littlefs2/tests/01-run.py @@ -10,5 +10,8 @@ import sys from testrunner import run_check_unittests +TIMEOUT = 180 # takes more than 2 minutes to complete on nrf52840dk + + if __name__ == "__main__": - sys.exit(run_check_unittests()) + sys.exit(run_check_unittests(timeout=TIMEOUT)) From a8be37bbf08dfad162d17428df10322c7bda1293 Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Thu, 25 Feb 2021 10:13:50 +0100 Subject: [PATCH 2/3] tests/pkg_littlefs*: make use hardware MTD optional --- tests/pkg_littlefs/main.c | 9 ++++++--- tests/pkg_littlefs2/main.c | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/tests/pkg_littlefs/main.c b/tests/pkg_littlefs/main.c index fccc7c5ae3..6821735334 100644 --- a/tests/pkg_littlefs/main.c +++ b/tests/pkg_littlefs/main.c @@ -23,8 +23,11 @@ #include "embUnit.h" -/* Define MTD_0 in board.h to use the board mtd if any */ -#ifdef MTD_0 +/* Define MTD_0 in board.h to use the board mtd if any and if + * CONFIG_USE_HARDWARE_MTD is defined (add CFLAGS=-DCONFIG_USE_HARDWARE_MTD to + * the command line to enable it */ +#if defined(MTD_0) && IS_ACTIVE(CONFIG_USE_HARDWARE_MTD) +#define USE_MTD_0 #define _dev (MTD_0) #else /* Test mock object implementing a simple RAM-based mtd */ @@ -404,7 +407,7 @@ static void tests_littlefs_statvfs(void) Test *tests_littlefs(void) { -#ifndef MTD_0 +#ifndef USE_MTD_0 memset(dummy_memory, 0xff, sizeof(dummy_memory)); #endif diff --git a/tests/pkg_littlefs2/main.c b/tests/pkg_littlefs2/main.c index 5f6aae89bd..a287a2b322 100644 --- a/tests/pkg_littlefs2/main.c +++ b/tests/pkg_littlefs2/main.c @@ -23,8 +23,11 @@ #include "embUnit.h" -/* Define MTD_0 in board.h to use the board mtd if any */ -#ifdef MTD_0 +/* Define MTD_0 in board.h to use the board mtd if any and if + * CONFIG_USE_HARDWARE_MTD is defined (add CFLAGS=-DCONFIG_USE_HARDWARE_MTD to + * the command line to enable it */ +#if defined(MTD_0) && IS_ACTIVE(CONFIG_USE_HARDWARE_MTD) +#define USE_MTD_0 #define _dev (MTD_0) #else /* Test mock object implementing a simple RAM-based mtd */ @@ -406,7 +409,7 @@ static void tests_littlefs_statvfs(void) Test *tests_littlefs(void) { -#ifndef MTD_0 +#ifndef USE_MTD_0 memset(dummy_memory, 0xff, sizeof(dummy_memory)); #endif From a8d04ad502e7b167258a657d5f55e9e317a12ead Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Thu, 25 Feb 2021 10:14:04 +0100 Subject: [PATCH 3/3] tests/pkg_spiffs: make use hardware MTD optional --- tests/pkg_spiffs/main.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/pkg_spiffs/main.c b/tests/pkg_spiffs/main.c index 3c695cd0b5..5dd433a8d3 100644 --- a/tests/pkg_spiffs/main.c +++ b/tests/pkg_spiffs/main.c @@ -21,9 +21,11 @@ #include "embUnit.h" - -/* Define MTD_0 in board.h to use the board mtd if any */ -#ifdef MTD_0 +/* Define MTD_0 in board.h to use the board mtd if any and if + * CONFIG_USE_HARDWARE_MTD is defined (add CFLAGS=-DCONFIG_USE_HARDWARE_MTD to + * the command line to enable it */ +#if defined(MTD_0) && IS_ACTIVE(CONFIG_USE_HARDWARE_MTD) +#define USE_MTD_0 #define _dev (MTD_0) #else /* Test mock object implementing a simple RAM-based mtd */ @@ -436,7 +438,7 @@ static void tests_spiffs_partition(void) Test *tests_spiffs(void) { -#ifndef MTD_0 +#ifndef USE_MTD_0 memset(dummy_memory, 0xff, sizeof(dummy_memory)); #endif EMB_UNIT_TESTFIXTURES(fixtures) {