From: Stefan Liebler <stli@linux.ibm.com>
To: libc-alpha@sourceware.org
Cc: adhemerval.zanella@linaro.org, Stefan Liebler <stli@linux.ibm.com>
Subject: [PATCH] S390: Don't test nanoseconds in io/tst-stat.c
Date: Wed, 17 Mar 2021 14:03:52 +0100 [thread overview]
Message-ID: <20210317130352.1782897-1-stli@linux.ibm.com> (raw)
Both new tests io/tst-stat and io/tst-stat-lfs (_FILE_OFFSET_BITS=64)
are comparing the nanosecond fields with the statx result. Unfortunately
on s390(31bit) those fields are always zero if old KABI with non-LFS
support is used. With _FILE_OFFSET_BITS=64 stat is using statx internally.
As suggested by Adhemerval this patch disables the nanosecond check for
s390(31bit).
---
io/tst-stat.c | 7 +++++--
support/Makefile | 1 +
support/support.h | 3 +++
support/support_stat_nanoseconds.c | 31 ++++++++++++++++++++++++++++++
4 files changed, 40 insertions(+), 2 deletions(-)
create mode 100644 support/support_stat_nanoseconds.c
diff --git a/io/tst-stat.c b/io/tst-stat.c
index 445ac4176c..397d480ecc 100644
--- a/io/tst-stat.c
+++ b/io/tst-stat.c
@@ -91,9 +91,12 @@ do_test (void)
TEST_COMPARE (stx.stx_blocks, st.st_blocks);
TEST_COMPARE (stx.stx_ctime.tv_sec, st.st_ctim.tv_sec);
- TEST_COMPARE (stx.stx_ctime.tv_nsec, st.st_ctim.tv_nsec);
TEST_COMPARE (stx.stx_mtime.tv_sec, st.st_mtim.tv_sec);
- TEST_COMPARE (stx.stx_mtime.tv_nsec, st.st_mtim.tv_nsec);
+ if (support_stat_nanoseconds ())
+ {
+ TEST_COMPARE (stx.stx_ctime.tv_nsec, st.st_ctim.tv_nsec);
+ TEST_COMPARE (stx.stx_mtime.tv_nsec, st.st_mtim.tv_nsec);
+ }
}
return 0;
diff --git a/support/Makefile b/support/Makefile
index fc9f4936a8..900e17f94f 100644
--- a/support/Makefile
+++ b/support/Makefile
@@ -71,6 +71,7 @@ libsupport-routines = \
support_set_small_thread_stack_size \
support_shared_allocate \
support_small_stack_thread_attribute \
+ support_stat_nanoseconds \
support_subprocess \
support_test_compare_blob \
support_test_compare_failure \
diff --git a/support/support.h b/support/support.h
index 2e477c9e7c..90f3ff9d1a 100644
--- a/support/support.h
+++ b/support/support.h
@@ -134,6 +134,9 @@ extern ssize_t support_copy_file_range (int, off64_t *, int, off64_t *,
operations (such as fstatat or utimensat). */
extern bool support_path_support_time64 (const char *path);
+/* Return true if stat supports nanoseconds resolution. */
+extern bool support_stat_nanoseconds (void);
+
__END_DECLS
#endif /* SUPPORT_H */
diff --git a/support/support_stat_nanoseconds.c b/support/support_stat_nanoseconds.c
new file mode 100644
index 0000000000..c0d5b2c3a9
--- /dev/null
+++ b/support/support_stat_nanoseconds.c
@@ -0,0 +1,31 @@
+/* Check if stat supports nanosecond resolution.
+ Copyright (C) 2021 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+#include <stdbool.h>
+
+bool
+support_stat_nanoseconds (void)
+{
+ /* s390 stat64 compat symbol does not support nanoseconds resolution
+ and it used on non-LFS [f,l]stat[at] implementations. */
+#if defined __linux__ && !defined __s390x__ && defined __s390__
+ return false;
+#else
+ return true;
+#endif
+}
--
2.28.0
next reply other threads:[~2021-03-17 13:04 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-17 13:03 Stefan Liebler [this message]
2021-03-17 21:01 ` Joseph Myers
2021-03-17 21:20 ` Adhemerval Zanella
2021-03-18 13:31 ` Adhemerval Zanella
2021-03-23 16:13 ` Stefan Liebler
2021-03-24 17:40 ` Adhemerval Zanella
2021-03-26 9:24 ` Stefan Liebler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210317130352.1782897-1-stli@linux.ibm.com \
--to=stli@linux.ibm.com \
--cc=adhemerval.zanella@linaro.org \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).