From patchwork Thu Apr 21 13:55:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Feceoru, Gabriel" X-Patchwork-Id: 8901071 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 6A394BF29F for ; Thu, 21 Apr 2016 13:56:03 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 834F22020F for ; Thu, 21 Apr 2016 13:56:02 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 94B2720034 for ; Thu, 21 Apr 2016 13:56:01 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D4CB389FF9; Thu, 21 Apr 2016 13:56:00 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTP id 8F53B89FF9 for ; Thu, 21 Apr 2016 13:55:59 +0000 (UTC) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga104.fm.intel.com with ESMTP; 21 Apr 2016 06:56:00 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.24,513,1455004800"; d="scan'208";a="949976236" Received: from gfeceoru-ms-7924.rb.intel.com ([10.237.104.199]) by fmsmga001.fm.intel.com with ESMTP; 21 Apr 2016 06:55:59 -0700 From: Gabriel Feceoru To: intel-gfx@lists.freedesktop.org Date: Thu, 21 Apr 2016 16:55:46 +0300 Message-Id: <1461246946-28851-1-git-send-email-gabriel.feceoru@intel.com> X-Mailer: git-send-email 1.9.1 Subject: [Intel-gfx] [PATCH i-g-t] tests: Mark some tests fail instead of skip X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 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-Spam-Status: No, score=-5.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP These checks may fail in runtime and will cause confusing flipping skip/pass results. Signed-off-by: Gabriel Feceoru --- tests/gem_exec_suspend.c | 2 +- tests/gem_exec_whisper.c | 2 +- tests/gem_reloc_overflow.c | 2 +- tests/gem_ringfill.c | 2 +- tests/gem_streaming_writes.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/gem_exec_suspend.c b/tests/gem_exec_suspend.c index cd133cc..1d03b4d 100644 --- a/tests/gem_exec_suspend.c +++ b/tests/gem_exec_suspend.c @@ -154,7 +154,7 @@ static void run_test(int fd, unsigned engine, unsigned flags) obj[0].flags |= EXEC_OBJECT_WRITE; obj[1].handle = gem_create(fd, 4096); gem_write(fd, obj[1].handle, 0, &bbe, sizeof(bbe)); - igt_require(__gem_execbuf(fd, &execbuf) == 0); + igt_assert(__gem_execbuf(fd, &execbuf) == 0); gem_close(fd, obj[1].handle); memset(&reloc, 0, sizeof(reloc)); diff --git a/tests/gem_exec_whisper.c b/tests/gem_exec_whisper.c index 8db475e..c55ee9c 100644 --- a/tests/gem_exec_whisper.c +++ b/tests/gem_exec_whisper.c @@ -181,7 +181,7 @@ static void whisper(int fd, unsigned engine, unsigned flags) execbuf.flags |= LOCAL_I915_EXEC_NO_RELOC; if (gen < 6) execbuf.flags |= I915_EXEC_SECURE; - igt_require(__gem_execbuf(fd, &execbuf) == 0); + igt_assert(__gem_execbuf(fd, &execbuf) == 0); scratch = tmp[0]; store = tmp[1]; } diff --git a/tests/gem_reloc_overflow.c b/tests/gem_reloc_overflow.c index d60bec9..dbff126 100644 --- a/tests/gem_reloc_overflow.c +++ b/tests/gem_reloc_overflow.c @@ -208,7 +208,7 @@ static void reloc_tests(const char *suffix) /* Make sure the batch would succeed except for the thing we're * testing. */ - igt_require(__gem_execbuf(fd, &execbuf) == 0); + igt_assert(__gem_execbuf(fd, &execbuf) == 0); } igt_subtest_f("batch-start-unaligned%s", suffix) { diff --git a/tests/gem_ringfill.c b/tests/gem_ringfill.c index f2dc803..1f53aac 100644 --- a/tests/gem_ringfill.c +++ b/tests/gem_ringfill.c @@ -113,7 +113,7 @@ static void run_test(int fd, unsigned ring, unsigned flags) obj[0].flags |= EXEC_OBJECT_WRITE; obj[1].handle = gem_create(fd, 1024*16 + 4096); gem_write(fd, obj[1].handle, 0, &bbe, sizeof(bbe)); - igt_require(__gem_execbuf(fd, &execbuf) == 0); + igt_assert(__gem_execbuf(fd, &execbuf) == 0); obj[1].relocs_ptr = (uintptr_t)reloc; obj[1].relocation_count = 1024; diff --git a/tests/gem_streaming_writes.c b/tests/gem_streaming_writes.c index 5d0014a..d084454 100644 --- a/tests/gem_streaming_writes.c +++ b/tests/gem_streaming_writes.c @@ -106,7 +106,7 @@ static void test_streaming(int fd, int mode, int sync) execbuf.flags = LOCAL_I915_EXEC_HANDLE_LUT; if (__gem_execbuf(fd, &execbuf)) { execbuf.flags = 0; - igt_require(__gem_execbuf(fd, &execbuf) == 0); + igt_assert(__gem_execbuf(fd, &execbuf) == 0); } /* We assume that the active objects are fixed to avoid relocations */ __src_offset = src_offset;