summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorTim Orling <ticotimo@gmail.com>2014-10-07 20:00:13 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-12-31 08:14:18 +0000
commit82a5df1a0a7d225e4e1c37a02443cc539edc34f7 (patch)
tree701f0e887707cc8f85a3feb9c6fee8c00f1a3249 /meta/recipes-graphics
parent66ede54cf8738107f4295179d19aed24e356eb36 (diff)
downloadpoky-82a5df1a0a7d225e4e1c37a02443cc539edc34f7.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. (From OE-Core rev: 7656e861be3e7c6111b722761857b4a7c5905712) Signed-off-by: Tim Orling <TicoTimo@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/clutter/clutter-1.0.inc4
-rw-r--r--meta/recipes-graphics/clutter/clutter-1.0/run-installed-tests-with-tap-output.patch20
-rw-r--r--meta/recipes-graphics/clutter/clutter-1.0/run-ptest3
-rw-r--r--meta/recipes-graphics/clutter/clutter-1.0_1.20.0.bb4
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 77035d746f..3929765a9d 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"
2HOMEPAGE = "http://www.clutter-project.org/" 2HOMEPAGE = "http://www.clutter-project.org/"
3LICENSE = "LGPLv2.1+" 3LICENSE = "LGPLv2.1+"
4 4
5inherit clutter 5inherit clutter ptest-gnome
6 6
7DEPENDS = "pango glib-2.0 json-glib atk udev cogl-1.0" 7DEPENDS = "pango glib-2.0 json-glib atk udev cogl-1.0"
8PACKAGE_BEFORE_PN += "${PN}-examples" 8PACKAGE_BEFORE_PN += "${PN}-examples"
@@ -39,6 +39,8 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland',
39FILES_${PN}-dbg += "${libdir}/clutter/examples/.debug" 39FILES_${PN}-dbg += "${libdir}/clutter/examples/.debug"
40FILES_${PN}-examples = "${libdir}/clutter/examples" 40FILES_${PN}-examples = "${libdir}/clutter/examples"
41 41
42FILES_${PN}-dbg += "${libexecdir}/installed-tests/.debug"
43
42do_configure_prepend() { 44do_configure_prepend() {
43 # see https://bugzilla.gnome.org/show_bug.cgi?id=661128 for this 45 # see https://bugzilla.gnome.org/show_bug.cgi?id=661128 for this
44 touch -t 200001010000 ${S}/po/clutter-1.0.pot 46 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 0000000000..80acab867c
--- /dev/null
+++ b/meta/recipes-graphics/clutter/clutter-1.0/run-installed-tests-with-tap-output.patch
@@ -0,0 +1,20 @@
1Configure output from installed-tests to be TAP compliant, such that gnome-desktop-testing-runner properly interprets the results.
2
3Upstream-status: Pending
4
5Signed-off-by: Tim Orling <TicoTimo@gmail.com>
6
7Index: clutter-1.20.0/build/autotools/glib-tap.mk
8===================================================================
9--- clutter-1.20.0.orig/build/autotools/glib-tap.mk
10+++ clutter-1.20.0/build/autotools/glib-tap.mk
11@@ -128,7 +128,8 @@ installed_test_meta_DATA = $(installed_t
12 $(AM_V_GEN) (echo '[Test]' > $@.tmp; \
13 echo 'Type=session' >> $@.tmp; \
14 echo 'TestEnvironment=G_ENABLE_DIAGNOSTIC=0;CLUTTER_ENABLE_DIAGNOSTIC=0;' >> $@.tmp; \
15- echo 'Exec=$(installed_testdir)/$<' >> $@.tmp; \
16+ echo 'Exec=$(installed_testdir)/$< --tap' >> $@.tmp; \
17+ echo 'Output=TAP' >> $@.tmp; \
18 mv $@.tmp $@)
19
20 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 0000000000..98877e5226
--- /dev/null
+++ b/meta/recipes-graphics/clutter/clutter-1.0/run-ptest
@@ -0,0 +1,3 @@
1#! /bin/sh
2
3gnome-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 7898810131..5f39a3a8ac 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"
5SRC_URI[archive.md5sum] = "a8a33a57a944c6d7c7c013ce9aa3222b" 5SRC_URI[archive.md5sum] = "a8a33a57a944c6d7c7c013ce9aa3222b"
6SRC_URI[archive.sha256sum] = "cc940809e6e1469ce349c4bddb0cbcc2c13c087d4fc15cda9278d855ee2d1293" 6SRC_URI[archive.sha256sum] = "cc940809e6e1469ce349c4bddb0cbcc2c13c087d4fc15cda9278d855ee2d1293"
7 7
8SRC_URI += "file://install-examples.patch" 8SRC_URI += "file://install-examples.patch \
9 file://run-installed-tests-with-tap-output.patch \
10 file://run-ptest"