From nobody Mon Nov 3 14:02:59 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1505972419392614.8077608676898; Wed, 20 Sep 2017 22:40:19 -0700 (PDT) Received: from localhost ([::1]:51892 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duuDh-0000gN-Pt for importer@patchew.org; Thu, 21 Sep 2017 01:40:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54618) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duuCr-0000K0-Lf for qemu-devel@nongnu.org; Thu, 21 Sep 2017 01:39:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1duuCo-00048m-JE for qemu-devel@nongnu.org; Thu, 21 Sep 2017 01:39:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59084) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1duuCo-00047V-DG; Thu, 21 Sep 2017 01:39:22 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id F21C8C058EB1; Thu, 21 Sep 2017 05:39:18 +0000 (UTC) Received: from thh440s.redhat.com (ovpn-116-54.ams2.redhat.com [10.36.116.54]) by smtp.corp.redhat.com (Postfix) with ESMTP id 90DE85D988; Thu, 21 Sep 2017 05:39:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com F21C8C058EB1 Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=thuth@redhat.com From: Thomas Huth To: qemu-ppc@nongnu.org Date: Thu, 21 Sep 2017 07:39:15 +0200 Message-Id: <1505972355-23903-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Thu, 21 Sep 2017 05:39:19 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH] tests/prom-env: Bump the timeout, and test pseries only in slow mode X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stefan Weil , Mark Cave-Ayland , qemu-devel@nongnu.org, David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" If QEMU has been compiled with the flags --enable-tcg-interpreter and --enable-debug, the guest is running incredibly slow. The prom-env test is approximately 10 times slower than normal in this case, and it takes up to 500 seconds until the test with the pseries machine finishs. While we should still look for ways to speed up the test on the pseries machine here, let's bump the timeout to 600 seconds to allow the test to pass with this unusal configuration already now. Also move the pseries test into the "slow" category - since it is really a very slow test. Signed-off-by: Thomas Huth Reviewed-by: Stefan Weil --- tests/prom-env-test.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/tests/prom-env-test.c b/tests/prom-env-test.c index eac207b..bc8b616 100644 --- a/tests/prom-env-test.c +++ b/tests/prom-env-test.c @@ -1,7 +1,7 @@ /* - * Test OpenBIOS-based machines. + * Test Open-Firmware-based machines. * - * Copyright (c) 2016 Red Hat Inc. + * Copyright (c) 2016, 2017 Red Hat Inc. * * Author: * Thomas Huth @@ -30,8 +30,8 @@ static void check_guest_memory(void) uint32_t signature; int i; =20 - /* Poll until code has run and modified memory. Wait at most 120 secon= ds */ - for (i =3D 0; i < 12000; ++i) { + /* Poll until code has run and modified memory. Wait at most 600 secon= ds */ + for (i =3D 0; i < 60000; ++i) { signature =3D readl(ADDRESS); if (signature =3D=3D MAGIC) { break; @@ -78,7 +78,6 @@ int main(int argc, char *argv[]) const char *sparc_machines[] =3D { "SPARCbook", "Voyager", "SS-20", NU= LL }; const char *sparc64_machines[] =3D { "sun4u", NULL }; const char *ppc_machines[] =3D { "mac99", "g3beige", NULL }; - const char *ppc64_machines[] =3D { "mac99", "g3beige", "pseries", NULL= }; const char *arch =3D qtest_get_arch(); =20 g_test_init(&argc, &argv, NULL); @@ -86,7 +85,10 @@ int main(int argc, char *argv[]) if (!strcmp(arch, "ppc")) { add_tests(ppc_machines); } else if (!strcmp(arch, "ppc64")) { - add_tests(ppc64_machines); + add_tests(ppc_machines); + if (g_test_slow()) { + qtest_add_data_func("prom-env/pseries", "pseries", test_machin= e); + } } else if (!strcmp(arch, "sparc")) { add_tests(sparc_machines); } else if (!strcmp(arch, "sparc64")) { --=20 1.8.3.1