tests: Simplify test_bluetooth configuration

Use common config for tests and use testcase.ini for defining micro
and nano kernel variants.

Change-Id: I47453cd49696dd496cc728cc1eb2eba9cf7f1c6c
Signed-off-by: Szymon Janc <ext.szymon.janc@tieto.com>

11 files changed, 8 insertions, 37 deletions

diff --git a/tests/bluetooth/test_bluetooth/microkernel/Makefile b/tests/bluetooth/test_bluetooth/Makefile
index 552689304..df10bf48f 100644
--- a/tests/bluetooth/test_bluetooth/microkernel/Makefile
+++ b/tests/bluetooth/test_bluetooth/Makefile
@@ -1,6 +1,6 @@
 MDEF_FILE = prj.mdef
-KERNEL_TYPE = micro
+KERNEL_TYPE ?= micro
 BOARD ?= qemu_x86
-CONF_FILE = prj_$(ARCH).conf
+CONF_FILE = prj.conf
 
 include $(ZEPHYR_BASE)/Makefile.inc
diff --git a/tests/bluetooth/test_bluetooth/microkernel/prj_x86.conf b/tests/bluetooth/test_bluetooth/microkernel/prj_x86.conf
deleted file mode 100644
index 67e07cfcf..000000000
--- a/tests/bluetooth/test_bluetooth/microkernel/prj_x86.conf
+++ /dev/null
@@ -1,8 +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
-CONFIG_BLUETOOTH=y
-CONFIG_BLUETOOTH_LE=y
-CONFIG_BLUETOOTH_NO_DRIVER=y
-CONFIG_BLUETOOTH_DEBUG=y
-CONFIG_UART_INTERRUPT_DRIVEN=n
diff --git a/tests/bluetooth/test_bluetooth/microkernel/testcase.ini b/tests/bluetooth/test_bluetooth/microkernel/testcase.ini
deleted file mode 100644
index ee3f7b9a0..000000000
--- a/tests/bluetooth/test_bluetooth/microkernel/testcase.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[test-bluetooth]
-tags = bluetooth
-
diff --git a/tests/bluetooth/test_bluetooth/nanokernel/Makefile b/tests/bluetooth/test_bluetooth/nanokernel/Makefile
deleted file mode 100644
index a7c2f46e7..000000000
--- a/tests/bluetooth/test_bluetooth/nanokernel/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-KERNEL_TYPE = nano
-BOARD ?= qemu_x86
-CONF_FILE = prj_$(ARCH).conf
-SOURCE_DIR = $(ZEPHYR_BASE)/tests/bluetooth/test_bluetooth/microkernel/src/
-
-include $(ZEPHYR_BASE)/Makefile.inc
diff --git a/tests/bluetooth/test_bluetooth/nanokernel/prj_arm.conf b/tests/bluetooth/test_bluetooth/nanokernel/prj_arm.conf
deleted file mode 100644
index 67e07cfcf..000000000
--- a/tests/bluetooth/test_bluetooth/nanokernel/prj_arm.conf
+++ /dev/null
@@ -1,8 +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
-CONFIG_BLUETOOTH=y
-CONFIG_BLUETOOTH_LE=y
-CONFIG_BLUETOOTH_NO_DRIVER=y
-CONFIG_BLUETOOTH_DEBUG=y
-CONFIG_UART_INTERRUPT_DRIVEN=n
diff --git a/tests/bluetooth/test_bluetooth/nanokernel/prj_x86.conf b/tests/bluetooth/test_bluetooth/nanokernel/prj_x86.conf
deleted file mode 100644
index 67e07cfcf..000000000
--- a/tests/bluetooth/test_bluetooth/nanokernel/prj_x86.conf
+++ /dev/null
@@ -1,8 +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
-CONFIG_BLUETOOTH=y
-CONFIG_BLUETOOTH_LE=y
-CONFIG_BLUETOOTH_NO_DRIVER=y
-CONFIG_BLUETOOTH_DEBUG=y
-CONFIG_UART_INTERRUPT_DRIVEN=n
diff --git a/tests/bluetooth/test_bluetooth/microkernel/prj_arm.conf b/tests/bluetooth/test_bluetooth/prj.conf
index 67e07cfcf..67e07cfcf 100644
--- a/tests/bluetooth/test_bluetooth/microkernel/prj_arm.conf
+++ b/tests/bluetooth/test_bluetooth/prj.conf
diff --git a/tests/bluetooth/test_bluetooth/microkernel/prj.mdef b/tests/bluetooth/test_bluetooth/prj.mdef
index a3ad4a5e6..a3ad4a5e6 100644
--- a/tests/bluetooth/test_bluetooth/microkernel/prj.mdef
+++ b/tests/bluetooth/test_bluetooth/prj.mdef
diff --git a/tests/bluetooth/test_bluetooth/microkernel/src/Makefile b/tests/bluetooth/test_bluetooth/src/Makefile
index 8a7b33766..8a7b33766 100644
--- a/tests/bluetooth/test_bluetooth/microkernel/src/Makefile
+++ b/tests/bluetooth/test_bluetooth/src/Makefile
diff --git a/tests/bluetooth/test_bluetooth/microkernel/src/bluetooth.c b/tests/bluetooth/test_bluetooth/src/bluetooth.c
index 555716bc7..555716bc7 100644
--- a/tests/bluetooth/test_bluetooth/microkernel/src/bluetooth.c
+++ b/tests/bluetooth/test_bluetooth/src/bluetooth.c
diff --git a/tests/bluetooth/test_bluetooth/nanokernel/testcase.ini b/tests/bluetooth/test_bluetooth/testcase.ini
index 9350a2259..90d63bfb2 100644
--- a/tests/bluetooth/test_bluetooth/nanokernel/testcase.ini
+++ b/tests/bluetooth/test_bluetooth/testcase.ini
@@ -1,5 +1,9 @@
-[test-bluetooth]
+[test_micro]
+tags = bluetooth
+
+[test_nano]
 tags = bluetooth
 arch_whitelist = x86 arm
 platform_whitelist = minnowboard basic_minuteia arduino_101 frdm_k64f
-
+extra_args = KERNEL_TYPE=nano
+kernel = nano