OpenJDK / jdk / hs
changeset 46586:5c2a3a2e86ea
Merge
| author | bobv |
|---|---|
| date | Wed, 28 Jun 2017 18:44:21 +0200 |
| parents | 4435f84dfa04 af110b4b1981 |
| children | 27a438928e38 |
| files | |
| diffstat | 3 files changed, 5 insertions(+), 57 deletions(-) [+] |
line wrap: on
line diff
--- a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/collect/FileSupport.java Wed Jun 28 15:21:48 2017 +0000 +++ b/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/collect/FileSupport.java Wed Jun 28 18:44:21 2017 +0200 @@ -46,7 +46,9 @@ private URI makeJarFileURI(Path path) { try { - return new URI("jar:file:" + path.toAbsolutePath() + "!/"); + String name = path.toAbsolutePath().toString(); + name = name.replace('\\','/'); + return new URI("jar:file:///" + name + "!/"); } catch (URISyntaxException e) { throw new InternalError(e); }
--- a/hotspot/test/ProblemList.txt Wed Jun 28 15:21:48 2017 +0000 +++ b/hotspot/test/ProblemList.txt Wed Jun 28 18:44:21 2017 +0200 @@ -50,61 +50,7 @@ compiler/types/correctness/CorrectnessTest.java 8066173 generic-all compiler/types/correctness/OffTest.java 8066173 generic-all -# aot tests intermittently failing in jprt 8175791 - -compiler/aot/RecompilationTest.java 8175791 windows-all -compiler/aot/SharedUsageTest.java 8175791 windows-all -compiler/aot/cli/MultipleAOTLibraryTest.java 8175791 windows-all -compiler/aot/cli/DisabledAOTWithLibraryTest.java 8175791 windows-all -compiler/aot/cli/SingleAOTLibraryTest.java 8175791 windows-all -compiler/aot/cli/NonExistingAOTLibraryTest.java 8175791 windows-all -compiler/aot/cli/SingleAOTOptionTest.java 8175791 windows-all -compiler/aot/cli/jaotc/ClasspathOptionTest.java 8175791 windows-all -compiler/aot/cli/jaotc/ListOptionTest.java 8175791 windows-all -compiler/aot/cli/jaotc/CompileModuleTest.java 8175791 windows-all -compiler/aot/cli/jaotc/CompileClassTest.java 8175791 windows-all -compiler/aot/cli/jaotc/CompileJarTest.java 8175791 windows-all -compiler/aot/cli/jaotc/ListOptionWrongFileTest.java 8175791 windows-all -compiler/aot/cli/jaotc/CompileDirectoryTest.java 8175791 windows-all -compiler/aot/cli/jaotc/ClasspathOptionUnknownClassTest.java 8175791 windows-all -compiler/aot/cli/jaotc/ListOptionNotExistingTest.java 8175791 windows-all -compiler/aot/cli/IncorrectAOTLibraryTest.java 8175791 windows-all -compiler/aot/verification/vmflags/TrackedFlagTest.java 8175791 windows-all -compiler/aot/verification/vmflags/NotTrackedFlagTest.java 8175791 windows-all -compiler/aot/verification/ClassAndLibraryNotMatchTest.java 8175791 windows-all -compiler/aot/calls/fromAot/AotInvokeInterface2InterpretedTest.java 8175791 windows-all -compiler/aot/calls/fromAot/AotInvokeDynamic2CompiledTest.java 8175791 windows-all -compiler/aot/calls/fromAot/AotInvokeVirtual2AotTest.java 8175791 windows-all -compiler/aot/calls/fromAot/AotInvokeVirtual2NativeTest.java 8175791 windows-all -compiler/aot/calls/fromAot/AotInvokeStatic2CompiledTest.java 8175791 windows-all -compiler/aot/calls/fromAot/AotInvokeStatic2AotTest.java 8175791 windows-all -compiler/aot/calls/fromAot/AotInvokeSpecial2NativeTest.java 8175791 windows-all -compiler/aot/calls/fromAot/AotInvokeDynamic2InterpretedTest.java 8175791 windows-all -compiler/aot/calls/fromAot/AotInvokeVirtual2CompiledTest.java 8175791 windows-all -compiler/aot/calls/fromAot/AotInvokeSpecial2InterpretedTest.java 8175791 windows-all -compiler/aot/calls/fromAot/AotInvokeSpecial2CompiledTest.java 8175791 windows-all -compiler/aot/calls/fromAot/AotInvokeVirtual2InterpretedTest.java 8175791 windows-all -compiler/aot/calls/fromAot/AotInvokeStatic2InterpretedTest.java 8175791 windows-all -compiler/aot/calls/fromAot/AotInvokeInterface2CompiledTest.java 8175791 windows-all -compiler/aot/calls/fromAot/AotInvokeStatic2NativeTest.java 8175791 windows-all -compiler/aot/calls/fromAot/AotInvokeInterface2AotTest.java 8175791 windows-all -compiler/aot/calls/fromAot/AotInvokeSpecial2AotTest.java 8175791 windows-all -compiler/aot/calls/fromAot/AotInvokeDynamic2AotTest.java 8175791 windows-all -compiler/aot/calls/fromAot/AotInvokeInterface2NativeTest.java 8175791 windows-all -compiler/aot/calls/fromAot/AotInvokeDynamic2NativeTest.java 8175791 windows-all -compiler/aot/calls/fromNative/NativeInvokeVirtual2AotTest.java 8175791 windows-all -compiler/aot/calls/fromNative/NativeInvokeStatic2AotTest.java 8175791 windows-all -compiler/aot/calls/fromNative/NativeInvokeSpecial2AotTest.java 8175791 windows-all -compiler/aot/calls/fromInterpreted/InterpretedInvokeDynamic2AotTest.java 8175791 windows-all -compiler/aot/calls/fromInterpreted/InterpretedInvokeSpecial2AotTest.java 8175791 windows-all -compiler/aot/calls/fromInterpreted/InterpretedInvokeStatic2AotTest.java 8175791 windows-all -compiler/aot/calls/fromInterpreted/InterpretedInvokeInterface2AotTest.java 8175791 windows-all -compiler/aot/calls/fromInterpreted/InterpretedInvokeVirtual2AotTest.java 8175791 windows-all -compiler/aot/calls/fromCompiled/CompiledInvokeStatic2AotTest.java 8175791 windows-all -compiler/aot/calls/fromCompiled/CompiledInvokeInterface2AotTest.java 8175791 windows-all -compiler/aot/calls/fromCompiled/CompiledInvokeSpecial2AotTest.java 8175791 windows-all -compiler/aot/calls/fromCompiled/CompiledInvokeVirtual2AotTest.java 8175791 windows-all -compiler/aot/calls/fromCompiled/CompiledInvokeDynamic2AotTest.java 8175791 windows-all +# aot test intermittently failing in jprt 8175791 compiler/aot/DeoptimizationTest.java 8175791 windows-all #############################################################################
--- a/hotspot/test/compiler/aot/verification/ClassAndLibraryNotMatchTest.java Wed Jun 28 15:21:48 2017 +0000 +++ b/hotspot/test/compiler/aot/verification/ClassAndLibraryNotMatchTest.java Wed Jun 28 18:44:21 2017 +0200 @@ -86,7 +86,7 @@ private void compileAotLibrary() { AotCompiler.launchCompiler(LIB_NAME, HELLO_WORLD_CLASS_NAME, - Arrays.asList("-classpath", Utils.TEST_CLASS_PATH + ":."), null); + Arrays.asList("-classpath", Utils.TEST_CLASS_PATH + File.pathSeparator + "."), null); } private void runAndCheckHelloWorld(String checkString) {