[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Qemu-devel] [PATCH for-2.3 2/2] i440fx-test: Fix test paths to incl

From: John Snow
Subject: Re: [Qemu-devel] [PATCH for-2.3 2/2] i440fx-test: Fix test paths to include architecture
Date: Tue, 24 Mar 2015 19:09:37 -0400
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.5.0

On 03/24/2015 06:45 PM, Andreas Färber wrote:
Replace g_test_add_func() with new qtest_add_func() and modify the path
passed to g_test_add() macro.

Signed-off-by: Andreas Färber <address@hidden>
  tests/i440fx-test.c | 8 +++++---
  1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/tests/i440fx-test.c b/tests/i440fx-test.c
index a3f7279..bc3f54c 100644
--- a/tests/i440fx-test.c
+++ b/tests/i440fx-test.c
@@ -383,8 +383,10 @@ static void add_firmware_test(const char *testpath,
                                void (*setup_fixture)(FirmwareTestFixture *f,
                                                      gconstpointer test_data))
-    g_test_add(testpath, FirmwareTestFixture, NULL, setup_fixture,
+    char *path = g_strdup_printf("/%s%s", qtest_get_arch(), testpath);
+    g_test_add(path, FirmwareTestFixture, NULL, setup_fixture,
                 test_i440fx_firmware, NULL);
+    g_free(path);

Is it not worth adding an even more generic wrapper to prevent future desynch from our preferred path format?

  static void request_bios(FirmwareTestFixture *fixture,
@@ -408,8 +410,8 @@ int main(int argc, char **argv)

      data.num_cpus = 1;

-    g_test_add_data_func("/i440fx/defaults", &data, test_i440fx_defaults);
-    g_test_add_data_func("/i440fx/pam", &data, test_i440fx_pam);
+    qtest_add_data_func("i440fx/defaults", &data, test_i440fx_defaults);
+    qtest_add_data_func("i440fx/pam", &data, test_i440fx_pam);
      add_firmware_test("/i440fx/firmware/bios", request_bios);
      add_firmware_test("/i440fx/firmware/pflash", request_pflash);

Similar to above, is it worth replacing other test's usage of g_test_add_data_func to force this standard path format everywhere?


reply via email to

[Prev in Thread] Current Thread [Next in Thread]