[GR-30009] Use to utimes/futimes/lutimes on Mac OS X Sierra

PullRequest: graalpython/1681

Author: otethal

ci.jsonnet

@@ -1 +1 @@
-{ "overlay": "d8d57ccfe5a0a2b1ef094be4772d4f01c2dfb2cb" }
+{ "overlay": "170e550ee492b57eddde3fbe3e2334bcf3ff5d5f" }

graalpython/com.oracle.graal.python.cext/posix/posix.c

@@ -59,6 +59,7 @@
 #include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <sys/select.h>
+#include <sys/time.h>
 #include <sys/types.h>
 #include <sys/utsname.h>
 #include <sys/wait.h>
@@ -362,6 +363,7 @@ int32_t call_readdir(intptr_t dirp, char *nameBuf, uint64_t nameBufSize, int64_t
     return 0;
 }
 
+#ifdef __gnu_linux__
 int32_t call_utimensat(int32_t dirFd, const char *path, int64_t *timespec, int32_t followSymlinks) {
     if (!timespec) {
         return utimensat(dirFd, path, NULL, followSymlinks ? 0 : AT_SYMLINK_NOFOLLOW);
@@ -387,6 +389,46 @@ int32_t call_futimens(int32_t fd, int64_t *timespec) {
         return futimens(fd, times);
     }
 }
+#endif
+
+int32_t call_futimes(int32_t fd, int64_t *timeval) {
+    if (!timeval) {
+        return futimes(fd, NULL);
+    } else {
+        struct timeval times[2];
+        times[0].tv_sec = timeval[0];
+        times[0].tv_usec = timeval[1];
+        times[1].tv_sec = timeval[2];
+        times[1].tv_usec = timeval[3];
+        return futimes(fd, times);
+    }
+}
+
+int32_t call_lutimes(const char *filename, int64_t *timeval) {
+    if (!timeval) {
+        return lutimes(filename, NULL);
+    } else {
+        struct timeval times[2];
+        times[0].tv_sec = timeval[0];
+        times[0].tv_usec = timeval[1];
+        times[1].tv_sec = timeval[2];
+        times[1].tv_usec = timeval[3];
+        return lutimes(filename, times);
+    }
+}
+
+int32_t call_utimes(const char *filename, int64_t *timeval) {
+    if (!timeval) {
+        return utimes(filename, NULL);
+    } else {
+        struct timeval times[2];
+        times[0].tv_sec = timeval[0];
+        times[0].tv_usec = timeval[1];
+        times[1].tv_sec = timeval[2];
+        times[1].tv_usec = timeval[3];
+        return utimes(filename, times);
+    }
+}
 
 int32_t call_renameat(int32_t oldDirFd, const char *oldPath, int32_t newDirFd, const char *newPath) {
     return renameat(oldDirFd, oldPath, newDirFd, newPath);

graalpython/com.oracle.graal.python.test/src/tests/test_posix.py

@@ -344,28 +344,32 @@ def test_fstat(self):
         with open(TEST_FULL_PATH2, 0) as fd:           # follows symlink
             self.assertEqual(inode, os.fstat(fd).st_ino)
 
-    def test_utime_basic(self):
-        stat_result = os.stat(TEST_FULL_PATH1)
+    def test_utimes(self):
         os.utime(TEST_FULL_PATH2, (-952468575.678901234, 1579569825.123456789))         # follows symlink
         self.assertTrue(os.stat(TEST_FULL_PATH1).st_atime < -900000000)
-        os.utime(TEST_FILENAME2, dir_fd=self.tmp_fd, ns=(stat_result.st_atime_ns, stat_result.st_mtime_ns))
-        self.assertTrue(abs(os.stat(TEST_FULL_PATH1).st_atime - stat_result.st_atime) < 10)
-        with open(TEST_FULL_PATH2, os.O_RDWR) as fd:
-            os.utime(fd, times=(12345, 67890))
-            self.assertTrue(abs(os.stat(TEST_FULL_PATH1).st_atime_ns - 12345000000000) < 10000000000)
+
+    def test_utimes(self):
+        os.utime(TEST_FULL_PATH2)
 
     @unittest.skipUnless(__graalpython__.posix_module_backend() != 'java',
                          'Due to bug in OpenJDK 8 on Linux we cannot set atime/mtime of symlinks')
-    def test_utime_basic_no_follow_symlinks(self):
-        stat_result = os.stat(TEST_FULL_PATH1)
+    def test_lutimes(self):
         os.utime(TEST_FULL_PATH2, (-952468575.678901234, 1579569825.123456789))         # follows symlink
         self.assertTrue(os.stat(TEST_FULL_PATH1).st_atime < -900000000)
         os.utime(TEST_FULL_PATH2, ns=(952468575678901234, 1579569825123456789), follow_symlinks=False)
         self.assertTrue(os.stat(TEST_FULL_PATH1).st_atime < -900000000)
         self.assertTrue(abs(os.stat(TEST_FULL_PATH1).st_mtime - 1579569825) < 10)
         self.assertTrue(os.stat(TEST_FULL_PATH2, follow_symlinks=False).st_atime > 900000000)
-        os.utime(TEST_FILENAME2, dir_fd=self.tmp_fd, ns=(stat_result.st_atime_ns, stat_result.st_mtime_ns))
-        self.assertTrue(abs(os.stat(TEST_FULL_PATH1).st_atime - stat_result.st_atime) < 10)
+
+    def test_utimensat(self):
+        if sys.platform == 'darwin':
+            with self.assertRaises(NotImplementedError):
+                os.utime(TEST_FILENAME2, dir_fd=self.tmp_fd, ns=(952468575678901234, 1579569825123456789))
+        else:
+            os.utime(TEST_FILENAME2, dir_fd=self.tmp_fd, ns=(952468575678901234, 1579569825123456789))
+            self.assertTrue(os.stat(TEST_FULL_PATH2).st_atime > 900000000)
+
+    def test_futimes_and_futimens(self):
         with open(TEST_FULL_PATH2, os.O_RDWR) as fd:
             os.utime(fd, times=(12345, 67890))
             self.assertTrue(abs(os.stat(TEST_FULL_PATH1).st_atime_ns - 12345000000000) < 10000000000)