From d906d70c94c2a40d5fc6fd26056c7bc57d540002 Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Thu, 23 Apr 2026 17:16:34 +0200 Subject: acpi: move test data header --- libs/acpi/CMakeLists.txt | 4 ++-- libs/acpi/acpi/common/table_header.test.cpp | 4 ++-- libs/acpi/acpi/data/madt.test.cpp | 4 ++-- libs/acpi/acpi/data/rsdt.test.cpp | 3 +-- libs/acpi/acpi/data/xsdt.test.cpp | 3 +-- libs/acpi/acpi/test_data/tables.S | 17 +++++++++++++++++ libs/acpi/acpi/test_data/tables.hpp | 28 ++++++++++++++++++++++++++++ libs/acpi/test_data/tables.S | 17 ----------------- libs/acpi/test_data/tables.hpp | 28 ---------------------------- 9 files changed, 53 insertions(+), 55 deletions(-) create mode 100644 libs/acpi/acpi/test_data/tables.S create mode 100644 libs/acpi/acpi/test_data/tables.hpp delete mode 100644 libs/acpi/test_data/tables.S delete mode 100644 libs/acpi/test_data/tables.hpp (limited to 'libs/acpi') diff --git a/libs/acpi/CMakeLists.txt b/libs/acpi/CMakeLists.txt index e73c6b3..d6d607a 100644 --- a/libs/acpi/CMakeLists.txt +++ b/libs/acpi/CMakeLists.txt @@ -95,7 +95,7 @@ if(BUILD_TESTING) list(APPEND GENERATED_TABLE_BLOBS "${CMAKE_CURRENT_BINARY_DIR}/test_data/${TABLE}.aml") endforeach() - set_source_files_properties("test_data/tables.S" PROPERTIES OBJECT_DEPENDS "${GENERATED_TABLE_BLOBS}") + set_source_files_properties("acpi/test_data/tables.S" PROPERTIES OBJECT_DEPENDS "${GENERATED_TABLE_BLOBS}") if(COMMAND "enable_coverage") enable_coverage("acpi") @@ -111,7 +111,7 @@ if(BUILD_TESTING) "acpi/data/xsdt.test.cpp" "acpi/pointers.test.cpp" - "test_data/tables.S" + "acpi/test_data/tables.S" ) target_include_directories("acpi_tests" PRIVATE diff --git a/libs/acpi/acpi/common/table_header.test.cpp b/libs/acpi/acpi/common/table_header.test.cpp index 53cdb26..ddc879e 100644 --- a/libs/acpi/acpi/common/table_header.test.cpp +++ b/libs/acpi/acpi/common/table_header.test.cpp @@ -1,11 +1,11 @@ #include +#include + #include #include -#include - SCENARIO("Common table header parsing", "[common_table_header]") { GIVEN("A valid compiled table header") diff --git a/libs/acpi/acpi/data/madt.test.cpp b/libs/acpi/acpi/data/madt.test.cpp index 5d3b366..1b95a74 100644 --- a/libs/acpi/acpi/data/madt.test.cpp +++ b/libs/acpi/acpi/data/madt.test.cpp @@ -1,13 +1,13 @@ #include +#include + #include #include #include -#include - SCENARIO("MADT parsing", "[madt]") { GIVEN("The basic compiled MADT containing a single LAPIC entry and the default x86 LAPIC address") diff --git a/libs/acpi/acpi/data/rsdt.test.cpp b/libs/acpi/acpi/data/rsdt.test.cpp index a6dd416..47992ce 100644 --- a/libs/acpi/acpi/data/rsdt.test.cpp +++ b/libs/acpi/acpi/data/rsdt.test.cpp @@ -1,6 +1,7 @@ #include #include +#include #include @@ -8,8 +9,6 @@ #include -#include - SCENARIO("RSDT parsing", "[rsdt]") { GIVEN("The basic compiled RSDT containing 8 table pointers") diff --git a/libs/acpi/acpi/data/xsdt.test.cpp b/libs/acpi/acpi/data/xsdt.test.cpp index cc18a66..77a5340 100644 --- a/libs/acpi/acpi/data/xsdt.test.cpp +++ b/libs/acpi/acpi/data/xsdt.test.cpp @@ -1,6 +1,7 @@ #include #include +#include #include @@ -8,8 +9,6 @@ #include -#include - SCENARIO("XSDT parsing", "[xsdt]") { GIVEN("The basic compiled XSDT containing 8 table pointers") diff --git a/libs/acpi/acpi/test_data/tables.S b/libs/acpi/acpi/test_data/tables.S new file mode 100644 index 0000000..641db6a --- /dev/null +++ b/libs/acpi/acpi/test_data/tables.S @@ -0,0 +1,17 @@ +.section .rodata + +.balign 16 + +#define TABLE(name, file) \ + .global name##_start; \ + .global name##_end; \ + name##_start: .incbin file; \ + name##_end: + +TABLE(basic_madt, "basic_madt.aml") +TABLE(basic_rsdt, "basic_rsdt.aml") +TABLE(basic_rsdp, "basic_rsdp.aml") +TABLE(basic_xsdt, "basic_xsdt.aml") +TABLE(table_header, "table_header.aml") + +#undef TABLE diff --git a/libs/acpi/acpi/test_data/tables.hpp b/libs/acpi/acpi/test_data/tables.hpp new file mode 100644 index 0000000..e91f1a5 --- /dev/null +++ b/libs/acpi/acpi/test_data/tables.hpp @@ -0,0 +1,28 @@ +#ifndef ACPI_TEST_DATA_TABLES_HPP +#define ACPI_TEST_DATA_TABLES_HPP + +#include +#include + +#define TABLE(name) \ + extern "C" std::byte const name##_start; \ + extern "C" std::byte const name##_end; \ + auto inline name()->std::span \ + { \ + return {&name##_start, &name##_end}; \ + } + +namespace acpi::test_data::tables +{ + + TABLE(basic_madt); + TABLE(basic_rsdt); + TABLE(basic_rsdp); + TABLE(basic_xsdt); + TABLE(table_header); + +} // namespace acpi::test_data::tables + +#undef TABLE + +#endif diff --git a/libs/acpi/test_data/tables.S b/libs/acpi/test_data/tables.S deleted file mode 100644 index 641db6a..0000000 --- a/libs/acpi/test_data/tables.S +++ /dev/null @@ -1,17 +0,0 @@ -.section .rodata - -.balign 16 - -#define TABLE(name, file) \ - .global name##_start; \ - .global name##_end; \ - name##_start: .incbin file; \ - name##_end: - -TABLE(basic_madt, "basic_madt.aml") -TABLE(basic_rsdt, "basic_rsdt.aml") -TABLE(basic_rsdp, "basic_rsdp.aml") -TABLE(basic_xsdt, "basic_xsdt.aml") -TABLE(table_header, "table_header.aml") - -#undef TABLE diff --git a/libs/acpi/test_data/tables.hpp b/libs/acpi/test_data/tables.hpp deleted file mode 100644 index e91f1a5..0000000 --- a/libs/acpi/test_data/tables.hpp +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef ACPI_TEST_DATA_TABLES_HPP -#define ACPI_TEST_DATA_TABLES_HPP - -#include -#include - -#define TABLE(name) \ - extern "C" std::byte const name##_start; \ - extern "C" std::byte const name##_end; \ - auto inline name()->std::span \ - { \ - return {&name##_start, &name##_end}; \ - } - -namespace acpi::test_data::tables -{ - - TABLE(basic_madt); - TABLE(basic_rsdt); - TABLE(basic_rsdp); - TABLE(basic_xsdt); - TABLE(table_header); - -} // namespace acpi::test_data::tables - -#undef TABLE - -#endif -- cgit v1.2.3