From patchwork Mon Dec 1 14:42:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tim.gore@intel.com X-Patchwork-Id: 5412931 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 33ACB9F1C5 for ; Mon, 1 Dec 2014 14:42:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 62C51202B4 for ; Mon, 1 Dec 2014 14:42:46 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 6E6E0202A1 for ; Mon, 1 Dec 2014 14:42:45 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D0D296E18F; Mon, 1 Dec 2014 06:42:43 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id E70FD6E18F for ; Mon, 1 Dec 2014 06:42:42 -0800 (PST) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP; 01 Dec 2014 06:42:42 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.07,494,1413270000"; d="scan'208";a="640734620" Received: from tgore-linux.isw.intel.com ([10.102.226.58]) by fmsmga002.fm.intel.com with ESMTP; 01 Dec 2014 06:42:38 -0800 From: tim.gore@intel.com To: intel-gfx@lists.freedesktop.org Date: Mon, 1 Dec 2014 14:42:37 +0000 Message-Id: <1417444957-4940-1-git-send-email-tim.gore@intel.com> X-Mailer: git-send-email 2.1.3 Cc: daniel.vetter@ffwll.ch Subject: [Intel-gfx] [PATCH i-g-t] tests/drv_hangman: remove check for other drm clients 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=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_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 From: Tim Gore This test will not run on Android as the coreu service remains running even after the android system is stopped. Coreu is a client of drm and when the test finds this it fails an assert. Coreu is started by the init process and there is no tidy, non invasive way to stop it (init just restarts it). Coreu isn't doing anything and would not be expected to interfere with this test. In addition, all the other igt tests just rely on the user/test script to ensure that there are no other drm clients, so this test can do the same. On Android we must rely on coreu being dormant when this test runs. Signed-off-by: Tim Gore --- tests/drv_hangman.c | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/tests/drv_hangman.c b/tests/drv_hangman.c index 8fbc2d3..cdbded2 100644 --- a/tests/drv_hangman.c +++ b/tests/drv_hangman.c @@ -163,26 +163,6 @@ static int get_line_count(const char *s) return count; } -static void check_other_clients(void) -{ - char tmp[1024]; - char *s; - int dev, pid, uid, magic; - - read_dfs("clients", tmp, sizeof(tmp)); - if (get_line_count(tmp) <= 2) - return; - - s = strstr(tmp, "y"); - igt_assert(s != NULL); - igt_assert(sscanf(s, "y %d %d %d %d", - &dev, &pid, &uid, &magic) == 4); - - igt_debug("client %d %d %d %d\n", dev, pid, uid, magic); - igt_assert(pid == getpid()); - igt_debug("found myself in client list\n"); -} - #define MAGIC_NUMBER 0x10001 const uint32_t batch[] = { MI_NOOP, MI_BATCH_BUFFER_END, @@ -252,7 +232,6 @@ static void test_error_state_basic(void) { int fd; - check_other_clients(); clear_error_state(); assert_error_state_clear(); @@ -406,7 +385,6 @@ static void test_error_state_capture(unsigned ring_id, uint64_t offset; bool cmd_parser; - check_other_clients(); clear_error_state(); fd = drm_open_any();