From patchwork Tue Oct 11 15:19:37 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 9371281 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0047260487 for ; Tue, 11 Oct 2016 15:21:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E2F9728F55 for ; Tue, 11 Oct 2016 15:20:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D268C28F87; Tue, 11 Oct 2016 15:20:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 778F528F55 for ; Tue, 11 Oct 2016 15:20:59 +0000 (UTC) Received: from localhost ([::1]:56409 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1btyrS-0005c9-EY for patchwork-qemu-devel@patchwork.kernel.org; Tue, 11 Oct 2016 11:20:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34969) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1btyqP-0005BL-JX for qemu-devel@nongnu.org; Tue, 11 Oct 2016 11:19:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1btyqI-0004FX-US for qemu-devel@nongnu.org; Tue, 11 Oct 2016 11:19:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35596) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1btyqI-0004FK-OF; Tue, 11 Oct 2016 11:19:46 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 479A26648; Tue, 11 Oct 2016 15:19:46 +0000 (UTC) Received: from thh440s.str.redhat.com. (dhcp-192-218.str.redhat.com [10.33.192.218]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u9BFJbMO002507; Tue, 11 Oct 2016 11:19:44 -0400 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell , Paolo Bonzini Date: Tue, 11 Oct 2016 17:19:37 +0200 Message-Id: <1476199177-32411-4-git-send-email-thuth@redhat.com> In-Reply-To: <1476199177-32411-1-git-send-email-thuth@redhat.com> References: <1476199177-32411-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Tue, 11 Oct 2016 15:19:46 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 3/3] tests/boot-sector: Increase time-out to 90 seconds 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: Victor Kaplansky , Michael Tsirkin , qemu-trivial@nongnu.org, qemu-ppc@nongnu.org, Sascha Silbe , David Gibson Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Since the PXE tester runs rather slow on ppc64 with tcg, there is a chance that we hit the 60 seconds timeout on machines that have a heavy CPU load. So let's increase the timeout to ease the situation. Signed-off-by: Thomas Huth --- tests/boot-sector.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/boot-sector.c b/tests/boot-sector.c index 8399314..e3880f4 100644 --- a/tests/boot-sector.c +++ b/tests/boot-sector.c @@ -106,9 +106,9 @@ void boot_sector_test(void) uint16_t signature; int i; - /* Wait at most 1 minute */ + /* Wait at most 90 seconds */ #define TEST_DELAY (1 * G_USEC_PER_SEC / 10) -#define TEST_CYCLES MAX((60 * G_USEC_PER_SEC / TEST_DELAY), 1) +#define TEST_CYCLES MAX((90 * G_USEC_PER_SEC / TEST_DELAY), 1) /* Poll until code has run and modified memory. Once it has we know BIOS * initialization is done. TODO: check that IP reached the halt