[v4,06/16] tests/qtest/bios-tables-test.c: Add support for arch in path

Commit Message

Sunil V L June 25, 2024, 3:08 p.m. UTC

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 <[e-mail]>
Acked-by: Alistair Francis <[e-mail]>
Reviewed-by: Igor Mammedov <[e-mail]>
---
 tests/qtest/bios-tables-test.c | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

Comments

Igor Mammedov July 2, 2024, 8:30 a.m. UTC | #1

On Tue, 25 Jun 2024 20:38:29 +0530
Sunil V L <[e-mail]> wrote:

> 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.

we probably should remove fallback path lookup after series is merged.
it' fine to do it as a follow up patch.

> 
> Signed-off-by: Sunil V L <[e-mail]>
> Acked-by: Alistair Francis <[e-mail]>
> Reviewed-by: Igor Mammedov <[e-mail]>

Sunil V L July 2, 2024, 8:33 a.m. UTC | #2

On Tue, Jul 02, 2024 at 10:30:02AM +0200, Igor Mammedov wrote:
> On Tue, 25 Jun 2024 20:38:29 +0530
> Sunil V L <[e-mail]> wrote:
> 
> > 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.
> 
> we probably should remove fallback path lookup after series is merged.
> it' fine to do it as a follow up patch.
> 
Agreed. Let me send a follow up patch.

Thanks,
Sunil

Patch

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);
         }