From patchwork Wed May 2 11:13:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 10375535 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 72DA160384 for ; Wed, 2 May 2018 11:13:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 61DC1286BE for ; Wed, 2 May 2018 11:13:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5390528E28; Wed, 2 May 2018 11:13:40 +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=-5.2 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 3656E286BE for ; Wed, 2 May 2018 11:13:38 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 64FFF6E4E5; Wed, 2 May 2018 11:13:37 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from fireflyinternet.com (mail.fireflyinternet.com [109.228.58.192]) by gabe.freedesktop.org (Postfix) with ESMTPS id C79C36E4E5 for ; Wed, 2 May 2018 11:13:35 +0000 (UTC) X-Default-Received-SPF: pass (skip=forwardok (res=PASS)) x-ip-name=78.156.65.138; Received: from haswell.alporthouse.com (unverified [78.156.65.138]) by fireflyinternet.com (Firefly Internet (M1)) with ESMTP id 11568370-1500050 for multiple; Wed, 02 May 2018 12:13:33 +0100 Received: by haswell.alporthouse.com (sSMTP sendmail emulation); Wed, 02 May 2018 12:13:27 +0100 From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Wed, 2 May 2018 12:13:26 +0100 Message-Id: <20180502111326.30196-1-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.17.0 X-Originating-IP: 78.156.65.138 X-Country: code=GB country="United Kingdom" ip=78.156.65.138 Subject: [Intel-gfx] [PATCH i-g-t] igt/gem_wait: Relax assertion for wait completion X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP When waiting for a finite batch, all that we require is that the batch completes. If it takes the full second (or longer) for us to wake up and notice the completed batch is immaterial, so only assert that we don't report an infinite timeout afterwards. Signed-off-by: Chris Wilson Reviewed-by: Joonas Lahtinen --- tests/gem_wait.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/gem_wait.c b/tests/gem_wait.c index 1d10055bb..61d8a4059 100644 --- a/tests/gem_wait.c +++ b/tests/gem_wait.c @@ -113,7 +113,7 @@ static void basic(int fd, unsigned engine, unsigned flags) igt_spin_batch_set_timeout(spin, NSEC_PER_SEC/2); wait.timeout_ns = NSEC_PER_SEC; /* 1.0s */ igt_assert_eq(__gem_wait(fd, &wait), 0); - igt_assert(wait.timeout_ns > 0); + igt_assert(wait.timeout_ns >= 0); } else { wait.timeout_ns = -1; igt_assert_eq(__gem_wait(fd, &wait), 0);