From efeb9b6534ffd3466c8edfe0dd1a7b8e147f0312 Mon Sep 17 00:00:00 2001 From: Daniel Leung Date: Mon, 28 Dec 2015 11:03:37 -0800 Subject: [PATCH] update tests due to recent board files shuffle () Adds board arduino_101, arduino_101_sss to sanity check. This will build the tests against these two new boards to catch issues. () Updates existing sample apps to be arduino_101_sss instead of quark_se_ss, due to renaming of boards. Change-Id: Ic512728d2ce581539bc3ae4c9f6524d5bf01b296 Signed-off-by: Daniel Leung --- samples/build_test/drivers/i2c_quark_se_ss/Makefile | 2 +- samples/build_test/drivers/i2c_quark_se_ss/testcase.ini | 2 +- samples/microkernel/benchmark/boot_time/Makefile | 1 + samples/nanokernel/apps/adc/testcase.ini | 2 +- samples/nanokernel/apps/gpio_dw/Makefile | 2 +- samples/nanokernel/apps/gpio_dw/testcase.ini | 2 +- samples/nanokernel/apps/grove_lcd/Makefile | 2 +- samples/nanokernel/apps/grove_lcd/testcase.ini | 2 +- samples/nanokernel/apps/i2c_fujitsu_fram/Makefile | 2 +- samples/nanokernel/apps/i2c_fujitsu_fram/testcase.ini | 2 +- samples/nanokernel/benchmark/boot_time/Makefile | 1 + samples/nanokernel/test/test_fifo/testcase.ini | 2 +- samples/nanokernel/test/test_lifo/testcase.ini | 2 +- samples/nanokernel/test/test_sema/testcase.ini | 2 +- scripts/sanity_chk/arches/arc.ini | 6 +++++- scripts/sanity_chk/arches/x86.ini | 4 +++- 16 files changed, 22 insertions(+), 14 deletions(-) diff --git a/samples/build_test/drivers/i2c_quark_se_ss/Makefile b/samples/build_test/drivers/i2c_quark_se_ss/Makefile index 0f9a78e83f5..76f6c18454f 100644 --- a/samples/build_test/drivers/i2c_quark_se_ss/Makefile +++ b/samples/build_test/drivers/i2c_quark_se_ss/Makefile @@ -1,5 +1,5 @@ KERNEL_TYPE = nano -BOARD ?= quark_se_ss +BOARD ?= arduino_101_sss SOURCE_DIR = $(ZEPHYR_BASE)/samples/nanokernel/apps/synchronization/src/ CONF_FILE = prj.conf diff --git a/samples/build_test/drivers/i2c_quark_se_ss/testcase.ini b/samples/build_test/drivers/i2c_quark_se_ss/testcase.ini index e14c7eed276..095f9e3dd6b 100644 --- a/samples/build_test/drivers/i2c_quark_se_ss/testcase.ini +++ b/samples/build_test/drivers/i2c_quark_se_ss/testcase.ini @@ -3,4 +3,4 @@ build_only = true tags = drivers arch_whitelist = arc -platform_whitelist = quark_se_ss +platform_whitelist = arduino_101_sss diff --git a/samples/microkernel/benchmark/boot_time/Makefile b/samples/microkernel/benchmark/boot_time/Makefile index 771766cd8cb..ff1cd289e1e 100644 --- a/samples/microkernel/benchmark/boot_time/Makefile +++ b/samples/microkernel/benchmark/boot_time/Makefile @@ -4,6 +4,7 @@ CONF_quark_se_ctb = quark_se/quark_se_prj.conf CONF_qemu_x86 = ia32/prj_expert_test.conf CONF_minnowboard = ia32/prj_expert_test.conf CONF_galileo = ia32_pci/prj.conf +CONF_arduino_101 = quark_se/quark_se_prj.conf MDEF_FILE = prj.mdef KERNEL_TYPE = micro diff --git a/samples/nanokernel/apps/adc/testcase.ini b/samples/nanokernel/apps/adc/testcase.ini index 9542566330c..3647cb1a8c6 100644 --- a/samples/nanokernel/apps/adc/testcase.ini +++ b/samples/nanokernel/apps/adc/testcase.ini @@ -3,4 +3,4 @@ build_only = true tags = apps arch_whitelist = x86 arc -platform_whitelist = galileo quark_se_ss +platform_whitelist = galileo arduino_101_sss diff --git a/samples/nanokernel/apps/gpio_dw/Makefile b/samples/nanokernel/apps/gpio_dw/Makefile index e1fb7b3e6ee..b0c7d951f14 100644 --- a/samples/nanokernel/apps/gpio_dw/Makefile +++ b/samples/nanokernel/apps/gpio_dw/Makefile @@ -1,5 +1,5 @@ ifeq ($(ARCH),arc) -BOARD ?= quark_se_ss +BOARD ?= arduino_101_sss else BOARD ?= arduino_101 endif diff --git a/samples/nanokernel/apps/gpio_dw/testcase.ini b/samples/nanokernel/apps/gpio_dw/testcase.ini index 23ac9074d47..fc581305222 100644 --- a/samples/nanokernel/apps/gpio_dw/testcase.ini +++ b/samples/nanokernel/apps/gpio_dw/testcase.ini @@ -3,4 +3,4 @@ build_only = true tags = drivers arch_whitelist = x86 arc -platform_whitelist = quark_se arduino_101 quark_se_ss +platform_whitelist = quark_se arduino_101 arduino_101_sss diff --git a/samples/nanokernel/apps/grove_lcd/Makefile b/samples/nanokernel/apps/grove_lcd/Makefile index 417d861c11e..cf07af92236 100644 --- a/samples/nanokernel/apps/grove_lcd/Makefile +++ b/samples/nanokernel/apps/grove_lcd/Makefile @@ -1,4 +1,4 @@ -BOARD ?= quark_se_ss +BOARD ?= arduino_101_sss ARCH ?= arc KERNEL_TYPE = nano CONF_FILE = prj.conf diff --git a/samples/nanokernel/apps/grove_lcd/testcase.ini b/samples/nanokernel/apps/grove_lcd/testcase.ini index e14c7eed276..095f9e3dd6b 100644 --- a/samples/nanokernel/apps/grove_lcd/testcase.ini +++ b/samples/nanokernel/apps/grove_lcd/testcase.ini @@ -3,4 +3,4 @@ build_only = true tags = drivers arch_whitelist = arc -platform_whitelist = quark_se_ss +platform_whitelist = arduino_101_sss diff --git a/samples/nanokernel/apps/i2c_fujitsu_fram/Makefile b/samples/nanokernel/apps/i2c_fujitsu_fram/Makefile index 417d861c11e..cf07af92236 100644 --- a/samples/nanokernel/apps/i2c_fujitsu_fram/Makefile +++ b/samples/nanokernel/apps/i2c_fujitsu_fram/Makefile @@ -1,4 +1,4 @@ -BOARD ?= quark_se_ss +BOARD ?= arduino_101_sss ARCH ?= arc KERNEL_TYPE = nano CONF_FILE = prj.conf diff --git a/samples/nanokernel/apps/i2c_fujitsu_fram/testcase.ini b/samples/nanokernel/apps/i2c_fujitsu_fram/testcase.ini index c2fa5bd7aa6..e9e9d5a8dfa 100644 --- a/samples/nanokernel/apps/i2c_fujitsu_fram/testcase.ini +++ b/samples/nanokernel/apps/i2c_fujitsu_fram/testcase.ini @@ -3,4 +3,4 @@ build_only = true tags = board_arduino_101 arch_whitelist = arc -platform_whitelist = quark_se_ss +platform_whitelist = arduino_101_sss diff --git a/samples/nanokernel/benchmark/boot_time/Makefile b/samples/nanokernel/benchmark/boot_time/Makefile index dd829f0c94f..ef2732a5845 100644 --- a/samples/nanokernel/benchmark/boot_time/Makefile +++ b/samples/nanokernel/benchmark/boot_time/Makefile @@ -4,6 +4,7 @@ CONF_quark_se_ctb = quark_se/quark_se_prj.conf CONF_qemu_x86 = ia32/prj_expert_test.conf CONF_galileo = ia32_pci/prj.conf CONF_minnowboard = ia32/prj_expert_test.conf +CONF_arduino_101 = quark_se/quark_se_prj.conf KERNEL_TYPE = nano BOARD ?= qemu_x86 diff --git a/samples/nanokernel/test/test_fifo/testcase.ini b/samples/nanokernel/test/test_fifo/testcase.ini index c6a3adbd4e5..6be0a8d3a48 100644 --- a/samples/nanokernel/test/test_fifo/testcase.ini +++ b/samples/nanokernel/test/test_fifo/testcase.ini @@ -1,4 +1,4 @@ [test] tags = core # Not enough SRAM to run this test on quark SE -platform_exclude = quark_se_sss_ctb +platform_exclude = quark_se_sss_ctb arduino_101_sss diff --git a/samples/nanokernel/test/test_lifo/testcase.ini b/samples/nanokernel/test/test_lifo/testcase.ini index c6a3adbd4e5..6be0a8d3a48 100644 --- a/samples/nanokernel/test/test_lifo/testcase.ini +++ b/samples/nanokernel/test/test_lifo/testcase.ini @@ -1,4 +1,4 @@ [test] tags = core # Not enough SRAM to run this test on quark SE -platform_exclude = quark_se_sss_ctb +platform_exclude = quark_se_sss_ctb arduino_101_sss diff --git a/samples/nanokernel/test/test_sema/testcase.ini b/samples/nanokernel/test/test_sema/testcase.ini index c6a3adbd4e5..6be0a8d3a48 100644 --- a/samples/nanokernel/test/test_sema/testcase.ini +++ b/samples/nanokernel/test/test_sema/testcase.ini @@ -1,4 +1,4 @@ [test] tags = core # Not enough SRAM to run this test on quark SE -platform_exclude = quark_se_sss_ctb +platform_exclude = quark_se_sss_ctb arduino_101_sss diff --git a/scripts/sanity_chk/arches/arc.ini b/scripts/sanity_chk/arches/arc.ini index 75cdb893352..2e3742f4d3b 100644 --- a/scripts/sanity_chk/arches/arc.ini +++ b/scripts/sanity_chk/arches/arc.ini @@ -1,7 +1,11 @@ [arch] name = arc -platforms = quark_se_sss_ctb +platforms = quark_se_sss_ctb arduino_101_sss [quark_se_sss_ctb] qemu_support = false microkernel_support = false + +[arduino_101_sss] +qemu_support = false +microkernel_support = false diff --git a/scripts/sanity_chk/arches/x86.ini b/scripts/sanity_chk/arches/x86.ini index 9b35b1ce44c..9599e756dbe 100644 --- a/scripts/sanity_chk/arches/x86.ini +++ b/scripts/sanity_chk/arches/x86.ini @@ -1,6 +1,6 @@ [arch] name = x86 -platforms = qemu_x86 minnowboard galileo quark_se_ctb quark_d2000_crb +platforms = qemu_x86 minnowboard galileo quark_se_ctb quark_d2000_crb arduino_101 [qemu_x86] qemu_support = true @@ -18,3 +18,5 @@ qemu_support = false qemu_support = false microkernel_support = false +[arduino_101] +qemu_support = false