summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2015-07-09 10:52:45 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-12 22:55:40 +0100
commitd296521cff7e2378fdf92b6298d11724d56f8428 (patch)
tree707782d7ac6c9e2d79696352d9662aa36a1d2f7c /meta/recipes-graphics
parent409490147b0902f85631095d30d4d2e58a62e436 (diff)
downloadpoky-d296521cff7e2378fdf92b6298d11724d56f8428.tar.gz
clutter-1.0: Upgrade 1.20.0 -> 1.22.4
* Update test TAP output patch (From OE-Core rev: 3926c63c027d932abcb9deafde7c83ea3b9f1907) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.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/run-installed-tests-with-tap-output.patch30
-rw-r--r--meta/recipes-graphics/clutter/clutter-1.0_1.22.4.bb (renamed from meta/recipes-graphics/clutter/clutter-1.0_1.20.0.bb)4
2 files changed, 23 insertions, 11 deletions
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
index 80acab867c..86d841b1c5 100644
--- 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
@@ -1,20 +1,32 @@
1Configure output from installed-tests to be TAP compliant, such that gnome-desktop-testing-runner properly interprets the results. 1From 668e1d14af13249384ab324c7d79ec4147f07e48 Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Mon, 27 Apr 2015 20:12:33 +0300
4Subject: [PATCH] Run installed tests with tap output
5
6Configure output from installed-tests to be TAP compliant such that
7gnome-desktop-testing-runner properly interprets the results.
2 8
3Upstream-status: Pending 9Upstream-status: Pending
4 10
5Signed-off-by: Tim Orling <TicoTimo@gmail.com> 11Signed-off-by: Tim Orling <TicoTimo@gmail.com>
12---
13 build/autotools/glib-tap.mk | 3 ++-
14 1 file changed, 2 insertions(+), 1 deletion(-)
6 15
7Index: clutter-1.20.0/build/autotools/glib-tap.mk 16diff --git a/build/autotools/glib-tap.mk b/build/autotools/glib-tap.mk
8=================================================================== 17index 7c5f82b..844e17e 100644
9--- clutter-1.20.0.orig/build/autotools/glib-tap.mk 18--- a/build/autotools/glib-tap.mk
10+++ clutter-1.20.0/build/autotools/glib-tap.mk 19+++ b/build/autotools/glib-tap.mk
11@@ -128,7 +128,8 @@ installed_test_meta_DATA = $(installed_t 20@@ -127,7 +127,8 @@ installed_test_meta_DATA = $(installed_testcases:=.test)
21 %.test: %$(EXEEXT) Makefile
12 $(AM_V_GEN) (echo '[Test]' > $@.tmp; \ 22 $(AM_V_GEN) (echo '[Test]' > $@.tmp; \
13 echo 'Type=session' >> $@.tmp; \ 23 echo 'Type=session' >> $@.tmp; \
14 echo 'TestEnvironment=G_ENABLE_DIAGNOSTIC=0;CLUTTER_ENABLE_DIAGNOSTIC=0;' >> $@.tmp; \ 24- echo 'Exec=env G_ENABLE_DIAGNOSTIC=0 CLUTTER_ENABLE_DIAGNOSTIC=0 $(installed_testdir)/$<' >> $@.tmp; \
15- echo 'Exec=$(installed_testdir)/$<' >> $@.tmp; \ 25+ echo 'Exec=env G_ENABLE_DIAGNOSTIC=0 CLUTTER_ENABLE_DIAGNOSTIC=0 $(installed_testdir)/$< --tap' >> $@.tmp; \
16+ echo 'Exec=$(installed_testdir)/$< --tap' >> $@.tmp; \
17+ echo 'Output=TAP' >> $@.tmp; \ 26+ echo 'Output=TAP' >> $@.tmp; \
18 mv $@.tmp $@) 27 mv $@.tmp $@)
19 28
20 CLEANFILES += $(installed_test_meta_DATA) 29 CLEANFILES += $(installed_test_meta_DATA)
30--
312.1.4
32
diff --git a/meta/recipes-graphics/clutter/clutter-1.0_1.20.0.bb b/meta/recipes-graphics/clutter/clutter-1.0_1.22.4.bb
index 5f39a3a8ac..418cdfd379 100644
--- a/meta/recipes-graphics/clutter/clutter-1.0_1.20.0.bb
+++ b/meta/recipes-graphics/clutter/clutter-1.0_1.22.4.bb
@@ -2,8 +2,8 @@ require clutter-1.0.inc
2 2
3LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" 3LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
4 4
5SRC_URI[archive.md5sum] = "a8a33a57a944c6d7c7c013ce9aa3222b" 5SRC_URI[archive.md5sum] = "26494256c980d49703a553916e3083cd"
6SRC_URI[archive.sha256sum] = "cc940809e6e1469ce349c4bddb0cbcc2c13c087d4fc15cda9278d855ee2d1293" 6SRC_URI[archive.sha256sum] = "1d77ce16025f87667a1d00dc4fa617a1935156f63fd17635fdadf138866c9e1e"
7 7
8SRC_URI += "file://install-examples.patch \ 8SRC_URI += "file://install-examples.patch \
9 file://run-installed-tests-with-tap-output.patch \ 9 file://run-installed-tests-with-tap-output.patch \