From patchwork Thu Nov 17 15:02:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Foss X-Patchwork-Id: 9434431 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 A30F960469 for ; Thu, 17 Nov 2016 15:03:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9436929543 for ; Thu, 17 Nov 2016 15:03:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 892BA29585; Thu, 17 Nov 2016 15:03:22 +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=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY 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 503C929543 for ; Thu, 17 Nov 2016 15:03:22 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 187FC6E829; Thu, 17 Nov 2016 15:03:19 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e3e3]) by gabe.freedesktop.org (Postfix) with ESMTPS id 34FAD6E80F for ; Thu, 17 Nov 2016 15:02:56 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: robertfoss) with ESMTPSA id 2316B268BA2 From: robert.foss@collabora.com To: intel-gfx@lists.freedesktop.org, Gustavo Padovan , Daniel Stone , Daniel Vetter , Marius Vlad , Eric Engestrom , Chris Wilson Date: Thu, 17 Nov 2016 10:02:07 -0500 Message-Id: <20161117150209.14810-20-robert.foss@collabora.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20161117150209.14810-1-robert.foss@collabora.com> References: <20161117150209.14810-1-robert.foss@collabora.com> Subject: [Intel-gfx] [PATCH i-g-t v6 19/21] tests/sw_sync: Add subtest test_sync_merge_invalid 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-Virus-Scanned: ClamAV using ClamSMTP From: Robert Foss Add subtest test_sync_merge_invalid that tests merging invalid fences. Signed-off-by: Robert Foss --- tests/sw_sync.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/tests/sw_sync.c b/tests/sw_sync.c index 0aae4dc..d60fb32 100644 --- a/tests/sw_sync.c +++ b/tests/sw_sync.c @@ -155,6 +155,44 @@ static void test_sync_busy(void) close(timeline); } +static void test_sync_merge_invalid(void) +{ + int in_fence; + int fence_invalid; + int fence_merge; + int timeline; + char tmppath[] = "/tmp/igt-XXXXXX"; + int skip = 0; + + timeline = sw_sync_timeline_create(); + in_fence = sw_sync_fence_create(timeline, 1); + + fence_invalid = -1; + fence_merge = sync_merge(in_fence, fence_invalid); + igt_assert_f(fence_merge < 0, "Verify invalid fd (-1) handling"); + + fence_invalid = drm_open_driver(DRIVER_ANY); + fence_merge = sync_merge(in_fence, fence_invalid); + igt_assert_f(fence_merge < 0, "Verify invalid fd (device fd) handling"); + + fence_invalid = mkstemp(tmppath); + if (fence_invalid == -1) { + skip = 1; + goto out; + } + unlink(tmppath); + fence_invalid = drm_open_driver(DRIVER_ANY); + fence_merge = sync_merge(in_fence, fence_invalid); + close(fence_invalid); + igt_assert_f(fence_merge < 0, "Verify invalid fd (file fd) handling"); + +out: + close(in_fence); + close(fence_merge); + close(timeline); + igt_require(skip == 0); +} + static void test_sync_merge(void) { int in_fence[3]; @@ -732,6 +770,9 @@ igt_main igt_subtest("sync_busy") test_sync_busy(); + igt_subtest("sync_merge_invalid") + test_sync_merge_invalid(); + igt_subtest("sync_merge") test_sync_merge();