diff options
| -rw-r--r-- | meta/recipes-core/glib-networking/glib-networking/eagain.patch | 29 | ||||
| -rw-r--r-- | meta/recipes-core/glib-networking/glib-networking_2.74.0.bb | 1 |
2 files changed, 30 insertions, 0 deletions
diff --git a/meta/recipes-core/glib-networking/glib-networking/eagain.patch b/meta/recipes-core/glib-networking/glib-networking/eagain.patch new file mode 100644 index 0000000000..6dfbb2736c --- /dev/null +++ b/meta/recipes-core/glib-networking/glib-networking/eagain.patch | |||
| @@ -0,0 +1,29 @@ | |||
| 1 | In autobuilder testing we regularly see glib-networking ptest fail with: | ||
| 2 | |||
| 3 | GLib-Net:ERROR:/usr/src/debug/glib-networking/2.74.0-r0/tls/tests/connection.c:1944:simul_read_thread: assertion failed (error == NULL): Resource temporarily unavailable (g-io-error-quark, 27) | ||
| 4 | Bail out! GLib-Net:ERROR:/usr/src/debug/glib-networking/2.74.0-r0/tls/tests/connection.c:1944:simul_read_thread: assertion failed (error == NULL): Resource temporarily unavailable (g-io-error-quark, 27) | ||
| 5 | FAIL: glib-networking/connection-openssl.test (Child process killed by signal 6) | ||
| 6 | SUMMARY: total=4; passed=3; skipped=0; failed=1; user=0.9s; system=0.4s; maxrss=10708 | ||
| 7 | FAIL: glib-networking/connection-openssl.test (Child process killed by signal 6) | ||
| 8 | |||
| 9 | The test should probably retry in this situation so test a patch which does this. | ||
| 10 | |||
| 11 | Upstream-Status: Pending [testing to see if patch resolves the issue] | ||
| 12 | |||
| 13 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
| 14 | |||
| 15 | Index: glib-networking-2.74.0/tls/tests/connection.c | ||
| 16 | =================================================================== | ||
| 17 | --- glib-networking-2.74.0.orig/tls/tests/connection.c | ||
| 18 | +++ glib-networking-2.74.0/tls/tests/connection.c | ||
| 19 | @@ -1941,6 +1941,10 @@ simul_read_thread (gpointer user_data) | ||
| 20 | test->buf + test->nread, | ||
| 21 | MIN (TEST_DATA_LENGTH / 2, TEST_DATA_LENGTH - test->nread), | ||
| 22 | NULL, &error); | ||
| 23 | + | ||
| 24 | + if (error == G_IO_STATUS_AGAIN) | ||
| 25 | + continue; | ||
| 26 | + | ||
| 27 | g_assert_no_error (error); | ||
| 28 | |||
| 29 | test->nread += nread; | ||
diff --git a/meta/recipes-core/glib-networking/glib-networking_2.74.0.bb b/meta/recipes-core/glib-networking/glib-networking_2.74.0.bb index dc0be23357..b3a88aca8d 100644 --- a/meta/recipes-core/glib-networking/glib-networking_2.74.0.bb +++ b/meta/recipes-core/glib-networking/glib-networking_2.74.0.bb | |||
| @@ -24,6 +24,7 @@ GNOMEBASEBUILDCLASS = "meson" | |||
| 24 | inherit gnomebase gettext upstream-version-is-even gio-module-cache ptest-gnome | 24 | inherit gnomebase gettext upstream-version-is-even gio-module-cache ptest-gnome |
| 25 | 25 | ||
| 26 | SRC_URI += "file://run-ptest" | 26 | SRC_URI += "file://run-ptest" |
| 27 | SRC_URI += "file://eagain.patch" | ||
| 27 | 28 | ||
| 28 | FILES:${PN} += "\ | 29 | FILES:${PN} += "\ |
| 29 | ${libdir}/gio/modules/libgio*.so \ | 30 | ${libdir}/gio/modules/libgio*.so \ |
