[03/15] linux: Add lutimes test

Message ID 20210323134458.2563022-4-adhemerval.zanella@linaro.org
State New
Headers show
Series
  • Add some tests and infra changes
Related show

Commit Message

Noah Goldstein via Libc-alpha March 23, 2021, 1:44 p.m.
It uses stat to compare against the values set by lutimes.

Checked on x86_64-linux-gnu and i686-linux-gnu.
---
 io/Makefile                 |  1 +
 io/tst-futimens.c           |  2 +-
 io/tst-futimes.c            |  2 +-
 io/tst-lutimes.c            | 53 +++++++++++++++++++++++++++++++++++++
 io/tst-utime.c              |  2 +-
 io/tst-utimensat-skeleton.c |  7 ++++-
 io/tst-utimes.c             |  2 +-
 7 files changed, 64 insertions(+), 5 deletions(-)
 create mode 100644 io/tst-lutimes.c

-- 
2.27.0

Comments

Siddhesh Poyarekar April 15, 2021, 5:25 a.m. | #1
On 3/23/21 7:14 PM, Adhemerval Zanella via Libc-alpha wrote:
> It uses stat to compare against the values set by lutimes.

> 

> Checked on x86_64-linux-gnu and i686-linux-gnu.


LGTM.

Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>

Patch

diff --git a/io/Makefile b/io/Makefile
index 0002e108a6..bec0e5871e 100644
--- a/io/Makefile
+++ b/io/Makefile
@@ -72,6 +72,7 @@  tests		:= test-utime test-stat test-stat2 test-lfs tst-getcwd \
 		   tst-utime \
 		   tst-utimes \
 		   tst-futimes \
+		   tst-lutimes \
 		   tst-futimens \
 
 # Likewise for statx, but we do not need static linking here.
diff --git a/io/tst-futimens.c b/io/tst-futimens.c
index ac7a980017..b3e3f3137f 100644
--- a/io/tst-futimens.c
+++ b/io/tst-futimens.c
@@ -38,7 +38,7 @@  test_futimens_helper (const char *file, int fd, const struct timespec *ts)
   return 0;
 }
 
-#define TEST_CALL(fname, fd, v1, v2) \
+#define TEST_CALL(fname, fd, lname, v1, v2) \
   test_futimens_helper (fname, fd, (struct timespec[]) { { v1, 0 }, \
 							 { v2, 0 } })
 
diff --git a/io/tst-futimes.c b/io/tst-futimes.c
index ea7ac7d5f8..bdef38d7cb 100644
--- a/io/tst-futimes.c
+++ b/io/tst-futimes.c
@@ -39,7 +39,7 @@  test_futimens_helper (const char *file, int fd, const struct timeval *tv)
   return 0;
 }
 
-#define TEST_CALL(fname, fd, v1, v2) \
+#define TEST_CALL(fname, fd, lname, v1, v2) \
   test_futimens_helper (fname, fd, (struct timeval[]) { { v1, 0 }, \
 							{ v2, 0 } })
 
diff --git a/io/tst-lutimes.c b/io/tst-lutimes.c
new file mode 100644
index 0000000000..b2da3c5796
--- /dev/null
+++ b/io/tst-lutimes.c
@@ -0,0 +1,53 @@ 
+/* Test for lutimes.
+   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 <support/check.h>
+#include <support/xunistd.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+
+static int
+test_lutimes_helper (const char *testfile, int fd, const char *testlink,
+                     const struct timeval *tv)
+{
+  struct stat64 stfile_orig;
+  xlstat (testfile, &stfile_orig);
+
+  TEST_VERIFY_EXIT (lutimes (testlink, tv) == 0);
+
+  struct stat64 stlink;
+  xlstat (testlink, &stlink);
+
+  TEST_COMPARE (stlink.st_atime, tv[0].tv_sec);
+  TEST_COMPARE (stlink.st_mtime, tv[1].tv_sec);
+
+  /* Check if the timestamp from original file is not changed.  */
+  struct stat64 stfile;
+  xlstat (testfile, &stfile);
+
+  TEST_COMPARE (stfile_orig.st_atime, stfile.st_atime);
+  TEST_COMPARE (stfile_orig.st_mtime, stfile.st_mtime);
+
+  return 0;
+}
+
+#define TEST_CALL(fname, fd, lname, v1, v2) \
+  test_lutimes_helper (fname, fd, lname, (struct timeval[]) { { v1, 0 }, \
+                                                              { v2, 0 } })
+
+#include "tst-utimensat-skeleton.c"
diff --git a/io/tst-utime.c b/io/tst-utime.c
index c1c7e75a29..6269ef7929 100644
--- a/io/tst-utime.c
+++ b/io/tst-utime.c
@@ -39,7 +39,7 @@  test_utime_helper (const char *file, int fd, const struct utimbuf *ut)
   return 0;
 }
 
-#define TEST_CALL(fname, fd, v1, v2) \
+#define TEST_CALL(fname, fd, lname, v1, v2) \
   test_utime_helper (fname, fd, &(struct utimbuf) { (v1), (v2) })
 
 #include "tst-utimensat-skeleton.c"
diff --git a/io/tst-utimensat-skeleton.c b/io/tst-utimensat-skeleton.c
index 3589146db5..ad9f6763c5 100644
--- a/io/tst-utimensat-skeleton.c
+++ b/io/tst-utimensat-skeleton.c
@@ -24,6 +24,7 @@ 
 
 static int temp_fd = -1;
 static char *testfile;
+static char *testlink;
 
 const static struct {
   int64_t v1;
@@ -49,6 +50,10 @@  do_prepare (int argc, char *argv[])
 {
   temp_fd = create_temp_file ("utime", &testfile);
   TEST_VERIFY_EXIT (temp_fd > 0);
+
+  testlink = xasprintf ("%s-symlink", testfile);
+  xsymlink (testfile, testlink);
+  add_temp_file (testlink);
 }
 
 static int
@@ -82,7 +87,7 @@  do_test (void)
 	  continue;
 	}
 
-      TEST_CALL (testfile, temp_fd, tests[i].v1, tests[i].v2);
+      TEST_CALL (testfile, temp_fd, testlink, tests[i].v1, tests[i].v2);
     }
 
   return 0;
diff --git a/io/tst-utimes.c b/io/tst-utimes.c
index ba710508b7..991ab0c7d3 100644
--- a/io/tst-utimes.c
+++ b/io/tst-utimes.c
@@ -40,7 +40,7 @@  test_utimes_helper (const char *file, int fd, const struct timeval *tv)
   return 0;
 }
 
-#define TEST_CALL(fname, fd, v1, v2) \
+#define TEST_CALL(fname, fd, lname, v1, v2) \
   test_utimes_helper (fname, fd, (struct timeval[]) { { v1, 0 }, \
 						      { v2, 0 } })