There are a number of ptest failures due to glib-genmarshal, glib-mkenums
and couple other executables not in the image. Since these
executables are in FILES_${PN}-dev, we add ${PN}-dev to ptest RDEPENDS.

When starting a glib ptest but decided to Ctrl-c interrupt midway,
./run-ptest cannot be restarted unless running `userdel glib2-test`
manually. Therefore adding a check prior to ptest will ensure the
ptest can be restarted.

Signed-off-by: Matthew Zeng<matthew.z...@windriver.com>
---
 meta/recipes-core/glib-2.0/glib-2.0/run-ptest | 3 +++
 meta/recipes-core/glib-2.0/glib.inc           | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/meta/recipes-core/glib-2.0/glib-2.0/run-ptest 
b/meta/recipes-core/glib-2.0/glib-2.0/run-ptest
index fc50082c8e..7a231b514b 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0/run-ptest
+++ b/meta/recipes-core/glib-2.0/glib-2.0/run-ptest
@@ -1,6 +1,9 @@
 #! /bin/sh

 set -eux
+if id -u glib2-test; then
+   userdel glib2-test
+fi
 useradd glib2-test
 su glib2-test -c 'gnome-desktop-testing-runner glib'
 userdel glib2-test
diff --git a/meta/recipes-core/glib-2.0/glib.inc 
b/meta/recipes-core/glib-2.0/glib.inc
index f4aff297e5..7204fc908a 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -138,6 +138,9 @@ CODEGEN_PYTHON_RDEPENDS_mingw32 = ""

 RDEPENDS_${PN}-codegen += "${CODEGEN_PYTHON_RDEPENDS}"

+RDEPENDS_${PN}-ptest += "${PN}-dev"
+INSANE_SKIP_${PN}-ptest += "dev-deps"
+
 RDEPENDS_${PN}-ptest += "\
             coreutils \
             libgcc \
--
2.24.0
-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Reply via email to