From 1a81e2f57e49b070fdb0cc7a2d35175fb195431d Mon Sep 17 00:00:00 2001 From: "Maxin B. John" Date: Mon, 2 Nov 2015 16:17:19 +0200 Subject: gnome-desktop-testing: fix ptest output format Fix ptest output format for glib-2.0 and other packages which depends on gnome-desktop-testing framework. [YOCTO #6601] Signed-off-by: Maxin B. John Signed-off-by: Ross Burton --- .../update-output-syntax.patch | 27 ++++++++++++++++++++++ .../gnome-desktop-testing_2014.1.bb | 1 + 2 files changed, 28 insertions(+) create mode 100644 meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing/update-output-syntax.patch (limited to 'meta/recipes-support/gnome-desktop-testing') 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 new file mode 100644 index 0000000000..5a178e2ef1 --- /dev/null +++ b/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing/update-output-syntax.patch @@ -0,0 +1,27 @@ + +The terms `FAIL` instead of `FAILED` and `SKIP` instead of `SKIPPED` +match what Automake does + +Upstream-Status: Accepted +[ https://git.gnome.org/browse/gnome-desktop-testing/commit/?id=048850731a640532ef55a61df7357fcc6d2ad501 ] + +Signed-off-by: Maxin B. John +--- +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 (); 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 index 482de99d4d..ccb3d3b7dc 100644 --- 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 @@ -4,6 +4,7 @@ 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" -- cgit 1.2.3-korg