From patchwork Thu Jun 27 13:54:42 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mika Kuoppala X-Patchwork-Id: 2793761 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 3282B9F245 for ; Thu, 27 Jun 2013 13:56:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 024BC201DB for ; Thu, 27 Jun 2013 13:56:26 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id A81AB201C3 for ; Thu, 27 Jun 2013 13:56:24 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 82498E5E0B for ; Thu, 27 Jun 2013 06:56:24 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id AE544E5C3B for ; Thu, 27 Jun 2013 06:54:46 -0700 (PDT) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP; 27 Jun 2013 06:52:24 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.87,952,1363158000"; d="scan'208";a="336404023" Received: from rosetta.fi.intel.com (HELO rosetta) ([10.237.72.67]) by orsmga001.jf.intel.com with ESMTP; 27 Jun 2013 06:54:45 -0700 Received: by rosetta (Postfix, from userid 1000) id 9FB068007A; Thu, 27 Jun 2013 16:54:44 +0300 (EEST) From: Mika Kuoppala To: intel-gfx@lists.freedesktop.org Date: Thu, 27 Jun 2013 16:54:42 +0300 Message-Id: <1372341284-14132-1-git-send-email-mika.kuoppala@intel.com> X-Mailer: git-send-email 1.7.9.5 Subject: [Intel-gfx] [PATCH 1/3] tests: rename debugfs base path to be more specific X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org X-Spam-Status: No, score=-5.5 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 In preparation to have sysfs entries used in scripts rename to more specific name. Signed-off-by: Mika Kuoppala --- tests/ZZ_hangman | 2 +- tests/debugfs_emon_crash | 2 +- tests/debugfs_reader | 2 +- tests/debugfs_wedged | 4 ++-- tests/drm_lib.sh | 8 ++++---- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/ZZ_hangman b/tests/ZZ_hangman index cf71972..08c5514 100755 --- a/tests/ZZ_hangman +++ b/tests/ZZ_hangman @@ -11,7 +11,7 @@ SOURCE_DIR="$( dirname "${BASH_SOURCE[0]}" )" oldpath=`pwd` -cd $i915_path +cd $i915_dfs_path if [ ! -f i915_ring_stop ] ; then echo "kernel doesn't support ring stopping" diff --git a/tests/debugfs_emon_crash b/tests/debugfs_emon_crash index 6e139a4..809bfab 100755 --- a/tests/debugfs_emon_crash +++ b/tests/debugfs_emon_crash @@ -8,7 +8,7 @@ SOURCE_DIR="$( dirname "${BASH_SOURCE[0]}" )" . $SOURCE_DIR/drm_lib.sh for z in $(seq 1 1000); do - cat $i915_path/i915_emon_status > /dev/null 2&>1 + cat $i915_dfs_path/i915_emon_status > /dev/null 2&>1 done # If we got here, we haven't crashed diff --git a/tests/debugfs_reader b/tests/debugfs_reader index 80d5998..9e2845e 100755 --- a/tests/debugfs_reader +++ b/tests/debugfs_reader @@ -4,6 +4,6 @@ SOURCE_DIR="$( dirname "${BASH_SOURCE[0]}" )" . $SOURCE_DIR/drm_lib.sh # read everything we can -cat $i915_path/* > /dev/null 2>&1 +cat $i915_dfs_path/* > /dev/null 2>&1 exit 0 diff --git a/tests/debugfs_wedged b/tests/debugfs_wedged index 80a32f6..903a0a2 100755 --- a/tests/debugfs_wedged +++ b/tests/debugfs_wedged @@ -6,5 +6,5 @@ SOURCE_DIR="$( dirname "${BASH_SOURCE[0]}" )" # Testcase: wedge the hw to check the error_state reading # # Unfortunately wedged is permanent, so this test is not run by default -echo 1 > ${i915_path}/i915_wedged -cat $i915_path/i915_error_state > /dev/null 2>&1 +echo 1 > ${i915_dfs_path}/i915_wedged +cat $i915_dfs_path/i915_error_state > /dev/null 2>&1 diff --git a/tests/drm_lib.sh b/tests/drm_lib.sh index a76fd47..7eaf34e 100755 --- a/tests/drm_lib.sh +++ b/tests/drm_lib.sh @@ -12,20 +12,20 @@ if [ -d /sys/kernel/debug/dri ] ; then debugfs_path=/sys/kernel/debug/dri fi -i915_path=x +i915_dfs_path=x for dir in `ls $debugfs_path` ; do if [ -f $debugfs_path/$dir/i915_error_state ] ; then - i915_path=$debugfs_path/$dir + i915_dfs_path=$debugfs_path/$dir break fi done -if [ $i915_path = "x" ] ; then +if [ $i915_dfs_path = "x" ] ; then die " i915 debugfs path not found." fi # read everything we can -if [ `cat $i915_path/clients | wc -l` -gt "2" ] ; then +if [ `cat $i915_dfs_path/clients | wc -l` -gt "2" ] ; then die "ERROR: other drm clients running" fi