diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 15:28:33 -0400 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 19:31:28 +0000 |
commit | 193236933b0f4ab91b1625b64e2187e2db4e0e8f (patch) | |
tree | e12769d7c76d8b0517d6de3d3c72189753d253ed /poky/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing/update-output-syntax.patch | |
parent | bd93df9478f2f56ffcbc8cb88f1709c735dcd85b (diff) | |
download | talos-openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.tar.gz talos-openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.zip |
reset upstream subtrees to HEAD
Reset the following subtrees on HEAD:
poky: 8217b477a1(master)
meta-xilinx: 64aa3d35ae(master)
meta-openembedded: 0435c9e193(master)
meta-raspberrypi: 490a4441ac(master)
meta-security: cb6d1c85ee(master)
Squashed patches:
meta-phosphor: drop systemd 239 patches
meta-phosphor: mrw-api: use correct install path
Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing/update-output-syntax.patch')
-rw-r--r-- | poky/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing/update-output-syntax.patch | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/poky/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing/update-output-syntax.patch b/poky/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing/update-output-syntax.patch deleted file mode 100644 index 19c524b0a..000000000 --- a/poky/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing/update-output-syntax.patch +++ /dev/null @@ -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 (); |