From dc8b3b10948d5009cf23a95a273fe222b0a842db Mon Sep 17 00:00:00 2001 From: "Charles E. Youse" Date: Fri, 27 Sep 2019 15:56:30 -0400 Subject: [PATCH] samples/board/x86_info: move to tests directory This application's primary purpose is to provide some useful data to the author of an x86 board support package for Zephyr-- it's not a good sample. It's not a good test either, but as a test it at least prevents regressions in multiboot/ACPI builds. Signed-off-by: Charles E. Youse --- samples/boards/x86_info/sample.yaml | 6 ------ .../boards/x86_info => tests/arch/x86/info}/CMakeLists.txt | 2 +- {samples/boards/x86_info => tests/arch/x86/info}/prj.conf | 0 {samples/boards/x86_info => tests/arch/x86/info}/src/acpi.c | 0 .../src/x86_info.h => tests/arch/x86/info/src/info.h | 0 {samples/boards/x86_info => tests/arch/x86/info}/src/main.c | 6 +++--- .../boards/x86_info => tests/arch/x86/info}/src/memmap.c | 0 .../boards/x86_info => tests/arch/x86/info}/src/multiboot.c | 0 .../boards/x86_info => tests/arch/x86/info}/src/timer.c | 0 tests/arch/x86/info/testcase.yaml | 4 ++++ 10 files changed, 8 insertions(+), 10 deletions(-) delete mode 100644 samples/boards/x86_info/sample.yaml rename {samples/boards/x86_info => tests/arch/x86/info}/CMakeLists.txt (91%) rename {samples/boards/x86_info => tests/arch/x86/info}/prj.conf (100%) rename {samples/boards/x86_info => tests/arch/x86/info}/src/acpi.c (100%) rename samples/boards/x86_info/src/x86_info.h => tests/arch/x86/info/src/info.h (100%) rename {samples/boards/x86_info => tests/arch/x86/info}/src/main.c (72%) rename {samples/boards/x86_info => tests/arch/x86/info}/src/memmap.c (100%) rename {samples/boards/x86_info => tests/arch/x86/info}/src/multiboot.c (100%) rename {samples/boards/x86_info => tests/arch/x86/info}/src/timer.c (100%) create mode 100644 tests/arch/x86/info/testcase.yaml diff --git a/samples/boards/x86_info/sample.yaml b/samples/boards/x86_info/sample.yaml deleted file mode 100644 index 2781886d549..00000000000 --- a/samples/boards/x86_info/sample.yaml +++ /dev/null @@ -1,6 +0,0 @@ -sample: - description: Tool to illustrate the use of some x86-specific kernel - interfaces, and also to provide information about x86-based platforms - (memory map, CPU information, timer frequencies) useful when bringing - up new boards. - name: x86 platform information tool diff --git a/samples/boards/x86_info/CMakeLists.txt b/tests/arch/x86/info/CMakeLists.txt similarity index 91% rename from samples/boards/x86_info/CMakeLists.txt rename to tests/arch/x86/info/CMakeLists.txt index 7b8ff32cd00..1c25776fa18 100644 --- a/samples/boards/x86_info/CMakeLists.txt +++ b/tests/arch/x86/info/CMakeLists.txt @@ -1,7 +1,7 @@ # SPDX-License-Identifier: Apache-2.0 # Copyright (c) 2019 Intel Corp. -cmake_minimum_required(VERSION 3.8.2) +cmake_minimum_required(VERSION 3.13.1) include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) project(x86_info) diff --git a/samples/boards/x86_info/prj.conf b/tests/arch/x86/info/prj.conf similarity index 100% rename from samples/boards/x86_info/prj.conf rename to tests/arch/x86/info/prj.conf diff --git a/samples/boards/x86_info/src/acpi.c b/tests/arch/x86/info/src/acpi.c similarity index 100% rename from samples/boards/x86_info/src/acpi.c rename to tests/arch/x86/info/src/acpi.c diff --git a/samples/boards/x86_info/src/x86_info.h b/tests/arch/x86/info/src/info.h similarity index 100% rename from samples/boards/x86_info/src/x86_info.h rename to tests/arch/x86/info/src/info.h diff --git a/samples/boards/x86_info/src/main.c b/tests/arch/x86/info/src/main.c similarity index 72% rename from samples/boards/x86_info/src/main.c rename to tests/arch/x86/info/src/main.c index af51aec857b..b5ac0186e3c 100644 --- a/samples/boards/x86_info/src/main.c +++ b/tests/arch/x86/info/src/main.c @@ -4,7 +4,7 @@ */ #include -#include "x86_info.h" +#include "info.h" __weak void multiboot(void) { @@ -18,12 +18,12 @@ __weak void acpi(void) void main(void) { - printk("\n\nx86_info: the Zephyr x86 platform information tool\n\n"); + printk("\n\ninfo: the Zephyr x86 platform information tool\n\n"); multiboot(); memmap(); acpi(); timer(); - printk("x86_info: complete\n"); + printk("info: complete\n"); } diff --git a/samples/boards/x86_info/src/memmap.c b/tests/arch/x86/info/src/memmap.c similarity index 100% rename from samples/boards/x86_info/src/memmap.c rename to tests/arch/x86/info/src/memmap.c diff --git a/samples/boards/x86_info/src/multiboot.c b/tests/arch/x86/info/src/multiboot.c similarity index 100% rename from samples/boards/x86_info/src/multiboot.c rename to tests/arch/x86/info/src/multiboot.c diff --git a/samples/boards/x86_info/src/timer.c b/tests/arch/x86/info/src/timer.c similarity index 100% rename from samples/boards/x86_info/src/timer.c rename to tests/arch/x86/info/src/timer.c diff --git a/tests/arch/x86/info/testcase.yaml b/tests/arch/x86/info/testcase.yaml new file mode 100644 index 00000000000..8e732cd2c05 --- /dev/null +++ b/tests/arch/x86/info/testcase.yaml @@ -0,0 +1,4 @@ +tests: + arch.x86.info: + arch_whitelist: x86 + platform_whitelist: up_squared