From ca0ad13a61ff5c8a40fa14c908034639f0a18f10 Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Wed, 26 Jul 2017 08:45:13 -0400 Subject: [PATCH] net: enable SLIP only on QEMU targets In many networking tests we had to configure SLIP in the prj.conf leaving those configurations Qemu specific. This change enables SLIP for QEMU targets automatically and allows reuse of prj.conf for multiple boards. Additionally, the TUN options is removed. This option was not used anywhere. To enable self-contained networking tests that do not depend on SLIP, we introduce the new option NET_TEST which disables TAP and allows testing in QEMU without the need for a host interface. Signed-off-by: Anas Nashif --- samples/net/coaps_client/prj_qemu_x86.conf | 1 - samples/net/coaps_server/prj_qemu_x86.conf | 1 - samples/net/dhcpv4_client/prj_qemu_x86.conf | 1 - samples/net/dns_resolve/prj_qemu_x86.conf | 1 - .../net/echo_client/prj_qemu_cortex_m3.conf | 1 - samples/net/echo_client/prj_qemu_x86.conf | 1 - samples/net/echo_client/prj_qemu_x86_tls.conf | 1 - .../net/echo_server/prj_qemu_cortex_m3.conf | 1 - samples/net/echo_server/prj_qemu_x86.conf | 1 - samples/net/echo_server/prj_qemu_x86_tls.conf | 1 - samples/net/http_client/prj_qemu_x86.conf | 1 - samples/net/http_server/prj_qemu_x86.conf | 1 - samples/net/https_client/prj_qemu_x86.conf | 1 - samples/net/irc_bot/prj_qemu_x86.conf | 1 - samples/net/leds_demo/prj.conf | 1 - .../net/mbedtls_dtlsclient/prj_qemu_x86.conf | 1 - .../net/mbedtls_dtlsserver/prj_qemu_x86.conf | 1 - samples/net/mqtt_publisher/prj_qemu_x86.conf | 1 - samples/net/nats/prj_qemu_x86.conf | 1 - samples/net/sockets/echo/prj_qemu_x86.conf | 1 - .../net/sockets/echo_async/prj_qemu_x86.conf | 1 - samples/net/telnet/prj_qemu_x86.conf | 1 - samples/net/telnet/prj_qemu_x86_iamcu.conf | 1 - samples/net/zoap_client/prj.conf | 1 - samples/net/zoap_server/prj.conf | 1 - samples/net/zperf/prj_qemu_x86.conf | 1 - subsys/net/ip/Kconfig | 32 ++++--------------- subsys/net/ip/l2/Kconfig | 2 +- tests/net/6lo/prj.conf | 1 + tests/net/all/prj.conf | 2 -- tests/net/arp/prj.conf | 1 + tests/net/buf/prj.conf | 1 + tests/net/context/prj.conf | 1 + tests/net/dhcpv4/prj.conf | 1 + tests/net/icmpv6/prj.conf | 1 + tests/net/ieee802154/fragment/prj.conf | 1 + tests/net/ieee802154/l2/prj.conf | 1 + tests/net/iface/prj.conf | 1 + tests/net/ip-addr/prj.conf | 1 + tests/net/ipv6/prj.conf | 1 + tests/net/ipv6_fragment/prj.conf | 1 + tests/net/lib/dns_packet/prj.conf | 1 + tests/net/lib/dns_resolve/prj.conf | 2 +- tests/net/lib/http_header_fields/prj.conf | 1 + tests/net/lib/mqtt_packet/prj.conf | 1 + tests/net/lib/zoap/prj.conf | 1 + tests/net/mgmt/prj.conf | 1 + tests/net/mld/prj.conf | 1 + tests/net/neighbor/prj.conf | 1 + tests/net/net_pkt/prj.conf | 1 + tests/net/route/prj.conf | 1 + tests/net/rpl/prj.conf | 1 + tests/net/socket/udp/prj.conf | 1 - tests/net/tcp/prj.conf | 1 + tests/net/trickle/prj.conf | 1 + tests/net/udp/prj.conf | 1 + tests/net/utils/prj.conf | 1 + 57 files changed, 35 insertions(+), 56 deletions(-) diff --git a/samples/net/coaps_client/prj_qemu_x86.conf b/samples/net/coaps_client/prj_qemu_x86.conf index 58c6f6fe3a8..c37694e7738 100644 --- a/samples/net/coaps_client/prj_qemu_x86.conf +++ b/samples/net/coaps_client/prj_qemu_x86.conf @@ -4,7 +4,6 @@ CONFIG_NET_UDP=y CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_NET_BUF_LOG=y CONFIG_NET_LOG=y -CONFIG_NET_SLIP_TAP=y CONFIG_SYS_LOG_SHOW_COLOR=y CONFIG_INIT_STACKS=y CONFIG_PRINTK=y diff --git a/samples/net/coaps_server/prj_qemu_x86.conf b/samples/net/coaps_server/prj_qemu_x86.conf index 8f48f282199..a2f54a84f69 100644 --- a/samples/net/coaps_server/prj_qemu_x86.conf +++ b/samples/net/coaps_server/prj_qemu_x86.conf @@ -4,7 +4,6 @@ CONFIG_NET_IPV4=n CONFIG_NET_UDP=y CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_NET_LOG=y -CONFIG_NET_SLIP_TAP=y CONFIG_SYS_LOG_SHOW_COLOR=y CONFIG_INIT_STACKS=y CONFIG_PRINTK=y diff --git a/samples/net/dhcpv4_client/prj_qemu_x86.conf b/samples/net/dhcpv4_client/prj_qemu_x86.conf index 51f3c9aec16..d26eda0f95d 100644 --- a/samples/net/dhcpv4_client/prj_qemu_x86.conf +++ b/samples/net/dhcpv4_client/prj_qemu_x86.conf @@ -4,7 +4,6 @@ CONFIG_NET_IPV4=y CONFIG_NET_ARP=y CONFIG_NET_UDP=y CONFIG_NET_DHCPV4=y -CONFIG_NET_SLIP_TAP=y CONFIG_NET_PKT_RX_COUNT=4 CONFIG_NET_PKT_TX_COUNT=4 diff --git a/samples/net/dns_resolve/prj_qemu_x86.conf b/samples/net/dns_resolve/prj_qemu_x86.conf index 07b28828f9e..340cf15e93d 100644 --- a/samples/net/dns_resolve/prj_qemu_x86.conf +++ b/samples/net/dns_resolve/prj_qemu_x86.conf @@ -2,7 +2,6 @@ CONFIG_NETWORKING=y CONFIG_NET_UDP=y CONFIG_RANDOM_GENERATOR=y CONFIG_TEST_RANDOM_GENERATOR=y -CONFIG_NET_SLIP_TAP=y CONFIG_INIT_STACKS=y CONFIG_NET_PKT_RX_COUNT=4 CONFIG_NET_PKT_TX_COUNT=4 diff --git a/samples/net/echo_client/prj_qemu_cortex_m3.conf b/samples/net/echo_client/prj_qemu_cortex_m3.conf index 8638a817184..a0dcab39e75 100644 --- a/samples/net/echo_client/prj_qemu_cortex_m3.conf +++ b/samples/net/echo_client/prj_qemu_cortex_m3.conf @@ -5,7 +5,6 @@ CONFIG_NET_UDP=y CONFIG_NET_TCP=y CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_NET_LOG=y -CONFIG_NET_SLIP_TAP=y CONFIG_SYS_LOG_SHOW_COLOR=y CONFIG_INIT_STACKS=y CONFIG_PRINTK=y diff --git a/samples/net/echo_client/prj_qemu_x86.conf b/samples/net/echo_client/prj_qemu_x86.conf index faef753d104..b67676f5c59 100644 --- a/samples/net/echo_client/prj_qemu_x86.conf +++ b/samples/net/echo_client/prj_qemu_x86.conf @@ -8,7 +8,6 @@ CONFIG_NET_BUF_LOG=y CONFIG_SYS_LOG_NET_BUF_LEVEL=2 CONFIG_NET_LOG=y CONFIG_SYS_LOG_NET_LEVEL=2 -CONFIG_NET_SLIP_TAP=y CONFIG_SYS_LOG_SHOW_COLOR=y CONFIG_INIT_STACKS=y CONFIG_PRINTK=y diff --git a/samples/net/echo_client/prj_qemu_x86_tls.conf b/samples/net/echo_client/prj_qemu_x86_tls.conf index 0d35c0dd693..850c156c6a6 100644 --- a/samples/net/echo_client/prj_qemu_x86_tls.conf +++ b/samples/net/echo_client/prj_qemu_x86_tls.conf @@ -8,7 +8,6 @@ CONFIG_NET_BUF_LOG=y CONFIG_SYS_LOG_NET_BUF_LEVEL=2 CONFIG_NET_LOG=y CONFIG_SYS_LOG_NET_LEVEL=2 -CONFIG_NET_SLIP_TAP=y CONFIG_SYS_LOG_SHOW_COLOR=y CONFIG_INIT_STACKS=y CONFIG_PRINTK=y diff --git a/samples/net/echo_server/prj_qemu_cortex_m3.conf b/samples/net/echo_server/prj_qemu_cortex_m3.conf index 53b5c56b062..544df946d97 100644 --- a/samples/net/echo_server/prj_qemu_cortex_m3.conf +++ b/samples/net/echo_server/prj_qemu_cortex_m3.conf @@ -6,7 +6,6 @@ CONFIG_NET_UDP=y CONFIG_NET_TCP=y CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_NET_LOG=y -CONFIG_NET_SLIP_TAP=y CONFIG_SYS_LOG_SHOW_COLOR=y CONFIG_INIT_STACKS=y CONFIG_PRINTK=y diff --git a/samples/net/echo_server/prj_qemu_x86.conf b/samples/net/echo_server/prj_qemu_x86.conf index 1efcd4d4062..6dbfef2b7ab 100644 --- a/samples/net/echo_server/prj_qemu_x86.conf +++ b/samples/net/echo_server/prj_qemu_x86.conf @@ -15,7 +15,6 @@ CONFIG_SYS_LOG_SHOW_COLOR=y CONFIG_NET_STATISTICS=y CONFIG_PRINTK=y -CONFIG_NET_SLIP_TAP=y CONFIG_NET_PKT_RX_COUNT=10 CONFIG_NET_PKT_TX_COUNT=10 diff --git a/samples/net/echo_server/prj_qemu_x86_tls.conf b/samples/net/echo_server/prj_qemu_x86_tls.conf index 758caa0152d..8bdbfd97599 100644 --- a/samples/net/echo_server/prj_qemu_x86_tls.conf +++ b/samples/net/echo_server/prj_qemu_x86_tls.conf @@ -10,7 +10,6 @@ CONFIG_SYS_LOG_NET_BUF_LEVEL=2 CONFIG_NET_LOG=y CONFIG_SYS_LOG_NET_LEVEL=2 CONFIG_NET_DEBUG_NET_PKT=y -CONFIG_NET_SLIP_TAP=y CONFIG_SYS_LOG_SHOW_COLOR=y CONFIG_INIT_STACKS=y CONFIG_PRINTK=y diff --git a/samples/net/http_client/prj_qemu_x86.conf b/samples/net/http_client/prj_qemu_x86.conf index 37172d27f3a..6bc82f1c3fc 100644 --- a/samples/net/http_client/prj_qemu_x86.conf +++ b/samples/net/http_client/prj_qemu_x86.conf @@ -3,7 +3,6 @@ CONFIG_NET_TCP=y CONFIG_RANDOM_GENERATOR=y CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_NET_LOG=y -CONFIG_NET_SLIP_TAP=y CONFIG_INIT_STACKS=y CONFIG_NET_PKT_RX_COUNT=64 diff --git a/samples/net/http_server/prj_qemu_x86.conf b/samples/net/http_server/prj_qemu_x86.conf index 89ba3ee7505..62bf0ad14bb 100644 --- a/samples/net/http_server/prj_qemu_x86.conf +++ b/samples/net/http_server/prj_qemu_x86.conf @@ -3,7 +3,6 @@ CONFIG_NET_TCP=y CONFIG_RANDOM_GENERATOR=y CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_NET_LOG=y -CONFIG_NET_SLIP_TAP=y CONFIG_INIT_STACKS=y CONFIG_NET_PKT_RX_COUNT=16 diff --git a/samples/net/https_client/prj_qemu_x86.conf b/samples/net/https_client/prj_qemu_x86.conf index c29a6317343..d1f14481559 100644 --- a/samples/net/https_client/prj_qemu_x86.conf +++ b/samples/net/https_client/prj_qemu_x86.conf @@ -3,7 +3,6 @@ CONFIG_NET_TCP=y CONFIG_RANDOM_GENERATOR=y CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_NET_LOG=y -CONFIG_NET_SLIP_TAP=y CONFIG_INIT_STACKS=y CONFIG_NET_PKT_RX_COUNT=64 diff --git a/samples/net/irc_bot/prj_qemu_x86.conf b/samples/net/irc_bot/prj_qemu_x86.conf index bcb59760cb8..69b29589421 100644 --- a/samples/net/irc_bot/prj_qemu_x86.conf +++ b/samples/net/irc_bot/prj_qemu_x86.conf @@ -14,7 +14,6 @@ CONFIG_NET_BUF_TX_COUNT=30 CONFIG_NET_PKT_RX_COUNT=14 CONFIG_NET_PKT_TX_COUNT=14 CONFIG_NET_SHELL=y -CONFIG_NET_SLIP_TAP=y CONFIG_NET_STATISTICS=y CONFIG_NET_TCP=y CONFIG_NETWORKING=y diff --git a/samples/net/leds_demo/prj.conf b/samples/net/leds_demo/prj.conf index 18d4b1d1d2f..f7faa956d2c 100644 --- a/samples/net/leds_demo/prj.conf +++ b/samples/net/leds_demo/prj.conf @@ -3,7 +3,6 @@ CONFIG_NETWORKING=y CONFIG_NET_IPV6=y CONFIG_NET_LOG=y CONFIG_NET_UDP=y -CONFIG_NET_SLIP_TAP=y CONFIG_SYS_LOG=y CONFIG_SYS_LOG_SHOW_COLOR=y CONFIG_RANDOM_GENERATOR=y diff --git a/samples/net/mbedtls_dtlsclient/prj_qemu_x86.conf b/samples/net/mbedtls_dtlsclient/prj_qemu_x86.conf index 23486a52c91..9473c81ca95 100644 --- a/samples/net/mbedtls_dtlsclient/prj_qemu_x86.conf +++ b/samples/net/mbedtls_dtlsclient/prj_qemu_x86.conf @@ -3,7 +3,6 @@ CONFIG_NET_IPV6=n CONFIG_NET_IPV4=y CONFIG_NET_UDP=y CONFIG_NET_LOG=y -CONFIG_NET_SLIP_TAP=y CONFIG_SYS_LOG=y CONFIG_SYS_LOG_SHOW_COLOR=y diff --git a/samples/net/mbedtls_dtlsserver/prj_qemu_x86.conf b/samples/net/mbedtls_dtlsserver/prj_qemu_x86.conf index d78436c3796..cc4a375ebe8 100644 --- a/samples/net/mbedtls_dtlsserver/prj_qemu_x86.conf +++ b/samples/net/mbedtls_dtlsserver/prj_qemu_x86.conf @@ -4,7 +4,6 @@ CONFIG_NET_IPV4=y CONFIG_NET_UDP=y CONFIG_NET_LOG=y CONFIG_NET_SLIP=y -CONFIG_NET_SLIP_TAP=y CONFIG_SYS_LOG=y CONFIG_SYS_LOG_SHOW_COLOR=y diff --git a/samples/net/mqtt_publisher/prj_qemu_x86.conf b/samples/net/mqtt_publisher/prj_qemu_x86.conf index 27102383f56..85270372185 100644 --- a/samples/net/mqtt_publisher/prj_qemu_x86.conf +++ b/samples/net/mqtt_publisher/prj_qemu_x86.conf @@ -3,7 +3,6 @@ CONFIG_NET_TCP=y CONFIG_RANDOM_GENERATOR=y CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_NET_LOG=y -CONFIG_NET_SLIP_TAP=y CONFIG_INIT_STACKS=y CONFIG_NET_PKT_RX_COUNT=16 diff --git a/samples/net/nats/prj_qemu_x86.conf b/samples/net/nats/prj_qemu_x86.conf index 1ecc6e4855c..71134bf70f9 100644 --- a/samples/net/nats/prj_qemu_x86.conf +++ b/samples/net/nats/prj_qemu_x86.conf @@ -11,7 +11,6 @@ CONFIG_NET_MAX_CONTEXTS=10 CONFIG_NET_PKT_RX_COUNT=14 CONFIG_NET_PKT_TX_COUNT=14 CONFIG_NET_SHELL=y -CONFIG_NET_SLIP_TAP=y CONFIG_NET_STATISTICS=y CONFIG_NET_TCP=y CONFIG_NETWORKING=y diff --git a/samples/net/sockets/echo/prj_qemu_x86.conf b/samples/net/sockets/echo/prj_qemu_x86.conf index 2435a9e4058..1b2c881ea23 100644 --- a/samples/net/sockets/echo/prj_qemu_x86.conf +++ b/samples/net/sockets/echo/prj_qemu_x86.conf @@ -10,7 +10,6 @@ CONFIG_NET_SOCKETS=y CONFIG_NET_SOCKETS_POSIX_NAMES=y # Network driver config -CONFIG_NET_SLIP_TAP=y CONFIG_TEST_RANDOM_GENERATOR=y # Without CONFIG_NET_BUF_LOG printf() doesn't work diff --git a/samples/net/sockets/echo_async/prj_qemu_x86.conf b/samples/net/sockets/echo_async/prj_qemu_x86.conf index 2435a9e4058..1b2c881ea23 100644 --- a/samples/net/sockets/echo_async/prj_qemu_x86.conf +++ b/samples/net/sockets/echo_async/prj_qemu_x86.conf @@ -10,7 +10,6 @@ CONFIG_NET_SOCKETS=y CONFIG_NET_SOCKETS_POSIX_NAMES=y # Network driver config -CONFIG_NET_SLIP_TAP=y CONFIG_TEST_RANDOM_GENERATOR=y # Without CONFIG_NET_BUF_LOG printf() doesn't work diff --git a/samples/net/telnet/prj_qemu_x86.conf b/samples/net/telnet/prj_qemu_x86.conf index 7731c9d98b6..d8887f9cfe0 100644 --- a/samples/net/telnet/prj_qemu_x86.conf +++ b/samples/net/telnet/prj_qemu_x86.conf @@ -6,7 +6,6 @@ CONFIG_NET_IPV4=y CONFIG_NET_ARP=y CONFIG_NET_UDP=y CONFIG_NET_TCP=y -CONFIG_NET_SLIP_TAP=y CONFIG_NET_DHCPV4=n CONFIG_NET_MGMT=n diff --git a/samples/net/telnet/prj_qemu_x86_iamcu.conf b/samples/net/telnet/prj_qemu_x86_iamcu.conf index 7731c9d98b6..d8887f9cfe0 100644 --- a/samples/net/telnet/prj_qemu_x86_iamcu.conf +++ b/samples/net/telnet/prj_qemu_x86_iamcu.conf @@ -6,7 +6,6 @@ CONFIG_NET_IPV4=y CONFIG_NET_ARP=y CONFIG_NET_UDP=y CONFIG_NET_TCP=y -CONFIG_NET_SLIP_TAP=y CONFIG_NET_DHCPV4=n CONFIG_NET_MGMT=n diff --git a/samples/net/zoap_client/prj.conf b/samples/net/zoap_client/prj.conf index 73384449e37..614dbe38866 100644 --- a/samples/net/zoap_client/prj.conf +++ b/samples/net/zoap_client/prj.conf @@ -3,7 +3,6 @@ CONFIG_NET_IPV4=y CONFIG_NET_IPV6=y CONFIG_NET_LOG=y CONFIG_NET_UDP=y -CONFIG_NET_SLIP_TAP=y CONFIG_SYS_LOG=y CONFIG_SYS_LOG_SHOW_COLOR=y CONFIG_RANDOM_GENERATOR=y diff --git a/samples/net/zoap_server/prj.conf b/samples/net/zoap_server/prj.conf index f3e3bfe5bf2..779dfcae3ad 100644 --- a/samples/net/zoap_server/prj.conf +++ b/samples/net/zoap_server/prj.conf @@ -2,7 +2,6 @@ CONFIG_NETWORKING=y CONFIG_NET_IPV6=y CONFIG_NET_LOG=y CONFIG_NET_UDP=y -CONFIG_NET_SLIP_TAP=y CONFIG_SYS_LOG=y CONFIG_SYS_LOG_SHOW_COLOR=y CONFIG_RANDOM_GENERATOR=y diff --git a/samples/net/zperf/prj_qemu_x86.conf b/samples/net/zperf/prj_qemu_x86.conf index 54fed3fd822..47e2032ecb0 100644 --- a/samples/net/zperf/prj_qemu_x86.conf +++ b/samples/net/zperf/prj_qemu_x86.conf @@ -22,7 +22,6 @@ CONFIG_INIT_STACKS=y CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_SYS_LOG_SHOW_COLOR=y -CONFIG_NET_SLIP_TAP=y CONFIG_NET_L2_ETHERNET=y CONFIG_NET_SHELL=y diff --git a/subsys/net/ip/Kconfig b/subsys/net/ip/Kconfig index 8ac3a029a6c..f17b509dc52 100644 --- a/subsys/net/ip/Kconfig +++ b/subsys/net/ip/Kconfig @@ -239,31 +239,12 @@ config NET_CONTEXT_CHECK If you know that the options passed to net_context...() functions are ok, then you can disable the checks to save some memory. -choice - prompt "Use SLIP connectivity with QEMU" - optional - default NET_SLIP_TUN +config NET_TEST + bool "Network Testing" + default n help - The SLIP support is only used when the application is run inside QEMU - and the network peer is run in your host. The host needs to have - tunslip running in order to receive and send network packets via the - SLIP driver. The SLIP driver Kconfig options can be tweaked in drivers - section. - - Options are provided to communicate with QEMU via a TUN driver, the - default, as it requires less configuration in the host side, or via a - TAP driver. - -config NET_SLIP_TUN - bool "TUN SLIP driver" - select SLIP - select UART_PIPE - select UART_INTERRUPT_DRIVEN - select NET_L2_DUMMY - help - The host needs to have tunslip running in order - to receive and send network packets via the SLIP driver. - Choose this if unsure. + Used for self-contained networking tests that do not require a + network device. config NET_SLIP_TAP bool "TAP SLIP driver" @@ -271,11 +252,12 @@ config NET_SLIP_TAP select UART_PIPE select UART_INTERRUPT_DRIVEN select SLIP_TAP + default n + default y if (QEMU_TARGET && !NET_TEST) help SLIP TAP support is necessary when testing IPv4/ARP. The host needs to have tunslip with TAP support running in order to communicate via the SLIP driver. -endchoice config NET_TRICKLE bool "Enable Trickle library" diff --git a/subsys/net/ip/l2/Kconfig b/subsys/net/ip/l2/Kconfig index d102314e58a..4814700808d 100644 --- a/subsys/net/ip/l2/Kconfig +++ b/subsys/net/ip/l2/Kconfig @@ -9,7 +9,7 @@ menu "Link layer options" config NET_L2_DUMMY bool "Enable dummy l2 layer" default n - default y if !NET_L2_ETHERNET && NET_SLIP_TUN + default y if !NET_L2_ETHERNET && NET_TEST help Add a dummy L2 layer driver, usually in case you need SLIP in TUN mode. diff --git a/tests/net/6lo/prj.conf b/tests/net/6lo/prj.conf index d7fdfebd6fa..bc8f464692c 100644 --- a/tests/net/6lo/prj.conf +++ b/tests/net/6lo/prj.conf @@ -1,4 +1,5 @@ CONFIG_NETWORKING=y +CONFIG_NET_TEST=y CONFIG_NET_L2_DUMMY=y CONFIG_NET_IPV6=y CONFIG_NET_IPV6_ND=n diff --git a/tests/net/all/prj.conf b/tests/net/all/prj.conf index 63a1ed83afb..34be202083b 100644 --- a/tests/net/all/prj.conf +++ b/tests/net/all/prj.conf @@ -106,8 +106,6 @@ CONFIG_NET_CONTEXT_SYNC_RECV=y CONFIG_NET_CONTEXT_CHECK=y # SLIP -CONFIG_NET_SLIP_TUN=n -CONFIG_NET_SLIP_TAP=y # Trickle algo CONFIG_NET_TRICKLE=y diff --git a/tests/net/arp/prj.conf b/tests/net/arp/prj.conf index a3fbdb03ed1..138a573016c 100644 --- a/tests/net/arp/prj.conf +++ b/tests/net/arp/prj.conf @@ -1,4 +1,5 @@ CONFIG_NETWORKING=y +CONFIG_NET_TEST=y CONFIG_NET_ARP=y CONFIG_NET_L2_ETHERNET=y CONFIG_NET_IPV4=y diff --git a/tests/net/buf/prj.conf b/tests/net/buf/prj.conf index 61c02799ecf..c9763a21835 100644 --- a/tests/net/buf/prj.conf +++ b/tests/net/buf/prj.conf @@ -1,4 +1,5 @@ CONFIG_NET_BUF=y +CONFIG_NET_TEST=y #CONFIG_NET_BUF_LOG=y #CONFIG_SYS_LOG_NET_BUF_LEVEL=4 CONFIG_ZTEST=y diff --git a/tests/net/context/prj.conf b/tests/net/context/prj.conf index 530decf9eef..7a61331aafa 100644 --- a/tests/net/context/prj.conf +++ b/tests/net/context/prj.conf @@ -1,4 +1,5 @@ CONFIG_NETWORKING=y +CONFIG_NET_TEST=y CONFIG_NET_IPV6=y CONFIG_NET_UDP=y CONFIG_NET_TCP=n diff --git a/tests/net/dhcpv4/prj.conf b/tests/net/dhcpv4/prj.conf index 8c5ccc6a5b3..b22918e9aa2 100644 --- a/tests/net/dhcpv4/prj.conf +++ b/tests/net/dhcpv4/prj.conf @@ -1,4 +1,5 @@ CONFIG_NETWORKING=y +CONFIG_NET_TEST=y CONFIG_NET_L2_DUMMY=y CONFIG_NET_UDP=y CONFIG_NET_DHCPV4=y diff --git a/tests/net/icmpv6/prj.conf b/tests/net/icmpv6/prj.conf index 72ce9efd090..cce73c7f2cf 100644 --- a/tests/net/icmpv6/prj.conf +++ b/tests/net/icmpv6/prj.conf @@ -1,4 +1,5 @@ CONFIG_NETWORKING=y +CONFIG_NET_TEST=y CONFIG_NET_IPV6=y CONFIG_NET_IPV4=y CONFIG_NET_BUF=y diff --git a/tests/net/ieee802154/fragment/prj.conf b/tests/net/ieee802154/fragment/prj.conf index 641d2596903..1c2e2f0cfd4 100644 --- a/tests/net/ieee802154/fragment/prj.conf +++ b/tests/net/ieee802154/fragment/prj.conf @@ -1,4 +1,5 @@ CONFIG_NETWORKING=y +CONFIG_NET_TEST=y CONFIG_NET_L2_DUMMY=y CONFIG_NET_IPV6=y CONFIG_NET_IPV6_ND=n diff --git a/tests/net/ieee802154/l2/prj.conf b/tests/net/ieee802154/l2/prj.conf index 1830d393216..415dd30822c 100644 --- a/tests/net/ieee802154/l2/prj.conf +++ b/tests/net/ieee802154/l2/prj.conf @@ -1,4 +1,5 @@ CONFIG_NETWORKING=y +CONFIG_NET_TEST=y CONFIG_NET_BUF=y CONFIG_NET_IPV6=y CONFIG_NET_L2_IEEE802154=y diff --git a/tests/net/iface/prj.conf b/tests/net/iface/prj.conf index d7599a9d379..06d4cfe9b4b 100644 --- a/tests/net/iface/prj.conf +++ b/tests/net/iface/prj.conf @@ -1,4 +1,5 @@ CONFIG_NETWORKING=y +CONFIG_NET_TEST=y CONFIG_NET_IPV6=y CONFIG_NET_UDP=y CONFIG_NET_TCP=n diff --git a/tests/net/ip-addr/prj.conf b/tests/net/ip-addr/prj.conf index a70a97cb839..428c0bc8e5a 100644 --- a/tests/net/ip-addr/prj.conf +++ b/tests/net/ip-addr/prj.conf @@ -1,4 +1,5 @@ CONFIG_NETWORKING=y +CONFIG_NET_TEST=y CONFIG_NET_IPV6=y CONFIG_NET_IPV6_DAD=n CONFIG_NET_IPV6_ND=n diff --git a/tests/net/ipv6/prj.conf b/tests/net/ipv6/prj.conf index f5e15544787..831f4afc07a 100644 --- a/tests/net/ipv6/prj.conf +++ b/tests/net/ipv6/prj.conf @@ -1,4 +1,5 @@ CONFIG_NETWORKING=y +CONFIG_NET_TEST=y CONFIG_NET_IPV6=y CONFIG_NET_UDP=y CONFIG_NET_TCP=n diff --git a/tests/net/ipv6_fragment/prj.conf b/tests/net/ipv6_fragment/prj.conf index 4d300858566..c84aeeb00cc 100644 --- a/tests/net/ipv6_fragment/prj.conf +++ b/tests/net/ipv6_fragment/prj.conf @@ -1,4 +1,5 @@ CONFIG_NETWORKING=y +CONFIG_NET_TEST=y CONFIG_NET_IPV6=y CONFIG_NET_UDP=y CONFIG_NET_TCP=n diff --git a/tests/net/lib/dns_packet/prj.conf b/tests/net/lib/dns_packet/prj.conf index 31223298ed4..88546884578 100644 --- a/tests/net/lib/dns_packet/prj.conf +++ b/tests/net/lib/dns_packet/prj.conf @@ -1,5 +1,6 @@ # required for htons CONFIG_NETWORKING=y +CONFIG_NET_TEST=y # native IP stack support CONFIG_RANDOM_GENERATOR=y diff --git a/tests/net/lib/dns_resolve/prj.conf b/tests/net/lib/dns_resolve/prj.conf index 515b9fac9f1..1f086762232 100644 --- a/tests/net/lib/dns_resolve/prj.conf +++ b/tests/net/lib/dns_resolve/prj.conf @@ -1,5 +1,5 @@ CONFIG_NETWORKING=y - +CONFIG_NET_TEST=y CONFIG_RANDOM_GENERATOR=y CONFIG_TEST_RANDOM_GENERATOR=y diff --git a/tests/net/lib/http_header_fields/prj.conf b/tests/net/lib/http_header_fields/prj.conf index a5305200ccb..590d102dfaa 100644 --- a/tests/net/lib/http_header_fields/prj.conf +++ b/tests/net/lib/http_header_fields/prj.conf @@ -1,4 +1,5 @@ CONFIG_NETWORKING=y +CONFIG_NET_TEST=y CONFIG_RANDOM_GENERATOR=y CONFIG_TEST_RANDOM_GENERATOR=y diff --git a/tests/net/lib/mqtt_packet/prj.conf b/tests/net/lib/mqtt_packet/prj.conf index d89b7cd7839..95b8e355ab1 100644 --- a/tests/net/lib/mqtt_packet/prj.conf +++ b/tests/net/lib/mqtt_packet/prj.conf @@ -1,5 +1,6 @@ # required for htons CONFIG_NETWORKING=y +CONFIG_NET_TEST=y # native IP stack support CONFIG_RANDOM_GENERATOR=y diff --git a/tests/net/lib/zoap/prj.conf b/tests/net/lib/zoap/prj.conf index 65c916f76a2..37f70469b3f 100644 --- a/tests/net/lib/zoap/prj.conf +++ b/tests/net/lib/zoap/prj.conf @@ -1,4 +1,5 @@ CONFIG_NET_BUF_LOG=y +CONFIG_NET_TEST=y CONFIG_SYS_LOG_NET_BUF_LEVEL=2 CONFIG_NETWORKING=y CONFIG_NETWORKING_WITH_IPV6=y diff --git a/tests/net/mgmt/prj.conf b/tests/net/mgmt/prj.conf index 5d64df7b5a9..ee8c451f0a4 100644 --- a/tests/net/mgmt/prj.conf +++ b/tests/net/mgmt/prj.conf @@ -1,4 +1,5 @@ CONFIG_NETWORKING=y +CONFIG_NET_TEST=y CONFIG_NET_BUF=y CONFIG_MAIN_STACK_SIZE=2048 CONFIG_NET_PKT_RX_COUNT=5 diff --git a/tests/net/mld/prj.conf b/tests/net/mld/prj.conf index 3c15cadbc47..cf279de4d6f 100644 --- a/tests/net/mld/prj.conf +++ b/tests/net/mld/prj.conf @@ -1,4 +1,5 @@ CONFIG_ZTEST=y +CONFIG_NET_TEST=y CONFIG_NETWORKING=y CONFIG_NET_IPV6=y CONFIG_NET_UDP=y diff --git a/tests/net/neighbor/prj.conf b/tests/net/neighbor/prj.conf index 397d9196ded..dc1950301bc 100644 --- a/tests/net/neighbor/prj.conf +++ b/tests/net/neighbor/prj.conf @@ -1,4 +1,5 @@ CONFIG_NETWORKING=y +CONFIG_NET_TEST=y CONFIG_NET_IPV6=y CONFIG_NET_BUF=y CONFIG_MAIN_STACK_SIZE=2048 diff --git a/tests/net/net_pkt/prj.conf b/tests/net/net_pkt/prj.conf index 18e64195f1b..594eb5cb348 100644 --- a/tests/net/net_pkt/prj.conf +++ b/tests/net/net_pkt/prj.conf @@ -1,4 +1,5 @@ CONFIG_NETWORKING=y +CONFIG_NET_TEST=y CONFIG_NET_IPV6=y CONFIG_NET_BUF=y CONFIG_NET_BUF_LOG=y diff --git a/tests/net/route/prj.conf b/tests/net/route/prj.conf index 6027807a7e7..f5580b56c49 100644 --- a/tests/net/route/prj.conf +++ b/tests/net/route/prj.conf @@ -1,4 +1,5 @@ CONFIG_NETWORKING=y +CONFIG_NET_TEST=y CONFIG_NET_IPV6=y CONFIG_NET_UDP=y CONFIG_NET_TCP=n diff --git a/tests/net/rpl/prj.conf b/tests/net/rpl/prj.conf index c6bfa7cc7d0..28dd3e7433d 100644 --- a/tests/net/rpl/prj.conf +++ b/tests/net/rpl/prj.conf @@ -1,4 +1,5 @@ CONFIG_NETWORKING=y +CONFIG_NET_TEST=y CONFIG_NET_IPV6=y CONFIG_NET_UDP=y CONFIG_NET_TCP=n diff --git a/tests/net/socket/udp/prj.conf b/tests/net/socket/udp/prj.conf index 68fc8397c2f..9700d77acdc 100644 --- a/tests/net/socket/udp/prj.conf +++ b/tests/net/socket/udp/prj.conf @@ -10,7 +10,6 @@ CONFIG_NET_SOCKETS=y CONFIG_NET_SOCKETS_POSIX_NAMES=y # Network driver config -CONFIG_NET_SLIP_TAP=y CONFIG_TEST_RANDOM_GENERATOR=y # Network address config diff --git a/tests/net/tcp/prj.conf b/tests/net/tcp/prj.conf index 7ba82b86928..278be2b0b2f 100644 --- a/tests/net/tcp/prj.conf +++ b/tests/net/tcp/prj.conf @@ -1,4 +1,5 @@ CONFIG_NETWORKING=y +CONFIG_NET_TEST=y CONFIG_NET_L2_DUMMY=y CONFIG_NET_TCP=y CONFIG_NET_MAX_CONN=64 diff --git a/tests/net/trickle/prj.conf b/tests/net/trickle/prj.conf index c43b5b4eaed..85057295024 100644 --- a/tests/net/trickle/prj.conf +++ b/tests/net/trickle/prj.conf @@ -1,4 +1,5 @@ CONFIG_NETWORKING=y +CONFIG_NET_TEST=y CONFIG_NET_IPV6=y CONFIG_NET_UDP=y CONFIG_NET_TCP=n diff --git a/tests/net/udp/prj.conf b/tests/net/udp/prj.conf index 5c5d264be78..788e0394c8f 100644 --- a/tests/net/udp/prj.conf +++ b/tests/net/udp/prj.conf @@ -1,4 +1,5 @@ CONFIG_NETWORKING=y +CONFIG_NET_TEST=y CONFIG_NET_L2_DUMMY=y CONFIG_NET_UDP=y CONFIG_NET_TCP=n diff --git a/tests/net/utils/prj.conf b/tests/net/utils/prj.conf index b9a02ccd401..8a97cc3352b 100644 --- a/tests/net/utils/prj.conf +++ b/tests/net/utils/prj.conf @@ -1,4 +1,5 @@ CONFIG_NETWORKING=y +CONFIG_NET_TEST=y CONFIG_NET_IPV6=y CONFIG_NET_IPV4=y CONFIG_NET_BUF=y