Message ID | 20210225003639.7943-1-lukma@denx.de |
---|---|
State | New |
Headers | show |
Series | tst: Add test for utimes | expand |
On 24/02/2021 21:36, Lukasz Majewski wrote: > This patch provides test for utimes. It uses xfstat() syscall to read > access and modification times to compare with ones written by utimes. Same as for futimens tests, it does not need to specific the internal function used. > > Moreover, access and modification times beyond the Y2038 threshold > date (i.e. 32 bit time_t overflow) are also checked. LGTM with the commit message change the small nit below. Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org> > --- > sysdeps/unix/sysv/linux/Makefile | 2 +- > sysdeps/unix/sysv/linux/tst-utimes.c | 82 ++++++++++++++++++++++++++++ > 2 files changed, 83 insertions(+), 1 deletion(-) > create mode 100644 sysdeps/unix/sysv/linux/tst-utimes.c > > diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile > index e68c259fa0..93ce0e4166 100644 > --- a/sysdeps/unix/sysv/linux/Makefile > +++ b/sysdeps/unix/sysv/linux/Makefile > @@ -107,7 +107,7 @@ tests += tst-clone tst-clone2 tst-clone3 tst-fanotify tst-personality \ > test-errno-linux tst-memfd_create tst-mlock2 tst-pkey \ > tst-rlimit-infinity tst-ofdlocks tst-gettid tst-gettid-kill \ > tst-tgkill tst-sysvsem-linux tst-sysvmsg-linux tst-sysvshm-linux \ > - tst-timerfd tst-ppoll tst-futimens tst-utime > + tst-timerfd tst-ppoll tst-futimens tst-utime tst-utimes > tests-internal += tst-ofdlocks-compat tst-sigcontext-get_pc > > CFLAGS-tst-sigcontext-get_pc.c = -fasynchronous-unwind-tables Ok. > diff --git a/sysdeps/unix/sysv/linux/tst-utimes.c b/sysdeps/unix/sysv/linux/tst-utimes.c > new file mode 100644 > index 0000000000..c843752e87 > --- /dev/null > +++ b/sysdeps/unix/sysv/linux/tst-utimes.c > @@ -0,0 +1,82 @@ > +/* Test for utimes > + 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 <time.h> > +#include <stdlib.h> > +#include <sys/stat.h> > +#include <sys/time.h> > +#include <support/check.h> > +#include <support/xunistd.h> > +#include <support/temp_file.h> > + > +static int temp_fd = -1; > +char *testfile; > + > +/* struct timeval array with Y2038 threshold minus 2 and 1 seconds. */ > +const struct timeval t1[2] = { { 0x7FFFFFFE, 0 }, { 0x7FFFFFFF, 0 } }; > + > +/* struct timeval array with Y2038 threshold plus 1 and 2 seconds. */ > +const struct timeval t2[2] = { { 0x80000001ULL, 0 }, { 0x80000002ULL, 0 } }; > + > +/* struct timeval array around Y2038 threshold. */ > +const struct timeval t3[2] = { { 0x7FFFFFFE, 0 }, { 0x80000002ULL, 0 } }; Use static here. > + > +#define PREPARE do_prepare > +static void > +do_prepare (int argc, char *argv[]) > +{ > + temp_fd = create_temp_file ("utimes", &testfile); > + TEST_VERIFY_EXIT (temp_fd > 0); > +} > + > +static int > +test_utime_helper (const struct timeval *tv) > +{ > + struct stat64 st; > + int result; > + time_t t; > + > + /* Check if we run on port with 32 bit time_t size */ > + if (__builtin_add_overflow (tv->tv_sec, 0, &t)) > + return 0; > + > + result = utimes(testfile, tv); Space before '('. > + TEST_VERIFY_EXIT (result == 0); > + > + xfstat (temp_fd, &st); > + > + /* Check if seconds for atime match */ > + TEST_COMPARE (st.st_atime, tv[0].tv_sec); > + > + /* Check if seconds for mtime match */ > + TEST_COMPARE (st.st_mtime, tv[1].tv_sec); > + > + return 0; > +} > + > +static int > +do_test (void) > +{ > + test_utime_helper (&t1[0]); > + test_utime_helper (&t2[0]); > + test_utime_helper (&t3[0]); > + > + return 0; > +} > + > +#include <support/test-driver.c> > Ok.
diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile index e68c259fa0..93ce0e4166 100644 --- a/sysdeps/unix/sysv/linux/Makefile +++ b/sysdeps/unix/sysv/linux/Makefile @@ -107,7 +107,7 @@ tests += tst-clone tst-clone2 tst-clone3 tst-fanotify tst-personality \ test-errno-linux tst-memfd_create tst-mlock2 tst-pkey \ tst-rlimit-infinity tst-ofdlocks tst-gettid tst-gettid-kill \ tst-tgkill tst-sysvsem-linux tst-sysvmsg-linux tst-sysvshm-linux \ - tst-timerfd tst-ppoll tst-futimens tst-utime + tst-timerfd tst-ppoll tst-futimens tst-utime tst-utimes tests-internal += tst-ofdlocks-compat tst-sigcontext-get_pc CFLAGS-tst-sigcontext-get_pc.c = -fasynchronous-unwind-tables diff --git a/sysdeps/unix/sysv/linux/tst-utimes.c b/sysdeps/unix/sysv/linux/tst-utimes.c new file mode 100644 index 0000000000..c843752e87 --- /dev/null +++ b/sysdeps/unix/sysv/linux/tst-utimes.c @@ -0,0 +1,82 @@ +/* Test for utimes + 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 <time.h> +#include <stdlib.h> +#include <sys/stat.h> +#include <sys/time.h> +#include <support/check.h> +#include <support/xunistd.h> +#include <support/temp_file.h> + +static int temp_fd = -1; +char *testfile; + +/* struct timeval array with Y2038 threshold minus 2 and 1 seconds. */ +const struct timeval t1[2] = { { 0x7FFFFFFE, 0 }, { 0x7FFFFFFF, 0 } }; + +/* struct timeval array with Y2038 threshold plus 1 and 2 seconds. */ +const struct timeval t2[2] = { { 0x80000001ULL, 0 }, { 0x80000002ULL, 0 } }; + +/* struct timeval array around Y2038 threshold. */ +const struct timeval t3[2] = { { 0x7FFFFFFE, 0 }, { 0x80000002ULL, 0 } }; + +#define PREPARE do_prepare +static void +do_prepare (int argc, char *argv[]) +{ + temp_fd = create_temp_file ("utimes", &testfile); + TEST_VERIFY_EXIT (temp_fd > 0); +} + +static int +test_utime_helper (const struct timeval *tv) +{ + struct stat64 st; + int result; + time_t t; + + /* Check if we run on port with 32 bit time_t size */ + if (__builtin_add_overflow (tv->tv_sec, 0, &t)) + return 0; + + result = utimes(testfile, tv); + TEST_VERIFY_EXIT (result == 0); + + xfstat (temp_fd, &st); + + /* Check if seconds for atime match */ + TEST_COMPARE (st.st_atime, tv[0].tv_sec); + + /* Check if seconds for mtime match */ + TEST_COMPARE (st.st_mtime, tv[1].tv_sec); + + return 0; +} + +static int +do_test (void) +{ + test_utime_helper (&t1[0]); + test_utime_helper (&t2[0]); + test_utime_helper (&t3[0]); + + return 0; +} + +#include <support/test-driver.c>