Updates to test and pal_time.c

• Remove targetIsRelative cases
• Multi-line if statement
• Combine HAVE_LUTIMES and #else conditions to allow more code charing

src/libraries/Native/Unix/System.Native/pal_time.c

@@ -34,22 +34,20 @@ int32_t SystemNative_UTimensat(const char* path, TimeSpec* times)
     updatedTimes[1].tv_sec = (time_t)times[1].tv_sec;
     updatedTimes[1].tv_nsec = (long)times[1].tv_nsec;
     while (CheckInterrupted(result = utimensat(AT_FDCWD, path, updatedTimes, AT_SYMLINK_NOFOLLOW)));
-#elif HAVE_LUTIMES
-    struct timeval updatedTimes[2];
-    updatedTimes[0].tv_sec = (long)times[0].tv_sec;
-    updatedTimes[0].tv_usec = (int)times[0].tv_nsec / 1000;
-
-    updatedTimes[1].tv_sec = (long)times[1].tv_sec;
-    updatedTimes[1].tv_usec = (int)times[1].tv_nsec / 1000;
-    while (CheckInterrupted(result = lutimes(path, updatedTimes)));
 #else
     struct timeval updatedTimes[2];
     updatedTimes[0].tv_sec = (long)times[0].tv_sec;
     updatedTimes[0].tv_usec = (int)times[0].tv_nsec / 1000;
 
     updatedTimes[1].tv_sec = (long)times[1].tv_sec;
     updatedTimes[1].tv_usec = (int)times[1].tv_nsec / 1000;
-    while (CheckInterrupted(result = utimes(path, updatedTimes)));
+    while (CheckInterrupted(result = 
+#if HAVE_LUTIMES
+        lutimes
+#else
+        utimes
+#endif
+        (path, updatedTimes)));
 #endif
 
     return result;

src/libraries/System.IO.FileSystem/tests/Base/BaseGetSetTimes.cs

@@ -26,13 +26,11 @@ public abstract class BaseGetSetTimes<T> : FileSystemTest
 
         protected abstract T CreateSymlink(string path, string pathToTarget);
 
-        protected T CreateSymlinkToItem(T item, bool isRelative)
+        protected T CreateSymlinkToItem(T item)
         {
-            // Creates a Symlink to 'item' (may or may not exist) that is optionally
-            // a relative path rather than an absolute path.
+            // Creates a Symlink to 'item' (target may or may not exist)
             string itemPath = GetItemPath(item);
-            string target = isRelative ? Path.GetFileName(itemPath) : itemPath;
-            return CreateSymlink(itemPath + ".link", target);
+            return CreateSymlink(path: itemPath + ".link", pathToTarget: itemPath);
         }
 
         protected abstract string GetItemPath(T item);
@@ -88,26 +86,23 @@ public void SettingUpdatesProperties()
 
         [Theory]
         [PlatformSpecific(~TestPlatforms.Browser)] // Browser is excluded as it doesn't support symlinks
-        [InlineData(false, false)]
-        [InlineData(false, true)]
-        [InlineData(true, false)]
-        [InlineData(true, true)]
-        public void SettingUpdatesPropertiesOnSymlink(bool targetIsRelative, bool targetExists)
+        [InlineData(false)]
+        [InlineData(true)]
+        public void SettingUpdatesPropertiesOnSymlink(bool targetExists)
         {
             // This test is in this class since it needs all of the time functions.
             // This test makes sure that the times are set on the symlink itself.
             // It is needed as on OSX for example, the default for most APIs is
             // to follow the symlink to completion and set the time on that entry
             // instead (eg. the setattrlist will do this without the flag set).
             // It is also the same case on unix, with the utimensat function.
-            // It is a theory since there are variants which have a relative target
-            // or absolute target, and whether the target exists or not.
+            // It is a theory since we test both the target existing and missing.
 
             T target = targetExists ? GetExistingItem() : GetMissingItem();
 
             // When the target exists, we want to verify that its times don't change.
 
-            T link = CreateSymlinkToItem(target, targetIsRelative);
+            T link = CreateSymlinkToItem(target);
             if (!targetExists)
             {
                 SettingUpdatesPropertiesCore(link);
@@ -121,7 +116,10 @@ public void SettingUpdatesPropertiesOnSymlink(bool targetIsRelative, bool target
                 SettingUpdatesPropertiesCore(link);
 
                 // Ensure that we have the latest times.
-                if (target is FileSystemInfo fsi) fsi.Refresh();
+                if (target is FileSystemInfo fsi)
+                {
+                    fsi.Refresh();
+                }
 
                 // Ensure the target's times haven't changed.
                 DateTime[] updatedTimes = timeFunctions.Select((funcs) => funcs.Getter(target)).ToArray();