diff options
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0/time-test.patch | 40 | ||||
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0_2.68.3.bb | 1 |
2 files changed, 41 insertions, 0 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/time-test.patch b/meta/recipes-core/glib-2.0/glib-2.0/time-test.patch new file mode 100644 index 0000000000..4d7ef97bb5 --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0/time-test.patch | |||
@@ -0,0 +1,40 @@ | |||
1 | Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2177] | ||
2 | Signed-off-by: Ross Burton <ross.burton@arm.com> | ||
3 | |||
4 | From 289f8be1b397a453cfcf35641455f3ae5fb4faeb Mon Sep 17 00:00:00 2001 | ||
5 | From: Ross Burton <ross.burton@arm.com> | ||
6 | Date: Tue, 6 Jul 2021 19:26:03 +0100 | ||
7 | Subject: [PATCH] gio/tests/g-file-info: don't assume million-in-one events | ||
8 | don't happen | ||
9 | |||
10 | The modification time test creates a file, gets the modification time in | ||
11 | seconds, then gets the modification time in microseconds and assumes | ||
12 | that the difference between the two has to be above 0. | ||
13 | |||
14 | As rare as this may be, it can happen: | ||
15 | |||
16 | $ stat g-file-info-test-50A450 -c %y | ||
17 | 2021-07-06 18:24:56.000000767 +0100 | ||
18 | |||
19 | Change the test to simply assert that the difference not negative to | ||
20 | handle this case. | ||
21 | --- | ||
22 | gio/tests/g-file-info.c | 2 +- | ||
23 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
24 | |||
25 | diff --git a/gio/tests/g-file-info.c b/gio/tests/g-file-info.c | ||
26 | index c11c50462..fd0c64b55 100644 | ||
27 | --- a/gio/tests/g-file-info.c | ||
28 | +++ b/gio/tests/g-file-info.c | ||
29 | @@ -178,7 +178,7 @@ test_g_file_info_modification_time (void) | ||
30 | g_assert_nonnull (dt_usecs); | ||
31 | |||
32 | ts = g_date_time_difference (dt_usecs, dt); | ||
33 | - g_assert_cmpint (ts, >, 0); | ||
34 | + g_assert_cmpint (ts, >=, 0); | ||
35 | g_assert_cmpint (ts, <, G_USEC_PER_SEC); | ||
36 | |||
37 | /* Try round-tripping the modification time. */ | ||
38 | -- | ||
39 | 2.25.1 | ||
40 | |||
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.68.3.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.68.3.bb index 2a3a00fada..62c8d49464 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.68.3.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.68.3.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://time-test.patch \ | ||
20 | " | 21 | " |
21 | SRC_URI_append_class-native = " file://relocate-modules.patch" | 22 | SRC_URI_append_class-native = " file://relocate-modules.patch" |
22 | 23 | ||