From d6f975c8f5324e4be8044644502adefe85db7f8d Mon Sep 17 00:00:00 2001
From: Luis Araujo <luis.araujo@collabora.co.uk>
Date: Mon, 21 Nov 2016 23:53:12 +0800
Subject: [PATCH] Remove x-out-of-screen-events-buttond test
This test is deprecated as a new one needs to be developed for
wayland images and it is not valid for SDK images.
Reviewed-by: Philip Withnall <philip.withnall@collabora.co.uk>
Signed-off-by: Luis Araujo <luis.araujo@collabora.co.uk>
Differential Revision: https://phabricator.apertis.org/D4946
---
Makefile | 1 -
sdk/x-out-of-screen-events-buttond.yaml | 28 ----
templates/group-sdk-tpl.json | 5 -
x-out-of-screen-events/.gitignore | 1 -
x-out-of-screen-events/Makefile | 15 ---
x-out-of-screen-events/buttond_tester.conf | 28 ----
x-out-of-screen-events/buttond_tester.sh | 34 -----
x-out-of-screen-events/input_generator.c | 133 -------------------
x-out-of-screen-events/keys.ref | 144 ---------------------
9 files changed, 389 deletions(-)
delete mode 100644 sdk/x-out-of-screen-events-buttond.yaml
delete mode 100644 x-out-of-screen-events/.gitignore
delete mode 100644 x-out-of-screen-events/Makefile
delete mode 100644 x-out-of-screen-events/buttond_tester.conf
delete mode 100755 x-out-of-screen-events/buttond_tester.sh
delete mode 100644 x-out-of-screen-events/input_generator.c
delete mode 100644 x-out-of-screen-events/keys.ref
diff --git a/Makefile b/Makefile
index 816ede3a..5d6c6442 100644
--- a/Makefile
+++ b/Makefile
@@ -46,7 +46,6 @@ SUBDIRS = \
contacts \
gstreamer-decode \
gstreamer-viv-direct-texture/automated/ \
- x-out-of-screen-events \
telepathy \
rfkill \
$(NULL)
diff --git a/sdk/x-out-of-screen-events-buttond.yaml b/sdk/x-out-of-screen-events-buttond.yaml
deleted file mode 100644
index 7c8aceb2..00000000
--- a/sdk/x-out-of-screen-events-buttond.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-metadata:
- name: x-out-of-screen-events-buttond
- format: "Lava-Test-Shell Test Definition 1.0"
- description: "Test X out of screen events by feeding synthetic touch input to buttond"
- maintainer: "luis.araujo@collabora.co.uk"
- scope:
- - functional
- devices:
- - i386
- environment:
- - lava-test-shell
-
-install:
- deps:
- - chaiwala-tests
- - xinput
- - tcl
-
-run:
- steps:
- - common/run-test-in-systemd --timeout=900 --basename /usr/lib/chaiwala-tests/x-out-of-screen-events/buttond_tester.sh
-
-parse:
- fixupdict:
- FAILED: fail
- PASSED: pass
- pattern: ^(?P<test_case_id>[\w-]+):\W+(?P<result>\w+)$
-
diff --git a/templates/group-sdk-tpl.json b/templates/group-sdk-tpl.json
index 61741a51..9f7876d4 100644
--- a/templates/group-sdk-tpl.json
+++ b/templates/group-sdk-tpl.json
@@ -80,11 +80,6 @@
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
"revision": "master",
"testdef": "sdk/telepathy-ring.yaml"
- },
- {
- "git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
- "testdef": "sdk/x-out-of-screen-events-buttond.yaml"
}
]
}
diff --git a/x-out-of-screen-events/.gitignore b/x-out-of-screen-events/.gitignore
deleted file mode 100644
index 6b463cb6..00000000
--- a/x-out-of-screen-events/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-input_generator
diff --git a/x-out-of-screen-events/Makefile b/x-out-of-screen-events/Makefile
deleted file mode 100644
index 458a1cbb..00000000
--- a/x-out-of-screen-events/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-all:input_generator
-
-TEST_NAME=x-out-of-screen-events
-include ../global-config.mk
-
-install: input_generator
- $(INSTALL) -m755 -d $(DESTDIR)$(TESTLIBDIR)
- $(INSTALL) -m755 -d $(DESTDIR)$(TESTDATADIR)
- $(INSTALL) input_generator $(DESTDIR)$(TESTLIBDIR)
- $(INSTALL) buttond_tester.sh $(DESTDIR)$(TESTLIBDIR)
- $(INSTALL) buttond_tester.conf $(DESTDIR)$(TESTDATADIR)
- $(INSTALL) keys.ref $(DESTDIR)$(TESTDATADIR)
-
-clean:
- rm -f input_generator
diff --git a/x-out-of-screen-events/buttond_tester.conf b/x-out-of-screen-events/buttond_tester.conf
deleted file mode 100644
index 43aac4dd..00000000
--- a/x-out-of-screen-events/buttond_tester.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-device "VIRTUAL KEYBOARD" 0xf00:1234 from ":Event Testing Device" {
- button 0,0 30x10 KEY_A
- button 0,10 30x10 KEY_B
- button 0,20 30x10 KEY_C
- button 0,30 30x10 KEY_D
- button 0,40 30x10 KEY_E
- button 0,50 30x10 KEY_F
- button 0,60 30x10 KEY_G
- button 0,70 30x10 KEY_H
-
- button 30,80 30x10 KEY_I
- button 30,90 30x10 KEY_J
- button 30,100 30x10 KEY_K
- button 30,110 30x10 KEY_L
- button 30,120 30x10 KEY_M
- button 30,130 30x10 KEY_N
- button 30,140 30x10 KEY_O
- button 30,150 30x10 KEY_P
-
- button 90,160 30x10 KEY_Q
- button 90,170 30x10 KEY_R
- button 90,180 30x10 KEY_S
- button 90,190 30x10 KEY_T
- button 90,210 30x10 KEY_U
- button 90,220 30x10 KEY_V
- button 90,230 30x10 KEY_W
- button 90,240 30x10 KEY_X
-}
diff --git a/x-out-of-screen-events/buttond_tester.sh b/x-out-of-screen-events/buttond_tester.sh
deleted file mode 100755
index eb51915d..00000000
--- a/x-out-of-screen-events/buttond_tester.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-echo "# $0: running as: $(id)"
-echo "# $0: running in: $(pwd)"
-echo "# $0: initial environment:"
-env | LC_ALL=C sort | sed -e 's/^/# /'
-
-echo "# $0: Xorg.log:"
-cat /var/log/Xorg.0.log | sed -e 's/^/# /'
-
-echo "# $0: System journal:"
-sudo journalctl | sed -e 's/^/# /'
-
-# Debuggability
-set -x
-
-# Report non-rightmost failing status in pipelines.
-set -e
-set -o pipefail
-
-/usr/lib/chaiwala-tests/x-out-of-screen-events/input_generator 2>&1 | sed -e 's/^/# input_generator: /' &
-sleep 2
-buttond /usr/share/chaiwala-tests/x-out-of-screen-events/buttond_tester.conf 2>&1 | sed -e 's/^/# buttond: /' &
-sleep 2
-xinput set-prop "Event Testing Device" "Evdev Axis Calibration" 0 300 0 2000 2>&1 | sed -e 's/^/# xinput: /'
-unbuffer xinput test "VIRTUAL KEYBOARD" > keys.out &
-sleep 5
-
-pkill -SIGUSR1 input_generator
-wait %1
-pkill xinput || true # xinput may exit cleanly of its own accord
-
-diff -u keys.out /usr/share/chaiwala-tests/x-out-of-screen-events/keys.ref 2>&1 | sed -e 's/^/# diff: /'
-echo "x-out-of-screen-events-buttond: PASSED"
diff --git a/x-out-of-screen-events/input_generator.c b/x-out-of-screen-events/input_generator.c
deleted file mode 100644
index b448ce5d..00000000
--- a/x-out-of-screen-events/input_generator.c
+++ /dev/null
@@ -1,133 +0,0 @@
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <string.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <linux/input.h>
-#include <linux/uinput.h>
-#include <signal.h>
-
-#define X_RES 2000
-#define Y_RES 2000
-#define MAX_FINGERS 10
-
-int event(int fd, int type, int code, int value)
-{
- struct input_event ev;
-
- memset(&ev, 0, sizeof(struct input_event));
- ev.type = type;
- ev.code = code;
- ev.value = value;
-
- if (write(fd, &ev, sizeof(struct input_event)) < 0)
- return 0;
- return 1;
-}
-
-int do_input(int fd)
-{
- int x, y;
-
- /* let's poke everything in a 10/10 grid */
- for (x = 0; x < X_RES; x += 10)
- for (y = 0; y < Y_RES; y += 10) {
- event(fd, EV_ABS, ABS_MT_SLOT, 0);
- event(fd, EV_ABS, ABS_MT_TRACKING_ID, 1);
- event(fd, EV_ABS, ABS_MT_POSITION_X, x);
- event(fd, EV_ABS, ABS_MT_POSITION_Y, y);
- event(fd, EV_SYN, SYN_REPORT, 0);
- event(fd, EV_ABS, ABS_MT_TRACKING_ID, -1);
- event(fd, EV_SYN, SYN_REPORT, 0);
- usleep(10000);
- }
- return 1;
-}
-
-int main(int argc, char **argv)
-{
- sigset_t sigset;
- struct uinput_user_dev ud;
- int ret, fd, sig;
-
- fd = open("/dev/uinput", O_WRONLY);
- if (fd < 0)
- return EXIT_FAILURE;
-
- ret = ioctl(fd, UI_SET_EVBIT, EV_ABS);
- if (ret < 0)
- return EXIT_FAILURE;
-
- ret = ioctl(fd, UI_SET_EVBIT, EV_KEY);
- if (ret < 0)
- return EXIT_FAILURE;
-
- ret = ioctl(fd, UI_SET_KEYBIT, BTN_TOUCH);
- if (ret < 0)
- return EXIT_FAILURE;
-
- ret = ioctl(fd, UI_SET_EVBIT, EV_SYN);
- if (ret < 0)
- return EXIT_FAILURE;
-
- ret = ioctl(fd, UI_SET_ABSBIT, ABS_X);
- if (ret < 0)
- return EXIT_FAILURE;
-
- ret = ioctl(fd, UI_SET_ABSBIT, ABS_Y);
- if (ret < 0)
- return EXIT_FAILURE;
-
- ret = ioctl(fd, UI_SET_ABSBIT, ABS_MT_POSITION_X);
- if (ret < 0)
- return EXIT_FAILURE;
-
- ret = ioctl(fd, UI_SET_ABSBIT, ABS_MT_POSITION_Y);
- if (ret < 0)
- return EXIT_FAILURE;
-
- ret = ioctl(fd, UI_SET_ABSBIT, ABS_MT_PRESSURE);
- if (ret < 0)
- return EXIT_FAILURE;
-
- ret = ioctl(fd, UI_SET_ABSBIT, ABS_MT_TRACKING_ID);
- if (ret < 0)
- return EXIT_FAILURE;
-
- ret = ioctl(fd, UI_SET_ABSBIT, ABS_MT_SLOT);
- if (ret < 0)
- return EXIT_FAILURE;
-
- memset(&ud, 0, sizeof(ud));
- sprintf(ud.name, "Event Testing Device");
- ud.id.bustype = BUS_USB;
- ud.id.vendor = 1234;
- ud.id.product = 5678;
- ud.id.version = 1;
- ud.absmax[ABS_MT_SLOT] = MAX_FINGERS;
- ud.absmax[ABS_X] = X_RES;
- ud.absmax[ABS_Y] = Y_RES;
- ud.absmax[ABS_MT_POSITION_X] = X_RES;
- ud.absmax[ABS_MT_POSITION_Y] = Y_RES;
- ud.absmax[ABS_MT_TOUCH_MAJOR] = 1;
- ud.absmax[ABS_MT_PRESSURE] = 10;
- ud.absfuzz[ABS_MT_POSITION_X] = 2;
- ud.absfuzz[ABS_MT_POSITION_Y] = 2;
- ret = write(fd, &ud, sizeof(ud));
- if (ret < 0)
- return EXIT_FAILURE;
- ret = ioctl(fd, UI_DEV_CREATE);
- if (ret < 0)
- return EXIT_FAILURE;
-
- sigemptyset(&sigset);
- sigaddset(&sigset, SIGUSR1);
- sigprocmask(SIG_BLOCK, &sigset, NULL);
- sigwait(&sigset, &sig);
-
- do_input(fd);
-
- return EXIT_SUCCESS;
-}
diff --git a/x-out-of-screen-events/keys.ref b/x-out-of-screen-events/keys.ref
deleted file mode 100644
index 3d52bdc0..00000000
--- a/x-out-of-screen-events/keys.ref
+++ /dev/null
@@ -1,144 +0,0 @@
-key press 38
-key release 38
-key press 56
-key release 56
-key press 54
-key release 54
-key press 40
-key release 40
-key press 26
-key release 26
-key press 41
-key release 41
-key press 42
-key release 42
-key press 43
-key release 43
-key press 38
-key release 38
-key press 56
-key release 56
-key press 54
-key release 54
-key press 40
-key release 40
-key press 26
-key release 26
-key press 41
-key release 41
-key press 42
-key release 42
-key press 43
-key release 43
-key press 38
-key release 38
-key press 56
-key release 56
-key press 54
-key release 54
-key press 40
-key release 40
-key press 26
-key release 26
-key press 41
-key release 41
-key press 42
-key release 42
-key press 43
-key release 43
-key press 31
-key release 31
-key press 44
-key release 44
-key press 45
-key release 45
-key press 46
-key release 46
-key press 58
-key release 58
-key press 57
-key release 57
-key press 32
-key release 32
-key press 33
-key release 33
-key press 31
-key release 31
-key press 44
-key release 44
-key press 45
-key release 45
-key press 46
-key release 46
-key press 58
-key release 58
-key press 57
-key release 57
-key press 32
-key release 32
-key press 33
-key release 33
-key press 31
-key release 31
-key press 44
-key release 44
-key press 45
-key release 45
-key press 46
-key release 46
-key press 58
-key release 58
-key press 57
-key release 57
-key press 32
-key release 32
-key press 33
-key release 33
-key press 24
-key release 24
-key press 27
-key release 27
-key press 39
-key release 39
-key press 28
-key release 28
-key press 30
-key release 30
-key press 55
-key release 55
-key press 25
-key release 25
-key press 53
-key release 53
-key press 24
-key release 24
-key press 27
-key release 27
-key press 39
-key release 39
-key press 28
-key release 28
-key press 30
-key release 30
-key press 55
-key release 55
-key press 25
-key release 25
-key press 53
-key release 53
-key press 24
-key release 24
-key press 27
-key release 27
-key press 39
-key release 39
-key press 28
-key release 28
-key press 30
-key release 30
-key press 55
-key release 55
-key press 25
-key release 25
-key press 53
-key release 53
--
GitLab