stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

7065902: (file) test/java/nio/file/Files/Misc.java fails on Solaris 11 when run as root

Browse Source 
Reviewed-by: alanb
This commit is contained in:
Dan Xu 2013-11-21 14:16:49 -08:00
parent b04c80f960
commit cf45a693dc
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
jdk/test/java/nio/file/Files/Misc.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -313,8 +313,14 @@ public class Misc {
acl.add(0, entry);
view.setAcl(acl);
try {
assertTrue(!isWritable(file));
assertTrue(!isExecutable(file));
if (isRoot()) {
// root has all permissions
assertTrue(isWritable(file));
assertTrue(isExecutable(file));
} else {
assertTrue(!isWritable(file));
assertTrue(!isExecutable(file));
}
} finally {
// Restore ACL
acl.remove(0);
@ -353,4 +359,12 @@ public class Misc {
if (!okay)
throw new RuntimeException("Assertion Failed");
}
private static boolean isRoot() {
if (System.getProperty("os.name").startsWith("Windows"))
return false;
Path passwd = Paths.get("/etc/passwd");
return Files.isWritable(passwd);
}
}