Re: [PATCH] tst: Add test for utime

[Adhemerval Zanella <adhemerval.zanella@linaro.org>]

On 24/02/2021 21:35, Lukasz Majewski wrote:
> This patch provides test for utime. It uses xfstat() syscall to read
> access and modification times to compare with ones written by utime.

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.

I am not sure if it is worth to silent not run the some internal tests
for 32 bit time, but we can improve it once we get 64 bit time_t
support.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>

> ---
>  sysdeps/unix/sysv/linux/Makefile    |  2 +-
>  sysdeps/unix/sysv/linux/tst-utime.c | 83 +++++++++++++++++++++++++++++
>  2 files changed, 84 insertions(+), 1 deletion(-)
>  create mode 100644 sysdeps/unix/sysv/linux/tst-utime.c
> 
> diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
> index 4e043c78ab..e68c259fa0 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-timerfd tst-ppoll tst-futimens tst-utime
>  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-utime.c b/sysdeps/unix/sysv/linux/tst-utime.c
> new file mode 100644
> index 0000000000..fe1869702c
> --- /dev/null
> +++ b/sysdeps/unix/sysv/linux/tst-utime.c
> @@ -0,0 +1,83 @@
> +/* Test for utime

Missing period.

> +   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/types.h>
> +#include <utime.h>
> +#include <support/check.h>
> +#include <support/xunistd.h>
> +#include <support/temp_file.h>
> +
> +static int temp_fd = -1;
> +char *testfile;
> +
> +/* struct utimbuf with Y2038 threshold minus 2 and 1 seconds.  */
> +const struct utimbuf t1 = { 0x7FFFFFFE, 0x7FFFFFFF };
> +
> +/* struct utimbuf with Y2038 threshold plus 1 and 2 seconds.  */
> +const struct utimbuf t2 = { 0x80000001ULL, 0x80000002ULL };
> +
> +/* struct utimbuf around Y2038 threshold.  */
> +const struct utimbuf t3 = { 0x7FFFFFFE, 0x80000002ULL };

Use static on these.

> +
> +#define PREPARE do_prepare
> +static void
> +do_prepare (int argc, char *argv[])
> +{
> +  temp_fd = create_temp_file ("utime", &testfile);
> +  TEST_VERIFY_EXIT (temp_fd > 0);
> +}
> +
> +static int
> +test_utime_helper (const struct utimbuf *ut)
> +{
> +  struct stat64 st;
> +  int result;
> +  time_t t;
> +
> +  /* Check if we run on port with 32 bit time_t size */
> +  if (__builtin_add_overflow (ut->actime, 0, &t))
> +    return 0;

Maybe add a warning that this specific test is not executed due
32 bit time_t? Same for futimens.

> +
> +  result = utime(testfile, ut);
> +  TEST_VERIFY_EXIT (result == 0);
> +
> +  xfstat (temp_fd, &st);
> +
> +  /* Check if seconds for actime match */
> +  TEST_COMPARE (st.st_atime, ut->actime);
> +
> +  /* Check if seconds for modtime match */
> +  TEST_COMPARE (st.st_mtime, ut->modtime);
> +
> +  return 0;
> +}
> +
> +static int
> +do_test (void)
> +{
> +  test_utime_helper (&t1);
> +  test_utime_helper (&t2);
> +  test_utime_helper (&t3);
> +
> +  return 0;
> +}
> +
> +#include <support/test-driver.c>
> 

Ok.