summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/gnome-desktop-testing
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-11-14 16:28:47 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-12-05 12:37:02 +0000
commitbd57916ae56669f563c7aa816ac520dc37cfc78d (patch)
treedc335f906ab74e9a8b3bfed3daebb701029b401d /meta/recipes-support/gnome-desktop-testing
parent185f1d99fd7cfa5b5d3fbc43c010096f8e7a59ed (diff)
downloadpoky-bd57916ae56669f563c7aa816ac520dc37cfc78d.tar.gz
gnome-desktop-testing: upgrade to 2018.1
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>
Diffstat (limited to 'meta/recipes-support/gnome-desktop-testing')
-rw-r--r--meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing/0001-gsystem-subprocess.c-Enable-GNU-extensions-in-system.patch35
-rw-r--r--meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing/update-output-syntax.patch27
-rw-r--r--meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2014.1.bb22
-rw-r--r--meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2018.1.bb18
4 files changed, 18 insertions, 84 deletions
diff --git a/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing/0001-gsystem-subprocess.c-Enable-GNU-extensions-in-system.patch b/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing/0001-gsystem-subprocess.c-Enable-GNU-extensions-in-system.patch
deleted file mode 100644
index 840666f302..0000000000
--- a/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing/0001-gsystem-subprocess.c-Enable-GNU-extensions-in-system.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1From b1de2c6290bc0651fe87a8c4fb52e7a0a5fe6322 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 5 Oct 2014 16:01:49 -0700
4Subject: [PATCH] gsystem-subprocess.c: Enable GNU extensions in system C
5 library
6
7This should export O_CLOEXEC where it is only
8available when _GNU_SOURCE is defined .e.g. uclibc based systems
9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11
12Upstream-Status: Pending
13
14---
15 src/libgsystem/gsystem-subprocess.c | 4 ++++
16 1 file changed, 4 insertions(+)
17
18diff --git a/src/libgsystem/gsystem-subprocess.c b/src/libgsystem/gsystem-subprocess.c
19index a967896..a52a362 100644
20--- a/src/libgsystem/gsystem-subprocess.c
21+++ b/src/libgsystem/gsystem-subprocess.c
22@@ -18,6 +18,10 @@
23
24 #include "config.h"
25
26+#ifndef _GNU_SOURCE
27+#define _GNU_SOURCE
28+#endif
29+
30 #define _GSYSTEM_NO_LOCAL_ALLOC
31 #include "libgsystem.h"
32
33--
342.1.1
35
diff --git a/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing/update-output-syntax.patch b/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing/update-output-syntax.patch
deleted file mode 100644
index 19c524b0ac..0000000000
--- a/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing/update-output-syntax.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1
2The terms `FAIL` instead of `FAILED` and `SKIP` instead of `SKIPPED`
3match what Automake does
4
5Upstream-Status: Accepted
6[ https://gitlab.gnome.org/GNOME/gnome-desktop-testing/commit/048850731a640532ef55a61df7357fcc6d2ad501 ]
7
8Signed-off-by: Maxin B. John <maxin.john@intel.com>
9---
10diff -Naur gnome-desktop-testing-2014.1-orig/src/gnome-desktop-testing-runner.c gnome-desktop-testing-2014.1/src/gnome-desktop-testing-runner.c
11--- gnome-desktop-testing-2014.1-orig/src/gnome-desktop-testing-runner.c 2014-01-16 12:58:26.000000000 +0200
12+++ gnome-desktop-testing-2014.1/src/gnome-desktop-testing-runner.c 2015-11-02 11:27:34.010594126 +0200
13@@ -280,12 +280,12 @@
14 else if (test->state == TEST_STATE_COMPLETE_FAILED)
15 {
16 msgid_value = ONE_TEST_FAILED_MSGID;
17- msg = g_strconcat ("FAILED: ", test->name, " (", reason, ")", NULL);
18+ msg = g_strconcat ("FAIL: ", test->name, " (", reason, ")", NULL);
19 }
20 else if (test->state == TEST_STATE_COMPLETE_SKIPPED)
21 {
22 msgid_value = ONE_TEST_SKIPPED_MSGID;
23- msg = g_strconcat ("SKIPPED: ", test->name, NULL);
24+ msg = g_strconcat ("SKIP: ", test->name, NULL);
25 }
26 else
27 g_assert_not_reached ();
diff --git a/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2014.1.bb b/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2014.1.bb
deleted file mode 100644
index ccb3d3b7dc..0000000000
--- a/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2014.1.bb
+++ /dev/null
@@ -1,22 +0,0 @@
1SUMMARY = "Test runner for GNOME-style installed tests"
2HOMEPAGE = "https://wiki.gnome.org/GnomeGoals/InstalledTests"
3LICENSE = "LGPLv2+"
4
5SRC_URI = "${GNOME_MIRROR}/${BPN}/${PV}/${BPN}-${PV}.tar.xz \
6 file://0001-gsystem-subprocess.c-Enable-GNU-extensions-in-system.patch \
7 file://update-output-syntax.patch \
8 "
9SRC_URI[md5sum] = "a608ad72a77e23a1aecdfd8d07a94baf"
10SRC_URI[sha256sum] = "1a3eed73678dd22d09d6a7ec4f899557df3e8b4a802affa76d0f163b31286539"
11
12LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
13 file://src/gnome-desktop-testing-runner.c;endline=19;md5=67311a600b83fd0068dfc7e5b84ffb3f"
14
15DEPENDS = "glib-2.0"
16
17inherit autotools pkgconfig
18
19PR = "r1"
20
21PACKAGECONFIG ??= ""
22PACKAGECONFIG[journald] = "--with-systemd-journal,--without-systemd-journal,systemd,systemd"
diff --git a/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2018.1.bb b/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2018.1.bb
new file mode 100644
index 0000000000..0defebeb15
--- /dev/null
+++ b/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2018.1.bb
@@ -0,0 +1,18 @@
1SUMMARY = "Test runner for GNOME-style installed tests"
2HOMEPAGE = "https://wiki.gnome.org/GnomeGoals/InstalledTests"
3LICENSE = "LGPLv2+"
4
5LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
6 file://src/gnome-desktop-testing-runner.c;beginline=1;endline=20;md5=7ef3ad9da2ffcf7707dc11151fe007f4"
7
8SRC_URI = "git://gitlab.gnome.org/GNOME/gnome-desktop-testing.git;protocol=http"
9SRCREV = "4decade67b29ad170fcf3de148e41695fc459f48"
10
11DEPENDS = "glib-2.0"
12
13S = "${WORKDIR}/git"
14
15inherit autotools pkgconfig
16
17PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
18PACKAGECONFIG[systemd] = ",,systemd"