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

Merge pull request #12890 from gschorcht/cpu/esp/fix_tests_spiffs

Browse Source 
cpu/esp*: fixes for tests/pkg_spiffs and tests/pkg_littlefs
This commit is contained in:
Kaspar Schleiser 2019-12-06 12:42:14 +01:00 committed by GitHub
commit 855e249d8c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cpu/esp32/Makefile.include
View File

@ -63,11 +63,11 @@ ifneq (,$(filter esp_eth,$(USEMODULE)))
endif endif
ifneq (,$(filter spiffs,$(USEMODULE))) ifneq (,$(filter spiffs,$(USEMODULE)))
export RIOT_TEST_TIMEOUT = 300 export RIOT_TEST_TIMEOUT = 120
endif endif
ifneq (,$(filter littlefs,$(USEMODULE))) ifneq (,$(filter littlefs,$(USEMODULE)))
export RIOT_TEST_TIMEOUT = 300 export RIOT_TEST_TIMEOUT = 120
endif endif
ifneq (,$(filter 4 5,$(LOG_LEVEL))) ifneq (,$(filter 4 5,$(LOG_LEVEL)))

5
cpu/esp32/ld/esp32.common.ld
View File

@ -101,8 +101,9 @@ SECTIONS
*esp_idf_spi_flash.a:*(.literal .text .literal.* .text.*) *esp_idf_spi_flash.a:*(.literal .text .literal.* .text.*)
/* parts of RIOT that should to run in IRAM */ /* parts of RIOT that should to run in IRAM */
*core.a:*(.literal .text .literal.* .text.*) *core.a:*(.literal .text .literal.* .text.*)
/* *spiffs_fs.a:*(.literal .text .literal.* .text.*) */ *spiffs_fs.a:*(.literal .text .literal.* .text.*)
/* *spiffs.a:*(.literal .text .literal.* .text.*) */ *spiffs.a:*(.literal .text .literal.* .text.*)
*vfs.a:*(.literal .text .literal.* .text.*)
/* part of RIOT ports that should run in IRAM */ /* part of RIOT ports that should run in IRAM */
*cpu.a:*(.literal .text .literal.* .text.*) *cpu.a:*(.literal .text .literal.* .text.*)

4
cpu/esp8266/Makefile.include
View File

@ -47,11 +47,11 @@ ifneq (, $(filter esp_gdbstub, $(USEMODULE)))
endif endif
ifneq (, $(filter spiffs, $(USEMODULE))) ifneq (, $(filter spiffs, $(USEMODULE)))
export RIOT_TEST_TIMEOUT = 300 export RIOT_TEST_TIMEOUT = 200
endif endif
ifneq (, $(filter littlefs, $(USEMODULE))) ifneq (, $(filter littlefs, $(USEMODULE)))
export RIOT_TEST_TIMEOUT = 300 export RIOT_TEST_TIMEOUT = 200
endif endif
# regular Makefile # regular Makefile