[Intel-gfx] [i-g-t PATCH 1/3] tests: add more checks for finding the debugfs in script based tests

[Chris Wilson]

On Thu, Oct 13, 2016 at 03:59:55PM +0300, Jani Nikula wrote:
> While at it, make debugfs_path point at the debugfs root, not
> dri. This'll be handy in future work.
> 
> Signed-off-by: Jani Nikula <jani.nikula at intel.com>
> ---
>  tests/drm_lib.sh | 16 ++++++++++------
>  1 file changed, 10 insertions(+), 6 deletions(-)
> 
> diff --git a/tests/drm_lib.sh b/tests/drm_lib.sh
> index 113da4c7d645..87e3ad0ab547 100755
> --- a/tests/drm_lib.sh
> +++ b/tests/drm_lib.sh
> @@ -41,18 +41,22 @@ do_or_die() {
>  	$@ > /dev/null 2>&1 || (echo "FAIL: $@ ($?)" && exit $IGT_EXIT_FAILURE)
>  }
>  
> -if [ -d /debug/dri ] ; then
> -	debugfs_path=/debug/dri
> +if [ -d /sys/kernel/debug ]; then
> +	debugfs_path=/sys/kernel/debug
> +elif [ -d /debug ]; then
> +	debugfs_path=/debug
> +else
> +	skip "debugfs not found"
>  fi
>  
> -if [ -d /sys/kernel/debug/dri ] ; then
> -	debugfs_path=/sys/kernel/debug/dri
> +if [ ! -d $debugfs_path/dri ]; then
> +	skip "dri debugfs not found"
>  fi
>  
>  i915_dfs_path=x
>  for minor in `seq 0 16`; do
> -	if [ -f $debugfs_path/$minor/i915_error_state ] ; then
> -		i915_dfs_path=$debugfs_path/$minor
> +	if [ -f $debugfs_path/dri/$minor/i915_error_state ] ; then
> +		i915_dfs_path=$debugfs_path/dri/$minor

Thinking of how to wean ourselves off i915_error_state; how about

	if [ grep -s i915 $debugfs_path/dri/$minor/name ]; then

?
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre