diff --git a/Makefile.include b/Makefile.include index cad5d27eda4e..609a1f8fecd8 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) diff --git a/pkg/flashdb/Makefile b/pkg/flashdb/Makefile index 8782ee26204d..1d13e091db9a 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 7538c7dee4e1..98f771e1a2cd 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 2cae1d41a857..000000000000 --- a/pkg/flashdb/patches/0002-remove-assert-definition.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 8c798a4fb33dbafec6a05735537f77e281bf11db Mon Sep 17 00:00:00 2001 -From: Benjamin Valentin -Date: Wed, 2 Feb 2022 22:03:41 +0100 -Subject: [PATCH] remove assert() definition - ---- - port/fal/inc/fal_def.h | 15 +-------------- - 1 file changed, 1 insertion(+), 14 deletions(-) - -diff --git a/port/fal/inc/fal_def.h b/port/fal/inc/fal_def.h -index f432c26..6ba206b 100644 ---- a/port/fal/inc/fal_def.h -+++ b/port/fal/inc/fal_def.h -@@ -25,6 +25,7 @@ - #ifndef _FAL_DEF_H_ - #define _FAL_DEF_H_ - -+#include - #include - #include - -@@ -64,15 +65,6 @@ - #endif - - #if FAL_DEBUG --#ifdef assert --#undef assert --#endif --#define assert(EXPR) \ --if (!(EXPR)) \ --{ \ -- FAL_PRINTF("(%s) has assert failed at %s.\n", #EXPR, __FUNCTION__); \ -- while (1); \ --} - - /* debug level log */ - #ifdef log_d -@@ -82,11 +74,6 @@ if (!(EXPR)) \ - - #else - --#ifdef assert --#undef assert --#endif --#define assert(EXPR) ((void)0); -- - /* debug level log */ - #ifdef log_d - #undef log_d --- -2.32.0 - diff --git a/tests/net/gcoap_fileserver/Makefile b/tests/net/gcoap_fileserver/Makefile index 316747c57297..04cb50dd220f 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 diff --git a/tests/net/gcoap_fileserver/tests/01-run.py b/tests/net/gcoap_fileserver/tests/01-run.py index a5c024727779..00190351d87f 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] diff --git a/tests/net/gnrc_rpl/Makefile b/tests/net/gnrc_rpl/Makefile index b4777025a7c3..c548be23f426 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 diff --git a/tests/net/gnrc_sixlowpan_frag_sfr_congure_impl/Makefile b/tests/net/gnrc_sixlowpan_frag_sfr_congure_impl/Makefile index 706361e2a22b..2a90b61b5b5a 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 diff --git a/tests/pkg/lvgl/Makefile b/tests/pkg/lvgl/Makefile index d8f220b604bc..2d72ece6e422 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 diff --git a/tests/pkg/lvgl_touch/Makefile b/tests/pkg/lvgl_touch/Makefile index 30a62476c36c..a78a0479df93 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