mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-08 17:19:20 +00:00
Code Issues Projects Releases Wiki Activity

gnome-desktop-testing: upgrade to 2018.1

Browse Source 
Drop backported and obsolete patches.

Respect systemd DISTRO_FEATURE when enabling/disabling journal support.

(From OE-Core rev: 33d2cee29758d2a827baa2dda98b10c993101be2)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton
2018-11-14 16:28:47 +00:00
committed by Richard Purdie
parent 185f1d99fd
commit bd57916ae5
4 changed files with 18 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing/0001-gsystem-subprocess.c-Enable-GNU-extensions-in-system.patch
-35
View File
@@ -1,35 +0,0 @@
From b1de2c6290bc0651fe87a8c4fb52e7a0a5fe6322 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sun, 5 Oct 2014 16:01:49 -0700
Subject: [PATCH] gsystem-subprocess.c: Enable GNU extensions in system C
library
This should export O_CLOEXEC where it is only
available when _GNU_SOURCE is defined .e.g. uclibc based systems
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Upstream-Status: Pending
---
src/libgsystem/gsystem-subprocess.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/libgsystem/gsystem-subprocess.c b/src/libgsystem/gsystem-subprocess.c
index a967896..a52a362 100644
--- a/src/libgsystem/gsystem-subprocess.c
+++ b/src/libgsystem/gsystem-subprocess.c
@@ -18,6 +18,10 @@
#include "config.h"
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+
#define _GSYSTEM_NO_LOCAL_ALLOC
#include "libgsystem.h"
--
2.1.1
meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing/update-output-syntax.patch
-27
View File
@@ -1,27 +0,0 @@
The terms `FAIL` instead of `FAILED` and `SKIP` instead of `SKIPPED`
match what Automake does
Upstream-Status: Accepted
[ https://gitlab.gnome.org/GNOME/gnome-desktop-testing/commit/048850731a640532ef55a61df7357fcc6d2ad501 ]
Signed-off-by: Maxin B. John <maxin.john@intel.com>
---
diff -Naur gnome-desktop-testing-2014.1-orig/src/gnome-desktop-testing-runner.c gnome-desktop-testing-2014.1/src/gnome-desktop-testing-runner.c
--- gnome-desktop-testing-2014.1-orig/src/gnome-desktop-testing-runner.c 2014-01-16 12:58:26.000000000 +0200
+++ gnome-desktop-testing-2014.1/src/gnome-desktop-testing-runner.c 2015-11-02 11:27:34.010594126 +0200
@@ -280,12 +280,12 @@
else if (test->state == TEST_STATE_COMPLETE_FAILED)
{
msgid_value = ONE_TEST_FAILED_MSGID;
- msg = g_strconcat ("FAILED: ", test->name, " (", reason, ")", NULL);
+ msg = g_strconcat ("FAIL: ", test->name, " (", reason, ")", NULL);
}
else if (test->state == TEST_STATE_COMPLETE_SKIPPED)
{
msgid_value = ONE_TEST_SKIPPED_MSGID;
- msg = g_strconcat ("SKIPPED: ", test->name, NULL);
+ msg = g_strconcat ("SKIP: ", test->name, NULL);
}
else
g_assert_not_reached ();
meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2014.1.bb
-22
View File
@@ -1,22 +0,0 @@
SUMMARY = "Test runner for GNOME-style installed tests"
HOMEPAGE = "https://wiki.gnome.org/GnomeGoals/InstalledTests"
LICENSE = "LGPLv2+"
SRC_URI = "${GNOME_MIRROR}/${BPN}/${PV}/${BPN}-${PV}.tar.xz \
file://0001-gsystem-subprocess.c-Enable-GNU-extensions-in-system.patch \
file://update-output-syntax.patch \
"
SRC_URI[md5sum] = "a608ad72a77e23a1aecdfd8d07a94baf"
SRC_URI[sha256sum] = "1a3eed73678dd22d09d6a7ec4f899557df3e8b4a802affa76d0f163b31286539"
LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
file://src/gnome-desktop-testing-runner.c;endline=19;md5=67311a600b83fd0068dfc7e5b84ffb3f"
DEPENDS = "glib-2.0"
inherit autotools pkgconfig
PR = "r1"
PACKAGECONFIG ??= ""
PACKAGECONFIG[journald] = "--with-systemd-journal,--without-systemd-journal,systemd,systemd"
meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2018.1.bb
+18
View File
@@ -0,0 +1,18 @@
SUMMARY = "Test runner for GNOME-style installed tests"
HOMEPAGE = "https://wiki.gnome.org/GnomeGoals/InstalledTests"
LICENSE = "LGPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
file://src/gnome-desktop-testing-runner.c;beginline=1;endline=20;md5=7ef3ad9da2ffcf7707dc11151fe007f4"
SRC_URI = "git://gitlab.gnome.org/GNOME/gnome-desktop-testing.git;protocol=http"
SRCREV = "4decade67b29ad170fcf3de148e41695fc459f48"
DEPENDS = "glib-2.0"
S = "${WORKDIR}/git"
inherit autotools pkgconfig
PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
PACKAGECONFIG[systemd] = ",,systemd"