net: apps: Move net samples to one directory instead of per kernel

Consolidate networking tests into 1 directory where possible and put
files under samples/net where possible.

Change-Id: Ieb65e000e1717f4d53058f87e36840a0786d467b
Signed-off-by: Jukka Rissanen <jukka.rissanen@linux.intel.com>
Signed-off-by: Anas Nashif <anas.nashif@intel.com>
This commit is contained in:
Anas Nashif 2016-02-07 21:45:05 -05:00
commit 3bf7ee01ea
50 changed files with 63 additions and 448 deletions

View file

@ -1,27 +0,0 @@
# Makefile - coap observe client test application
#
# Copyright (c) 2015 Intel Corporation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
MDEF_FILE = prj.mdef
KERNEL_TYPE = micro
BOARD ?= basic_minuteia
CONF_FILE = prj_$(ARCH).conf
SOURCE_DIR = $(ZEPHYR_BASE)/samples/net/coap_observe_client/src/
QEMU_EXTRA_FLAGS = -serial none -serial unix:/tmp/slip.sock
include $(ZEPHYR_BASE)/Makefile.inc

View file

@ -1,5 +0,0 @@
% Application : Network listener
% TASK NAME PRIO ENTRY STACK GROUPS
% ===================================================
TASK MAIN 7 startup 2048 [EXE]

View file

@ -1,11 +0,0 @@
CONFIG_TEST_RANDOM_GENERATOR=y
CONFIG_NETWORKING=y
CONFIG_NETWORKING_WITH_LOGGING=y
CONFIG_NETWORKING_UART=y
CONFIG_IP_BUF_RX_SIZE=3
CONFIG_IP_BUF_TX_SIZE=5
CONFIG_NANO_TIMEOUTS=y
CONFIG_NANO_TIMERS=y
CONFIG_ER_COAP=y
CONFIG_ER_COAP_CLIENT=y
CONFIG_ER_COAP_DEBUG=y

View file

@ -1,11 +0,0 @@
CONFIG_TEST_RANDOM_GENERATOR=y
CONFIG_NETWORKING=y
CONFIG_NETWORKING_WITH_LOGGING=y
CONFIG_NETWORKING_UART=y
CONFIG_IP_BUF_RX_SIZE=3
CONFIG_IP_BUF_TX_SIZE=5
CONFIG_NANO_TIMEOUTS=y
CONFIG_NANO_TIMERS=y
CONFIG_ER_COAP=y
CONFIG_ER_COAP_CLIENT=y
CONFIG_ER_COAP_DEBUG=y

View file

@ -1,27 +0,0 @@
# Makefile - coap server that is used in testing
#
# Copyright (c) 2015 Intel Corporation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
MDEF_FILE = prj.mdef
KERNEL_TYPE = micro
BOARD ?= basic_minuteia
CONF_FILE = prj_$(ARCH).conf
SOURCE_DIR = $(ZEPHYR_BASE)/samples/net/coap_server/src/
QEMU_EXTRA_FLAGS = -serial none -serial unix:/tmp/slip.sock
include $(ZEPHYR_BASE)/Makefile.inc

View file

@ -1,10 +0,0 @@
CONFIG_TEST_RANDOM_GENERATOR=y
CONFIG_NETWORKING=y
CONFIG_NETWORKING_WITH_LOGGING=y
CONFIG_NETWORKING_UART=y
CONFIG_IP_BUF_RX_SIZE=3
CONFIG_IP_BUF_TX_SIZE=4
CONFIG_NANO_TIMEOUTS=y
CONFIG_ER_COAP=y
CONFIG_ER_COAP_WITH_DTLS=y
CONFIG_ER_COAP_DEBUG=y

View file

@ -1,10 +0,0 @@
CONFIG_TEST_RANDOM_GENERATOR=y
CONFIG_NETWORKING=y
CONFIG_NETWORKING_WITH_LOGGING=y
CONFIG_NETWORKING_UART=y
CONFIG_IP_BUF_RX_SIZE=3
CONFIG_IP_BUF_TX_SIZE=4
CONFIG_NANO_TIMEOUTS=y
CONFIG_ER_COAP=y
CONFIG_ER_COAP_WITH_DTLS=y
CONFIG_ER_COAP_DEBUG=y

View file

@ -1,27 +0,0 @@
# Makefile - dtls client that is used in testing
#
# Copyright (c) 2015 Intel Corporation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
MDEF_FILE = prj.mdef
KERNEL_TYPE = micro
BOARD ?= basic_minuteia
CONF_FILE = prj_$(ARCH).conf
SOURCE_DIR = $(ZEPHYR_BASE)/samples/net/dtls_client/src/
QEMU_EXTRA_FLAGS = -serial none -serial unix:/tmp/slip.sock
include $(ZEPHYR_BASE)/Makefile.inc

View file

@ -1,11 +0,0 @@
CONFIG_TEST_RANDOM_GENERATOR=y
CONFIG_NETWORKING=y
CONFIG_NETWORKING_WITH_LOGGING=y
CONFIG_NETWORKING_WITH_LOOPBACK=y
CONFIG_NETWORKING_UART=y
CONFIG_NETWORKING_DEBUG_UART=y
CONFIG_IP_BUF_TX_SIZE=4
CONFIG_IP_BUF_RX_SIZE=3
CONFIG_NANO_TIMEOUTS=y
CONFIG_TINYDTLS=y
CONFIG_TINYDTLS_DEBUG=y

View file

@ -1,10 +0,0 @@
CONFIG_TEST_RANDOM_GENERATOR=y
CONFIG_NETWORKING=y
CONFIG_NETWORKING_WITH_LOGGING=y
CONFIG_NETWORKING_WITH_LOOPBACK=y
CONFIG_NETWORKING_UART=y
CONFIG_NETWORKING_DEBUG_UART=y
CONFIG_IP_BUF_TX_SIZE=4
CONFIG_IP_BUF_RX_SIZE=3
CONFIG_NANO_TIMEOUTS=y
CONFIG_TINYDTLS=y

View file

@ -1,27 +0,0 @@
# Makefile - dtls server that is used in testing
#
# Copyright (c) 2015 Intel Corporation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
MDEF_FILE = prj.mdef
KERNEL_TYPE = micro
BOARD ?= basic_minuteia
CONF_FILE = prj_$(ARCH).conf
SOURCE_DIR = $(ZEPHYR_BASE)/samples/net/dtls_server/src/
QEMU_EXTRA_FLAGS = -serial none -serial unix:/tmp/slip.sock
include $(ZEPHYR_BASE)/Makefile.inc

View file

@ -1,5 +0,0 @@
% Application : DTSL server
% TASK NAME PRIO ENTRY STACK GROUPS
% ==================================
TASK TASKA 7 startup 3000 [EXE]

View file

@ -1,10 +0,0 @@
CONFIG_NETWORKING=y
CONFIG_NETWORKING_WITH_LOGGING=y
CONFIG_NETWORKING_WITH_LOOPBACK=y
CONFIG_NETWORKING_UART=y
CONFIG_NETWORKING_DEBUG_UART=y
CONFIG_IP_BUF_RX_SIZE=3
CONFIG_IP_BUF_TX_SIZE=2
CONFIG_NANO_TIMEOUTS=y
CONFIG_TINYDTLS=y
CONFIG_TINYDTLS_DEBUG=y

View file

@ -1,9 +0,0 @@
CONFIG_NETWORKING=y
CONFIG_NETWORKING_WITH_LOGGING=y
CONFIG_NETWORKING_WITH_LOOPBACK=y
CONFIG_NETWORKING_UART=y
CONFIG_NETWORKING_DEBUG_UART=y
CONFIG_IP_BUF_RX_SIZE=3
CONFIG_IP_BUF_TX_SIZE=2
CONFIG_NANO_TIMEOUTS=y
CONFIG_TINYDTLS=y

View file

@ -1,27 +0,0 @@
# Makefile - echo client test application
#
# Copyright (c) 2015 Intel Corporation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
NET_IFACE ?= slip
MDEF_FILE = prj.mdef
KERNEL_TYPE = micro
BOARD ?= qemu_x86
CONF_FILE = prj_$(NET_IFACE).conf
SOURCE_DIR = $(ZEPHYR_BASE)/samples/net/echo_client/src/
include $(ZEPHYR_BASE)/Makefile.inc
include $(ZEPHYR_BASE)/samples/net/echo_server/Makefile.ipstack

View file

@ -1,10 +0,0 @@
CONFIG_TEST_RANDOM_GENERATOR=y
CONFIG_NETWORKING=y
CONFIG_NETWORKING_WITH_LOGGING=y
CONFIG_IP_BUF_RX_SIZE=2
CONFIG_IP_BUF_TX_SIZE=3
CONFIG_NETWORKING_WITH_15_4=y
CONFIG_NETWORKING_WITH_15_4_TI_CC2520=y
CONFIG_TI_CC2520_DEBUG=y
CONFIG_NETWORKING_WITH_6LOWPAN=y
CONFIG_6LOWPAN_COMPRESSION_IPHC=y

View file

@ -1,8 +0,0 @@
CONFIG_TEST_RANDOM_GENERATOR=y
CONFIG_NETWORKING=y
CONFIG_NETWORKING_WITH_LOGGING=y
CONFIG_NETWORKING_WITH_LOOPBACK=y
CONFIG_NETWORKING_UART=y
CONFIG_NETWORKING_DEBUG_UART=y
CONFIG_IP_BUF_RX_SIZE=2
CONFIG_IP_BUF_TX_SIZE=3

View file

@ -1,8 +0,0 @@
CONFIG_TEST_RANDOM_GENERATOR=y
CONFIG_NETWORKING=y
CONFIG_NETWORKING_WITH_LOGGING=y
CONFIG_NETWORKING_WITH_LOOPBACK=y
CONFIG_NETWORKING_UART=y
CONFIG_NETWORKING_DEBUG_UART=y
CONFIG_IP_BUF_RX_SIZE=2
CONFIG_IP_BUF_TX_SIZE=3

View file

@ -1,27 +0,0 @@
# Makefile - Network echo server microkernel
#
# Copyright (c) 2015 Intel Corporation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
NET_IFACE ?= slip
MDEF_FILE = prj.mdef
KERNEL_TYPE = micro
BOARD ?= qemu_x86
CONF_FILE = prj_$(NET_IFACE).conf
SOURCE_DIR = $(ZEPHYR_BASE)/samples/net/echo_server/src/
include $(ZEPHYR_BASE)/Makefile.inc
include $(ZEPHYR_BASE)/samples/net/echo_server/Makefile.ipstack

View file

@ -1,11 +0,0 @@
CONFIG_INIT_STACKS=y
CONFIG_NETWORKING=y
CONFIG_NETWORKING_WITH_LOGGING=y
CONFIG_IP_BUF_RX_SIZE=3
CONFIG_IP_BUF_TX_SIZE=2
CONFIG_NANO_TIMEOUTS=y
CONFIG_NETWORKING_WITH_15_4=y
CONFIG_NETWORKING_WITH_15_4_TI_CC2520=y
CONFIG_TI_CC2520_DEBUG=y
CONFIG_NETWORKING_WITH_6LOWPAN=y
CONFIG_6LOWPAN_COMPRESSION_IPHC=y

View file

@ -1,8 +0,0 @@
CONFIG_NETWORKING=y
CONFIG_NETWORKING_WITH_LOGGING=y
CONFIG_NETWORKING_WITH_LOOPBACK=y
CONFIG_NETWORKING_UART=y
CONFIG_NETWORKING_DEBUG_UART=y
CONFIG_IP_BUF_RX_SIZE=3
CONFIG_IP_BUF_TX_SIZE=2
CONFIG_NANO_TIMEOUTS=y

View file

@ -1,26 +0,0 @@
# Makefile - IP 802.15.4 test Makefile for microkernel
#
# Copyright (c) 2011-2014, Wind River Systems, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
MDEF_FILE = prj.mdef
KERNEL_TYPE = micro
BOARD ?= qemu_x86
CONF_FILE = prj_$(ARCH).conf
SOURCE_DIR = $(ZEPHYR_BASE)/samples/net/test_15_4/src/
include $(ZEPHYR_BASE)/Makefile.inc
include $(ZEPHYR_BASE)/samples/net/test_15_4/Makefile.15_4

View file

@ -1,11 +0,0 @@
% Application : Network demo
% TASK NAME PRIO ENTRY STACK GROUPS
% ==================================
TASK TASKA 7 taskA 2048 [EXE]
TASK TASKB 7 taskB 2048 [EXE]
% SEMA NAME
% =============
SEMA TASKASEM
SEMA TASKBSEM

View file

@ -1,6 +0,0 @@
CONFIG_NETWORKING=y
CONFIG_NETWORKING_WITH_LOGGING=y
CONFIG_NETWORKING_WITH_6LOWPAN=y
CONFIG_NETWORKING_WITH_15_4=y
CONFIG_IP_BUF_RX_SIZE=5
CONFIG_IP_BUF_TX_SIZE=3

View file

@ -1,7 +0,0 @@
CONFIG_NETWORKING=y
CONFIG_NETWORKING_WITH_LOGGING=y
CONFIG_NETWORKING_WITH_6LOWPAN=y
CONFIG_NETWORKING_WITH_15_4=y
CONFIG_NET_15_4_LOOPBACK_NUM=1
CONFIG_IP_BUF_RX_SIZE=5
CONFIG_IP_BUF_TX_SIZE=3

View file

@ -1,26 +0,0 @@
# Makefile - Network echo server microkernel
#
# Copyright (c) 2015 Intel Corporation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
MDEF_FILE = prj.mdef
KERNEL_TYPE = nano
BOARD ?= qemu_x86
CONF_FILE = prj_$(ARCH).conf
SOURCE_DIR = $(ZEPHYR_BASE)/samples/net/echo_server/src/
QEMU_EXTRA_FLAGS = -serial unix:/tmp/slip.sock
include $(ZEPHYR_BASE)/Makefile.inc

View file

@ -1,11 +0,0 @@
% Application : Network listener
% TASK NAME PRIO ENTRY STACK GROUPS
% ==================================
TASK TASKA 7 taskA 2048 [EXE]
TASK TASKB 7 taskB 2048 [EXE]
% SEMA NAME
% =============
SEMA TASKASEM
SEMA TASKBSEM

View file

@ -1,5 +0,0 @@
CONFIG_NETWORKING=y
CONFIG_NETWORKING_WITH_LOGGING=y
CONFIG_NETWORKING_WITH_LOOPBACK=y
CONFIG_NETWORKING_UART=y
CONFIG_NETWORKING_DEBUG_UART=y

View file

@ -1,6 +0,0 @@
CONFIG_INIT_STACKS=y
CONFIG_NETWORKING=y
CONFIG_NETWORKING_WITH_LOGGING=y
CONFIG_NETWORKING_WITH_LOOPBACK=y
CONFIG_NETWORKING_UART=y
CONFIG_NETWORKING_DEBUG_UART=y

View file

@ -1,25 +0,0 @@
# Makefile - Simple loopback network app Makefile for nanokernel
#
# Copyright (c) 2015 Intel Corporation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
MDEF_FILE = prj.mdef
KERNEL_TYPE = nano
BOARD ?= qemu_x86
CONF_FILE = prj_$(ARCH).conf
SOURCE_DIR = $(ZEPHYR_BASE)/samples/net/loopback_test/src/
include $(ZEPHYR_BASE)/Makefile.inc

View file

@ -1,5 +0,0 @@
% Application : Bluetooth Shell
% TASK NAME PRIO ENTRY STACK GROUPS
% ===================================================
TASK MAIN 7 mainloop 2048 [EXE]

View file

@ -1,3 +0,0 @@
CONFIG_NETWORKING=y
CONFIG_NETWORKING_WITH_LOGGING=y
CONFIG_NETWORKING_WITH_LOOPBACK=y

View file

@ -1,3 +0,0 @@
CONFIG_NETWORKING=y
CONFIG_NETWORKING_WITH_LOGGING=y
CONFIG_NETWORKING_WITH_LOOPBACK=y

View file

@ -17,7 +17,7 @@
#
MDEF_FILE = prj.mdef
KERNEL_TYPE = nano
KERNEL_TYPE ?= nano
BOARD ?= qemu_x86
CONF_FILE = prj_$(ARCH).conf

View file

@ -1,5 +1,12 @@
[test]
[test-nano]
tags = net
build_only = true
arch_whitelist = x86
platform_whitelist = minnowboard
platform_whitelist = qemu_x86
[test-micro]
tags = net
build_only = true
extra_args = KERNEL_TYPE=micro
arch_whitelist = x86
platform_whitelist = qemu_x86

View file

@ -17,7 +17,7 @@
#
MDEF_FILE = prj.mdef
KERNEL_TYPE = nano
KERNEL_TYPE ?= nano
BOARD ?= qemu_x86
CONF_FILE = prj_$(ARCH).conf

View file

@ -1,5 +1,14 @@
[test]
[test-nano]
tags = net
build_only = true
arch_whitelist = x86
platform_whitelist = minnowboard
platform_whitelist = qemu_x86
kernel = nano
[test-micro]
tags = net
build_only = true
extra_args = KERNEL_TYPE=micro
kernel = micro
arch_whitelist = x86
platform_whitelist = qemu_x86

View file

@ -16,7 +16,8 @@
# limitations under the License.
#
KERNEL_TYPE = nano
MDEF_FILE = prj.mdef
KERNEL_TYPE ?= nano
BOARD ?= qemu_x86
CONF_FILE = prj_$(ARCH).conf

View file

@ -1,5 +1,14 @@
[test]
[test-nano]
tags = net
build_only = true
arch_whitelist = x86
platform_whitelist = minnowboard
platform_whitelist = qemu_x86
kernel = nano
[test-micro]
tags = net
kernel = micro
build_only = true
extra_args = KERNEL_TYPE=micro
arch_whitelist = x86
platform_whitelist = qemu_x86

View file

@ -16,7 +16,8 @@
# limitations under the License.
#
KERNEL_TYPE = nano
MDEF_FILE = prj.mdef
KERNEL_TYPE ?= nano
BOARD ?= qemu_x86
CONF_FILE = prj_$(ARCH).conf

View file

@ -1,5 +1,14 @@
[test]
[test-nano]
tags = net
build_only = true
arch_whitelist = x86
platform_whitelist = minnowboard
platform_whitelist = qemu_x86
kernel = nano
[test-micro]
tags = net
build_only = true
extra_args = KERNEL_TYPE=micro
kernel = micro
arch_whitelist = x86
platform_whitelist = qemu_x86

View file

@ -17,7 +17,8 @@
#
NET_IFACE ?= slip
KERNEL_TYPE = nano
MDEF_FILE = prj.mdef
KERNEL_TYPE ?= nano
BOARD ?= qemu_x86
CONF_FILE = prj_$(NET_IFACE).conf

View file

@ -17,7 +17,8 @@
#
NET_IFACE ?= slip
KERNEL_TYPE = nano
MDEF_FILE = prj.mdef
KERNEL_TYPE ?= nano
BOARD ?= qemu_x86
CONF_FILE = prj_$(NET_IFACE).conf

View file

@ -17,7 +17,7 @@
#
MDEF_FILE = prj.mdef
KERNEL_TYPE = nano
KERNEL_TYPE ?= nano
BOARD ?= qemu_x86
CONF_FILE = prj_$(ARCH).conf
CFLAGS += -DNET_802154_TX_STACK_SIZE=5120

View file

@ -1 +1,11 @@
% Application : Network demo
% TASK NAME PRIO ENTRY STACK GROUPS
% ==================================
TASK TASKA 7 taskA 2048 [EXE]
TASK TASKB 7 taskB 2048 [EXE]
% SEMA NAME
% =============
SEMA TASKASEM
SEMA TASKBSEM