[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 06/16] tests/qtest/bios-tables-test.c: Add support for arch in
From: |
Sunil V L |
Subject: |
[PATCH v4 06/16] tests/qtest/bios-tables-test.c: Add support for arch in path |
Date: |
Tue, 25 Jun 2024 20:38:29 +0530 |
Since machine name can be common for multiple architectures (ex: virt),
add "arch" in the path to search for expected AML files. Since the AML
files are still under old path, add support for searching with and
without arch in the path.
Signed-off-by: Sunil V L <sunilvl@ventanamicro.com>
Acked-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
---
tests/qtest/bios-tables-test.c | 23 ++++++++++++++++++++---
1 file changed, 20 insertions(+), 3 deletions(-)
diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
index c4a4d1c7bf..29c52952f4 100644
--- a/tests/qtest/bios-tables-test.c
+++ b/tests/qtest/bios-tables-test.c
@@ -78,6 +78,7 @@
typedef struct {
bool tcg_only;
const char *machine;
+ const char *arch;
const char *machine_param;
const char *variant;
const char *uefi_fl1;
@@ -262,8 +263,19 @@ static void dump_aml_files(test_data *data, bool rebuild)
g_assert(exp_sdt->aml);
if (rebuild) {
- aml_file = g_strdup_printf("%s/%s/%.4s%s", data_dir, data->machine,
+ aml_file = g_strdup_printf("%s/%s/%s/%.4s%s", data_dir,
+ data->arch, data->machine,
sdt->aml, ext);
+
+ /*
+ * To keep test cases not failing before the DATA files are moved
to
+ * ${arch}/${machine} folder, add this check as well.
+ */
+ if (!g_file_test(aml_file, G_FILE_TEST_EXISTS)) {
+ aml_file = g_strdup_printf("%s/%s/%.4s%s", data_dir,
+ data->machine, sdt->aml, ext);
+ }
+
if (!g_file_test(aml_file, G_FILE_TEST_EXISTS) &&
sdt->aml_len == exp_sdt->aml_len &&
!memcmp(sdt->aml, exp_sdt->aml, sdt->aml_len)) {
@@ -398,8 +410,13 @@ static GArray *load_expected_aml(test_data *data)
memset(&exp_sdt, 0, sizeof(exp_sdt));
try_again:
- aml_file = g_strdup_printf("%s/%s/%.4s%s", data_dir, data->machine,
- sdt->aml, ext);
+ aml_file = g_strdup_printf("%s/%s/%s/%.4s%s", data_dir, data->arch,
+ data->machine, sdt->aml, ext);
+ if (!g_file_test(aml_file, G_FILE_TEST_EXISTS)) {
+ aml_file = g_strdup_printf("%s/%s/%.4s%s", data_dir, data->machine,
+ sdt->aml, ext);
+ }
+
if (verbosity_level >= 2) {
fprintf(stderr, "Looking for expected file '%s'\n", aml_file);
}
--
2.40.1
- [PATCH v4 00/16] Add support for RISC-V ACPI tests, Sunil V L, 2024/06/25
- [PATCH v4 01/16] hw/riscv/virt.c: Make block devices default to virtio, Sunil V L, 2024/06/25
- [PATCH v4 02/16] uefi-test-tools/UefiTestToolsPkg: Add RISC-V support, Sunil V L, 2024/06/25
- [PATCH v4 03/16] uefi-test-tools: Add support for python based build script, Sunil V L, 2024/06/25
- [PATCH v4 04/16] tests/data/uefi-boot-images: Add RISC-V ISO image, Sunil V L, 2024/06/25
- [PATCH v4 05/16] qtest: bios-tables-test: Rename aarch64 tests with aarch64 in them, Sunil V L, 2024/06/25
- [PATCH v4 06/16] tests/qtest/bios-tables-test.c: Add support for arch in path,
Sunil V L <=
- [PATCH v4 07/16] tests/qtest/bios-tables-test.c: Set "arch" for aarch64 tests, Sunil V L, 2024/06/25
- [PATCH v4 08/16] tests/qtest/bios-tables-test.c: Set "arch" for x86 tests, Sunil V L, 2024/06/25
- [PATCH v4 09/16] tests/data/acpi: Move x86 ACPI tables under x86/${machine} path, Sunil V L, 2024/06/25
- [PATCH v4 10/16] tests/data/acpi/virt: Move ARM64 ACPI tables under aarch64/${machine} path, Sunil V L, 2024/06/25
- [PATCH v4 11/16] meson.build: Add RISC-V to the edk2-target list, Sunil V L, 2024/06/25
- [PATCH v4 12/16] pc-bios/meson.build: Add support for RISC-V in unpack_edk2_blobs, Sunil V L, 2024/06/25
- [PATCH v4 13/16] tests/data/acpi/rebuild-expected-aml.sh: Add RISC-V, Sunil V L, 2024/06/25
- [PATCH v4 14/16] tests/qtest/bios-tables-test: Add empty ACPI data files for RISC-V, Sunil V L, 2024/06/25
- [PATCH v4 15/16] tests/qtest/bios-tables-test.c: Enable basic testing for RISC-V, Sunil V L, 2024/06/25
- [PATCH v4 16/16] tests/qtest/bios-tables-test: Add expected ACPI data files for RISC-V, Sunil V L, 2024/06/25