From mboxrd@z Thu Jan  1 00:00:00 1970
From: Daniel Vetter <daniel@ffwll.ch>
Subject: Re: [PATCH 3/3] tests/ZZ_hangman: Test both error_state
 interfaces
Date: Mon, 1 Jul 2013 18:56:11 +0200
Message-ID: <20130701165611.GU18285@phenom.ffwll.local>
References: <20130627172330.GR18285@phenom.ffwll.local>
	<1372419341-5858-1-git-send-email-mika.kuoppala@intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org>
Received: from mail-ea0-f182.google.com (mail-ea0-f182.google.com
	[209.85.215.182])
	by gabe.freedesktop.org (Postfix) with ESMTP id 5CBFEE5BF0
	for <intel-gfx@lists.freedesktop.org>;
	Mon,  1 Jul 2013 09:56:13 -0700 (PDT)
Received: by mail-ea0-f182.google.com with SMTP id d10so2217002eaj.41
	for <intel-gfx@lists.freedesktop.org>;
	Mon, 01 Jul 2013 09:56:12 -0700 (PDT)
Content-Disposition: inline
In-Reply-To: <1372419341-5858-1-git-send-email-mika.kuoppala@intel.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org
Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org
To: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Cc: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

On Fri, Jun 28, 2013 at 02:35:41PM +0300, Mika Kuoppala wrote:
> Test both debugfs and sysfs error_state interfaces.
> 
> v2: sysfs error_state not mandatory
> 
> Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com>

Series merged with Chris' s/error_state/error/ bikeshed applied, thanks.
-Daniel

> ---
>  tests/ZZ_hangman |   52 ++++++++++++++++++++++++++++++++++++++--------------
>  1 file changed, 38 insertions(+), 14 deletions(-)
> 
> diff --git a/tests/ZZ_hangman b/tests/ZZ_hangman
> index 08c5514..4db3823 100755
> --- a/tests/ZZ_hangman
> +++ b/tests/ZZ_hangman
> @@ -18,25 +18,49 @@ if [ ! -f i915_ring_stop ] ; then
>  	exit 77
>  fi
>  
> -if cat i915_error_state | grep -v "no error state collected" > /dev/null ; then
> -	echo "gpu hang dectected"
> -	exit 1
> -fi
> +function check_iface {
> +    estate_fname=$1
> +    mandatory=$2
>  
> -# stop rings
> -echo 0xf > i915_ring_stop
> -echo "rings stopped"
> +    echo checking ${estate_fname}
>  
> -(cd $oldpath; $SOURCE_DIR/gem_exec_big) > /dev/null
> +    if [ ! -f $estate_fname ] ; then
> +	if [  $mandatory != 0 ] ; then
> +	    echo "'${estate_fname}' not found";
> +	    exit 1;
> +	else
> +	    echo "${estate_fname} not mandatory";
> +	    return;
> +	fi
> +    fi
>  
> -if cat i915_error_state | grep -v "no error state collected" > /dev/null ; then
> -	echo "gpu hang correctly dectected"
> -else
> -	echo "gpu hang not dectected"
> +    if cat $estate_fname | grep -v "no error state collected" > /dev/null ; then
> +	echo "gpu hang detected"
>  	exit 2
> -fi
> +    fi
> +
> +    echo 0xf > i915_ring_stop
> +    echo "rings stopped"
> +
> +    (cd $oldpath; $SOURCE_DIR/gem_exec_big) > /dev/null
> +
> +    if cat $estate_fname | grep -v "no error state collected" > /dev/null ; then
> +	echo "gpu hang correctly detected"
> +    else
> +	echo "gpu hang not detected"
> +	exit 3
> +    fi
>  
>  # clear error state
> -echo > i915_error_state
> +    echo > $estate_fname
> +
> +    if cat $estate_fname | grep -v "no error state collected" > /dev/null ; then
> +	echo "gpu hang still present"
> +	exit 4
> +    fi
> +}
> +
> +check_iface $i915_dfs_path/i915_error_state 1
> +check_iface $i915_sfs_path/error_state 0
>  
>  exit 0
> -- 
> 1.7.9.5
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch