aboutsummaryrefslogtreecommitdiffstats
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 10:37:51 +0000
commit3f799b173d871160ab24666920f5e7ab4e09fd42 (patch)
treef692f40d4d2103c80927133935ed0f3406182138
parent2c9773e71ed757f1ff3306eb716d22a71defeb25 (diff)
downloadopenembedded-core-contrib-3f799b173d871160ab24666920f5e7ab4e09fd42.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 Signed-off-by: Max Krummenacher <max.oss.09@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-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
+ (cd $(top_srcdir) && install $(TESTS) $(DESTDIR)/test)
+ (cd $(top_srcdir) && install test/rule-syntax-check.py $(DESTDIR)/test)
+ (cd $(top_srcdir) && install $(RULES) $(DESTDIR)/rules)
-+ tar -C $(DESTDIR)/test/ -xJf $(top_srcdir)/test/sys.tar.xz
++ cp $(top_srcdir)/test/sys.tar.xz $(DESTDIR)/test/
--- a/test/udev-test.pl 2012-03-18 16:43:36.000000000 +0100
+++ b/test/udev-test.pl 2013-02-18 10:31:29.706357321 +0100
@@ -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 @@
#!/bin/sh
+tar -C test/ -xJf test/sys.tar.xz
make -k check-TESTS
+make test-sys-distclean