diff options
author | Yi Fan Yu <yifan.yu@windriver.com> | 2021-02-03 19:08:07 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-02-05 08:16:32 +0000 |
commit | 4b5b18c369d9d8bd4b8e8aab4741302c91b7151b (patch) | |
tree | f1612de0a13917f922ffbaca105021108b497077 /meta/recipes-core | |
parent | ab012b3b94a3369988dc4aedbc9abe958cb04bca (diff) | |
download | poky-4b5b18c369d9d8bd4b8e8aab4741302c91b7151b.tar.gz |
glib-2.0: add workaround to fix codegen.py.test failing
Adding a patch to remove an unecessary print statement
in test-codegen.py that cause the ptest-runner to fail.
Root cause is suspected to be in ptest-runner.
[YOCTO #14170]
Uptream-Status: Inappropriate [other]
this is a workaround.
(From OE-Core rev: afc9ba7d546f3f2e60fb6f46f740dc925542df16)
Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0/0001-tests-codegen.py-removing-unecessary-print-statement.patch | 38 | ||||
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0_2.66.4.bb | 1 |
2 files changed, 39 insertions, 0 deletions
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 new file mode 100644 index 0000000000..40427e0e67 --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-tests-codegen.py-removing-unecessary-print-statement.patch | |||
@@ -0,0 +1,38 @@ | |||
1 | From 6178df5658045a6253ef806e018fe80d99a8f5fb Mon Sep 17 00:00:00 2001 | ||
2 | From: Yi Fan Yu <yifan.yu@windriver.com> | ||
3 | Date: Mon, 1 Feb 2021 16:10:28 -0500 | ||
4 | Subject: [PATCH] tests/codegen.py: removing unecessary print statement | ||
5 | |||
6 | A huge amount of output(boiler-plate code) is | ||
7 | printed to the console screen. | ||
8 | This is not critical to the test results. | ||
9 | |||
10 | This causes intermittent test failure when another process | ||
11 | has to parse its output. | ||
12 | |||
13 | Root cause is in ptest-runner, This is a workaround | ||
14 | |||
15 | Uptream-Status: Inappropriate [other] | ||
16 | |||
17 | |||
18 | |||
19 | Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com> | ||
20 | --- | ||
21 | gio/tests/codegen.py | 1 - | ||
22 | 1 file changed, 1 deletion(-) | ||
23 | |||
24 | diff --git a/gio/tests/codegen.py b/gio/tests/codegen.py | ||
25 | index 51de0ede4..cfa4db42e 100644 | ||
26 | --- a/gio/tests/codegen.py | ||
27 | +++ b/gio/tests/codegen.py | ||
28 | @@ -250,7 +250,6 @@ class TestCodegen(unittest.TestCase): | ||
29 | |||
30 | result = Result(info, out, err, subs) | ||
31 | |||
32 | - print('Output:', result.out) | ||
33 | return result | ||
34 | |||
35 | def runCodegenWithInterface(self, interface_contents, *args): | ||
36 | -- | ||
37 | 2.29.2 | ||
38 | |||
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.66.4.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.66.4.bb index 70e8aa8785..5e1c0f2d33 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.66.4.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.66.4.bb | |||
@@ -17,6 +17,7 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ | |||
17 | file://0001-meson-Run-atomics-test-on-clang-as-well.patch \ | 17 | file://0001-meson-Run-atomics-test-on-clang-as-well.patch \ |
18 | file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \ | 18 | file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \ |
19 | file://0001-gio-tests-codegen.py-bump-timeout-to-100-seconds.patch \ | 19 | file://0001-gio-tests-codegen.py-bump-timeout-to-100-seconds.patch \ |
20 | file://0001-tests-codegen.py-removing-unecessary-print-statement.patch \ | ||
20 | " | 21 | " |
21 | 22 | ||
22 | SRC_URI_append_class-native = " file://relocate-modules.patch" | 23 | SRC_URI_append_class-native = " file://relocate-modules.patch" |