From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47912) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YaXaC-0004Hn-7R for qemu-devel@nongnu.org; Tue, 24 Mar 2015 18:46:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YaXa3-0006nD-SM for qemu-devel@nongnu.org; Tue, 24 Mar 2015 18:46:00 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53729 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YaXa3-0006n4-LP for qemu-devel@nongnu.org; Tue, 24 Mar 2015 18:45:51 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Tue, 24 Mar 2015 23:45:48 +0100 Message-Id: <1427237148-8728-3-git-send-email-afaerber@suse.de> In-Reply-To: <1427237148-8728-1-git-send-email-afaerber@suse.de> References: <1427237148-8728-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH for-2.3 2/2] i440fx-test: Fix test paths to include architecture List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, =?UTF-8?q?Andreas=20F=C3=A4rber?= , stefanha@redhat.com, peter.maydell@linaro.org 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=C3=A4rber --- 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_d= ata)) { - g_test_add(testpath, FirmwareTestFixture, NULL, setup_fixture, + char *path =3D g_strdup_printf("/%s%s", qtest_get_arch(), testpath); + g_test_add(path, FirmwareTestFixture, NULL, setup_fixture, test_i440fx_firmware, NULL); + g_free(path); } =20 static void request_bios(FirmwareTestFixture *fixture, @@ -408,8 +410,8 @@ int main(int argc, char **argv) =20 data.num_cpus =3D 1; =20 - 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); =20 --=20 2.1.4