riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #16089 from aabadie/pr/tests/pkg_fs_timeout_fix

Browse Source 
tests/pkg_littlefs:  tests/pkg_spiffs: fix test timeouts on nrf52840dk
This commit is contained in:
Alexandre Abadie 2021-02-25 14:12:34 +01:00 committed by GitHub
commit fa6c79209e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/pkg_littlefs/main.c
View File

@ -23,8 +23,11 @@
#include "embUnit.h" #include "embUnit.h"
/* Define MTD_0 in board.h to use the board mtd if any */ /* Define MTD_0 in board.h to use the board mtd if any and if
#ifdef MTD_0 * 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) #define _dev (MTD_0)
#else #else
/* Test mock object implementing a simple RAM-based mtd */ /* Test mock object implementing a simple RAM-based mtd */
@ -404,7 +407,7 @@ static void tests_littlefs_statvfs(void)
Test *tests_littlefs(void) Test *tests_littlefs(void)
{ {
#ifndef MTD_0 #ifndef USE_MTD_0
memset(dummy_memory, 0xff, sizeof(dummy_memory)); memset(dummy_memory, 0xff, sizeof(dummy_memory));
#endif #endif

5
tests/pkg_littlefs/tests/01-run.py
View File

@ -10,5 +10,8 @@ import sys
from testrunner import run_check_unittests from testrunner import run_check_unittests
TIMEOUT = 180 # takes more than 2 minutes to complete on nrf52840dk
if __name__ == "__main__": if __name__ == "__main__":
sys.exit(run_check_unittests()) sys.exit(run_check_unittests(timeout=TIMEOUT))

9
tests/pkg_littlefs2/main.c
View File

@ -23,8 +23,11 @@
#include "embUnit.h" #include "embUnit.h"
/* Define MTD_0 in board.h to use the board mtd if any */ /* Define MTD_0 in board.h to use the board mtd if any and if
#ifdef MTD_0 * 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) #define _dev (MTD_0)
#else #else
/* Test mock object implementing a simple RAM-based mtd */ /* Test mock object implementing a simple RAM-based mtd */
@ -406,7 +409,7 @@ static void tests_littlefs_statvfs(void)
Test *tests_littlefs(void) Test *tests_littlefs(void)
{ {
#ifndef MTD_0 #ifndef USE_MTD_0
memset(dummy_memory, 0xff, sizeof(dummy_memory)); memset(dummy_memory, 0xff, sizeof(dummy_memory));
#endif #endif

5
tests/pkg_littlefs2/tests/01-run.py
View File

@ -10,5 +10,8 @@ import sys
from testrunner import run_check_unittests from testrunner import run_check_unittests
TIMEOUT = 180 # takes more than 2 minutes to complete on nrf52840dk
if __name__ == "__main__": if __name__ == "__main__":
sys.exit(run_check_unittests()) sys.exit(run_check_unittests(timeout=TIMEOUT))

10
tests/pkg_spiffs/main.c
View File

@ -21,9 +21,11 @@
#include "embUnit.h" #include "embUnit.h"
/* Define MTD_0 in board.h to use the board mtd if any and if
/* Define MTD_0 in board.h to use the board mtd if any */ * CONFIG_USE_HARDWARE_MTD is defined (add CFLAGS=-DCONFIG_USE_HARDWARE_MTD to
#ifdef MTD_0 * the command line to enable it */
#if defined(MTD_0) && IS_ACTIVE(CONFIG_USE_HARDWARE_MTD)
#define USE_MTD_0
#define _dev (MTD_0) #define _dev (MTD_0)
#else #else
/* Test mock object implementing a simple RAM-based mtd */ /* Test mock object implementing a simple RAM-based mtd */
@ -436,7 +438,7 @@ static void tests_spiffs_partition(void)
Test *tests_spiffs(void) Test *tests_spiffs(void)
{ {
#ifndef MTD_0 #ifndef USE_MTD_0
memset(dummy_memory, 0xff, sizeof(dummy_memory)); memset(dummy_memory, 0xff, sizeof(dummy_memory));
#endif #endif
EMB_UNIT_TESTFIXTURES(fixtures) { EMB_UNIT_TESTFIXTURES(fixtures) {