michaelh/zephyr
1
0
Fork 0
Code Releases Activity

tests: net: Unified kernel is now default and only one

Browse source 
Adapting all unit tests so:

- main task's prj.mdef is already provided by unified kernel with a
default stack of 2kb.
- unified is the only kernel to be used now, removing unecessary kernel
type make option.
- removing all NANOKERNEL/MICROKERNEL related #ifdefs and so on.

Change-Id: I9b853dbd2aef971d355188cbf7fe2ececaaa80c1
Signed-off-by: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
This commit is contained in:
Tomasz Bursztyka 2016-11-07 13:14:16 +01:00 • committed by Jukka Rissanen
commit 64e7dc2caa
40 changed files with 2 additions and 145 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/net/6lo/Makefile
View file

@ -1,6 +1,4 @@
BOARD ?= qemu_x86 BOARD ?= qemu_x86
MDEF_FILE = prj.mdef
KERNEL_TYPE ?= nano
CONF_FILE = prj.conf CONF_FILE = prj.conf
include $(ZEPHYR_BASE)/Makefile.inc include $(ZEPHYR_BASE)/Makefile.inc

5
tests/net/6lo/prj.mdef
View file

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

2
tests/net/arp/Makefile
View file

@ -1,6 +1,4 @@
BOARD ?= qemu_x86 BOARD ?= qemu_x86
MDEF_FILE = prj.mdef
KERNEL_TYPE ?= nano
CONF_FILE = prj.conf CONF_FILE = prj.conf
include $(ZEPHYR_BASE)/Makefile.inc include $(ZEPHYR_BASE)/Makefile.inc

5
tests/net/arp/prj.mdef
View file

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

2
tests/net/context/Makefile
View file

@ -1,6 +1,4 @@
BOARD ?= qemu_x86 BOARD ?= qemu_x86
MDEF_FILE = prj.mdef
KERNEL_TYPE ?= nano
CONF_FILE = prj.conf CONF_FILE = prj.conf
include $(ZEPHYR_BASE)/Makefile.inc include $(ZEPHYR_BASE)/Makefile.inc

5
tests/net/context/prj.mdef
View file

@ -1,5 +0,0 @@
% Application : Buffer test
% TASK NAME PRIO ENTRY STACK GROUPS
% ===================================================
TASK MAIN 7 main 2048 [EXE]

2
tests/net/dhcpv4/Makefile
View file

@ -1,6 +1,4 @@
BOARD ?= qemu_x86 BOARD ?= qemu_x86
MDEF_FILE = prj.mdef
KERNEL_TYPE ?= nano
CONF_FILE = prj.conf CONF_FILE = prj.conf
include $(ZEPHYR_BASE)/Makefile.inc include $(ZEPHYR_BASE)/Makefile.inc

5
tests/net/dhcpv4/prj.mdef
View file

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

7
tests/net/dhcpv4/src/main.c
View file

@ -554,18 +554,11 @@ void main_fiber(void)
fiber_yield(); fiber_yield();
} }
#if defined(CONFIG_NANOKERNEL)
#define STACKSIZE 3000 #define STACKSIZE 3000
char __noinit __stack fiberStack[STACKSIZE]; char __noinit __stack fiberStack[STACKSIZE];
#endif
void main(void) void main(void)
{ {
#if defined(CONFIG_MICROKERNEL)
main_fiber();
#else
task_fiber_start(&fiberStack[0], STACKSIZE, task_fiber_start(&fiberStack[0], STACKSIZE,
(nano_fiber_entry_t)main_fiber, 0, 0, 7, 0); (nano_fiber_entry_t)main_fiber, 0, 0, 7, 0);
#endif
net_mgmt_del_event_callback(&rx_cb);
} }

9
tests/net/dhcpv4/testcase.ini
View file

@ -1,10 +1,3 @@
[test_micro] [test]
tags = net-dhcvp4 tags = net-dhcvp4
arch_whitelist = x86 arch_whitelist = x86
kernel = micro
[test_nano]
tags = net-dhcpv4
arch_whitelist = x86
kernel = nano
platform_exclude = quark_d2000_crb # not enough RAM

2
tests/net/icmpv6/Makefile
View file

@ -1,6 +1,4 @@
BOARD ?= qemu_x86 BOARD ?= qemu_x86
MDEF_FILE = prj.mdef
KERNEL_TYPE ?= nano
CONF_FILE = prj.conf CONF_FILE = prj.conf
include $(ZEPHYR_BASE)/Makefile.inc include $(ZEPHYR_BASE)/Makefile.inc

5
tests/net/icmpv6/prj.mdef
View file

@ -1,5 +0,0 @@
% Application : ICMPv6 test
% TASK NAME PRIO ENTRY STACK GROUPS
% ===================================================
TASK MAIN 7 main 2048 [EXE]

2
tests/net/ieee802154/fragment/Makefile
View file

@ -1,6 +1,4 @@
BOARD ?= qemu_x86 BOARD ?= qemu_x86
MDEF_FILE = prj.mdef
KERNEL_TYPE ?= nano
CONF_FILE = prj.conf CONF_FILE = prj.conf
include $(ZEPHYR_BASE)/Makefile.inc include $(ZEPHYR_BASE)/Makefile.inc

5
tests/net/ieee802154/fragment/prj.mdef
View file

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

2
tests/net/ieee802154/l2/Makefile
View file

@ -1,6 +1,4 @@
BOARD ?= qemu_x86 BOARD ?= qemu_x86
MDEF_FILE = prj.mdef
KERNEL_TYPE ?= nano
CONF_FILE = prj.conf CONF_FILE = prj.conf
include $(ZEPHYR_BASE)/Makefile.inc include $(ZEPHYR_BASE)/Makefile.inc

5
tests/net/ieee802154/l2/prj.mdef
View file

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

2
tests/net/ip-addr/Makefile
View file

@ -1,6 +1,4 @@
BOARD ?= qemu_x86 BOARD ?= qemu_x86
MDEF_FILE = prj.mdef
KERNEL_TYPE ?= nano
CONF_FILE = prj.conf CONF_FILE = prj.conf
include $(ZEPHYR_BASE)/Makefile.inc include $(ZEPHYR_BASE)/Makefile.inc

5
tests/net/ip-addr/prj.mdef
View file

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

2
tests/net/ipv6/Makefile
View file

@ -1,6 +1,4 @@
BOARD ?= qemu_x86 BOARD ?= qemu_x86
MDEF_FILE = prj.mdef
KERNEL_TYPE ?= nano
CONF_FILE = prj.conf CONF_FILE = prj.conf
include $(ZEPHYR_BASE)/Makefile.inc include $(ZEPHYR_BASE)/Makefile.inc

5
tests/net/ipv6/prj.mdef
View file

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

1
tests/net/mgmt/Makefile
View file

@ -1,5 +1,4 @@
BOARD ?= qemu_x86 BOARD ?= qemu_x86
KERNEL_TYPE ?= nano
CONF_FILE = prj.conf CONF_FILE = prj.conf
include $(ZEPHYR_BASE)/Makefile.inc include $(ZEPHYR_BASE)/Makefile.inc

2
tests/net/nbuf/Makefile
View file

@ -1,6 +1,4 @@
BOARD ?= qemu_x86 BOARD ?= qemu_x86
MDEF_FILE = prj.mdef
KERNEL_TYPE ?= nano
CONF_FILE ?= prj.conf CONF_FILE ?= prj.conf
include $(ZEPHYR_BASE)/Makefile.inc include $(ZEPHYR_BASE)/Makefile.inc

5
tests/net/nbuf/prj.mdef
View file

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

5
tests/net/nbuf/src/main.c
View file

@ -1171,11 +1171,8 @@ static int test_nbuf_read_write_insert(void)
return 0; return 0;
} }
#ifdef CONFIG_MICROKERNEL
void mainloop(void)
#else
void main(void) void main(void)
#endif
{ {
if (test_ipv6_multi_frags() < 0) { if (test_ipv6_multi_frags() < 0) {
goto fail; goto fail;

2
tests/net/neighbor/Makefile
View file

@ -1,6 +1,4 @@
BOARD ?= qemu_x86 BOARD ?= qemu_x86
MDEF_FILE = prj.mdef
KERNEL_TYPE ?= nano
CONF_FILE = prj.conf CONF_FILE = prj.conf
include $(ZEPHYR_BASE)/Makefile.inc include $(ZEPHYR_BASE)/Makefile.inc

5
tests/net/neighbor/prj.mdef
View file

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

2
tests/net/route/Makefile
View file

@ -1,6 +1,4 @@
BOARD ?= qemu_x86 BOARD ?= qemu_x86
MDEF_FILE = prj.mdef
KERNEL_TYPE ?= nano
CONF_FILE = prj.conf CONF_FILE = prj.conf
include $(ZEPHYR_BASE)/Makefile.inc include $(ZEPHYR_BASE)/Makefile.inc

5
tests/net/route/prj.mdef
View file

@ -1,5 +0,0 @@
% Application : Buffer test
% TASK NAME PRIO ENTRY STACK GROUPS
% ===================================================
TASK MAIN 7 main 2048 [EXE]

2
tests/net/rpl/Makefile
View file

@ -1,6 +1,4 @@
BOARD ?= qemu_x86 BOARD ?= qemu_x86
MDEF_FILE = prj.mdef
KERNEL_TYPE ?= nano
CONF_FILE = prj.conf CONF_FILE = prj.conf
include $(ZEPHYR_BASE)/Makefile.inc include $(ZEPHYR_BASE)/Makefile.inc

5
tests/net/rpl/prj.mdef
View file

@ -1,5 +0,0 @@
% Application : Buffer test
% TASK NAME PRIO ENTRY STACK GROUPS
% ===================================================
TASK MAIN 7 main 2048 [EXE]

2
tests/net/tcp/Makefile
View file

@ -1,6 +1,4 @@
BOARD ?= qemu_x86 BOARD ?= qemu_x86
MDEF_FILE = prj.mdef
KERNEL_TYPE ?= nano
CONF_FILE = prj.conf CONF_FILE = prj.conf
include $(ZEPHYR_BASE)/Makefile.inc include $(ZEPHYR_BASE)/Makefile.inc

5
tests/net/tcp/prj.mdef
View file

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

2
tests/net/trickle/Makefile
View file

@ -1,6 +1,4 @@
BOARD ?= qemu_x86 BOARD ?= qemu_x86
MDEF_FILE = prj.mdef
KERNEL_TYPE ?= nano
CONF_FILE = prj.conf CONF_FILE = prj.conf
include $(ZEPHYR_BASE)/Makefile.inc include $(ZEPHYR_BASE)/Makefile.inc

5
tests/net/trickle/prj.mdef
View file

@ -1,5 +0,0 @@
% Application : Unit test
% TASK NAME PRIO ENTRY STACK GROUPS
% ===================================================
TASK MAIN 7 main 2048 [EXE]

2
tests/net/udp/Makefile
View file

@ -1,6 +1,4 @@
BOARD ?= qemu_x86 BOARD ?= qemu_x86
MDEF_FILE = prj.mdef
KERNEL_TYPE ?= nano
CONF_FILE = prj.conf CONF_FILE = prj.conf
include $(ZEPHYR_BASE)/Makefile.inc include $(ZEPHYR_BASE)/Makefile.inc

5
tests/net/udp/prj.mdef
View file

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

2
tests/net/utils/Makefile
View file

@ -1,6 +1,4 @@
BOARD ?= qemu_x86 BOARD ?= qemu_x86
MDEF_FILE = prj.mdef
KERNEL_TYPE ?= nano
CONF_FILE = prj.conf CONF_FILE = prj.conf
include $(ZEPHYR_BASE)/Makefile.inc include $(ZEPHYR_BASE)/Makefile.inc

5
tests/net/utils/prj.mdef
View file

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

1
tests/net/zoap/Makefile
View file

@ -1,5 +1,4 @@
BOARD ?= qemu_x86 BOARD ?= qemu_x86
MDEF_FILE = prj.mdef
CONF_FILE = prj.conf CONF_FILE = prj.conf
include $(ZEPHYR_BASE)/Makefile.inc include $(ZEPHYR_BASE)/Makefile.inc

5
tests/net/zoap/prj.mdef
View file

@ -1,5 +0,0 @@
% Application : Buffer test
% TASK NAME PRIO ENTRY STACK GROUPS
% ===================================================
TASK MAIN 7 main 2048 [EXE]