diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2020-12-22 10:37:57 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-12-24 08:25:14 +0000 |
commit | 2848b3d949312681902a51938dae34f6389bd24d (patch) | |
tree | 46630fa4b3fba49166e73744dc5444df297047d0 /meta/recipes-core/glib-2.0 | |
parent | 2d99b0993aa7a703c4fd6a3b7c0ddbaa28608aac (diff) | |
download | poky-2848b3d949312681902a51938dae34f6389bd24d.tar.gz |
glib-2.0: add a patch to increase a test timeout
There have been intermittent ptest failures in this test;
I couldn't reproduce the failures in isolation, and
this is the only reason I can think of from reading code.
(From OE-Core rev: eddbc1880231dd3839c635f688a2a46589fd1b51)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/glib-2.0')
3 files changed, 28 insertions, 1 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-codegen.py-bump-timeout-to-100-seconds.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-codegen.py-bump-timeout-to-100-seconds.patch new file mode 100644 index 0000000000..508c8c3bad --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-codegen.py-bump-timeout-to-100-seconds.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | From b833254bcc9fcf4cdc2572027b1154d799535ca4 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Sun, 20 Dec 2020 22:01:43 +0100 | ||
4 | Subject: [PATCH] gio/tests/codegen.py: bump timeout to 100 seconds | ||
5 | |||
6 | This may be necessary on overloaded CI systems. | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
10 | --- | ||
11 | gio/tests/codegen.py | 2 +- | ||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
13 | |||
14 | diff --git a/gio/tests/codegen.py b/gio/tests/codegen.py | ||
15 | index 51de0ed..ca98c9d 100644 | ||
16 | --- a/gio/tests/codegen.py | ||
17 | +++ b/gio/tests/codegen.py | ||
18 | @@ -51,7 +51,7 @@ class TestCodegen(unittest.TestCase): | ||
19 | cwd = '' | ||
20 | |||
21 | def setUp(self): | ||
22 | - self.timeout_seconds = 10 # seconds per test | ||
23 | + self.timeout_seconds = 100 # seconds per test | ||
24 | self.tmpdir = tempfile.TemporaryDirectory() | ||
25 | self.cwd = os.getcwd() | ||
26 | os.chdir(self.tmpdir.name) | ||
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch b/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch index 2b8e930511..4cbcc29a50 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch +++ b/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 85931fbb981b5aae38f1c1370d5d3c091cb862b8 Mon Sep 17 00:00:00 2001 | 1 | From 011c9f024b6475d31e7d5432a38d00fb67eaea40 Mon Sep 17 00:00:00 2001 |
2 | From: Ross Burton <ross.burton@intel.com> | 2 | From: Ross Burton <ross.burton@intel.com> |
3 | Date: Fri, 11 Mar 2016 15:35:55 +0000 | 3 | Date: Fri, 11 Mar 2016 15:35:55 +0000 |
4 | Subject: [PATCH] glib-2.0: relocate the GIO module directory for native builds | 4 | Subject: [PATCH] glib-2.0: relocate the GIO module directory for native builds |
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.66.2.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.66.2.bb index 1f83660856..01ed54d06a 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.66.2.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.66.2.bb | |||
@@ -16,6 +16,7 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ | |||
16 | file://0001-Do-not-write-bindir-into-pkg-config-files.patch \ | 16 | file://0001-Do-not-write-bindir-into-pkg-config-files.patch \ |
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 | " | 20 | " |
20 | 21 | ||
21 | SRC_URI_append_class-native = " file://relocate-modules.patch" | 22 | SRC_URI_append_class-native = " file://relocate-modules.patch" |