tests: test_fifo: unify nano and micro tests into one directory

Manage this test using one testcase.ini for both nano and micro
kernel cases.

Change-Id: I9757299cdced17e7fcbfa1fbbbcf87693b48bf41
Signed-off-by: Anas Nashif <anas.nashif@intel.com>

tests/kernel/test_fifo/Makefile

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

tests/kernel/test_fifo/README.nanokernel.txt

@@ -11,7 +11,7 @@ Building and Running Project:
 This nanokernel project outputs to the console.  It can be built and executed
 on QEMU as follows:
 
-    make qemu
+    make KERNEL_TYPE=nano qemu
 
 ---------------------------------------------------------------------------
 

tests/kernel/test_fifo/microkernel/prj_arm.conf

@@ -1 +0,0 @@
-CONFIG_NUM_IRQS=2

tests/kernel/test_fifo/microkernel/prj_x86.conf

@@ -1,4 +0,0 @@
-# Let stack canaries use non-random number generator.
-# This option is NOT to be used in production code.
-
-CONFIG_TEST_RANDOM_GENERATOR=y

tests/kernel/test_fifo/microkernel/src/Makefile

@@ -1,3 +0,0 @@
-ccflags-y += -I${srctree}/tests/include
-
-obj-y = fifo.o

tests/kernel/test_fifo/microkernel/testcase.ini

@@ -1,3 +0,0 @@
-[test]
-tags = core
-

tests/kernel/test_fifo/nanokernel/Makefile

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

tests/kernel/test_fifo/nanokernel/testcase.ini

@@ -1,4 +0,0 @@
-[test]
-tags = core
-# Not enough SRAM to run this test on quark SE
-platform_exclude = quark_se_sss_ctb arduino_101_sss

tests/kernel/test_fifo/src/Makefile

@@ -1,4 +1,5 @@
 ccflags-y += -I${srctree}/tests/include
 ccflags-$(CONFIG_SOC_QUARK_D2000) += -DFIBER_STACKSIZE=256
 
-obj-y = fifo.o fifo_timeout.o
+obj-$(CONFIG_MICROKERNEL) = micro_fifo.o
+obj-$(CONFIG_NANOKERNEL) = nano_fifo.o fifo_timeout.o

tests/kernel/test_fifo/testcase.ini

@@ -0,0 +1,11 @@
+[test_micro]
+extra_args = KERNEL_TYPE=micro
+tags = core
+kernel = micro
+
+[test_nano]
+extra_args = KERNEL_TYPE=nano
+tags = core
+kernel = nano
+# Not enough SRAM to run this test on quark SE
+platform_exclude = arduino_101_sss quark_se_sss_ctb

tests/kernel/test_fifo_priv/Makefile

@@ -2,7 +2,7 @@ MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
 BOARD ?= qemu_x86
 CONF_FILE = prj_$(ARCH).conf
-SOURCE_DIR := $(ZEPHYR_BASE)/tests/kernel/test_fifo/microkernel/src
+SOURCE_DIR := $(ZEPHYR_BASE)/tests/kernel/test_fifo/src
 # Enable testing for private microkernel FIFOs
 CFLAGS = -DTEST_PRIV_FIFO
 

tests/kernel/test_timer/microkernel/src/Makefile

@@ -1,4 +1,4 @@
 ccflags-y += -I${srctree}/tests/include \
-    -I$(srctree)/tests/kernel/test_fifo/nanokernel/src/
+    -I$(srctree)/tests/kernel/test_fifo/src/
 
 obj-y = timer.o