test_fifo: Reorganize directories

Splits the test into two clear sub-categories: microkernel and nanokernel.
This is done to maintain consistency with other tests that do the same
(e.g. test_obj_tracing, test_sema, test_stackprot, test_timer).

Change-Id: Iddb1ec8d569a9d953fb8af5ce08e87b51995f821
Signed-off-by: Peter Mitsis <peter.mitsis@windriver.com>

19 files changed, 27 insertions, 18 deletions

diff --git a/tests/kernel/test_fifo/Makefile b/tests/kernel/test_fifo/microkernel/Makefile
index 1f6caaeee..0d56ce66d 100644
--- a/tests/kernel/test_fifo/Makefile
+++ b/tests/kernel/test_fifo/microkernel/Makefile
@@ -1,5 +1,5 @@
 MDEF_FILE = prj.mdef
-KERNEL_TYPE ?= nano
+KERNEL_TYPE = micro
 BOARD ?= qemu_x86
 CONF_FILE = prj.conf
 
diff --git a/tests/kernel/test_fifo/README.microkernel.txt b/tests/kernel/test_fifo/microkernel/README.txt
index c287175c3..c287175c3 100644
--- a/tests/kernel/test_fifo/README.microkernel.txt
+++ b/tests/kernel/test_fifo/microkernel/README.txt
diff --git a/tests/kernel/test_fifo/microkernel/prj.conf b/tests/kernel/test_fifo/microkernel/prj.conf
new file mode 100644
index 000000000..dda44832d
--- /dev/null
+++ b/tests/kernel/test_fifo/microkernel/prj.conf
@@ -0,0 +1,7 @@
+# Let stack canaries use non-random number generator.
+# This option is NOT to be used in production code.
+
+CONFIG_TEST_RANDOM_GENERATOR=y
+CONFIG_ASSERT=y
+CONFIG_ASSERT_LEVEL=2
+CONFIG_IRQ_OFFLOAD=y
diff --git a/tests/kernel/test_fifo/prj.mdef b/tests/kernel/test_fifo/microkernel/prj.mdef
index b111ba4db..b111ba4db 100644
--- a/tests/kernel/test_fifo/prj.mdef
+++ b/tests/kernel/test_fifo/microkernel/prj.mdef
diff --git a/tests/kernel/test_fifo/microkernel/src/Makefile b/tests/kernel/test_fifo/microkernel/src/Makefile
new file mode 100644
index 000000000..1c953d559
--- /dev/null
+++ b/tests/kernel/test_fifo/microkernel/src/Makefile
@@ -0,0 +1,3 @@
+ccflags-y += -I${srctree}/tests/include
+
+obj-y = fifo.o
diff --git a/tests/kernel/test_fifo/src/micro_fifo.c b/tests/kernel/test_fifo/microkernel/src/fifo.c
index c2564bfed..c2564bfed 100644
--- a/tests/kernel/test_fifo/src/micro_fifo.c
+++ b/tests/kernel/test_fifo/microkernel/src/fifo.c
diff --git a/tests/kernel/test_fifo/microkernel/testcase.ini b/tests/kernel/test_fifo/microkernel/testcase.ini
new file mode 100644
index 000000000..914a14535
--- /dev/null
+++ b/tests/kernel/test_fifo/microkernel/testcase.ini
@@ -0,0 +1,2 @@
+[test]
+tags = core
diff --git a/tests/kernel/test_fifo/nanokernel/Makefile b/tests/kernel/test_fifo/nanokernel/Makefile
new file mode 100644
index 000000000..f2e25a17f
--- /dev/null
+++ b/tests/kernel/test_fifo/nanokernel/Makefile
@@ -0,0 +1,5 @@
+KERNEL_TYPE = nano
+BOARD ?= qemu_x86
+CONF_FILE = prj.conf
+
+include ${ZEPHYR_BASE}/Makefile.inc
diff --git a/tests/kernel/test_fifo/README.nanokernel.txt b/tests/kernel/test_fifo/nanokernel/README.txt
index a3fa000ae..1c1ee5e9c 100644
--- a/tests/kernel/test_fifo/README.nanokernel.txt
+++ b/tests/kernel/test_fifo/nanokernel/README.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 KERNEL_TYPE=nano qemu
+    make qemu
 
 ---------------------------------------------------------------------------
 
diff --git a/tests/kernel/test_fifo/prj.conf b/tests/kernel/test_fifo/nanokernel/prj.conf
index dfabafd11..dfabafd11 100644
--- a/tests/kernel/test_fifo/prj.conf
+++ b/tests/kernel/test_fifo/nanokernel/prj.conf
diff --git a/tests/kernel/test_fifo/nanokernel/src/Makefile b/tests/kernel/test_fifo/nanokernel/src/Makefile
new file mode 100644
index 000000000..662ac71c5
--- /dev/null
+++ b/tests/kernel/test_fifo/nanokernel/src/Makefile
@@ -0,0 +1,3 @@
+ccflags-y += -I${srctree}/tests/include
+
+obj-y = fifo.o fifo_timeout.o
diff --git a/tests/kernel/test_fifo/src/nano_fifo.c b/tests/kernel/test_fifo/nanokernel/src/fifo.c
index d1f86e205..d1f86e205 100644
--- a/tests/kernel/test_fifo/src/nano_fifo.c
+++ b/tests/kernel/test_fifo/nanokernel/src/fifo.c
diff --git a/tests/kernel/test_fifo/src/fifo_timeout.c b/tests/kernel/test_fifo/nanokernel/src/fifo_timeout.c
index d48495425..d48495425 100644
--- a/tests/kernel/test_fifo/src/fifo_timeout.c
+++ b/tests/kernel/test_fifo/nanokernel/src/fifo_timeout.c
diff --git a/tests/kernel/test_fifo/nanokernel/testcase.ini b/tests/kernel/test_fifo/nanokernel/testcase.ini
new file mode 100644
index 000000000..914a14535
--- /dev/null
+++ b/tests/kernel/test_fifo/nanokernel/testcase.ini
@@ -0,0 +1,2 @@
+[test]
+tags = core
diff --git a/tests/kernel/test_fifo/src/Makefile b/tests/kernel/test_fifo/src/Makefile
deleted file mode 100644
index a1d955757..000000000
--- a/tests/kernel/test_fifo/src/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-ccflags-y += -I${srctree}/tests/include
-
-obj-$(CONFIG_MICROKERNEL) = micro_fifo.o
-obj-$(CONFIG_NANOKERNEL) = nano_fifo.o fifo_timeout.o
diff --git a/tests/kernel/test_fifo/testcase.ini b/tests/kernel/test_fifo/testcase.ini
deleted file mode 100644
index 76e1cdcce..000000000
--- a/tests/kernel/test_fifo/testcase.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[test_micro]
-extra_args = KERNEL_TYPE=micro
-tags = core
-kernel = micro
-
-[test_nano]
-extra_args = KERNEL_TYPE=nano
-tags = core
-kernel = nano
diff --git a/tests/kernel/test_fifo_priv/Makefile b/tests/kernel/test_fifo_priv/Makefile
index 32e7c3afe..dc1608b44 100644
--- a/tests/kernel/test_fifo_priv/Makefile
+++ b/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/src
+SOURCE_DIR := $(ZEPHYR_BASE)/tests/kernel/test_fifo/microkernel/src
 # Enable testing for private microkernel FIFOs
 CFLAGS = -DTEST_PRIV_FIFO
 
diff --git a/tests/kernel/test_fifo_priv/prj.mdef b/tests/kernel/test_fifo_priv/prj.mdef
index 9aa69b830..ed03660f9 100644
--- a/tests/kernel/test_fifo_priv/prj.mdef
+++ b/tests/kernel/test_fifo_priv/prj.mdef
@@ -1,4 +1,4 @@
-% Please keep this in-sync with ../test_fifo/prj.mdef
+% Please keep this in-sync with ../test_fifo/microkernel/prj.mdef
 % except those specified below
 
 % Application       : test microkernel FIFO APIs
diff --git a/tests/kernel/test_timer/microkernel/src/Makefile b/tests/kernel/test_timer/microkernel/src/Makefile
index 6fe993a45..a5013015c 100644
--- a/tests/kernel/test_timer/microkernel/src/Makefile
+++ b/tests/kernel/test_timer/microkernel/src/Makefile
@@ -1,4 +1,4 @@
 ccflags-y += -I${srctree}/tests/include \
-    -I$(srctree)/tests/kernel/test_fifo/src/
+    -I$(srctree)/tests/kernel/test_fifo/nanokernel/src/
 
 obj-y = timer.o