mirror of
https://git.yoctoproject.org/poky
synced 2026-01-29 21:08:42 +01:00
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 ] (From OE-Core rev: 7d2bd897fdbcf5215bf2287cb96eb6b58803f08c) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
287745a09d
commit
486a35a674
40
meta/recipes-core/glib-2.0/glib-2.0/time-test.patch
Normal file
40
meta/recipes-core/glib-2.0/glib-2.0/time-test.patch
Normal file
@@ -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
|
||||
|
||||
@@ -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"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user