diff options
| author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2015-07-09 10:52:45 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-07-12 22:53:18 +0100 |
| commit | 3926c63c027d932abcb9deafde7c83ea3b9f1907 (patch) | |
| tree | 6ba178c87bcb516c4962e87f6bc0c12c9ceaf3d9 /meta | |
| parent | 9d38fb232deaa2e7e46d3c442d1598e13bba9c0a (diff) | |
| download | openembedded-core-3926c63c027d932abcb9deafde7c83ea3b9f1907.tar.gz openembedded-core-3926c63c027d932abcb9deafde7c83ea3b9f1907.tar.bz2 openembedded-core-3926c63c027d932abcb9deafde7c83ea3b9f1907.zip | |
clutter-1.0: Upgrade 1.20.0 -> 1.22.4
* Update test TAP output patch
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-graphics/clutter/clutter-1.0/run-installed-tests-with-tap-output.patch | 30 | ||||
| -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 @@ -Configure output from installed-tests to be TAP compliant, such that gnome-desktop-testing-runner properly interprets the results. +From 668e1d14af13249384ab324c7d79ec4147f07e48 Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen <jussi.kukkonen@intel.com> +Date: Mon, 27 Apr 2015 20:12:33 +0300 +Subject: [PATCH] Run installed tests with tap output + +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> +--- + build/autotools/glib-tap.mk | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) -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 +diff --git a/build/autotools/glib-tap.mk b/build/autotools/glib-tap.mk +index 7c5f82b..844e17e 100644 +--- a/build/autotools/glib-tap.mk ++++ b/build/autotools/glib-tap.mk +@@ -127,7 +127,8 @@ installed_test_meta_DATA = $(installed_testcases:=.test) + %.test: %$(EXEEXT) Makefile $(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 'Exec=env G_ENABLE_DIAGNOSTIC=0 CLUTTER_ENABLE_DIAGNOSTIC=0 $(installed_testdir)/$<' >> $@.tmp; \ ++ echo 'Exec=env G_ENABLE_DIAGNOSTIC=0 CLUTTER_ENABLE_DIAGNOSTIC=0 $(installed_testdir)/$< --tap' >> $@.tmp; \ + echo 'Output=TAP' >> $@.tmp; \ mv $@.tmp $@) CLEANFILES += $(installed_test_meta_DATA) +-- +2.1.4 + 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 LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" -SRC_URI[archive.md5sum] = "a8a33a57a944c6d7c7c013ce9aa3222b" -SRC_URI[archive.sha256sum] = "cc940809e6e1469ce349c4bddb0cbcc2c13c087d4fc15cda9278d855ee2d1293" +SRC_URI[archive.md5sum] = "26494256c980d49703a553916e3083cd" +SRC_URI[archive.sha256sum] = "1d77ce16025f87667a1d00dc4fa617a1935156f63fd17635fdadf138866c9e1e" SRC_URI += "file://install-examples.patch \ file://run-installed-tests-with-tap-output.patch \ |