diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-04-25 13:21:38 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-04-25 13:21:38 +0200 |
| commit | bb40c7e8df2183449e6e252556b9c176d516caeb (patch) | |
| tree | 739ec987854a7499f82bbf9f5acfc26cbc87a809 | |
| parent | cf72da57dcc1baeaaff71250a82b40ab324b7590 (diff) | |
test: fix up hangman script and enable by default
Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
| -rw-r--r-- | tests/Makefile.am | 1 | ||||
| -rwxr-xr-x | tests/ZZ_hangman | 11 |
2 files changed, 6 insertions, 6 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 369b09ae..108b55c6 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -71,6 +71,7 @@ TESTS_scripts = \ debugfs_emon_crash \ sysfs_edid_timing \ ZZ_check_dmesg \ + ZZ_hangman \ $(NULL) kernel_tests = \ diff --git a/tests/ZZ_hangman b/tests/ZZ_hangman index 80ed9687..d1489786 100755 --- a/tests/ZZ_hangman +++ b/tests/ZZ_hangman @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # Testcase: Simulate gpu hang # @@ -9,6 +9,8 @@ SOURCE_DIR="$( dirname "${BASH_SOURCE[0]}" )" . $SOURCE_DIR/drm_lib.sh +oldpath=`pwd` + cd $i915_path if [ ! -f i915_ring_stop ] ; then @@ -23,12 +25,9 @@ fi # stop rings echo 0xf > i915_ring_stop +echo "rings stopped" -# need to run it twice, otherwise there are no waiters -$cur_path/gem_exec_nop > /dev/null 2>&1 & -$cur_path/gem_exec_nop > /dev/null 2>&1 & - -sleep 10 +$oldpath/$SOURCE_DIR/gem_exec_nop > /dev/null if cat i915_error_state | grep -v "no error state collected" > /dev/null ; then echo "gpu hang correctly dectected" |