OpenJDK / bsd-port / jdk9 / hotspot
changeset 11100:4b507595eb11
Merge
| author | ppunegov |
|---|---|
| date | Fri, 29 Apr 2016 03:02:43 +0200 |
| parents | a76d0c16fbf9 e6c903c11db8 |
| children | 28ea1f9f8548 |
| files | |
| diffstat | 6 files changed, 7 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/test/gc/g1/humongousObjects/TestHumongousClassLoader.java Thu Apr 28 23:32:50 2016 +0000 +++ b/test/gc/g1/humongousObjects/TestHumongousClassLoader.java Fri Apr 29 03:02:43 2016 +0200 @@ -40,6 +40,7 @@ * @summary Checks that unreachable classes and unreachable humongous class loader are unloaded after GC * @requires vm.gc=="G1" | vm.gc=="null" * @requires vm.opt.G1HeapRegionSize == "null" | vm.opt.G1HeapRegionSize == "1M" + * @requires vm.opt.ExplicitGCInvokesConcurrent != true * @library /testlibrary /test/lib / * @modules java.management * @build sun.hotspot.WhiteBox
--- a/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/Compiler.java Thu Apr 28 23:32:50 2016 +0000 +++ b/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/Compiler.java Fri Apr 29 03:02:43 2016 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2016, 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 @@ -25,7 +25,7 @@ import sun.hotspot.WhiteBox; import jdk.internal.misc.SharedSecrets; -import sun.reflect.ConstantPool; +import jdk.internal.reflect.ConstantPool; import java.lang.reflect.Executable;
--- a/test/testlibrary_tests/ctw/ClassesDirTest.java Thu Apr 28 23:32:50 2016 +0000 +++ b/test/testlibrary_tests/ctw/ClassesDirTest.java Fri Apr 29 03:02:43 2016 +0200 @@ -26,7 +26,7 @@ * @bug 8012447 * @library /testlibrary /test/lib /testlibrary/ctw/src * @modules java.base/jdk.internal.misc - * java.base/sun.reflect + * java.base/jdk.internal.reflect * java.management * @build ClassFileInstaller sun.hotspot.tools.ctw.CompileTheWorld sun.hotspot.WhiteBox Foo Bar * @run main ClassFileInstaller sun.hotspot.WhiteBox Foo Bar
--- a/test/testlibrary_tests/ctw/ClassesListTest.java Thu Apr 28 23:32:50 2016 +0000 +++ b/test/testlibrary_tests/ctw/ClassesListTest.java Fri Apr 29 03:02:43 2016 +0200 @@ -26,7 +26,7 @@ * @bug 8012447 * @library /testlibrary /test/lib /testlibrary/ctw/src * @modules java.base/jdk.internal.misc - * java.base/sun.reflect + * java.base/jdk.internal.reflect * java.management * @build ClassFileInstaller sun.hotspot.tools.ctw.CompileTheWorld sun.hotspot.WhiteBox Foo Bar * @run main ClassFileInstaller sun.hotspot.WhiteBox Foo Bar
--- a/test/testlibrary_tests/ctw/JarDirTest.java Thu Apr 28 23:32:50 2016 +0000 +++ b/test/testlibrary_tests/ctw/JarDirTest.java Fri Apr 29 03:02:43 2016 +0200 @@ -26,7 +26,7 @@ * @bug 8012447 * @library /testlibrary /test/lib /testlibrary/ctw/src * @modules java.base/jdk.internal.misc - * java.base/sun.reflect + * java.base/jdk.internal.reflect * java.compiler * java.management * jdk.jvmstat/sun.jvmstat.monitor
--- a/test/testlibrary_tests/ctw/JarsTest.java Thu Apr 28 23:32:50 2016 +0000 +++ b/test/testlibrary_tests/ctw/JarsTest.java Fri Apr 29 03:02:43 2016 +0200 @@ -26,7 +26,7 @@ * @bug 8012447 * @library /testlibrary /test/lib /testlibrary/ctw/src * @modules java.base/jdk.internal.misc - * java.base/sun.reflect + * java.base/jdk.internal.reflect * java.compiler * java.management * jdk.jvmstat/sun.jvmstat.monitor