1
0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00

boards: rename native64 -> native

This patch renames the current native board into native32 and replaces
it with the current native64 board.

The changeset is mostly renaming directories and replacing native64 with
native32 within application Makefiles (unless native64) was not
supported.
This commit is contained in:
Oleg Hahm 2024-12-21 01:15:35 +01:00
parent 243ca3114b
commit 06a5511eb0
134 changed files with 216 additions and 215 deletions

2
.github/labeler.yml vendored
View File

@ -118,7 +118,7 @@
"Platform: native":
- "boards/native/**/*"
- "boards/native64/**/*"
- "boards/native32/**/*"
- "cpu/native/**/*"
- "makefiles/arch/native.inc.mk"

View File

@ -15,7 +15,7 @@ hifive1b
msb-430
msba2
native
native64
native32
nrf52840dk
qn9080dk
samr21-xpro
@ -41,7 +41,7 @@ esac
# factor 2, but still have a decent regression test coverage.
# TODO: Consider reusing QUICKBUILD_BOARDS once all those boards are supported
# on LLVM.
: ${TEST_BOARDS_LLVM_COMPILE:="iotlab-m3 native native64 nrf52dk mulle nucleo-f401re samr21-xpro slstk3402a"}
: ${TEST_BOARDS_LLVM_COMPILE:="iotlab-m3 native native32 nrf52dk mulle nucleo-f401re samr21-xpro slstk3402a"}
: ${TEST_WITH_CONFIG_SUPPORTED:="examples/suit_update tests/drivers/at86rf2xx_aes"}
@ -383,9 +383,9 @@ compile() {
EMULATED=0
fi
if [ $RUN_TESTS -eq 1 -o "$board" = "native" -o "$board" = "native64" -o "$EMULATED" = "1" ]; then
if [ $RUN_TESTS -eq 1 -o "$board" = "native" -o "$board" = "native32" -o "$EMULATED" = "1" ]; then
if [ -f "${BINDIR}/.test" ]; then
if [ "$board" = "native" -o "$board" = "native64" -o "${EMULATED}" = "1" ]; then
if [ "$board" = "native" -o "$board" = "native32" -o "${EMULATED}" = "1" ]; then
# For native, we can run the test on the worker that also
# compiled it (`make -C${appdir} test`).
# "dwq-localjob" allows using some (locally run) command's

View File

@ -204,7 +204,7 @@ include $(RIOTMAKE)/boards.inc.mk
include $(RIOTMAKE)/dependencies_debug.inc.mk
# Use TOOLCHAIN environment variable to select the toolchain to use.
ifneq (,$(filter native native64,$(BOARD)))
ifneq (,$(filter native native32,$(BOARD)))
ifeq ($(OS),Darwin)
$(shell $(COLOR_ECHO) "$(COLOR_RED)"Buildin on macOS is not supported."\
"We recommend vagrant for building:$(COLOR_RESET)"\
@ -485,7 +485,7 @@ include $(RIOTMAKE)/toolchain/$(TOOLCHAIN).inc.mk
# Other than on native, RWX segments in ROM are not actually RWX, as regular
# store instructions won't write to flash.
ifeq (,$(filter native native64,$(BOARD)))
ifeq (,$(filter native native32,$(BOARD)))
LINKER_SUPPORTS_NOWARNRWX ?= $(shell LC_ALL=C $(LINK) $(RIOTTOOLS)/testprogs/minimal_linkable.c -o /dev/null -lc -Wall -Wextra -pedantic -Wl,--no-warn-rwx-segments 2> /dev/null && echo 1 || echo 0)
ifeq (1,$(LINKER_SUPPORTS_NOWARNRWX))
LINKFLAGS += -Wl,--no-warn-rwx-segments

View File

@ -6,9 +6,9 @@
#
config BOARD
default "native" if BOARD_NATIVE
default "native64" if BOARD_NATIVE64
config BOARD_NATIVE
config BOARD_NATIVE64
bool
default y
select CPU_MODEL_NATIVE

View File

@ -1,6 +1,6 @@
CPU = native
FEATURES_PROVIDED += arch_32bit
NATIVE_ARCH_BIT = 32
FEATURES_PROVIDED += arch_64bit
NATIVE_ARCH_BIT = 64
include $(RIOTBOARD)/native/common_features.inc.mk

View File

@ -1,41 +1,13 @@
/**
@defgroup boards_native Native Board
@defgroup boards_native64 Native64 Board
@ingroup boards
@brief Support for running RIOT in native
@brief Support for running RIOT in native64
[Family: native](https://github.com/RIOT-OS/RIOT/wiki/Family:-native)
# Overview
![Terminal running RIOT native](https://raw.githubusercontent.com/wiki/RIOT-OS/RIOT/images/Native.jpg)
# Hardware
- CPU: Host CPU
- RAM: Host RAM
- Flash:
- for program execution: Host file system
- for the @ref drivers_periph_flashpage : emulated in RAM
- Network: Tap Interface
- UART: Runtime configurable - `/dev/tty*` are supported
- Timers: Host timer
- LEDs: One red and one green LED - state changes are printed to the UART
- PWM: Dummy PWM
- QDEC: Emulated according to PWM
- SPI: Runtime configurable - `/dev/spidev*` are supported (Linux host only)
- GPIO: Runtime configurable - `/dev/gpiochip*` are supported (Linux host only)
# Required packages
On Debian/Ubuntu you can install the required libraries with
```
sudo apt install gcc-multilib
```
Likewise, for the unittest execution, `libasan5` is needed for 32 bit binaries.
On Debian/Ubuntu you can install the required libraries with
```
sudo apt install lib32asan5
```
Same board as \ref boards_native "native", but compiled for 64-bit instead of 32-bit.
Currently only Linux x86-64 is supported.
Otherwise, everything works the same as for the 32-bit version.
For more information on this board, see the \ref boards_native "native board" documentation.
*/

View File

@ -6,9 +6,9 @@
#
config BOARD
default "native64" if BOARD_NATIVE64
default "native" if BOARD_NATIVE
config BOARD_NATIVE64
config BOARD_NATIVE
bool
default y
select CPU_MODEL_NATIVE

View File

@ -1,6 +1,6 @@
CPU = native
FEATURES_PROVIDED += arch_64bit
NATIVE_ARCH_BIT = 64
FEATURES_PROVIDED += arch_32bit
NATIVE_ARCH_BIT = 32
include $(RIOTBOARD)/native/common_features.inc.mk

41
boards/native32/doc.txt Normal file
View File

@ -0,0 +1,41 @@
/**
@defgroup boards_native Native Board
@ingroup boards
@brief Support for running RIOT in native
[Family: native](https://github.com/RIOT-OS/RIOT/wiki/Family:-native)
# Overview
![Terminal running RIOT native](https://raw.githubusercontent.com/wiki/RIOT-OS/RIOT/images/Native.jpg)
# Hardware
- CPU: Host CPU
- RAM: Host RAM
- Flash:
- for program execution: Host file system
- for the @ref drivers_periph_flashpage : emulated in RAM
- Network: Tap Interface
- UART: Runtime configurable - `/dev/tty*` are supported
- Timers: Host timer
- LEDs: One red and one green LED - state changes are printed to the UART
- PWM: Dummy PWM
- QDEC: Emulated according to PWM
- SPI: Runtime configurable - `/dev/spidev*` are supported (Linux host only)
- GPIO: Runtime configurable - `/dev/gpiochip*` are supported (Linux host only)
# Required packages
On Debian/Ubuntu you can install the required libraries with
```
sudo apt install gcc-multilib
```
Likewise, for the unittest execution, `libasan5` is needed for 32 bit binaries.
On Debian/Ubuntu you can install the required libraries with
```
sudo apt install lib32asan5
```
*/

View File

@ -1,13 +0,0 @@
/**
@defgroup boards_native64 Native64 Board
@ingroup boards
@brief Support for running RIOT in native64
[Family: native](https://github.com/RIOT-OS/RIOT/wiki/Family:-native)
Same board as \ref boards_native "native", but compiled for 64-bit instead of 32-bit.
Currently only Linux x86-64 is supported.
Otherwise, everything works the same as for the 32-bit version.
For more information on this board, see the \ref boards_native "native board" documentation.
*/

View File

@ -187,7 +187,7 @@ uintptr_t measure_stack_free_internal(const char *stack, size_t size)
uintptr_t *stackp = (uintptr_t *)(uintptr_t)stack;
uintptr_t end = (uintptr_t)stack + size;
/* HACK: This will affect native/native64 only.
/* HACK: This will affect native/native32 only.
*
* The dark magic used here is frowned upon by valgrind. E.g. valgrind may
* deduce that a specific value was at some point allocated on the stack,

View File

@ -50,13 +50,13 @@ then
if [ "$BUILDTEST_MCU_GROUP" == "x86" ]
then
make -C ./tests/unittests all test BOARD=native TERMPROG='gdb -batch -ex r -ex bt $(ELF)' || exit
make -C ./tests/unittests all test BOARD=native32 TERMPROG='gdb -batch -ex r -ex bt $(ELF)' || exit
set_result $?
fi
if [ "$BUILDTEST_MCU_GROUP" == "x86_64" ]
then
make -C ./tests/unittests all test BOARD=native64 TERMPROG='gdb -batch -ex r -ex bt $(ELF)' || exit
make -C ./tests/unittests all test BOARD=native TERMPROG='gdb -batch -ex r -ex bt $(ELF)' || exit
set_result $?
fi

View File

@ -92,7 +92,7 @@ DEFAULT_BOARDS = [
'microbit',
'mulle',
'native',
'native64',
'native32',
'nrf52840dk',
'nrf9160dk',
'nucleo-f072rb',

View File

@ -3,7 +3,7 @@ APPLICATION = ccn-lite-relay
# If no BOARD is found in the environment, use this default:
BOARD ?= native
BOARD_WHITELIST := iotlab-m3 msba2 mulle native native64 nrf52dk nrf52840dk \
BOARD_WHITELIST := iotlab-m3 msba2 mulle native native32 nrf52dk nrf52840dk \
pba-d-01-kw2x samr21-xpro

View File

@ -98,7 +98,7 @@ endif
# use ethos (ethernet over serial) or SLIP (serial-line IP) for network
# communication and stdio over UART, but not on native, as native has a tap
# interface towards the host.
ifeq (,$(filter native native64,$(BOARD)))
ifeq (,$(filter native native32,$(BOARD)))
ifeq (slip,$(UPLINK))
# SLIP baudrate and UART device can be configured from make command
SLIP_BAUDRATE ?= 115200
@ -155,7 +155,7 @@ host-tools:
$(Q)env -u CC -u CFLAGS $(MAKE) -C $(RIOTTOOLS)
# define native specific targets to only run UHCP daemon when required
ifneq (,$(filter native native64,$(BOARD)))
ifneq (,$(filter native native32,$(BOARD)))
ifeq (uhcp,$(PREFIX_CONF))
.PHONY: uhcpd-daemon

View File

@ -1,5 +1,5 @@
# Put board specific dependencies here
ifeq (,$(filter native native64,$(BOARD)))
ifeq (,$(filter native native32,$(BOARD)))
ifeq (slip,$(UPLINK))
USEMODULE += slipdev_stdio
else ifeq (ethos,$(UPLINK))

View File

@ -178,7 +178,7 @@ To select ethos as the serial driver, be sure that the `Makefile`
has the following:
```make
ifeq (,$(filter native native64,$(BOARD)))
ifeq (,$(filter native native32,$(BOARD)))
USEMODULE += stdio_ethos
CFLAGS += '-DETHOS_UART=UART_DEV(0)' -DETHOS_BAUDRATE=115200
FEATURES_REQUIRED += periph_uart

View File

@ -12,7 +12,7 @@ RIOTBASE ?= $(CURDIR)/../..
# development process:
DEVELHELP ?= 1
ifeq (,$(filter native native64,$(BOARD)))
ifeq (,$(filter native native32,$(BOARD)))
# Set stack size to something (conservatively) enormous
CFLAGS += -DTHREAD_STACKSIZE_MAIN=9092
endif

View File

@ -19,9 +19,9 @@ QUIET ?= 1
USEMODULE += shell
USEMODULE += periph_gpio
# Prevents native and native64 program from segfault when gpio set/clear are
# Prevents native and native32 program from segfault when gpio set/clear are
# used without a gpiochip
ifneq (,$(filter native native64,$(BOARD)))
ifneq (,$(filter native native32,$(BOARD)))
USEMODULE += periph_gpio_mock
endif

View File

@ -14,7 +14,7 @@ DEVELHELP ?= 1
# Change this to 0 show compiler invocation lines by default:
QUIET ?= 1
ifeq (,$(filter native native64,$(BOARD)))
ifeq (,$(filter native native32,$(BOARD)))
# This stack size is large enough to run Lua print() functions of
# various lengths. Other functions untested.
CFLAGS += -DTHREAD_STACKSIZE_MAIN='(THREAD_STACKSIZE_DEFAULT+2048)'

View File

@ -32,7 +32,7 @@ FEATURES_OPTIONAL += periph_spi
TESTRUNNER_RESET_AFTER_TERM ?= 1
# failing on native with floating point exception (#15870)
TEST_ON_CI_BLACKLIST += native native64
TEST_ON_CI_BLACKLIST += native native32
# avoid running Kconfig by default
SHOULD_RUN_KCONFIG ?=

View File

@ -44,7 +44,7 @@ ifneq (,$(filter $(BOARD),$(LOW_MEMORY_BOARDS)))
endif
# Enable fileserver for boards with plenty of memory
HIGH_MEMORY_BOARDS := native native64 same54-xpro mcb2388
HIGH_MEMORY_BOARDS := native native32 same54-xpro mcb2388
ifneq (,$(filter $(BOARD),$(HIGH_MEMORY_BOARDS)))
# enable separate response
@ -58,7 +58,7 @@ ifneq (,$(filter $(BOARD),$(HIGH_MEMORY_BOARDS)))
USEMODULE += vfs_default
# always enable auto-format for native
ifneq (,$(filter native native64,$(BOARD)))
ifneq (,$(filter native native32,$(BOARD)))
USEMODULE += vfs_auto_format
endif
endif

View File

@ -4,6 +4,6 @@ ifneq (,$(filter arch_esp,$(FEATURES_USED)))
USEMODULE += esp_wifi
endif
ifneq (,$(filter native native64,$(BOARD)))
ifneq (,$(filter native native32,$(BOARD)))
USEMODULE += netdev_default
endif

View File

@ -56,7 +56,7 @@ CFLAGS += -DSUIT_MANIFEST_RESOURCE=\"$(SUIT_COAP_ROOT)/$(SUIT_NOTIFY_MANIFEST)\"
# Enable test_utils_interactive_sync, only used when running automatic test
DEFAULT_MODULE += test_utils_interactive_sync
ifneq (,$(filter native native64,$(BOARD)))
ifneq (,$(filter native native32,$(BOARD)))
USE_ETHOS ?= 0
IFACE ?= tapbr0
# Configure two RAM regions with 2K each

View File

@ -1,4 +1,4 @@
ifneq (,$(filter native native64,$(BOARD)))
ifneq (,$(filter native native32,$(BOARD)))
USEMODULE += suit_storage_ram
USEMODULE += netdev_default
# Use VFS storage for native

View File

@ -9,13 +9,13 @@ EPOCH = $(call memoized,EPOCH,$(shell date +%s))
APP_VER ?= $(EPOCH)
# Default addressing if following README.native.md
ifneq (,$(filter native native64,$(BOARD)))
ifneq (,$(filter native native32,$(BOARD)))
SUIT_CLIENT ?= [2001:db8::2]
SUIT_COAP_SERVER ?= [2001:db8::1]
$(call target-export-variables,test-with-config,SUIT_COAP_SERVER)
endif
ifneq (,$(filter native native64,$(BOARD)))
ifneq (,$(filter native native32,$(BOARD)))
# Set settings for publishing fake fw payloads to native
SUIT_NATIVE_PAYLOAD ?= "AABBCCDD"
SUIT_NATIVE_PAYLOAD_BIN ?= $(BINDIR_APP)/fw.$(APP_VER).bin

View File

@ -140,7 +140,7 @@ def get_reachable_addr(child):
# Give some time for the network interface to be configured
time.sleep(1)
# Get address
if BOARD in ["native", "native64"]:
if BOARD in ["native", "native32"]:
iface_addr = get_iface_addr(IFACE)
network = IPv6Network(iface_addr, strict=False)
client_addr = iface_addr
@ -212,7 +212,7 @@ def _test_successful_update(child, client, app_ver):
child.expect_exact("Install correct payload")
# Wait for reboot on non-native BOARDs
if BOARD not in ["native", "native64"]:
if BOARD not in ["native", "native32"]:
child.expect_exact(REBOOTING_MSG)
# Verify client is reachable and get address
client = get_reachable_addr(child)

View File

@ -11,7 +11,7 @@ ip link show dev "${IFACE}" > /dev/null
RESULT=$?
if [ $RESULT -eq 0 ]; then
if [ "${BOARD}" = "native" ] || [ "${BOARD}" = "native64" ]; then
if [ "${BOARD}" = "native" ] || [ "${BOARD}" = "native32" ]; then
IFACE_IPV6_ADDR=$(ip -6 addr show dev "${IFACE}"| grep inet6 | \
awk -F '[ \t]+|/' '{print $3}' | grep -v ^::1 | \
grep -v ^fe80)
@ -23,7 +23,7 @@ if [ $RESULT -eq 0 ]; then
fi
fi
if [ "${BOARD}" = "native" ] || [ "${BOARD}" = "native64" ]; then
if [ "${BOARD}" = "native" ] || [ "${BOARD}" = "native32" ]; then
echo "You may be able to create \"${IFACE}\" by using e.g." \
"\`${RIOTTOOLS#${RIOTBASE}/}/tapsetup/tapsetup\`."
echo "You can add a routable IPV6 address by using e.g." \

View File

@ -7,7 +7,7 @@ RIOTBASE ?= $(CURDIR)/../..
USEPKG += wamr
ifeq (,$(filter native native64,$(BOARD)))
ifeq (,$(filter native native32,$(BOARD)))
CFLAGS += -DTHREAD_STACKSIZE_MAIN='(6 * 1024)'
endif

View File

@ -28,7 +28,7 @@
#define ENABLE_DEBUG (0)
#include "debug.h"
#ifdef BOARD_NATIVE
#ifdef BOARD_NATIVE32
#include "mtd_default.h"
/* native mtd is file backed => Start address of flash is 0. */
char *_backing_memory = NULL;
@ -62,7 +62,7 @@ static ctap_status_code_t _flash_write(const void *buf, uint32_t addr, size_t le
ctap_status_code_t fido2_ctap_mem_init(void)
{
#ifdef BOARD_NATIVE
#ifdef BOARD_NATIVE32
_mtd_dev = mtd_default_get_dev(0);
#endif
@ -123,7 +123,7 @@ static ctap_status_code_t _flash_write(const void *buf, uint32_t addr, size_t le
static bool _flash_is_erased(uint32_t addr, size_t len)
{
#ifdef BOARD_NATIVE
#ifdef BOARD_NATIVE32
return true;
#else
for (size_t i = 0; i < len; i++) {

View File

@ -7,9 +7,9 @@ DEVELHELP ?= 1
ifneq (,$(wildcard $(CURDIR)/tests*/.))
# add interactive test configuration when automated testing is available,
# except for `native` and `native64` where we control when the RIOT app is
# except for `native` and `native32` where we control when the RIOT app is
# started
ifeq (,$(filter native native64,$(BOARD)))
ifeq (,$(filter native native32,$(BOARD)))
DEFAULT_MODULE += test_utils_interactive_sync
endif
# print stack usage by default when automated testing is available

View File

@ -128,7 +128,7 @@ with some kind of `synchronization`. This can be done in two ways:
- use `test_utils_interactive_sync` when uart input/output does not need to be
disabled for the test. This is enabled by default, except for `native` and
`native64`.
`native32`.
- set up the test in a loop so the test script will be able so sync with some kind
of start condition in the test.

View File

@ -7,7 +7,7 @@ USEMODULE += benchmark
ifeq (llvm,$(TOOLCHAIN))
# the floating point exception bug is more likely to trigger when build
# with LLVM, so we just disable LLVM on native as a work around
TEST_ON_CI_BLACKLIST += native native64
TEST_ON_CI_BLACKLIST += native native32
endif
include $(RIOTBASE)/Makefile.include

View File

@ -4,7 +4,7 @@ include ../Makefile.bench_common
# CFLAGS configuration to build properly
SINGLE_TIMER_BOARDS = \
native \
native64 \
native32 \
nucleo-f031k6 \
nucleo-f042k6 \
#

View File

@ -10,6 +10,6 @@ CFLAGS += -DTEST_HZ=$(TEST_HZ)LU
TEST_ON_CI_BLACKLIST += microbit
# This test randomly fails on `native` so disable it from CI
TEST_ON_CI_BLACKLIST += native native64
TEST_ON_CI_BLACKLIST += native native32
include $(RIOTBASE)/Makefile.include

View File

@ -1,4 +1,4 @@
BOARD_WHITELIST = native native64
BOARD_WHITELIST = native native32
include ../Makefile.build_system_common
include $(RIOTBASE)/Makefile.include

View File

@ -41,7 +41,7 @@ def expect_some(child, size, avail, range_start):
def expect_content(child, counter):
if counter == 0:
if os.environ.get('BOARD') in ['native', 'native64']:
if os.environ.get('BOARD') in ['native', 'native32']:
child.expect_exact('type: 0x0000, content: 0 ((nil))')
else:
child.expect(r'type: 0x0000, content: 0 \((0x)?0+\)')

View File

@ -7,6 +7,6 @@ USEMODULE += xtimer
TEST_ON_CI_BLACKLIST += microbit
# This test randomly fails on `native` so disable it from CI
TEST_ON_CI_BLACKLIST += native native64
TEST_ON_CI_BLACKLIST += native native32
include $(RIOTBASE)/Makefile.include

View File

@ -6,7 +6,7 @@ USEMODULE += ztimer_usec
# native has known issues: the context switch via glibc's setcontext()
# apparently doesn't properly save and restore the FPU state. This results in
# occasionally wrong results (often nan) being printed for the same calculation
TEST_ON_CI_BLACKLIST += native native64
TEST_ON_CI_BLACKLIST += native native32
#DISABLE_MODULE += cortexm_fpu

View File

@ -2,7 +2,7 @@ include ../Makefile.cpu_common
USEMODULE += backtrace
BOARD_WHITELIST := native native64
BOARD_WHITELIST := native native32
# Tests if native returns a backtrace of size three.
# The following function should be included in the backtrace:

View File

@ -1,4 +1,4 @@
ifneq (,$(filter native native64,$(BOARD)))
ifneq (,$(filter native native32,$(BOARD)))
CAN_DRIVER ?= PERIPH_CAN
endif

View File

@ -3,7 +3,7 @@ include ../Makefile.drivers_common
USEMODULE += grove_ledbar
# disable native GPIOs for automatic test
ifneq (,$(filter native native64,$(BOARD)))
ifneq (,$(filter native native32,$(BOARD)))
USEMODULE += periph_gpio_mock
endif

View File

@ -3,7 +3,7 @@ include ../Makefile.drivers_common
USEMODULE += hd44780
# disable native GPIOs for automatic test
ifneq (,$(filter native native64,$(BOARD)))
ifneq (,$(filter native native32,$(BOARD)))
USEMODULE += periph_gpio_mock
endif

View File

@ -3,7 +3,7 @@ include ../Makefile.drivers_common
USEMODULE += my9221
# disable native GPIOs for automatic test
ifneq (,$(filter native native64,$(BOARD)))
ifneq (,$(filter native native32,$(BOARD)))
USEMODULE += periph_gpio_mock
endif

View File

@ -10,7 +10,7 @@ DISABLE_MODULE += test_utils_print_stack_usage
USEMODULE += stdio_null
# adjust stack sizes to very small values
ifeq (,$(filter native native64,$(BOARD)))
ifeq (,$(filter native native32,$(BOARD)))
CFLAGS += -DTHREAD_STACKSIZE_MAIN=256 -DTHREAD_STACKSIZE_IDLE=128
endif

View File

@ -5,7 +5,7 @@ RIOTBASE ?= $(CURDIR)/../..
export TAP ?= tap0
# use Ethernet as link-layer protocol
ifneq (,$(filter native native64,$(BOARD)))
ifneq (,$(filter native native32,$(BOARD)))
PORT ?= $(TAP)
else
ETHOS_BAUDRATE ?= 115200

View File

@ -1,5 +1,5 @@
# Put board specific dependencies here
ifneq (,$(filter native native64,$(BOARD)))
ifneq (,$(filter native native32,$(BOARD)))
USEMODULE += netdev_tap
else
USEMODULE += stdio_ethos

View File

@ -27,7 +27,7 @@ CFLAGS += -DHAS_SOCK_DNS_MOCK=1
include $(RIOTBASE)/Makefile.include
ifneq (,$(filter native native64,$(BOARD)))
ifneq (,$(filter native native32,$(BOARD)))
test: PORT=
$(call target-export-variables,test,PORT)
endif

View File

@ -26,14 +26,14 @@ USEMODULE += shell_cmd_md5sum
TEST_ON_CI_BLACKLIST += all
# automated test only works on native
# TEST_ON_CI_WHITELIST += native native64
# TEST_ON_CI_WHITELIST += native native32
# use small blocksize for test to increase chance for errors
CFLAGS += -DCONFIG_NANOCOAP_BLOCKSIZE_DEFAULT=COAP_BLOCKSIZE_16
CFLAGS += -DCONFIG_COAP_ACK_TIMEOUT_MS=100
CFLAGS += -DCONFIG_COAP_MAX_RETRANSMIT=10
ifneq (,$(filter native native64,$(BOARD)))
ifneq (,$(filter native native32,$(BOARD)))
USEMODULE += socket_zep
USEMODULE += socket_zep_hello
USEMODULE += netdev

View File

@ -136,7 +136,7 @@ def run_test(func, factory):
if __name__ == "__main__":
board = os.environ.get('BOARD', 'native')
if board not in ['native', 'native64']:
if board not in ['native', 'native32']:
print('\x1b[1;31mThis test requires a native board.\x1b[0m\n',
file=sys.stderr)
sys.exit(1)

View File

@ -13,7 +13,7 @@ USEMODULE += dhcpv6_client_ia_na
USEMODULE += gnrc_dhcpv6_client
USEMODULE += gnrc_ipv6_default
USEMODULE += xtimer
ifneq (,$(filter native native64,$(BOARD)))
ifneq (,$(filter native native32,$(BOARD)))
# Has to be provided here and not in Makefile.dep, so TERMFLAGS are properly
# configured
USEMODULE += netdev_default
@ -50,7 +50,7 @@ dhcpv6_server:
dhcpv6_server:
$(CURDIR)/dhcpv6_server.sh $(DHCPV6_SERVER_PORT) $(CURDIR)/kea-dhcp6.conf
ifeq (,$(filter native native64,$(BOARD)))
ifeq (,$(filter native native32,$(BOARD)))
.PHONY: ethos
ethos:

View File

@ -1,3 +1,3 @@
ifeq (,$(filter native native64,$(BOARD)))
ifeq (,$(filter native native32,$(BOARD)))
USEMODULE += stdio_ethos
endif

View File

@ -14,7 +14,7 @@ USEMODULE += shell
USEMODULE += shell_cmds_default
# use Ethernet as link-layer protocol
ifneq (,$(filter native native64,$(BOARD)))
ifneq (,$(filter native native32,$(BOARD)))
TERMFLAGS += -z [::1]:17754
else
ETHOS_BAUDRATE ?= 115200
@ -44,7 +44,7 @@ ifeq (1,$(STATIC_ROUTES))
endif
endif
ifeq (,$(filter native native64,$(BOARD)))
ifeq (,$(filter native native32,$(BOARD)))
.PHONY: ethos
ethos:

View File

@ -1,5 +1,5 @@
# Put board specific dependencies here
ifneq (,$(filter native native64,$(BOARD)))
ifneq (,$(filter native native32,$(BOARD)))
USEMODULE += netdev_tap
USEMODULE += socket_zep
else

View File

@ -15,7 +15,7 @@ USEMODULE += shell
USEMODULE += shell_cmds_default
# use Ethernet as link-layer protocol
ifneq (,$(filter native native64,$(BOARD)))
ifneq (,$(filter native native32,$(BOARD)))
# Has to be provided here and not in Makefile.dep, so TERMFLAGS are properly
# configured
USEMODULE += netdev_default
@ -40,7 +40,7 @@ SHOULD_RUN_KCONFIG ?=
include $(RIOTBASE)/Makefile.include
ifeq (,$(filter native native64,$(BOARD)))
ifeq (,$(filter native native32,$(BOARD)))
.PHONY: ethos
ethos:

View File

@ -1,4 +1,4 @@
# Put board specific dependencies here
ifeq (,$(filter native native64,$(BOARD)))
ifeq (,$(filter native native32,$(BOARD)))
USEMODULE += stdio_ethos
endif

View File

@ -11,7 +11,7 @@ USEMODULE += gnrc_netif_single # Only one interface used and it makes
# shell commands easier
# use Ethernet as link-layer protocol
ifneq (,$(filter native native64,$(BOARD)))
ifneq (,$(filter native native32,$(BOARD)))
PORT ?= $(TAP)
else
ETHOS_BAUDRATE ?= 115200

View File

@ -1,5 +1,5 @@
# Put board specific dependencies here
ifneq (,$(filter native native64,$(BOARD)))
ifneq (,$(filter native native32,$(BOARD)))
USEMODULE += netdev_tap
else
USEMODULE += stdio_ethos

View File

@ -5,7 +5,7 @@ include ../Makefile.net_common
export TAP ?= tap0
# use Ethernet as link-layer protocol
ifneq (,$(filter native native64,$(BOARD)))
ifneq (,$(filter native native32,$(BOARD)))
PORT ?= $(TAP)
else
ETHOS_BAUDRATE ?= 115200

View File

@ -1,5 +1,5 @@
# Put board specific dependencies here
ifneq (,$(filter native native64,$(BOARD)))
ifneq (,$(filter native native32,$(BOARD)))
USEMODULE += netdev_tap
else
USEMODULE += stdio_ethos

View File

@ -7,7 +7,7 @@ export TAP ?= tap0
CFLAGS += -DOUTPUT=TEXT
CFLAGS += -DTEST_SUITES="gnrc_ipv6_ext_frag"
ifneq (,$(filter native native64,$(BOARD)))
ifneq (,$(filter native native32,$(BOARD)))
PORT ?= $(TAP)
else
ETHOS_BAUDRATE ?= 115200

View File

@ -1,5 +1,5 @@
# Put board specific dependencies here
ifneq (,$(filter native native64,$(BOARD)))
ifneq (,$(filter native native32,$(BOARD)))
USEMODULE += netdev_tap
else
USEMODULE += stdio_ethos

View File

@ -379,7 +379,7 @@ def testfunc(child):
run_sock_test(test_ipv6_ext_frag_fwd_success, s)
run_sock_test(test_ipv6_ext_frag_fwd_too_big, s)
if not os.environ.get("BOARD", "") in ["native", "native64"]:
if not os.environ.get("BOARD", "") in ["native", "native32"]:
# ethos currently can't handle the larger, rapidly sent packets by the
# IPv6 fragmentation of the Linux Kernel
print("SUCCESS")

View File

@ -5,7 +5,7 @@ include ../Makefile.net_common
export TAP ?= tap0
# use Ethernet as link-layer protocol
ifneq (,$(filter native native64,$(BOARD)))
ifneq (,$(filter native native32,$(BOARD)))
PORT ?= $(TAP)
else
ETHOS_BAUDRATE ?= 115200

View File

@ -1,5 +1,5 @@
# Put board specific dependencies here
ifneq (,$(filter native native64,$(BOARD)))
ifneq (,$(filter native native32,$(BOARD)))
USEMODULE += netdev_tap
else
USEMODULE += stdio_ethos

View File

@ -9,7 +9,7 @@ USEMODULE += sock_dns
USEMODULE += gnrc_ipv6_default
USEMODULE += gnrc_ipv6_nib_dns
# use Ethernet as link-layer protocol
ifneq (,$(filter native native64,$(BOARD)))
ifneq (,$(filter native native32,$(BOARD)))
PORT ?= $(TAP)
else
ETHOS_BAUDRATE ?= 115200

View File

@ -1,5 +1,5 @@
# Put board specific dependencies here
ifneq (,$(filter native native64,$(BOARD)))
ifneq (,$(filter native native32,$(BOARD)))
USEMODULE += netdev_tap
else
USEMODULE += stdio_ethos

View File

@ -1,8 +1,8 @@
BOARD_WHITELIST = native native64 derfmega256 avr-rss2 atmega256rfr2-xpro nrf52840dongle
BOARD_WHITELIST = native native32 derfmega256 avr-rss2 atmega256rfr2-xpro nrf52840dongle
include ../Makefile.net_common
ifneq (,$(filter native native64,$(BOARD)))
ifneq (,$(filter native native32,$(BOARD)))
USEMODULE += socket_zep
TERMFLAGS ?= -z "0.0.0.0:17755,localhost:17754"
USEMODULE += netdev
@ -29,6 +29,6 @@ USEMODULE += gnrc_netif_ieee802154
# the application dumps received packets to stdout
USEMODULE += gnrc_pktdump
TEST_ON_CI_WHITELIST += native native64
TEST_ON_CI_WHITELIST += native native32
include $(RIOTBASE)/Makefile.include

View File

@ -9,7 +9,7 @@ USEMODULE += gnrc_rpl
USEMODULE += shell
USEMODULE += shell_cmds_default
ifneq (,$(filter native native64,$(BOARD)))
ifneq (,$(filter native native32,$(BOARD)))
USEMODULE += socket_zep
USEMODULE += socket_zep_hello
USEMODULE += netdev
@ -28,6 +28,6 @@ host-tools:
TEST_DEPS += host-tools
# Test is flaky and regularly derails unrelated merge trains
TEST_ON_CI_BLACKLIST += native native64
TEST_ON_CI_BLACKLIST += native native32
include $(RIOTBASE)/Makefile.include

View File

@ -178,7 +178,7 @@ def run_test(func, factory):
if __name__ == "__main__":
board = os.environ.get('BOARD', 'native')
if board not in ['native', 'native64']:
if board not in ['native', 'native32']:
print('\x1b[1;31mThis test requires a native board.\x1b[0m\n',
file=sys.stderr)
sys.exit(1)

View File

@ -7,7 +7,7 @@ export TAP ?= tap0
CFLAGS += -DOUTPUT=TEXT
# use Ethernet as link-layer protocol
ifneq (,$(filter native native64,$(BOARD)))
ifneq (,$(filter native native32,$(BOARD)))
PORT ?= $(TAP)
else
ETHOS_BAUDRATE ?= 115200

View File

@ -1,5 +1,5 @@
# Put board specific dependencies here
ifneq (,$(filter native native64,$(BOARD)))
ifneq (,$(filter native native32,$(BOARD)))
USEMODULE += netdev_tap
else
USEMODULE += stdio_ethos

View File

@ -5,7 +5,7 @@ include ../Makefile.net_common
# maybe it is an actual race condition.
#
# TODO: Solve the issue and re-enable
TEST_ON_CI_BLACKLIST += native native64
TEST_ON_CI_BLACKLIST += native native32
USEMODULE += auto_init_gnrc_netif
USEMODULE += gnrc_ipv6_router_default
@ -24,7 +24,7 @@ USEMODULE += netstats_l2
USEMODULE += netstats_ipv6
USEMODULE += netstats_rpl
ifneq (,$(filter native native64,$(BOARD)))
ifneq (,$(filter native native32,$(BOARD)))
USEMODULE += socket_zep
USEMODULE += socket_zep_hello
USEMODULE += netdev

View File

@ -157,7 +157,7 @@ def run_zep_dispatch():
if __name__ == "__main__":
board = os.environ.get('BOARD', 'native')
if board not in ['native', 'native64']:
if board not in ['native', 'native32']:
print('\x1b[1;31mThis test requires a native board.\x1b[0m\n',
file=sys.stderr)
sys.exit(1)

View File

@ -10,7 +10,7 @@ USEMODULE += gnrc_ipv6_nib_dns
USEMODULE += gnrc_netif_single # Only one interface used and it makes
# shell commands easier
# use Ethernet as link-layer protocol
ifneq (,$(filter native native64,$(BOARD)))
ifneq (,$(filter native native32,$(BOARD)))
PORT ?= $(TAP)
else
ETHOS_BAUDRATE ?= 115200

View File

@ -1,5 +1,5 @@
# Put board specific dependencies here
ifneq (,$(filter native native64,$(BOARD)))
ifneq (,$(filter native native32,$(BOARD)))
USEMODULE += netdev_tap
else
USEMODULE += stdio_ethos

View File

@ -20,7 +20,7 @@ USEMODULE += shell_cmds_default
USEPKG += tinydtls
# use Ethernet as link-layer protocol
ifneq (,$(filter native native64,$(BOARD)))
ifneq (,$(filter native native32,$(BOARD)))
PORT ?= $(TAP)
else
ETHOS_BAUDRATE ?= 115200

View File

@ -1,5 +1,5 @@
# Put board specific dependencies here
ifneq (,$(filter native native64,$(BOARD)))
ifneq (,$(filter native native32,$(BOARD)))
USEMODULE += netdev_tap
else
USEMODULE += stdio_ethos

View File

@ -12,7 +12,7 @@ TIMEOUT_MS ?= 3000
# Suppress test execution to avoid CI errors
TEST_ON_CI_BLACKLIST += all
ifneq (,$(filter native native64,$(BOARD)))
ifneq (,$(filter native native32,$(BOARD)))
PORT ?= $(TAP)
else
ETHOS_BAUDRATE ?= 115200

View File

@ -1,5 +1,5 @@
# Put board specific dependencies here
ifneq (,$(filter native native64,$(BOARD)))
ifneq (,$(filter native native32,$(BOARD)))
USEMODULE += netdev_tap
else
USEMODULE += stdio_ethos

View File

@ -234,7 +234,7 @@ def generate_port_number():
def sudo_guard(uses_scapy=False):
sudo_required = uses_scapy or (not os.environ.get("BOARD", "") in ["native", "native64"])
sudo_required = uses_scapy or (not os.environ.get("BOARD", "") in ["native", "native32"])
if sudo_required and os.geteuid() != 0:
print("\x1b[1;31mThis test requires root privileges.\n"
"It uses `./dist/tools/ethos/start_networking.sh` as term" +

View File

@ -17,7 +17,7 @@ CUSTOM_GNRC_TCP_NO_TIMEOUT ?= 1
# Suppress test execution to avoid CI errors
TEST_ON_CI_BLACKLIST += all
ifneq (,$(filter native native64,$(BOARD)))
ifneq (,$(filter native native32,$(BOARD)))
PORT ?= $(TAP)
else
ETHOS_BAUDRATE ?= 115200

View File

@ -1,5 +1,5 @@
# Put board specific dependencies here
ifneq (,$(filter native native64,$(BOARD)))
ifneq (,$(filter native native32,$(BOARD)))
USEMODULE += netdev_tap
else
USEMODULE += stdio_ethos

View File

@ -5,11 +5,12 @@
# 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.
import sys
import os
import random
import re
import socket
import random
import sys
import testrunner
@ -310,7 +311,7 @@ def generate_port_number():
def sudo_guard(uses_scapy=False):
sudo_required = uses_scapy or (not os.environ.get("BOARD", "") in ["native", "native64"])
sudo_required = uses_scapy or (not os.environ.get("BOARD", "") in ["native", "native32"])
if sudo_required and os.geteuid() != 0:
print("\x1b[1;31mThis test requires root privileges.\n"
"It uses `./dist/tools/ethos/start_networking.sh` as term" +

View File

@ -1,6 +1,6 @@
include ../Makefile.net_common
ifneq (,$(filter native native64,$(BOARD)))
ifneq (,$(filter native native32,$(BOARD)))
ZEP_PORT_BASE ?= 17754
TERMFLAGS += -z [::1]:$(ZEP_PORT_BASE)
USEMODULE += socket_zep

View File

@ -13,7 +13,7 @@ USEMODULE += ieee802154
USEMODULE += ieee802154_submac
USEMODULE += ztimer_usec
ifneq (,$(filter native native64,$(BOARD)))
ifneq (,$(filter native native32,$(BOARD)))
USE_ZEP = 1
USEMODULE += socket_zep
endif

View File

@ -49,7 +49,7 @@ ifeq (,$(filter $(BOARD),$(LOW_MEMORY_BOARDS)))
CFLAGS += -DTHREAD_STACKSIZE_MAIN=\(3*THREAD_STACKSIZE_DEFAULT\)
# always enable auto-format for native
ifneq (,$(filter native native64,$(BOARD)))
ifneq (,$(filter native native32,$(BOARD)))
USEMODULE += vfs_auto_format
endif
endif

View File

@ -11,7 +11,7 @@ USEMODULE += netstats_l2
# Cannot run the test on `murdock` in `native`
# open(/dev/net/tun): No such file or directory
TEST_ON_CI_BLACKLIST += native native64
TEST_ON_CI_BLACKLIST += native native32
# sometimes fails on esp32, see #14237.
TEST_ON_CI_BLACKLIST += esp32-wroom-32

View File

@ -1,6 +1,6 @@
include ../Makefile.net_common
BOARD_WHITELIST = native native64 # socket_zep is only available on native
BOARD_WHITELIST = native native32 # socket_zep is only available on native
USEMODULE += od
USEMODULE += socket_zep

View File

@ -11,7 +11,7 @@ USEMODULE += shell_cmds_default
USEMODULE += benchmark
# disable native GPIOs for automatic test
ifneq (,$(filter native native64,$(BOARD)))
ifneq (,$(filter native native32,$(BOARD)))
USEMODULE += periph_gpio_mock
endif

View File

@ -18,7 +18,7 @@ BOARD = os.environ['BOARD']
# Increase timeout on "real" hardware
# 170 seconds on `arduino-mega2560`
# ~300 seconds on `z1`
TIMEOUT = 320 if BOARD not in ['native', 'native64'] else DEFAULT_TIMEOUT
TIMEOUT = 320 if BOARD not in ['native', 'native32'] else DEFAULT_TIMEOUT
if __name__ == "__main__":

View File

@ -3,7 +3,7 @@ include ../Makefile.pkg_common
FEATURES_REQUIRED += netif
# Cannot run the test on `murdock` in `native`
# open(/dev/net/tun): No such file or directory
TEST_ON_CI_BLACKLIST += native native64
TEST_ON_CI_BLACKLIST += native native32
# Test fails pretty regularly on CI
TEST_ON_CI_BLACKLIST += esp32-wroom-32

View File

@ -12,7 +12,7 @@ USEPKG += fatfs
FATFS_IMAGE_FILE_SIZE_MIB ?= 128
ifneq (,$(filter native native64,$(BOARD)))
ifneq (,$(filter native native32,$(BOARD)))
#overwrite default mtd_native-config to use fat image as flash device
CFLAGS += -DMTD_NATIVE_FILENAME=\"./bin/riot_fatfs_disk.img\"
CFLAGS += -DFATFS_IMAGE_FILE_SIZE_MIB=$(FATFS_IMAGE_FILE_SIZE_MIB)

View File

@ -10,7 +10,7 @@ CFLAGS += -DCONFIG_FATFS_FORMAT_ALLOC_STATIC=1
FATFS_IMAGE_FILE_SIZE_MIB ?= 128
ifneq (,$(filter native native64,$(BOARD)))
ifneq (,$(filter native native32,$(BOARD)))
USEMODULE += mtd_native
#overwrite default mtd_native-config to use fat image as flash device

View File

@ -1,6 +1,6 @@
include ../Makefile.pkg_common
TEST_ON_CI_WHITELIST += native native64
TEST_ON_CI_WHITELIST += native native32
USEPKG += libcose
# By default we use hacl as crypto backend, uncomment to use a different

View File

@ -15,7 +15,7 @@ from testrunner import TIMEOUT as DEFAULT_TIMEOUT
BOARD = os.environ['BOARD']
# on real hardware, this test application can take several minutes to
# complete (>5min on nrf51dk)
TIMEOUT = 400 if BOARD not in ['native', 'native64'] else DEFAULT_TIMEOUT
TIMEOUT = 400 if BOARD not in ['native', 'native32'] else DEFAULT_TIMEOUT
if __name__ == "__main__":

Some files were not shown because too many files have changed in this diff Show More