From 0a5dae88f4f2b94127edd9edf2ac084c6a6e9317 Mon Sep 17 00:00:00 2001 From: Benjamin Valentin Date: Tue, 8 Aug 2023 22:25:20 +0200 Subject: [PATCH 1/8] Revert "tests/net/gcoap_fileserver: fix race condition" This reverts commit 653bd615bd64bc7f7ddfea537ed9336c6c8123f5. --- tests/net/gcoap_fileserver/tests/01-run.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tests/net/gcoap_fileserver/tests/01-run.py b/tests/net/gcoap_fileserver/tests/01-run.py index a5c0247277..00190351d8 100755 --- a/tests/net/gcoap_fileserver/tests/01-run.py +++ b/tests/net/gcoap_fileserver/tests/01-run.py @@ -110,11 +110,6 @@ def test_linear_topology(factory, zep_dispatch): # upload the file to node B (only one node should write MEMORY.bin) A.cmd("ncput /const/song.txt coap://[" + global_addr(B.cmd("ifconfig 7"))[1] + "]/vfs/song2.txt", timeout=60) - # It seems like failures may occur due to the `ncput` command finishing but - # the data not being written to the file yet. Therefore, we wait a bit... - # This is just a guess though. - time.sleep(0.5) - # make sure the content matches assert B.cmd("md5sum /nvm0/song.txt").split()[2] == B.cmd("md5sum /nvm0/song2.txt").split()[2] From 9215e37848e6b8b0bc796de710f3b1aa4b022aab Mon Sep 17 00:00:00 2001 From: Benjamin Valentin Date: Tue, 8 Aug 2023 22:25:47 +0200 Subject: [PATCH 2/8] tests/gcoap_fileserver: add zep_dispatcher to TEST_DEPS --- tests/net/gcoap_fileserver/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/net/gcoap_fileserver/Makefile b/tests/net/gcoap_fileserver/Makefile index 316747c572..04cb50dd22 100644 --- a/tests/net/gcoap_fileserver/Makefile +++ b/tests/net/gcoap_fileserver/Makefile @@ -46,6 +46,6 @@ endif host-tools: $(Q)env -u CC -u CFLAGS $(MAKE) -C $(RIOTTOOLS) -TERMDEPS += host-tools +TEST_DEPS += host-tools include $(RIOTBASE)/Makefile.include From 76c697570cce05936d712511fcfe8ab44620779f Mon Sep 17 00:00:00 2001 From: Benjamin Valentin Date: Tue, 8 Aug 2023 22:29:39 +0200 Subject: [PATCH 3/8] tests/gnrc_rpl/Makefile: add zep_dispatcher to TEST_DEPS --- tests/net/gnrc_rpl/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/net/gnrc_rpl/Makefile b/tests/net/gnrc_rpl/Makefile index b4777025a7..c548be23f4 100644 --- a/tests/net/gnrc_rpl/Makefile +++ b/tests/net/gnrc_rpl/Makefile @@ -25,7 +25,7 @@ endif host-tools: $(Q)env -u CC -u CFLAGS $(MAKE) -C $(RIOTTOOLS) -TERMDEPS += host-tools +TEST_DEPS += host-tools include $(RIOTBASE)/Makefile.include From 094f7f011b9f5530f30932f73f4e44c0cab408dc Mon Sep 17 00:00:00 2001 From: Benjamin Valentin Date: Tue, 8 Aug 2023 22:30:39 +0200 Subject: [PATCH 4/8] tests/gnrc_sixlowpan_frag_sfr_congure_impl: zep_dispatcher to TEST_DEPS --- tests/net/gnrc_sixlowpan_frag_sfr_congure_impl/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/net/gnrc_sixlowpan_frag_sfr_congure_impl/Makefile b/tests/net/gnrc_sixlowpan_frag_sfr_congure_impl/Makefile index 706361e2a2..2a90b61b5b 100644 --- a/tests/net/gnrc_sixlowpan_frag_sfr_congure_impl/Makefile +++ b/tests/net/gnrc_sixlowpan_frag_sfr_congure_impl/Makefile @@ -54,7 +54,7 @@ endif zep_dispatch: $(Q)env -u CC -u CFLAGS $(MAKE) -C $(RIOTTOOLS) $@ -TERMDEPS += zep_dispatch +TEST_DEPS += zep_dispatch include $(RIOTBASE)/Makefile.include From 2a87213ff4d6ee4a9e46a5e42afb400da43aac07 Mon Sep 17 00:00:00 2001 From: Gunar Schorcht Date: Wed, 9 Aug 2023 07:39:19 +0200 Subject: [PATCH 5/8] tests/pkg/lvgl: increase main thread stack size for ESPs ESPx SoC need more stack size for the main thread to avoid stack overflows. --- tests/pkg/lvgl/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/pkg/lvgl/Makefile b/tests/pkg/lvgl/Makefile index d8f220b604..2d72ece6e4 100644 --- a/tests/pkg/lvgl/Makefile +++ b/tests/pkg/lvgl/Makefile @@ -12,12 +12,13 @@ USEMODULE += lvgl_extra_layout_flex USEMODULE += lvgl_extra_theme_default USEMODULE += lvgl_extra_theme_default_dark +include $(RIOTBASE)/Makefile.include + # SDL requires more stack ifeq (native,$(BOARD)) CFLAGS += -DTHREAD_STACKSIZE_MAIN=64*1024 +else ifneq (,$(filter esp%,$(CPU_FAM))) + CFLAGS += -DTHREAD_STACKSIZE_MAIN=4*1024 else CFLAGS += -DTHREAD_STACKSIZE_MAIN=2*1024 endif - - -include $(RIOTBASE)/Makefile.include From db71529ef4eb95cc72afbe376a70965539db7041 Mon Sep 17 00:00:00 2001 From: Gunar Schorcht Date: Wed, 9 Aug 2023 07:39:52 +0200 Subject: [PATCH 6/8] tests/pkg/lvgl_touch: increase main thread stack size for ESPs ESPx SoC need more stack size for the main thread to avoid stack overflows. --- tests/pkg/lvgl_touch/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/pkg/lvgl_touch/Makefile b/tests/pkg/lvgl_touch/Makefile index 30a62476c3..a78a0479df 100644 --- a/tests/pkg/lvgl_touch/Makefile +++ b/tests/pkg/lvgl_touch/Makefile @@ -17,11 +17,13 @@ USEMODULE += lvgl_extra_theme_default USEMODULE += random +include $(RIOTBASE)/Makefile.include + # SDL requires more stack ifeq (native,$(BOARD)) CFLAGS += -DTHREAD_STACKSIZE_MAIN=64*1024 +else ifneq (,$(filter esp%,$(CPU_FAM))) + CFLAGS += -DTHREAD_STACKSIZE_MAIN=4*1024 else CFLAGS += -DTHREAD_STACKSIZE_MAIN=2*1024 endif - -include $(RIOTBASE)/Makefile.include From d4d9be5ce4dcb837d36f233940752088febd538c Mon Sep 17 00:00:00 2001 From: Karl Fessel Date: Wed, 9 Aug 2023 13:20:05 +0200 Subject: [PATCH 7/8] make: COMPILE_COMMANDS_PATH adapt for external apps --- Makefile.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.include b/Makefile.include index cad5d27eda..609a1f8fec 100644 --- a/Makefile.include +++ b/Makefile.include @@ -730,7 +730,7 @@ else _LINK = $(if $(CPPMIX),$(LINKXX),$(LINK)) $$(find $(BASELIBS:%.module=$(BINDIR)/%/) -name "*.o" 2> /dev/null | sort) $(ARCHIVES_GROUP) $(LINKFLAGS) $(LINKFLAGPREFIX)-Map=$(BINDIR)/$(APPLICATION).map endif # BUILDOSXNATIVE -COMPILE_COMMANDS_PATH ?= $(RIOTBASE)/compile_commands.json +COMPILE_COMMANDS_PATH ?= $(if $(findstring $(RIOTBASE),$(APPDIR)),$(RIOTBASE)/compile_commands.json, $(APPDIR)/compile_commands.json) COMPILE_COMMANDS_FLAGS ?= --clangd .PHONY: compile-commands compile-commands: $(BUILDDEPS) From 67ba4fced31978c60e41487ff74e7af0b2689f45 Mon Sep 17 00:00:00 2001 From: Benjamin Valentin Date: Mon, 7 Aug 2023 17:29:07 +0200 Subject: [PATCH 8/8] pkg/flashdb: bump to 2.0.0 --- pkg/flashdb/Makefile | 4 ++-- pkg/flashdb/Makefile.dep | 1 + .../patches/0002-remove-assert-definition.patch | Bin 1383 -> 0 bytes 3 files changed, 3 insertions(+), 2 deletions(-) delete mode 100644 pkg/flashdb/patches/0002-remove-assert-definition.patch diff --git a/pkg/flashdb/Makefile b/pkg/flashdb/Makefile index 8782ee2620..1d13e091db 100644 --- a/pkg/flashdb/Makefile +++ b/pkg/flashdb/Makefile @@ -1,7 +1,7 @@ PKG_NAME=flashdb PKG_URL=https://github.com/armink/FlashDB.git -# 1.1.2 -PKG_VERSION=7062902a3e7b6b8a7e8f5886ae242271a0164e05 +# 2.0.0 +PKG_VERSION=fab8a161809d72878d1ad5bdd6ddd54301dfcb81 PKG_LICENSE=Apache-2.0 include $(RIOTBASE)/pkg/pkg.mk diff --git a/pkg/flashdb/Makefile.dep b/pkg/flashdb/Makefile.dep index 7538c7dee4..98f771e1a2 100644 --- a/pkg/flashdb/Makefile.dep +++ b/pkg/flashdb/Makefile.dep @@ -1,5 +1,6 @@ # FlashDB is only supported by 32 bit architectures FEATURES_REQUIRED += arch_32bit +CFLAGS += -DFDB_USING_NATIVE_ASSERT ifneq (,$(filter flashdb_tsdb,$(USEMODULE))) CFLAGS += -DFDB_USING_TSDB diff --git a/pkg/flashdb/patches/0002-remove-assert-definition.patch b/pkg/flashdb/patches/0002-remove-assert-definition.patch deleted file mode 100644 index 2cae1d41a8574c6d8c67afd359e044e3e70eb2d0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1383 zcmb_cYj2w{6#edBan`C5lt91`$kM7xU#yk3uIgi(v`)x?owy0!?!&~3YKCDJJs+|_q`sf0OzGuH4C-txQ$ikPR0 zi&9WJa{W=@!E!y7KQYdEvNqqb=IXjP&i$sBKviPqcv36Caie=7mxX!9GJ<sFD8cyzC5L@Zeveu52xolN_H`kxp8=+m5&);3&nE3bcKx`>s zJTqFN|6$r_P>i29>!+C&qbAa+y1u!*x{Hk+W3M(bWp$S=2&Q^92WzlbI}hbf54$>` z9+D)!zdF6Ue0`N9=D|i!$M|uoJKXSoY-|qv^{g1b>YDcV)vZXE6BK;K3l!A^`~9}m zy0+R*^0qC8wCAat90hG#;K_@i`->MfSE8P_vkYTZ$=r0!1EPK@e-tmeUhcwImzhw< Ir;ba=H@AmV^Z)<=