changeset 57812:6eb44470aa98

8229280: Test failures on several linux hosts after JDK-8181493 Reviewed-by: alanb, clanger, dfuchs
author bpb
date Thu, 05 Sep 2019 14:12:01 -0700
parents 06f3d5092832
children 94ed03f861fe 713a50cef9a2 0d80754387b7 c582e358d7d6 63266396a435 cfd0f43fdf5f
files test/jdk/java/nio/file/attribute/BasicFileAttributeView/SetTimesNanos.java
diffstat 1 files changed, 19 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/test/jdk/java/nio/file/attribute/BasicFileAttributeView/SetTimesNanos.java	Thu Sep 05 11:12:12 2019 -0700
+++ b/test/jdk/java/nio/file/attribute/BasicFileAttributeView/SetTimesNanos.java	Thu Sep 05 14:12:01 2019 -0700
@@ -25,37 +25,43 @@
  * @bug 8181493
  * @summary Verify that nanosecond precision is maintained for file timestamps
  * @requires (os.family == "linux") | (os.family == "mac") | (os.family == "solaris")
+ * @modules java.base/sun.nio.fs:+open
  */
 
 import java.io.IOException;
+import java.lang.reflect.Method;
 import java.nio.file.Files;
 import java.nio.file.FileStore;
 import java.nio.file.Path;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.nio.file.attribute.BasicFileAttributeView;
 import java.nio.file.attribute.FileTime;
-import java.time.Instant;
-import java.time.ZoneId;
-import java.time.ZoneOffset;
-import java.time.format.DateTimeFormatter;
-import java.util.Arrays;
+import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
 public class SetTimesNanos {
-    public static void main(String[] args) throws IOException,
-        InterruptedException {
+    public static void main(String[] args) throws Exception {
+        // Check whether futimens() system call is supported
+        Class unixNativeDispatcherClass = Class.forName("sun.nio.fs.UnixNativeDispatcher");
+        Method futimensSupported = unixNativeDispatcherClass.getDeclaredMethod("futimensSupported");
+        futimensSupported.setAccessible(true);
+        if (!(boolean)futimensSupported.invoke(null)) {
+            System.err.println("futimens() system call not supported; skipping test");
+            return;
+        }
 
         Path dirPath = Path.of("test");
         Path dir = Files.createDirectory(dirPath);
         FileStore store = Files.getFileStore(dir);
-        System.out.format("FileStore: %s on %s (%s)%n", dir, store.name(),
-            store.type());
-        if (System.getProperty("os.name").toLowerCase().startsWith("mac") &&
-            store.type().equalsIgnoreCase("hfs")) {
-            System.err.println
-                ("HFS on macOS does not have nsec timestamps: skipping test");
+        System.out.format("FileStore: \"%s\" on %s (%s)%n",
+            dir, store.name(), store.type());
+
+        Set<String> testedTypes = Set.of("apfs", "ext4", "xfs", "zfs");
+        if (!testedTypes.contains(store.type())) {
+            System.err.format("%s not in %s; skipping test", store.type(), testedTypes);
             return;
         }
+
         testNanos(dir);
 
         Path file = Files.createFile(dir.resolve("test.dat"));