diff options
| author |   Ross Burton <ross@burtonini.com> | 2021-07-07 10:04:14 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-07 11:39:56 +0100 |
| commit | 7d2bd897fdbcf5215bf2287cb96eb6b58803f08c (patch) | |
| tree | e57e18625ce68db75176f9cdfd38c08ab73d33b2 /meta/recipes-core/glib-2.0 | |
| parent | f7de32dfcc2e6b1872fbd5ea61dcba944d5553a8 (diff) | |
| download | openembedded-core-contrib-7d2bd897fdbcf5215bf2287cb96eb6b58803f08c.tar.gz | |
glib-2.0: fix g-file-into modification time test
The GFileInfo modification time test assumed that the difference between
a modification timestamp in seconds and in microseconds must be greater
than 0.
Mathmatically, there's a one-in-a-million chance that it will be 0. It
turns out that one-in-a-million chances happen approximately once every
fortnight on the autobuilder.
[ YOCTO 14373 ]
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/glib-2.0')
| -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 @@ +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2177] +Signed-off-by: Ross Burton <ross.burton@arm.com> + +From 289f8be1b397a453cfcf35641455f3ae5fb4faeb Mon Sep 17 00:00:00 2001 +From: Ross Burton <ross.burton@arm.com> +Date: Tue, 6 Jul 2021 19:26:03 +0100 +Subject: [PATCH] gio/tests/g-file-info: don't assume million-in-one events + don't happen + +The modification time test creates a file, gets the modification time in +seconds, then gets the modification time in microseconds and assumes +that the difference between the two has to be above 0. + +As rare as this may be, it can happen: + +$ stat g-file-info-test-50A450 -c %y +2021-07-06 18:24:56.000000767 +0100 + +Change the test to simply assert that the difference not negative to +handle this case. +--- + gio/tests/g-file-info.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gio/tests/g-file-info.c b/gio/tests/g-file-info.c +index c11c50462..fd0c64b55 100644 +--- a/gio/tests/g-file-info.c ++++ b/gio/tests/g-file-info.c +@@ -178,7 +178,7 @@ test_g_file_info_modification_time (void) + g_assert_nonnull (dt_usecs); + + ts = g_date_time_difference (dt_usecs, dt); +- g_assert_cmpint (ts, >, 0); ++ g_assert_cmpint (ts, >=, 0); + g_assert_cmpint (ts, <, G_USEC_PER_SEC); + + /* Try round-tripping the modification time. */ +-- +2.25.1 + 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 \ file://0001-meson-Run-atomics-test-on-clang-as-well.patch \ file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \ file://0001-gio-tests-codegen.py-bump-timeout-to-100-seconds.patch \ + file://time-test.patch \ " SRC_URI_append_class-native = " file://relocate-modules.patch" |