sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

clutter-1.0: add ptest 

Upstream has reworked installed-tests, use them for ptest.
Default output format for tests is not TAP, add patch to generate TAP output.
Run tests with gnome-desktop-testing-runner, which understands TAP output.

Tested on nuc with core-image-clutter and core-image-weston.

Reminder that for "pure" wayland (e.g. core-image-weston) you need to "export CLUTTER_BACKEND = wayland" to get past setting the DISPLAY variable expected for X11 backend.

(From OE-Core rev: 7656e861be3e7c6111b722761857b4a7c5905712)

Signed-off-by: Tim Orling <TicoTimo@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Tim Orling 2014-10-07 20:00:13 -07:00 committed by Richard Purdie
parent 66ede54cf8
commit 82a5df1a0a
4 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meta/recipes-graphics/clutter/clutter-1.0.inc
View File

@ -2,7 +2,7 @@ SUMMARY = "Graphics library for creating hardware-accelerated user interfaces"
HOMEPAGE = "http://www.clutter-project.org/"
LICENSE = "LGPLv2.1+"
inherit clutter
inherit clutter ptest-gnome
DEPENDS = "pango glib-2.0 json-glib atk udev cogl-1.0"
PACKAGE_BEFORE_PN += "${PN}-examples"
@ -39,6 +39,8 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland',
FILES_${PN}-dbg += "${libdir}/clutter/examples/.debug"
FILES_${PN}-examples = "${libdir}/clutter/examples"
FILES_${PN}-dbg += "${libexecdir}/installed-tests/.debug"
do_configure_prepend() {
# see https://bugzilla.gnome.org/show_bug.cgi?id=661128 for this
touch -t 200001010000 ${S}/po/clutter-1.0.pot

20
meta/recipes-graphics/clutter/clutter-1.0/run-installed-tests-with-tap-output.patch Normal file
View File

@ -0,0 +1,20 @@
Configure output from installed-tests to be TAP compliant, such that gnome-desktop-testing-runner properly interprets the results.
Upstream-status: Pending
Signed-off-by: Tim Orling <TicoTimo@gmail.com>
Index: clutter-1.20.0/build/autotools/glib-tap.mk
===================================================================
--- clutter-1.20.0.orig/build/autotools/glib-tap.mk
+++ clutter-1.20.0/build/autotools/glib-tap.mk
@@ -128,7 +128,8 @@ installed_test_meta_DATA = $(installed_t
$(AM_V_GEN) (echo '[Test]' > $@.tmp; \
echo 'Type=session' >> $@.tmp; \
echo 'TestEnvironment=G_ENABLE_DIAGNOSTIC=0;CLUTTER_ENABLE_DIAGNOSTIC=0;' >> $@.tmp; \
- echo 'Exec=$(installed_testdir)/$<' >> $@.tmp; \
+ echo 'Exec=$(installed_testdir)/$< --tap' >> $@.tmp; \
+ echo 'Output=TAP' >> $@.tmp; \
mv $@.tmp $@)
CLEANFILES += $(installed_test_meta_DATA)

3
meta/recipes-graphics/clutter/clutter-1.0/run-ptest Normal file
View File

@ -0,0 +1,3 @@
#! /bin/sh
gnome-desktop-testing-runner clutter

4
meta/recipes-graphics/clutter/clutter-1.0_1.20.0.bb
View File

@ -5,4 +5,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
SRC_URI[archive.md5sum] = "a8a33a57a944c6d7c7c013ce9aa3222b"
SRC_URI[archive.sha256sum] = "cc940809e6e1469ce349c4bddb0cbcc2c13c087d4fc15cda9278d855ee2d1293"
SRC_URI += "file://install-examples.patch"
SRC_URI += "file://install-examples.patch \
file://run-installed-tests-with-tap-output.patch \
file://run-ptest"