Merge RIOT-OS#19863 RIOT-OS#19864 RIOT-OS#19865 RIOT-OS#19869

19863: pkg/flashdb: bump to 2.0.0 r=benpicco a=benpicco 19864: tests/gcoap_fileserver: add zep_dispatcher to TEST_DEPS r=benpicco a=benpicco 19865: tests/pkg/lvgl*: fix the main thread stack size for ESPs r=benpicco a=gschorcht ### Contribution description ESPx SoC need more stack size for the main thread to avoid stack overflows. ### Testing procedure Use any ESP32 board or any ESP32-S2 board and flash `tests/pkg/lvgl` for the `esp32-wrover-kit` respective the `esp32s2-lilygo-ttgo-t8`, for example: ``` BOARD=esp32-wrover-kit make -j8 -C tests/pkg/lvgl flash ``` Without this PR the application crashes ``` main(): This is RIOT! (Version: 2023.10-devel-106-gd512f-tests/pkg/lvgl_fix_main_stack_size) EXCEPTION!! exccause=29 (StoreProhibitedCause) `@4008274a` excvaddr=fefffffb heap: 310368 (used 4176, free 306192) [bytes] register set pc : 40082f74 ps : 00050033 exccause: 0000001d excvaddr: fefffffb epc1 : 40082f74 a0 : 4008274a a1 : 3ffb1bd0 a2 : fefffff7 a3 : 00000000 a4 : 3ff000dc a5 : 400826e0 a6 : 00000000 a7 : 3ffb1e08 a8 : 0000000b a9 : 3ffb1df8 a10 : 3ffb1e7c a11 : 00000001 a12 : 00000000 a13 : 00000000 a14 : 00000000 a15 : 000000a3 ``` with this PR the application works as expected. ### Issues/PRs references 19869: make: COMPILE_COMMANDS_PATH adapt for external apps r=benpicco a=kfessel ### Contribution description `COMPILE_COMMANDS_PATH` currently defaults to `RIOTBASE` which may not be an parent path for external applications -> set to `APPDIR` in case ### Testing procedure - current good will stay good test with riot examples and or testes `$make compile-commands` should create a `compile_command.json` in `<RIOT>` - test with external app Makefile including `include $(RIOTBASE)/Makefile.include` should create `compile_command.json` in `APPDIR` ### Issues/PRs references Co-authored-by: Benjamin Valentin <[email protected]> Co-authored-by: Gunar Schorcht <[email protected]> Co-authored-by: Karl Fessel <[email protected]>
qmk · Aug 9, 2023 · 91441db · 91441db
5 parents fff3dc4 + 67ba4fc + 094f7f0 + db71529 + d4d9be5
commit 91441db
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 68 deletions.
diff --git 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)

diff --git 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
@@ -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
diff --git 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
diff --git 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]
 

diff --git 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
 

diff --git 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
 

diff --git 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
diff --git 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