On pe, 2016-05-20 at 18:20 +0300, Marius Vlad wrote:
> Either we return $IGT_EXIT_FAILURE or remove it entirely (like in
> this
> patch). If rmmod returns non-zero (i.e., Module: i915 is still in
> use), reload
> will bail with $IGT_EXIT_SKIP, making the check with lsmod useless.
> Also use the return value in the fault-injection loop.
>
> Signed-off-by: Marius Vlad <marius.c.v...@intel.com>
> ---
> tests/drv_module_reload_basic | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/tests/drv_module_reload_basic
> b/tests/drv_module_reload_basic
> index 3bba796..3a8df33 100755
> --- a/tests/drv_module_reload_basic
> +++ b/tests/drv_module_reload_basic
> @@ -30,7 +30,7 @@ function reload() {
>
> #ignore errors in ips - gen5 only
> rmmod intel_ips &> /dev/null
> - rmmod i915 || return $IGT_EXIT_SKIP
> + rmmod i915
Not sure what was the reason to bail out here, continuing seems like
the correct thing to do.
> #ignore errors in intel-gtt, often built-in
> rmmod intel-gtt &> /dev/null
> # drm may be used by other devices (nouveau, radeon, udl,
> etc)
> @@ -76,7 +76,7 @@ finish_load || exit $?
>
> # Repeat the module reload trying to to generate faults
> for i in $(seq 1 4); do
> - reload inject_load_failure=$i
> + reload inject_load_failure=$i || exit $?
The idea was to keep the system in a working state even in case of
failure here, so I'd still attempt a normal reload before exiting with
failure.
--Imre
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
