Merge pull request #20744 from leandrolanzieri/pr/makefile_include/include-app-headers

crasbe · web-flow · commit 65a8b47c89fe · 2025-05-15T15:19:58.000Z
Makefile.include: fix override headers from application
diff --git a/Makefile.include b/Makefile.include
@@ -397,6 +397,7 @@ ifneq (,$(IOTLAB_NODE))
 endif
 
 # Add standard include directories
+INCLUDES += -I$(APPDIR)
 INCLUDES += -I$(RIOTBASE)/core/lib/include
 INCLUDES += -I$(RIOTBASE)/core/include
 INCLUDES += -I$(RIOTBASE)/drivers/include
diff --git a/tests/core/irq_cpp/irq.h b/tests/core/irq_cpp/irq.h
diff --git a/tests/core/irq_cpp/main.cpp b/tests/core/irq_cpp/main.cpp
@@ -16,18 +16,27 @@
  * @author     Jens Wetterich <jens@wetterich-net.de>
  */
 
+#include <stdbool.h>
+
+/* prevent the inclusion of irq.h on irq.hpp */
+#define IRQ_H
+unsigned irq_disable(void);
+unsigned irq_enable(void);
+bool irq_is_enabled(void);
+bool irq_is_in(void);
+void irq_restore(unsigned state);
+
 #define FFF_ARG_HISTORY_LEN  1u
 #define FFF_CALL_HISTORY_LEN 1u
 #include "cppunit.hpp"
 #include "fff.h"
-#include "irq.h"
 #include "irq.hpp"
 DEFINE_FFF_GLOBALS
 
 FAKE_VALUE_FUNC(unsigned, irq_disable)
 FAKE_VALUE_FUNC(unsigned, irq_enable)
-FAKE_VALUE_FUNC(int, irq_is_enabled)
-FAKE_VALUE_FUNC(int, irq_is_in)
+FAKE_VALUE_FUNC(bool, irq_is_enabled)
+FAKE_VALUE_FUNC(bool, irq_is_in)
 FAKE_VOID_FUNC(irq_restore, unsigned)
 
 class irq_suite : public riot::testing::test_suite {
diff --git a/tests/drivers/kw2xrf/common.h b/tests/drivers/kw2xrf/common.h
diff --git a/tests/drivers/kw2xrf/main.c b/tests/drivers/kw2xrf/main.c
@@ -20,7 +20,7 @@
 
 #include <stdio.h>
 
-#include "common.h"
+#include "test_common.h"
 #include "fmt.h"
 #include "init_dev.h"
 #include "kw2xrf.h"
diff --git a/tests/drivers/kw2xrf/test_common.h b/tests/drivers/kw2xrf/test_common.h
@@ -0,0 +1 @@
+../../net/ieee802154_hal/test_common.h
diff --git a/tests/drivers/mrf24j40/common.h b/tests/drivers/mrf24j40/common.h
diff --git a/tests/drivers/mrf24j40/main.c b/tests/drivers/mrf24j40/main.c
@@ -26,7 +26,7 @@
 #include "shell.h"
 #include "test_utils/netdev_ieee802154_minimal.h"
 #include "net/netdev/ieee802154_submac.h"
-#include "common.h"
+#include "test_common.h"
 
 static netdev_ieee802154_submac_t mrf24j40_netdev[MRF24J40_NUM];
 
diff --git a/tests/drivers/mrf24j40/test_common.h b/tests/drivers/mrf24j40/test_common.h
@@ -0,0 +1 @@
+../../net/ieee802154_hal/test_common.h
diff --git a/tests/net/ieee802154_hal/init_devs.c b/tests/net/ieee802154_hal/init_devs.c
@@ -22,7 +22,7 @@
 #include "assert.h"
 #include "kernel_defines.h"
 #include "net/ieee802154/radio.h"
-#include "common.h"
+#include "test_common.h"
 #include "bhp/event.h"
 
 #ifdef MODULE_CC2538_RF
diff --git a/tests/net/ieee802154_hal/main.c b/tests/net/ieee802154_hal/main.c
@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include <strings.h>
 
-#include "common.h"
+#include "test_common.h"
 #include "errno.h"
 #include "event/thread.h"
 #include "luid.h"
diff --git a/tests/net/ieee802154_hal/test_common.h b/tests/net/ieee802154_hal/test_common.h
@@ -15,8 +15,8 @@
  *
  * @author  José I. Alamos <jose.alamos@haw-hamburg.de>
  */
-#ifndef COMMON_H
-#define COMMON_H
+#ifndef TEST_COMMON_H
+#define TEST_COMMON_H
 
 #include "net/ieee802154/radio.h"
 #if IS_USED(MODULE_SOCKET_ZEP)
@@ -60,5 +60,5 @@ void ieee802154_hal_test_init_devs(ieee802154_dev_cb_t cb, void *opaque);
 }
 #endif
 
-#endif /* COMMON_H */
+#endif /* TEST_COMMON_H */
 /** @} */
diff --git a/tests/net/ieee802154_submac/common.h b/tests/net/ieee802154_submac/common.h
diff --git a/tests/net/ieee802154_submac/main.c b/tests/net/ieee802154_submac/main.c
@@ -34,7 +34,7 @@
 #include "test_utils/expect.h"
 #include "ztimer.h"
 
-#include "common.h"
+#include "test_common.h"
 
 #define MAX_LINE    (80)
 
diff --git a/tests/net/ieee802154_submac/test_common.h b/tests/net/ieee802154_submac/test_common.h
@@ -0,0 +1 @@
+../ieee802154_hal/test_common.h
diff --git a/tests/pkg/lwip/cli.h b/tests/pkg/lwip/cli.h
@@ -15,8 +15,8 @@
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
  */
-#ifndef COMMON_H
-#define COMMON_H
+#ifndef CLI_H
+#define CLI_H
 
 #include <stdint.h>
 #include <sys/types.h>
@@ -46,17 +46,6 @@ extern "C" {
  * @}
  */
 
-/**
- * @brief   Converts hex string to byte array.
- *
- * @param[out] out  Resulting byte array
- * @param[in] in    `\0` terminated string. Non-hex characters (all except 0-9, a-f, A-F)
- *                  will be ignored.
- *
- * @return  Length of @p out.
- */
-size_t hex2ints(uint8_t *out, const char *in);
-
 #ifdef MODULE_SOCK_IP
 /**
  * @brief   Raw IP shell command
@@ -100,5 +89,5 @@ int udp_cmd(int argc, char **argv);
 }
 #endif
 
-#endif /* COMMON_H */
+#endif /* CLI_H */
 /** @} */
diff --git a/tests/pkg/lwip/ip.c b/tests/pkg/lwip/ip.c
@@ -20,7 +20,7 @@
 #include <stdint.h>
 #include <stdio.h>
 
-#include "common.h"
+#include "cli.h"
 #include "kernel_defines.h"
 #include "od.h"
 #include "net/af.h"
@@ -29,6 +29,7 @@
 #include "shell.h"
 #include "thread.h"
 #include "test_utils/expect.h"
+#include "utilities.h"
 #include "ztimer.h"
 
 #ifdef MODULE_SOCK_IP
diff --git a/tests/pkg/lwip/main.c b/tests/pkg/lwip/main.c
@@ -22,7 +22,7 @@
 #include <errno.h>
 #include <stdio.h>
 
-#include "common.h"
+#include "cli.h"
 #include "lwip.h"
 #include "lwip/netif.h"
 #if LWIP_IPV4
diff --git a/tests/pkg/lwip/tcp.c b/tests/pkg/lwip/tcp.c
@@ -20,7 +20,7 @@
 #include <stdint.h>
 #include <stdio.h>
 
-#include "common.h"
+#include "cli.h"
 #include "od.h"
 #include "net/af.h"
 #include "net/sock/async/event.h"
@@ -29,6 +29,7 @@
 #include "shell.h"
 #include "test_utils/expect.h"
 #include "thread.h"
+#include "utilities.h"
 #include "ztimer.h"
 
 #ifdef MODULE_SOCK_TCP
diff --git a/tests/pkg/lwip/udp.c b/tests/pkg/lwip/udp.c
@@ -20,7 +20,7 @@
 #include <stdint.h>
 #include <stdio.h>
 
-#include "common.h"
+#include "cli.h"
 #include "od.h"
 #include "net/af.h"
 #include "net/sock/async/event.h"
@@ -29,6 +29,7 @@
 #include "shell.h"
 #include "test_utils/expect.h"
 #include "thread.h"
+#include "utilities.h"
 #include "ztimer.h"
 
 #ifdef MODULE_SOCK_UDP
diff --git a/tests/pkg/lwip/utiliities.c b/tests/pkg/lwip/utiliities.c
@@ -15,7 +15,7 @@
 
 #include <stdbool.h>
 
-#include "common.h"
+#include "utilities.h"
 
 size_t hex2ints(uint8_t *out, const char *in)
 {
diff --git a/tests/pkg/lwip/utilities.h b/tests/pkg/lwip/utilities.h
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2016 Martine Lenders <mlenders@inf.fu-berlin.de>
+ *
+ * This file is subject to the terms and conditions of the GNU Lesser
+ * General Public License v2.1. See the file LICENSE in the top level
+ * directory for more details.
+ */
+
+/**
+ * @ingroup     tests
+ * @{
+ *
+ * @file
+ * @brief   Utilities for tests/lwip/
+ *
+ * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
+ */
+#ifndef UTILITIES_H
+#define UTILITIES_H
+
+#include <stdint.h>
+#include <sys/types.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @brief   Converts hex string to byte array.
+ *
+ * @param[out] out  Resulting byte array
+ * @param[in] in    `\0` terminated string. Non-hex characters (all except 0-9, a-f, A-F)
+ *                  will be ignored.
+ *
+ * @return  Length of @p out.
+ */
+size_t hex2ints(uint8_t *out, const char *in);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* UTILITIES_H */
+/** @} */
