diff options
| author |   Tim Orling <ticotimo@gmail.com> | 2014-10-07 20:00:13 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-30 11:38:40 +0000 |
| commit | 7656e861be3e7c6111b722761857b4a7c5905712 (patch) | |
| tree | 27e9fdf83e6417a516f387aacc277f1c418b0882 /meta/recipes-graphics/clutter | |
| parent | 87cf3f43bf6a5c648039be18cd4bda103ba64a68 (diff) | |
| download | openembedded-core-contrib-7656e861be3e7c6111b722761857b4a7c5905712.tar.gz | |
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.
Signed-off-by: Tim Orling <TicoTimo@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/clutter')
4 files changed, 29 insertions, 2 deletions
diff --git a/meta/recipes-graphics/clutter/clutter-1.0.inc b/meta/recipes-graphics/clutter/clutter-1.0.inc index 77035d746f6..3929765a9d2 100644 --- a/meta/recipes-graphics/clutter/clutter-1.0.inc +++ b/meta/recipes-graphics/clutter/clutter-1.0.inc @@ -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 diff --git a/meta/recipes-graphics/clutter/clutter-1.0/run-installed-tests-with-tap-output.patch b/meta/recipes-graphics/clutter/clutter-1.0/run-installed-tests-with-tap-output.patch new file mode 100644 index 00000000000..80acab867c8 --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-1.0/run-installed-tests-with-tap-output.patch @@ -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) diff --git a/meta/recipes-graphics/clutter/clutter-1.0/run-ptest b/meta/recipes-graphics/clutter/clutter-1.0/run-ptest new file mode 100644 index 00000000000..98877e5226b --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-1.0/run-ptest @@ -0,0 +1,3 @@ +#! /bin/sh + +gnome-desktop-testing-runner clutter diff --git a/meta/recipes-graphics/clutter/clutter-1.0_1.20.0.bb b/meta/recipes-graphics/clutter/clutter-1.0_1.20.0.bb index 78988101315..5f39a3a8acf 100644 --- a/meta/recipes-graphics/clutter/clutter-1.0_1.20.0.bb +++ b/meta/recipes-graphics/clutter/clutter-1.0_1.20.0.bb @@ -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" |