In preparation to have sysfs entries used in scripts rename to more specific name. Signed-off-by: Mika Kuoppala <mika.kuoppala at intel.com> --- 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 -- 1.7.9.5