Revert "glib-2.0: add workaround to fix codegen.py.test failing"

This reverts commit afc9ba7d546f3f2e60fb6f46f740dc925542df16.

Ptest-runner was upgraded in e3fd8f17dfb41173dbe037c25087a69f90b1346f,
which means we no longer need to limit glib-2.0 ptest output.

[YOCTO #14170]

Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-tests-codegen.py-removing-unecessary-print-statement.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-tests-codegen.py-removing-unecessary-print-statement.patch
deleted file mode 100644 (file)
index 1f19afc..0000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/0001-tests-codegen.py-removing-unecessary-print-statement.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 6178df5658045a6253ef806e018fe80d99a8f5fb Mon Sep 17 00:00:00 2001
-From: Yi Fan Yu <yifan.yu@windriver.com>
-Date: Mon, 1 Feb 2021 16:10:28 -0500
-Subject: [PATCH] tests/codegen.py: removing unecessary print statement
-
-A huge amount of output(boiler-plate code) is
-printed to the console screen.
-This is not critical to the test results.
-
-This causes intermittent test failure when another process
-has to parse its output.
-
-Root cause is in ptest-runner, This is a workaround
-
-Uptream-Status: Inappropriate [other]
-
-Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com>
----
- gio/tests/codegen.py | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/gio/tests/codegen.py b/gio/tests/codegen.py
-index 0317765..f66b806 100644
---- a/gio/tests/codegen.py
-+++ b/gio/tests/codegen.py
-@@ -257,7 +257,6 @@ class TestCodegen(unittest.TestCase):
- 
-         result = Result(info, out, err, subs)
- 
--        print("Output:", result.out)
-         return result
- 
-     def runCodegenWithInterface(self, interface_contents, *args):
--- 
-2.25.1
-

diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.68.0.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.68.0.bb
index 3a90be8bc962dc976b30e4c38503a696deac72df..94d24318c39cb1495e2047010859f439d005a87c 100644 (file)
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.68.0.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.68.0.bb
@@ -17,7 +17,6 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
            file://0001-meson-Run-atomics-test-on-clang-as-well.patch \
            file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \
            file://0001-gio-tests-codegen.py-bump-timeout-to-100-seconds.patch \
-           file://0001-tests-codegen.py-removing-unecessary-print-statement.patch \
            "
 SRC_URI_append_class-native = " file://relocate-modules.patch"