Merge #19182 #19184

19182: pkg/libfixmath: bump version r=maribu a=benpicco 19184: pkg/tinydtls: bump version r=maribu a=benpicco Co-authored-by: Benjamin Valentin <benjamin.valentin@ml-pa.com>
RIOT-OS · Jan 22, 2023 · 4c4cb3a · 4c4cb3a
3 parents 855dc07 + d102723 + bb515ab
commit 4c4cb3a
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 401 deletions.
diff --git a/core/lib/init.c b/core/lib/init.c
@@ -60,7 +60,12 @@ static void *main_trampoline(void *arg)
         LOG_INFO(CONFIG_BOOT_MSG_STRING "\n");
     }
 
-    main();
+    int res = main();
+
+    if (IS_USED(MODULE_TEST_UTILS_MAIN_EXIT_CB)) {
+        void test_utils_main_exit_cb(int res);
+        test_utils_main_exit_cb(res);
+    }
 
 #ifdef MODULE_TEST_UTILS_PRINT_STACK_USAGE
     void print_stack_usage_metric(const char *name, void *stack, unsigned max_size);

diff --git a/makefiles/pseudomodules.inc.mk b/makefiles/pseudomodules.inc.mk
@@ -581,6 +581,7 @@ PSEUDOMODULES += crypto_aes_unroll
 
 # declare shell version of test_utils_interactive_sync
 PSEUDOMODULES += test_utils_interactive_sync_shell
+PSEUDOMODULES += test_utils_main_exit_cb
 
 # All auto_init modules are pseudomodules
 PSEUDOMODULES += auto_init_%

diff --git a/pkg/libfixmath/Makefile b/pkg/libfixmath/Makefile
@@ -1,5 +1,5 @@
 PKG_NAME     := libfixmath
-PKG_VERSION  := 24488b16cc0359daada0682a9bd3a11a801d0a01
+PKG_VERSION  := b987044c73dcaba496bb5bc86e69d134cd8790ec
 PKG_URL      := https://github.com/PetteriAimonen/libfixmath
 PKG_LICENSE  := MIT
 
@@ -9,4 +9,4 @@ all: $(filter libfixmath-unittests,$(USEMODULE))
 	$(QQ)"$(MAKE)" -C $(PKG_SOURCE_DIR)/$(PKG_NAME) -f $(CURDIR)/Makefile.$(PKG_NAME)
 
 libfixmath-unittests:
-	$(QQ)"$(MAKE)" -C $(PKG_SOURCE_DIR)/unittests -f $(CURDIR)/Makefile.$(PKG_NAME)-unittests
+	$(QQ)"$(MAKE)" -C $(PKG_SOURCE_DIR)/tests -f $(CURDIR)/Makefile.$(PKG_NAME)-unittests
diff --git a/pkg/libfixmath/Makefile.include b/pkg/libfixmath/Makefile.include
@@ -14,5 +14,6 @@ CFLAGS += $(libfixmath_options:CONFIG_FIXMATH_%=-DFIXMATH_%)
 INCLUDES += -I$(PKG_SOURCE_DIR)/libfixmath
 
 ifneq (,$(filter libfixmath-unittests,$(USEMODULE)))
-  INCLUDES += -I$(PKG_SOURCE_DIR)/unittests
+  INCLUDES += -I$(PKG_SOURCE_DIR)
+  INCLUDES += -I$(PKG_SOURCE_DIR)/tests
 endif
diff --git a/pkg/libfixmath/patches/0001-Fix-warnings.patch b/pkg/libfixmath/patches/0001-Fix-warnings.patch