From f2a6123ba3628980344cd2c04cbb4e025bbe9195 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Wed, 25 Mar 2015 23:09:37 +0100 Subject: [PATCH] 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: 60c0b80048e1f8aae1a4aaa3619c84496a111ae2) Signed-off-by: Max Krummenacher Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-core/udev/udev/add-install-ptest.patch | 2 +- meta/recipes-core/udev/udev/run-ptest | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) 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