summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrevor Gamblin <tgamblin@baylibre.com>2023-06-20 13:59:13 -0400
committerSteve Sakoman <steve@sakoman.com>2023-07-07 04:30:26 -1000
commita5d9fa0860f60eb4814c0055b03718a08cbbf71c (patch)
tree3b27db7b14543df6de00665d42a65602610150a1
parent2ed4fd70e4520de0289ef2155ce7b4920dbca0f3 (diff)
downloadpoky-a5d9fa0860f60eb4814c0055b03718a08cbbf71c.tar.gz
glib-networking: use correct error code in ptest
The eagain patch is currently using G_IO_ERROR_BUSY as part of the check to retry when the simul_read_thread test fails during ptests, but the actual error code is 27, which corresponds to G_IO_ERROR_WOULD_BLOCK. Change the check so that it looks for the right code. (From OE-Core rev: 669bb92fde575d3f9674b87044575873c3506df5) Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 8574fb1371e2d83c1c7ee58067c50319a62a22ea) Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r--meta/recipes-core/glib-networking/glib-networking/eagain.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-core/glib-networking/glib-networking/eagain.patch b/meta/recipes-core/glib-networking/glib-networking/eagain.patch
index ac6592ffef..ee5b6a7beb 100644
--- a/meta/recipes-core/glib-networking/glib-networking/eagain.patch
+++ b/meta/recipes-core/glib-networking/glib-networking/eagain.patch
@@ -21,7 +21,7 @@ Index: glib-networking-2.74.0/tls/tests/connection.c
21 MIN (TEST_DATA_LENGTH / 2, TEST_DATA_LENGTH - test->nread), 21 MIN (TEST_DATA_LENGTH / 2, TEST_DATA_LENGTH - test->nread),
22 NULL, &error); 22 NULL, &error);
23+ 23+
24+ if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_BUSY)) 24+ if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_WOULD_BLOCK))
25+ continue; 25+ continue;
26+ 26+
27 g_assert_no_error (error); 27 g_assert_no_error (error);