Merge pull request #16026 from fjmolinas/pr_fix_native

makefiles/info-global.inc.mk: reset features_required_any

makefiles/info-global.inc.mk

@@ -10,6 +10,7 @@ BOARDDIR_GLOBAL := $(BOARDDIR)
 USEMODULE_GLOBAL := $(USEMODULE)
 USEPKG_GLOBAL := $(USEPKG)
 FEATURES_REQUIRED_GLOBAL := $(FEATURES_REQUIRED)
+FEATURES_REQUIRED_ANY_GLOBAL := $(FEATURES_REQUIRED_ANY)
 FEATURES_OPTIONAL_GLOBAL := $(FEATURES_OPTIONAL)
 FEATURES_CONFLICT_GLOBAL := $(FEATURES_CONFLICT)
 FEATURES_CONFLICT_MSG_GLOBAL := $(FEATURES_MSG_CONFLICT)
@@ -24,6 +25,7 @@ define board_unsatisfied_features
   DISABLE_MODULE    := $(DISABLE_MODULE_GLOBAL)
   DEFAULT_MODULE    := $(DEFAULT_MODULE_GLOBAL)
   FEATURES_REQUIRED := $(FEATURES_REQUIRED_GLOBAL)
+  FEATURES_REQUIRED_ANY := $(FEATURES_REQUIRED_ANY_GLOBAL)
   FEATURES_OPTIONAL := $(FEATURES_OPTIONAL_GLOBAL)
   FEATURES_CONFLICT := $(FEATURES_CONFLICT_GLOBAL)
   FEATURES_CONFLICT_MSG := $(FEATURES_CONFLICT_MSG_GLOBAL)

sys/include/net/netstats/neighbor.h

@@ -21,7 +21,6 @@
 
 #include <string.h>
 #include "net/netif.h"
-#include "xtimer.h"
 #include "timex.h"
 
 #ifdef __cplusplus

sys/net/netstats/netstats_neighbor.c

@@ -22,6 +22,7 @@
 #include "net/l2util.h"
 #include "net/netdev.h"
 #include "net/netstats/neighbor.h"
+#include "xtimer.h"
 
 #define ENABLE_DEBUG 0
 #include "debug.h"

tests/bench_xtimer/Makefile.ci

@@ -10,4 +10,5 @@ BOARD_INSUFFICIENT_MEMORY := \
     samd10-xmini \
     slstk3400a \
     stk3200 \
+    zigduino \
     #

tests/gnrc_tx_sync/Makefile.ci

@@ -1,4 +1,11 @@
 BOARD_INSUFFICIENT_MEMORY := \
+    arduino-duemilanove \
+    arduino-leonardo \
+    arduino-mega2560 \
+    arduino-nano \
+    arduino-uno \
+    atmega328p \
+    atmega1281 \
     bluepill-stm32f030c8 \
     i-nucleo-lrwan1 \
     msb-430 \
@@ -18,5 +25,6 @@ BOARD_INSUFFICIENT_MEMORY := \
     stm32f0discovery \
     stm32l0538-disco \
     telosb \
+    waspmote-pro \
     z1 \
     #

tests/mtd_flashpage/Makefile

@@ -3,4 +3,10 @@ include ../Makefile.tests_common
 USEMODULE += mtd_flashpage
 USEMODULE += embunit
 
+# https://github.com/RIOT-OS/RIOT/pull/15859 exposed a bug in the
+# handling of FEATURES_REQUIRED_ANY, so https://github.com/RIOT-OS/RIOT/pull/15935
+# did not run unittests, native is currently failing, so blacklist while this
+# is still the case
+FEATURES_BLACKLIST += arch_native
+
 include $(RIOTBASE)/Makefile.include

tests/unittests/tests-flashpage/Makefile.include

@@ -0,0 +1 @@
+FEATURES_REQUIRED += periph_flashpage