[PATCH i-g-t 1/2] drv_module_reload: Don't declare success when failing

[PATCH i-g-t 1/2] drv_module_reload: Don't declare success when failing

[Damien Lespiau]

We weren't returning straight away when failing to unload the driver, so
the test happilly executed gem_suspend and printed ""module successfully
loaded again".

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
---
 tests/drv_module_reload | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tests/drv_module_reload b/tests/drv_module_reload
index c1fd395..66cd6bb 100755
--- a/tests/drv_module_reload
+++ b/tests/drv_module_reload
@@ -33,10 +33,9 @@ rmmod drm &> /dev/null
 
 if lsmod | grep i915 &> /dev/null ; then
 	echo WARNING: i915.ko still loaded!
-	exitcode=1
+	exit 1
 else
 	echo module successfully unloaded
-	exitcode=0
 fi
 
 modprobe i915
@@ -47,4 +46,4 @@ modprobe snd_hda_intel
 # try to run something
 $SOURCE_DIR/gem_exec_nop > /dev/null && echo "module successfully loaded again"
 
-exit $exitcode
+exit 0
-- 
1.8.3.1

[PATCH i-g-t 2/2] drv_module_reload: For some reason, vtcon0 has been seen as being fbcon

[Damien Lespiau]

Not sure if this was ABI, I vote for no, so just unbind everyone.

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
---
 tests/drv_module_reload | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tests/drv_module_reload b/tests/drv_module_reload
index 66cd6bb..0e729d3 100755
--- a/tests/drv_module_reload
+++ b/tests/drv_module_reload
@@ -5,14 +5,17 @@
 # ... we've broken this way too often :(
 #
 
+set -x
+
 SOURCE_DIR="$( dirname "${BASH_SOURCE[0]}" )"
 . $SOURCE_DIR/drm_lib.sh
 
 # no other drm service should be running, so we can just unbind
 
 # vtcon0 is vga, vtcon1 fbcon and let's pray that won't change due to boot load
-# time changes
-if ! echo 0 > /sys/class/vtconsole/vtcon1/bind ; then
+# time changes. It just did here!, unbind everything, like a boss.
+if ! echo 0 > /sys/class/vtconsole/vtcon0/bind && \
+     echo 0 > /sys/class/vtconsole/vtcon1/bind; then
 	echo -e "no kms unload support"
 	echo "please enable CONFIG_VT_HW_CONSOLE_BINDING in the kernel"
 	exit 77
-- 
1.8.3.1

Re: [PATCH i-g-t 2/2] drv_module_reload: For some reason, vtcon0 has been seen as being fbcon

[Damien Lespiau]

On Thu, Jul 10, 2014 at 02:17:43PM +0100, Damien Lespiau wrote:
> Not sure if this was ABI, I vote for no, so just unbind everyone.
> 
> Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>

Meh, this is very wrong, don't look at it.

> ---
>  tests/drv_module_reload | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/drv_module_reload b/tests/drv_module_reload
> index 66cd6bb..0e729d3 100755
> --- a/tests/drv_module_reload
> +++ b/tests/drv_module_reload
> @@ -5,14 +5,17 @@
>  # ... we've broken this way too often :(
>  #
>  
> +set -x
> +
>  SOURCE_DIR="$( dirname "${BASH_SOURCE[0]}" )"
>  . $SOURCE_DIR/drm_lib.sh
>  
>  # no other drm service should be running, so we can just unbind
>  
>  # vtcon0 is vga, vtcon1 fbcon and let's pray that won't change due to boot load
> -# time changes
> -if ! echo 0 > /sys/class/vtconsole/vtcon1/bind ; then
> +# time changes. It just did here!, unbind everything, like a boss.
> +if ! echo 0 > /sys/class/vtconsole/vtcon0/bind && \
> +     echo 0 > /sys/class/vtconsole/vtcon1/bind; then
>  	echo -e "no kms unload support"
>  	echo "please enable CONFIG_VT_HW_CONSOLE_BINDING in the kernel"
>  	exit 77
> -- 
> 1.8.3.1
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx