1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8214916: SourceLauncherTest fails on exploded image

Browse Source 
Reviewed-by: ksrini
This commit is contained in:
Jonathan Gibbons 2019-12-11 15:33:17 -08:00
parent cbe604cf5d
commit 93b7d283d8
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/langtools/tools/javac/launcher/SourceLauncherTest.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018, 2019, 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
@ -213,6 +213,12 @@ public class SourceLauncherTest extends TestRunner {
@Test
public void testPermissions(Path base) throws IOException {
// does not work on exploded image, because the default policy file assumes jrt:; skip the test
if (Files.exists(Path.of(System.getProperty("java.home")).resolve("modules"))) {
out.println("JDK using exploded modules; test skipped");
return;
}
Path policyFile = base.resolve("test.policy");
Path sourceFile = base.resolve("TestPermissions.java");

6
test/langtools/tools/javac/plugin/AutostartPlugins.java
View File

@ -141,6 +141,12 @@ public class AutostartPlugins extends TestRunner {
@Test
public void testImage(Path base) throws Exception {
// does not work on exploded image: cannot jlink an image from exploded modules; skip the test
if (Files.exists(Path.of(System.getProperty("java.home")).resolve("modules"))) {
out.println("JDK using exploded modules; test skipped");
return;
}
Path tmpJDK = base.resolve("tmpJDK");
ToolProvider jlink = ToolProvider.findFirst("jlink")
.orElseThrow(() -> new Exception("cannot find jlink"));