summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Krummenacher <max.oss.09@gmail.com>2015-01-25 16:33:39 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-01-29 15:36:49 +0000
commit57351e90bae24bf51046a0ccd777add79b919eaa (patch)
tree41aa2ce50586a7ca5f7464fce9050b7f2ea20f72
parent0d5ac1a1def4f919b5d9f8cbf949fbaef7a5744d (diff)
downloadpoky-57351e90bae24bf51046a0ccd777add79b919eaa.tar.gz
udev: don't keep ptest testdata laying around
Only unpack udev's testdata right before executing the tests and cleanup afterwards. udev's testsuite can be used by ptest. However currently the testdata against which its functionality is tested is installed in the sysroot at udev install time. If the sysroot is used with qemu the testdata makes qemu entering an infinite loop. http://lists.openembedded.org/pipermail/openembedded-core/2014-September/097098.html This has already been fixed for the systemd udev flavour. https://bugzilla.yoctoproject.org/show_bug.cgi?id=5664 (From OE-Core rev: 3f799b173d871160ab24666920f5e7ab4e09fd42) Signed-off-by: Max Krummenacher <max.oss.09@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/udev/udev/add-install-ptest.patch2
-rw-r--r--meta/recipes-core/udev/udev/run-ptest2
2 files changed, 3 insertions, 1 deletions
diff --git a/meta/recipes-core/udev/udev/add-install-ptest.patch b/meta/recipes-core/udev/udev/add-install-ptest.patch
index 755946a4d7..bfc2e9409d 100644
--- a/meta/recipes-core/udev/udev/add-install-ptest.patch
+++ b/meta/recipes-core/udev/udev/add-install-ptest.patch
@@ -34,7 +34,7 @@ Upstream-Status: Pending
34+ (cd $(top_srcdir) && install $(TESTS) $(DESTDIR)/test) 34+ (cd $(top_srcdir) && install $(TESTS) $(DESTDIR)/test)
35+ (cd $(top_srcdir) && install test/rule-syntax-check.py $(DESTDIR)/test) 35+ (cd $(top_srcdir) && install test/rule-syntax-check.py $(DESTDIR)/test)
36+ (cd $(top_srcdir) && install $(RULES) $(DESTDIR)/rules) 36+ (cd $(top_srcdir) && install $(RULES) $(DESTDIR)/rules)
37+ tar -C $(DESTDIR)/test/ -xJf $(top_srcdir)/test/sys.tar.xz 37+ cp $(top_srcdir)/test/sys.tar.xz $(DESTDIR)/test/
38--- a/test/udev-test.pl 2012-03-18 16:43:36.000000000 +0100 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 39+++ b/test/udev-test.pl 2013-02-18 10:31:29.706357321 +0100
40@@ -1459,11 +1459,13 @@ 40@@ -1459,11 +1459,13 @@
diff --git a/meta/recipes-core/udev/udev/run-ptest b/meta/recipes-core/udev/udev/run-ptest
index c6961ce58a..0e39806b01 100644
--- a/meta/recipes-core/udev/udev/run-ptest
+++ b/meta/recipes-core/udev/udev/run-ptest
@@ -1,3 +1,5 @@
1#!/bin/sh 1#!/bin/sh
2 2
3tar -C test/ -xJf test/sys.tar.xz
3make -k check-TESTS 4make -k check-TESTS
5make test-sys-distclean