mirror of
https://git.yoctoproject.org/poky
synced 2026-02-26 19:39:40 +01:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
409490147b
commit
d296521cff
@@ -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
|
||||
|
||||
|
||||
@@ -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 \
|
||||
Reference in New Issue
Block a user