[PATCH libinput 2/3] test: rename hover tests into semi_mt_hover

[Peter Hutterer]

On Thu, Apr 30, 2015 at 04:30:24PM -0400, Benjamin Tissoires wrote:
> From: Benjamin Tissoires <benjamin.tissoires at redhat.com>
> 
> The current hover tests are uniquely designed for some Synaptics
> touchpad. Libinput can handle hovering through ABS_MT_DISTANCE,
> so we need to reserve the "hover" name for real hovering devices.
> 
> Signed-off-by: Benjamin Tissoires <benjamin.tissoires at redhat.com>

merged and pushed 1 and 2 of this series, thanks.

Cheers,
   Peter

> ---
>  test/touchpad.c |   26 +++++++++++++-------------
>  1 files changed, 13 insertions(+), 13 deletions(-)
> 
> diff --git a/test/touchpad.c b/test/touchpad.c
> index 830e589..49f5023 100644
> --- a/test/touchpad.c
> +++ b/test/touchpad.c
> @@ -3480,7 +3480,7 @@ hover_start(struct litest_device *dev, unsigned int slot,
>  	/* WARNING: no SYN_REPORT! */
>  }
>  
> -START_TEST(touchpad_hover_noevent)
> +START_TEST(touchpad_semi_mt_hover_noevent)
>  {
>  	struct litest_device *dev = litest_current_device();
>  	struct libinput *li = dev->libinput;
> @@ -3511,7 +3511,7 @@ START_TEST(touchpad_hover_noevent)
>  }
>  END_TEST
>  
> -START_TEST(touchpad_hover_down)
> +START_TEST(touchpad_semi_mt_hover_down)
>  {
>  	struct litest_device *dev = litest_current_device();
>  	struct libinput *li = dev->libinput;
> @@ -3586,7 +3586,7 @@ START_TEST(touchpad_hover_down)
>  }
>  END_TEST
>  
> -START_TEST(touchpad_hover_down_hover_down)
> +START_TEST(touchpad_semi_mt_hover_down_hover_down)
>  {
>  	struct litest_device *dev = litest_current_device();
>  	struct libinput *li = dev->libinput;
> @@ -3673,7 +3673,7 @@ START_TEST(touchpad_hover_down_hover_down)
>  }
>  END_TEST
>  
> -START_TEST(touchpad_hover_down_up)
> +START_TEST(touchpad_semi_mt_hover_down_up)
>  {
>  	struct litest_device *dev = litest_current_device();
>  	struct libinput *li = dev->libinput;
> @@ -3740,7 +3740,7 @@ START_TEST(touchpad_hover_down_up)
>  }
>  END_TEST
>  
> -START_TEST(touchpad_hover_2fg_noevent)
> +START_TEST(touchpad_semi_mt_hover_2fg_noevent)
>  {
>  	struct litest_device *dev = litest_current_device();
>  	struct libinput *li = dev->libinput;
> @@ -3785,7 +3785,7 @@ START_TEST(touchpad_hover_2fg_noevent)
>  }
>  END_TEST
>  
> -START_TEST(touchpad_hover_2fg_1fg_down)
> +START_TEST(touchpad_semi_mt_hover_2fg_1fg_down)
>  {
>  	struct litest_device *dev = litest_current_device();
>  	struct libinput *li = dev->libinput;
> @@ -4232,14 +4232,14 @@ int main(int argc, char **argv) {
>  	litest_add("touchpad:left-handed", touchpad_left_handed_delayed, LITEST_TOUCHPAD|LITEST_BUTTON, LITEST_CLICKPAD);
>  	litest_add("touchpad:left-handed", touchpad_left_handed_clickpad_delayed, LITEST_CLICKPAD, LITEST_APPLE_CLICKPAD);
>  
> -	/* Hover tests aren't generic, they only work on this device and
> +	/* Semi-MT hover tests aren't generic, they only work on this device and
>  	 * ignore the semi-mt capability (it doesn't matter for the tests */
> -	litest_add_for_device("touchpad:hover", touchpad_hover_noevent, LITEST_SYNAPTICS_HOVER_SEMI_MT);
> -	litest_add_for_device("touchpad:hover", touchpad_hover_down, LITEST_SYNAPTICS_HOVER_SEMI_MT);
> -	litest_add_for_device("touchpad:hover", touchpad_hover_down_up, LITEST_SYNAPTICS_HOVER_SEMI_MT);
> -	litest_add_for_device("touchpad:hover", touchpad_hover_down_hover_down, LITEST_SYNAPTICS_HOVER_SEMI_MT);
> -	litest_add_for_device("touchpad:hover", touchpad_hover_2fg_noevent, LITEST_SYNAPTICS_HOVER_SEMI_MT);
> -	litest_add_for_device("touchpad:hover", touchpad_hover_2fg_1fg_down, LITEST_SYNAPTICS_HOVER_SEMI_MT);
> +	litest_add_for_device("touchpad:semi-mt-hover", touchpad_semi_mt_hover_noevent, LITEST_SYNAPTICS_HOVER_SEMI_MT);
> +	litest_add_for_device("touchpad:semi-mt-hover", touchpad_semi_mt_hover_down, LITEST_SYNAPTICS_HOVER_SEMI_MT);
> +	litest_add_for_device("touchpad:semi-mt-hover", touchpad_semi_mt_hover_down_up, LITEST_SYNAPTICS_HOVER_SEMI_MT);
> +	litest_add_for_device("touchpad:semi-mt-hover", touchpad_semi_mt_hover_down_hover_down, LITEST_SYNAPTICS_HOVER_SEMI_MT);
> +	litest_add_for_device("touchpad:semi-mt-hover", touchpad_semi_mt_hover_2fg_noevent, LITEST_SYNAPTICS_HOVER_SEMI_MT);
> +	litest_add_for_device("touchpad:semi-mt-hover", touchpad_semi_mt_hover_2fg_1fg_down, LITEST_SYNAPTICS_HOVER_SEMI_MT);
>  
>  	litest_add_for_device("touchpad:trackpoint", touchpad_trackpoint_buttons, LITEST_SYNAPTICS_TRACKPOINT_BUTTONS);
>  	litest_add_for_device("touchpad:trackpoint", touchpad_trackpoint_mb_scroll, LITEST_SYNAPTICS_TRACKPOINT_BUTTONS);
> -- 
> 1.7.1
> 
> _______________________________________________
> wayland-devel mailing list
> wayland-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/wayland-devel
>