infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-22 08:21:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

8184904: jdk/internal/jrtfs/WithSecurityManager fails with exploded builds

Browse Source 
Reviewed-by: alanb
This commit is contained in:
Felix Yang 2017-07-20 06:49:20 -07:00
parent 0888be8840
commit dd5025d434
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
jdk/test/jdk/internal/jrtfs/Basic.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, 2017, 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
@ -70,15 +70,11 @@ public class Basic {
@BeforeClass
public void setup() {
theFileSystem = FileSystems.getFileSystem(URI.create("jrt:/"));
Path javaHomeDir = Paths.get(System.getProperty("java.home"));
Path jrtJarPath = javaHomeDir.resolve("jrt-fs.jar");
Path modulesPath = javaHomeDir.resolve("lib/modules");
isExplodedBuild = !Files.exists(jrtJarPath)
&& !Files.exists(modulesPath);
if (Files.notExists(jrtJarPath)
&& Files.notExists(modulesPath)) {
System.out.printf("Following files not exist: %s, %s",
jrtJarPath.toString(), modulesPath.toString());
Path modulesPath = Paths.get(System.getProperty("java.home"),
"lib", "modules");
isExplodedBuild = Files.notExists(modulesPath);
if (isExplodedBuild) {
System.out.printf("%s doesn't exist.", modulesPath.toString());
System.out.println();
System.out.println("It is most probably an exploded build."
+ " Skip non-default FileSystem testing.");

14
jdk/test/jdk/internal/jrtfs/WithSecurityManager.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, 2017, 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
@ -29,16 +29,28 @@
import java.net.URI;
import java.nio.file.FileSystems;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Collections;
public class WithSecurityManager {
public static void main(String[] args) throws Exception {
Path modulesPath = Paths.get(System.getProperty("java.home"),
"lib", "modules");
if (Files.notExists(modulesPath)) {
System.out.printf("%s doesn't exist.", modulesPath.toString());
System.out.println();
System.out.println("It is most probably an exploded build."
+ " Skip the test.");
return;
}
boolean allow = args[0].equals("allow");
// set security policy to allow access
if (allow) {
String testSrc = System.getProperty("test.src");
if (testSrc == null)
testSrc = ".";