diff options
Diffstat (limited to 'meta/recipes-core/udev/udev/add-install-ptest.patch')
-rw-r--r-- | meta/recipes-core/udev/udev/add-install-ptest.patch | 86 |
1 files changed, 0 insertions, 86 deletions
diff --git a/meta/recipes-core/udev/udev/add-install-ptest.patch b/meta/recipes-core/udev/udev/add-install-ptest.patch deleted file mode 100644 index bfc2e9409d..0000000000 --- a/meta/recipes-core/udev/udev/add-install-ptest.patch +++ /dev/null | |||
@@ -1,86 +0,0 @@ | |||
1 | Adjustements for ptest: | ||
2 | |||
3 | - Add 'install-ptest' rule. | ||
4 | - Print a standard result line for each test. | ||
5 | - Replace the use of "tree" with "find". | ||
6 | |||
7 | Signed-off-by: Björn Stenberg <bjst@enea.com> | ||
8 | Signed-off-by: Alexandra Safta <alst@enea.com> | ||
9 | Upstream-Status: Pending | ||
10 | |||
11 | Add missing files for rule-syntax-check | ||
12 | - Add rule-syntax-check.py | ||
13 | - Add the deployed udev rules to the testdata | ||
14 | |||
15 | Signed-off-by: Max Krummenacher <max.oss.09@gmail.com> | ||
16 | Upstream-Status: Pending | ||
17 | --- a/Makefile.am 2012-03-18 16:28:14.000000000 +0100 | ||
18 | +++ b/Makefile.am 2013-02-18 10:03:36.531101244 +0100 | ||
19 | @@ -708,3 +708,18 @@ | ||
20 | for i in src/docs/html/*.{html,css,png}; do echo $$i; kup put $$i $$i.sign /pub/linux/utils/kernel/hotplug/libudev/; done | ||
21 | for i in src/gudev/docs/html/*.{html,css,png}; do rm -f $$i.sign; gpg --armor --detach-sign --output=$$i.sign $$i; done | ||
22 | for i in src/gudev/docs/html/*.{html,css,png}; do echo $$i; kup put $$i $$i.sign /pub/linux/utils/kernel/hotplug/gudev/; done | ||
23 | + | ||
24 | +RULES = rules/* src/accelerometer/61-accelerometer.rules \ | ||
25 | + src/cdrom_id/60-cdrom_id.rules \ | ||
26 | + src/keymap/95-keyboard-force-release.rules src/keymap/95-keymap.rules \ | ||
27 | + src/mtd_probe/75-probe_mtd.rules src/v4l_id/60-persistent-v4l.rules | ||
28 | + | ||
29 | +install-ptest: | ||
30 | + install test-udev $(DESTDIR) | ||
31 | + cp Makefile $(DESTDIR) | ||
32 | + sed -i -e 's|^Makefile:|_Makefile:|' $(DESTDIR)/Makefile | ||
33 | + install -d $(DESTDIR)/test $(DESTDIR)/rules | ||
34 | + (cd $(top_srcdir) && install $(TESTS) $(DESTDIR)/test) | ||
35 | + (cd $(top_srcdir) && install test/rule-syntax-check.py $(DESTDIR)/test) | ||
36 | + (cd $(top_srcdir) && install $(RULES) $(DESTDIR)/rules) | ||
37 | + cp $(top_srcdir)/test/sys.tar.xz $(DESTDIR)/test/ | ||
38 | --- a/test/udev-test.pl 2012-03-18 16:43:36.000000000 +0100 | ||
39 | +++ b/test/udev-test.pl 2013-02-18 10:31:29.706357321 +0100 | ||
40 | @@ -1459,11 +1459,13 @@ | ||
41 | print "add: error"; | ||
42 | if ($rules->{exp_add_error}) { | ||
43 | print " as expected\n"; | ||
44 | + print "XFAIL: TEST $number: $rules->{desc}: add\n"; | ||
45 | } else { | ||
46 | print "\n"; | ||
47 | - system("tree $udev_root"); | ||
48 | + system("find $udev_root"); | ||
49 | print "\n"; | ||
50 | $error++; | ||
51 | + print "FAIL: TEST $number: $rules->{desc}: add\n"; | ||
52 | sleep(1); | ||
53 | } | ||
54 | } | ||
55 | @@ -1479,15 +1481,18 @@ | ||
56 | print "remove: error"; | ||
57 | if ($rules->{exp_rem_error}) { | ||
58 | print " as expected\n"; | ||
59 | + print "XFAIL: TEST $number: $rules->{desc}: remove\n"; | ||
60 | } else { | ||
61 | print "\n"; | ||
62 | - system("tree $udev_root"); | ||
63 | + system("find $udev_root"); | ||
64 | print "\n"; | ||
65 | $error++; | ||
66 | + print "FAIL: TEST $number: $rules->{desc}: remove\n"; | ||
67 | sleep(1); | ||
68 | } | ||
69 | } else { | ||
70 | print "remove: ok\n"; | ||
71 | + print "PASS: TEST $number: $rules->{desc}: remove\n"; | ||
72 | } | ||
73 | |||
74 | print "\n"; | ||
75 | --- a/configure.ac 2013-11-28 09:14:02.814248826 +0100 | ||
76 | +++ b/configure.ac 2013-11-28 09:14:34.260874296 +0100 | ||
77 | @@ -6,7 +6,7 @@ | ||
78 | [http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html]) | ||
79 | AC_CONFIG_SRCDIR([src/udevd.c]) | ||
80 | AC_CONFIG_AUX_DIR([build-aux]) | ||
81 | -AM_INIT_AUTOMAKE([check-news foreign 1.11 -Wall -Wno-portability silent-rules tar-pax no-dist-gzip dist-xz subdir-objects]) | ||
82 | +AM_INIT_AUTOMAKE([check-news foreign 1.11 -Wall -Wno-portability silent-rules tar-pax no-dist-gzip dist-xz subdir-objects serial-tests]) | ||
83 | AC_USE_SYSTEM_EXTENSIONS | ||
84 | AC_SYS_LARGEFILE | ||
85 | AC_CONFIG_MACRO_DIR([m4]) | ||
86 | |||