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>
diff --git a/tests/kernel/test_fifo/Makefile b/tests/kernel/test_fifo/microkernel/Makefile
similarity index 82%
rename from tests/kernel/test_fifo/Makefile
rename to tests/kernel/test_fifo/microkernel/Makefile
index 1f6caae..0d56ce6 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
similarity index 100%
rename from tests/kernel/test_fifo/README.microkernel.txt
rename to 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 0000000..dda4483
--- /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
similarity index 100%
rename from tests/kernel/test_fifo/prj.mdef
rename to 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 0000000..1c953d5
--- /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
similarity index 100%
rename from tests/kernel/test_fifo/src/micro_fifo.c
rename to 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 0000000..914a145
--- /dev/null
+++ b/tests/kernel/test_fifo/microkernel/testcase.ini
@@ -0,0 +1,2 @@
+[test]
+tags = core
diff --git a/tests/kernel/test_fifo/Makefile b/tests/kernel/test_fifo/nanokernel/Makefile
similarity index 64%
copy from tests/kernel/test_fifo/Makefile
copy to tests/kernel/test_fifo/nanokernel/Makefile
index 1f6caae..f2e25a1 100644
--- a/tests/kernel/test_fifo/Makefile
+++ b/tests/kernel/test_fifo/nanokernel/Makefile
@@ -1,5 +1,4 @@
-MDEF_FILE = prj.mdef
-KERNEL_TYPE ?= nano
+KERNEL_TYPE = nano
BOARD ?= qemu_x86
CONF_FILE = prj.conf
diff --git a/tests/kernel/test_fifo/README.nanokernel.txt b/tests/kernel/test_fifo/nanokernel/README.txt
similarity index 98%
rename from tests/kernel/test_fifo/README.nanokernel.txt
rename to tests/kernel/test_fifo/nanokernel/README.txt
index a3fa000..1c1ee5e 100644
--- a/tests/kernel/test_fifo/README.nanokernel.txt
+++ b/tests/kernel/test_fifo/nanokernel/README.txt
@@ -11,7 +11,7 @@
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
similarity index 100%
rename from tests/kernel/test_fifo/prj.conf
rename to 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 0000000..662ac71
--- /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
similarity index 100%
rename from tests/kernel/test_fifo/src/nano_fifo.c
rename to 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
similarity index 100%
rename from tests/kernel/test_fifo/src/fifo_timeout.c
rename to 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 0000000..914a145
--- /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 a1d9557..0000000
--- 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 76e1cdc..0000000
--- 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 32e7c3a..dc1608b 100644
--- a/tests/kernel/test_fifo_priv/Makefile
+++ b/tests/kernel/test_fifo_priv/Makefile
@@ -2,7 +2,7 @@
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 9aa69b8..ed03660 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 6fe993a..a501301 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
