--- old/test/compiler/arguments/TestUseCountTrailingZerosInstructionOnUnsupportedCPU.java 2014-12-09 15:12:59.657780966 +0100 +++ new/test/compiler/arguments/TestUseCountTrailingZerosInstructionOnUnsupportedCPU.java 2014-12-09 15:12:59.337780956 +0100 @@ -26,17 +26,17 @@ * @bug 8031321 * @summary Verify processing of UseCountTrailingZerosInstruction option * on CPU without TZCNT instruction (BMI1 feature) support. - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build TestUseCountTrailingZerosInstructionOnUnsupportedCPU * BMIUnsupportedCPUTest - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI * TestUseCountTrailingZerosInstructionOnUnsupportedCPU */ -import sun.hotspot.cpuinfo.CPUInfo; +import jdk.testlib.cpuinfo.CPUInfo; import com.oracle.java.testlibrary.*; import com.oracle.java.testlibrary.cli.*; --- old/test/compiler/arguments/TestUseBMI1InstructionsOnUnsupportedCPU.java 2014-12-09 15:12:59.641780965 +0100 +++ new/test/compiler/arguments/TestUseBMI1InstructionsOnUnsupportedCPU.java 2014-12-09 15:12:59.325780955 +0100 @@ -26,16 +26,16 @@ * @bug 8031321 * @summary Verify processing of UseBMI1Instructions option on CPU without * BMI1 feature support. - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build TestUseBMI1InstructionsOnUnsupportedCPU * BMIUnsupportedCPUTest - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI TestUseBMI1InstructionsOnUnsupportedCPU */ -import sun.hotspot.cpuinfo.CPUInfo; +import jdk.testlib.cpuinfo.CPUInfo; import com.oracle.java.testlibrary.*; import com.oracle.java.testlibrary.cli.*; --- old/src/share/vm/prims/wbtestmethods/parserTests.cpp 2014-12-09 15:12:59.641780965 +0100 +++ new/src/share/vm/prims/wbtestmethods/parserTests.cpp 2014-12-09 15:12:59.337780956 +0100 @@ -50,7 +50,7 @@ */ static const char* lookup_diagnosticArgumentEnum(const char* field_name, oop object) { Thread* THREAD = Thread::current(); - const char* enum_sig = "Lsun/hotspot/parser/DiagnosticCommand$DiagnosticArgumentType;"; + const char* enum_sig = "Ljdk/testlib/parser/DiagnosticCommand$DiagnosticArgumentType;"; TempNewSymbol enumSigSymbol = SymbolTable::lookup(enum_sig, (int) strlen(enum_sig), THREAD); int offset = WhiteBox::offset_for_field(field_name, object, enumSigSymbol); oop enumOop = object->obj_field(offset); --- old/src/share/vm/prims/nativeLookup.cpp 2014-12-09 15:12:59.689780967 +0100 +++ new/src/share/vm/prims/nativeLookup.cpp 2014-12-09 15:12:59.345780956 +0100 @@ -120,7 +120,7 @@ { CC"Java_sun_misc_Unsafe_registerNatives", NULL, FN_PTR(JVM_RegisterUnsafeMethods) }, { CC"Java_java_lang_invoke_MethodHandleNatives_registerNatives", NULL, FN_PTR(JVM_RegisterMethodHandleMethods) }, { CC"Java_sun_misc_Perf_registerNatives", NULL, FN_PTR(JVM_RegisterPerfMethods) }, - { CC"Java_sun_hotspot_WhiteBox_registerNatives", NULL, FN_PTR(JVM_RegisterWhiteBoxMethods) }, + { CC"Java_jdk_testlib_WhiteBox_registerNatives", NULL, FN_PTR(JVM_RegisterWhiteBoxMethods) }, }; static address lookup_special_native(char* jni_name) { --- old/src/share/vm/prims/whitebox.cpp 2014-12-09 15:12:59.649780965 +0100 +++ new/src/share/vm/prims/whitebox.cpp 2014-12-09 15:12:59.337780956 +0100 @@ -1145,12 +1145,12 @@ if (env->IsInstanceOf(throwable_obj, no_such_method_error_klass)) { // NoSuchMethodError is thrown when a method can't be found or a method is not native. // Ignoring the exception since it is not preventing use of other WhiteBox methods. - tty->print_cr("Warning: 'NoSuchMethodError' on register of sun.hotspot.WhiteBox::%s%s", + tty->print_cr("Warning: 'NoSuchMethodError' on register of jdk.testlib.WhiteBox::%s%s", method_array[i].name, method_array[i].signature); } } else { // Registration failed unexpectedly. - tty->print_cr("Warning: unexpected error on register of sun.hotspot.WhiteBox::%s%s. All methods will be unregistered", + tty->print_cr("Warning: unexpected error on register of jdk.testlib.WhiteBox::%s%s. All methods will be unregistered", method_array[i].name, method_array[i].signature); env->UnregisterNatives(wbclass); break; @@ -1169,7 +1169,7 @@ {CC"getVMPageSize", CC"()I", (void*)&WB_GetVMPageSize }, {CC"isClassAlive0", CC"(Ljava/lang/String;)Z", (void*)&WB_IsClassAlive }, {CC"parseCommandLine", - CC"(Ljava/lang/String;C[Lsun/hotspot/parser/DiagnosticCommand;)[Ljava/lang/Object;", + CC"(Ljava/lang/String;C[Ljdk/testlib/parser/DiagnosticCommand;)[Ljava/lang/Object;", (void*) &WB_ParseCommandLine }, {CC"addToBootstrapClassLoaderSearch", CC"(Ljava/lang/String;)V", --- old/test/compiler/arguments/TestUseCountTrailingZerosInstructionOnSupportedCPU.java 2014-12-09 15:12:59.725780968 +0100 +++ new/test/compiler/arguments/TestUseCountTrailingZerosInstructionOnSupportedCPU.java 2014-12-09 15:12:59.345780956 +0100 @@ -26,17 +26,17 @@ * @bug 8031321 * @summary Verify processing of UseCountTrailingZerosInstruction option * on CPU with TZCNT (BMI1 feature) support. - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build TestUseCountTrailingZerosInstructionOnSupportedCPU * BMISupportedCPUTest - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI * TestUseCountTrailingZerosInstructionOnSupportedCPU */ -import sun.hotspot.cpuinfo.CPUInfo; +import jdk.testlib.cpuinfo.CPUInfo; import com.oracle.java.testlibrary.*; import com.oracle.java.testlibrary.cli.*; --- old/test/compiler/arguments/TestUseBMI1InstructionsOnSupportedCPU.java 2014-12-09 15:12:59.713780967 +0100 +++ new/test/compiler/arguments/TestUseBMI1InstructionsOnSupportedCPU.java 2014-12-09 15:12:59.397780957 +0100 @@ -26,16 +26,16 @@ * @bug 8031321 * @summary Verify processing of UseBMI1Instructions option on CPU with * BMI1 feature support. - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build TestUseBMI1InstructionsOnSupportedCPU * BMISupportedCPUTest - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI TestUseBMI1InstructionsOnSupportedCPU */ -import sun.hotspot.cpuinfo.CPUInfo; +import jdk.testlib.cpuinfo.CPUInfo; import com.oracle.java.testlibrary.*; public class TestUseBMI1InstructionsOnSupportedCPU --- old/test/compiler/arguments/TestUseCountLeadingZerosInstructionOnUnsupportedCPU.java 2014-12-09 15:12:59.761780969 +0100 +++ new/test/compiler/arguments/TestUseCountLeadingZerosInstructionOnUnsupportedCPU.java 2014-12-09 15:12:59.345780956 +0100 @@ -26,17 +26,17 @@ * @bug 8031321 * @summary Verify processing of UseCountLeadingZerosInstruction option * on CPU without LZCNT support. - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build TestUseCountLeadingZerosInstructionOnUnsupportedCPU * BMIUnsupportedCPUTest - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI * TestUseCountLeadingZerosInstructionOnUnsupportedCPU */ -import sun.hotspot.cpuinfo.CPUInfo; +import jdk.testlib.cpuinfo.CPUInfo; import com.oracle.java.testlibrary.*; public class TestUseCountLeadingZerosInstructionOnUnsupportedCPU --- old/test/compiler/classUnloading/anonymousClass/TestAnonymousClassUnloading.java 2014-12-09 15:12:59.757780969 +0100 +++ new/test/compiler/classUnloading/anonymousClass/TestAnonymousClassUnloading.java 2014-12-09 15:12:59.397780957 +0100 @@ -21,7 +21,7 @@ * questions. */ -import sun.hotspot.WhiteBox; +import jdk.testlib.WhiteBox; import sun.misc.Unsafe; import sun.misc.IOUtils; @@ -33,11 +33,11 @@ * @test TestAnonymousClassUnloading * @bug 8054402 * @summary "Tests unloading of anonymous classes." - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @compile TestAnonymousClassUnloading.java * @run main ClassFileInstaller TestAnonymousClassUnloading - * sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:-BackgroundCompilation TestAnonymousClassUnloading */ public class TestAnonymousClassUnloading { --- old/test/compiler/classUnloading/methodUnloading/TestMethodUnloading.java 2014-12-09 15:12:59.757780969 +0100 +++ new/test/compiler/classUnloading/methodUnloading/TestMethodUnloading.java 2014-12-09 15:12:59.337780956 +0100 @@ -21,7 +21,7 @@ * questions. */ -import sun.hotspot.WhiteBox; +import jdk.testlib.WhiteBox; import java.lang.reflect.Method; import java.net.URL; @@ -31,11 +31,11 @@ * @test MethodUnloadingTest * @bug 8029443 * @summary "Tests the unloading of methods to to class unloading" - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build TestMethodUnloading * @build WorkerClass - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:-BackgroundCompilation -XX:-UseCompressedOops -XX:CompileOnly=TestMethodUnloading::doWork TestMethodUnloading */ public class TestMethodUnloading { --- old/test/compiler/arguments/TestUseCountLeadingZerosInstructionOnSupportedCPU.java 2014-12-09 15:12:59.777780969 +0100 +++ new/test/compiler/arguments/TestUseCountLeadingZerosInstructionOnSupportedCPU.java 2014-12-09 15:12:59.393780957 +0100 @@ -26,17 +26,17 @@ * @bug 8031321 * @summary Verify processing of UseCountLeadingZerosInstruction option * on CPU with LZCNT support. - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build TestUseCountLeadingZerosInstructionOnSupportedCPU * BMISupportedCPUTest - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI * TestUseCountLeadingZerosInstructionOnSupportedCPU */ -import sun.hotspot.cpuinfo.CPUInfo; +import jdk.testlib.cpuinfo.CPUInfo; import com.oracle.java.testlibrary.*; public class TestUseCountLeadingZerosInstructionOnSupportedCPU --- old/test/compiler/c2/6589834/Test_ia32.java 2014-12-09 15:12:59.789780970 +0100 +++ new/test/compiler/c2/6589834/Test_ia32.java 2014-12-09 15:12:59.385780957 +0100 @@ -26,11 +26,11 @@ * @bug 6589834 * @summary Safepoint placed between stack pointer increment and decrement leads * to interpreter's stack corruption after deoptimization. - * @library /testlibrary /testlibrary/whitebox - * @build ClassFileInstaller sun.hotspot.WhiteBox com.oracle.java.testlibrary.* + * @library /testlibrary /../../test/lib + * @build ClassFileInstaller jdk.testlib.WhiteBox com.oracle.java.testlibrary.* * Test_ia32 InlinedArrayCloneTestCase - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI -XX:CompileOnly=InlinedArrayCloneTestCase * -XX:CompileCommand=dontinline,InlinedArrayCloneTestCase.invokeArrayClone @@ -41,7 +41,7 @@ import java.lang.reflect.Method; import com.oracle.java.testlibrary.Asserts; -import sun.hotspot.WhiteBox; +import jdk.testlib.WhiteBox; public class Test_ia32 { private static final int NUM_THREADS --- old/test/compiler/codecache/CheckSegmentedCodeCache.java 2014-12-09 15:13:00.025780977 +0100 +++ new/test/compiler/codecache/CheckSegmentedCodeCache.java 2014-12-09 15:12:59.949780975 +0100 @@ -22,16 +22,16 @@ */ import com.oracle.java.testlibrary.*; -import sun.hotspot.WhiteBox; +import jdk.testlib.WhiteBox; /* * @test CheckSegmentedCodeCache * @bug 8015774 - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @summary "Checks VM options related to the segmented code cache" * @build CheckSegmentedCodeCache - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI CheckSegmentedCodeCache */ public class CheckSegmentedCodeCache { --- old/test/compiler/intrinsics/bmi/TestBlsrL.java 2014-12-09 15:13:00.625780996 +0100 +++ new/test/compiler/intrinsics/bmi/TestBlsrL.java 2014-12-09 15:13:00.477780992 +0100 @@ -27,15 +27,15 @@ * @bug 8031321 * @summary Verify that results of computations are the same w/ * and w/o usage of BLSR instruction - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build TestBlsrL BMITestRunner Expr - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI TestBlsrL */ -import sun.hotspot.cpuinfo.CPUInfo; +import jdk.testlib.cpuinfo.CPUInfo; public class TestBlsrL { --- old/test/compiler/intrinsics/bmi/TestAndnL.java 2014-12-09 15:13:00.697780999 +0100 +++ new/test/compiler/intrinsics/bmi/TestAndnL.java 2014-12-09 15:13:00.469780991 +0100 @@ -27,15 +27,15 @@ * @bug 8031321 * @summary Verify that results of computations are the same w/ * and w/o usage of ANDN instruction - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build TestAndnL BMITestRunner Expr - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI TestAndnL */ -import sun.hotspot.cpuinfo.CPUInfo; +import jdk.testlib.cpuinfo.CPUInfo; public class TestAndnL { --- old/test/compiler/codecache/OverflowCodeCacheTest.java 2014-12-09 15:13:00.749781000 +0100 +++ new/test/compiler/codecache/OverflowCodeCacheTest.java 2014-12-09 15:13:00.477780992 +0100 @@ -26,18 +26,18 @@ import java.util.EnumSet; import java.util.ArrayList; -import sun.hotspot.WhiteBox; -import sun.hotspot.code.BlobType; -import sun.hotspot.code.CodeBlob; +import jdk.testlib.WhiteBox; +import jdk.testlib.code.BlobType; +import jdk.testlib.code.CodeBlob; import com.oracle.java.testlibrary.Asserts; /* * @test OverflowCodeCacheTest * @bug 8059550 - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build OverflowCodeCacheTest - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI -XX:CompileCommand=compileonly,null::* * -XX:-SegmentedCodeCache OverflowCodeCacheTest --- old/test/compiler/intrinsics/bmi/TestLzcntI.java 2014-12-09 15:13:00.857781004 +0100 +++ new/test/compiler/intrinsics/bmi/TestLzcntI.java 2014-12-09 15:13:00.601780996 +0100 @@ -27,15 +27,15 @@ * @bug 8031321 * @summary Verify that results of computations are the same w/ * and w/o usage of intrinsic - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build TestLzcntI BMITestRunner Expr - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI TestLzcntI */ -import sun.hotspot.cpuinfo.CPUInfo; +import jdk.testlib.cpuinfo.CPUInfo; public class TestLzcntI { --- old/test/compiler/intrinsics/bmi/TestAndnI.java 2014-12-09 15:13:00.829781003 +0100 +++ new/test/compiler/intrinsics/bmi/TestAndnI.java 2014-12-09 15:13:00.521780993 +0100 @@ -27,15 +27,15 @@ * @bug 8031321 * @summary Verify that results of computations are the same w/ * and w/o usage of ANDN instruction - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build TestAndnI BMITestRunner Expr - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI TestAndnI */ -import sun.hotspot.cpuinfo.CPUInfo; +import jdk.testlib.cpuinfo.CPUInfo; public class TestAndnI { --- old/test/compiler/intrinsics/bmi/TestBlsmskI.java 2014-12-09 15:13:00.829781003 +0100 +++ new/test/compiler/intrinsics/bmi/TestBlsmskI.java 2014-12-09 15:13:00.489780992 +0100 @@ -27,15 +27,15 @@ * @bug 8031321 * @summary Verify that results of computations are the same w/ * and w/o usage of BLSMSK instruction - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build TestBlsmskI BMITestRunner Expr - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI TestBlsmskI */ -import sun.hotspot.cpuinfo.CPUInfo; +import jdk.testlib.cpuinfo.CPUInfo; public class TestBlsmskI { --- old/test/compiler/intrinsics/bmi/TestBlsiL.java 2014-12-09 15:13:00.869781004 +0100 +++ new/test/compiler/intrinsics/bmi/TestBlsiL.java 2014-12-09 15:13:00.561780994 +0100 @@ -27,15 +27,15 @@ * @bug 8031321 * @summary Verify that results of computations are the same w/ * and w/o usage of BLSI instruction - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build TestBlsiL BMITestRunner Expr - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI TestBlsiL */ -import sun.hotspot.cpuinfo.CPUInfo; +import jdk.testlib.cpuinfo.CPUInfo; public class TestBlsiL { --- old/test/compiler/intrinsics/bmi/TestBlsiI.java 2014-12-09 15:13:00.873781004 +0100 +++ new/test/compiler/intrinsics/bmi/TestBlsiI.java 2014-12-09 15:13:00.561780994 +0100 @@ -27,15 +27,15 @@ * @bug 8031321 * @summary Verify that results of computations are the same w/ * and w/o usage of BLSI instruction - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build TestBlsiI BMITestRunner Expr - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI TestBlsiI */ -import sun.hotspot.cpuinfo.CPUInfo; +import jdk.testlib.cpuinfo.CPUInfo; public class TestBlsiI { --- old/test/compiler/intrinsics/bmi/TestTzcntI.java 2014-12-09 15:13:00.909781005 +0100 +++ new/test/compiler/intrinsics/bmi/TestTzcntI.java 2014-12-09 15:13:00.621780996 +0100 @@ -27,15 +27,15 @@ * @bug 8031321 * @summary Verify that results of computations are the same w/ * and w/o usage of intrinsic - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build TestTzcntI BMITestRunner Expr - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI TestTzcntI */ -import sun.hotspot.cpuinfo.CPUInfo; +import jdk.testlib.cpuinfo.CPUInfo; public class TestTzcntI { --- old/test/compiler/intrinsics/bmi/TestBlsrI.java 2014-12-09 15:13:00.905781005 +0100 +++ new/test/compiler/intrinsics/bmi/TestBlsrI.java 2014-12-09 15:13:00.525780993 +0100 @@ -27,15 +27,15 @@ * @bug 8031321 * @summary Verify that results of computations are the same w/ * and w/o usage of BLSR instruction - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build TestBlsrI BMITestRunner Expr - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI TestBlsrI */ -import sun.hotspot.cpuinfo.CPUInfo; +import jdk.testlib.cpuinfo.CPUInfo; public class TestBlsrI { --- old/test/compiler/intrinsics/bmi/TestLzcntL.java 2014-12-09 15:13:00.909781005 +0100 +++ new/test/compiler/intrinsics/bmi/TestLzcntL.java 2014-12-09 15:13:00.525780993 +0100 @@ -27,15 +27,15 @@ * @bug 8031321 * @summary Verify that results of computations are the same w/ * and w/o usage of intrinsic - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build TestLzcntL BMITestRunner Expr - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI TestLzcntL */ -import sun.hotspot.cpuinfo.CPUInfo; +import jdk.testlib.cpuinfo.CPUInfo; public class TestLzcntL { --- old/test/compiler/intrinsics/bmi/TestBlsmskL.java 2014-12-09 15:13:00.929781006 +0100 +++ new/test/compiler/intrinsics/bmi/TestBlsmskL.java 2014-12-09 15:13:00.609780996 +0100 @@ -27,15 +27,15 @@ * @bug 8031321 * @summary Verify that results of computations are the same w/ * and w/o usage of BLSMSK instruction - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build TestBlsmskL BMITestRunner Expr - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI TestBlsmskL */ -import sun.hotspot.cpuinfo.CPUInfo; +import jdk.testlib.cpuinfo.CPUInfo; public class TestBlsmskL { --- old/test/compiler/intrinsics/bmi/TestTzcntL.java 2014-12-09 15:13:01.297781018 +0100 +++ new/test/compiler/intrinsics/bmi/TestTzcntL.java 2014-12-09 15:13:01.177781014 +0100 @@ -27,15 +27,15 @@ * @bug 8031321 * @summary Verify that results of computations are the same w/ * and w/o usage of intrinsic - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build TestTzcntL BMITestRunner Expr - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI TestTzcntL */ -import sun.hotspot.cpuinfo.CPUInfo; +import jdk.testlib.cpuinfo.CPUInfo; public class TestTzcntL { --- old/test/compiler/intrinsics/bmi/verifycode/AddnTestL.java 2014-12-09 15:13:01.301781018 +0100 +++ new/test/compiler/intrinsics/bmi/verifycode/AddnTestL.java 2014-12-09 15:13:01.177781014 +0100 @@ -24,10 +24,10 @@ /* * @test * @bug 8031321 - * @library /testlibrary /testlibrary/whitebox /compiler/whitebox .. + * @library /testlibrary /../../test/lib /compiler/whitebox .. * @build AddnTestL - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI * -XX:+IgnoreUnrecognizedVMOptions -XX:+UseBMI1Instructions AddnTestL */ --- old/test/compiler/intrinsics/bmi/verifycode/AddnTestI.java 2014-12-09 15:13:01.305781018 +0100 +++ new/test/compiler/intrinsics/bmi/verifycode/AddnTestI.java 2014-12-09 15:13:01.185781014 +0100 @@ -24,10 +24,10 @@ /* * @test * @bug 8031321 - * @library /testlibrary /testlibrary/whitebox /compiler/whitebox .. + * @library /testlibrary /../../test/lib /compiler/whitebox .. * @build AddnTestI - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI * -XX:+IgnoreUnrecognizedVMOptions -XX:+UseBMI1Instructions AddnTestI */ --- old/test/compiler/intrinsics/bmi/verifycode/BlsiTestI.java 2014-12-09 15:13:01.313781018 +0100 +++ new/test/compiler/intrinsics/bmi/verifycode/BlsiTestI.java 2014-12-09 15:13:01.189781014 +0100 @@ -24,10 +24,10 @@ /* * @test * @bug 8031321 - * @library /testlibrary /testlibrary/whitebox /compiler/whitebox .. + * @library /testlibrary /../../test/lib /compiler/whitebox .. * @build BlsiTestI - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI * -XX:+IgnoreUnrecognizedVMOptions -XX:+UseBMI1Instructions BlsiTestI */ --- old/test/compiler/intrinsics/bmi/verifycode/BlsmskTestI.java 2014-12-09 15:13:02.941781070 +0100 +++ new/test/compiler/intrinsics/bmi/verifycode/BlsmskTestI.java 2014-12-09 15:13:02.761781064 +0100 @@ -24,10 +24,10 @@ /* * @test * @bug 8031321 - * @library /testlibrary /testlibrary/whitebox /compiler/whitebox .. + * @library /testlibrary /../../test/lib /compiler/whitebox .. * @build BlsmskTestI - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI * -XX:+IgnoreUnrecognizedVMOptions -XX:+UseBMI1Instructions BlsmskTestI */ --- old/test/compiler/intrinsics/bmi/verifycode/BlsrTestL.java 2014-12-09 15:13:03.025781073 +0100 +++ new/test/compiler/intrinsics/bmi/verifycode/BlsrTestL.java 2014-12-09 15:13:02.717781063 +0100 @@ -24,10 +24,10 @@ /* * @test * @bug 8031321 - * @library /testlibrary /testlibrary/whitebox /compiler/whitebox .. + * @library /testlibrary /../../test/lib /compiler/whitebox .. * @build BlsrTestL - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI * -XX:+IgnoreUnrecognizedVMOptions -XX:+UseBMI1Instructions BlsrTestL */ --- old/test/compiler/intrinsics/classcast/NullCheckDroppingsTest.java 2014-12-09 15:13:03.085781074 +0100 +++ new/test/compiler/intrinsics/classcast/NullCheckDroppingsTest.java 2014-12-09 15:13:02.757781064 +0100 @@ -25,18 +25,18 @@ * @test NullCheckDroppingsTest * @bug 8054492 * @summary "Casting can result in redundant null checks in generated code" - * @library /testlibrary /testlibrary/whitebox /testlibrary/com/oracle/java/testlibrary + * @library /testlibrary /../../test/lib /testlibrary/com/oracle/java/testlibrary * @build NullCheckDroppingsTest - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main ClassFileInstaller com.oracle.java.testlibrary.Platform * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI * -Xmixed -XX:-BackgroundCompilation -XX:-TieredCompilation -XX:CompileThreshold=1000 * -XX:CompileCommand=exclude,NullCheckDroppingsTest::runTest NullCheckDroppingsTest */ -import sun.hotspot.WhiteBox; -import sun.hotspot.code.NMethod; +import jdk.testlib.WhiteBox; +import jdk.testlib.code.NMethod; import com.oracle.java.testlibrary.Platform; import java.lang.reflect.Method; --- old/test/compiler/intrinsics/bmi/verifycode/LZcntTestL.java 2014-12-09 15:13:03.173781077 +0100 +++ new/test/compiler/intrinsics/bmi/verifycode/LZcntTestL.java 2014-12-09 15:13:02.809781066 +0100 @@ -24,10 +24,10 @@ /* * @test * @bug 8031321 - * @library /testlibrary /testlibrary/whitebox /compiler/whitebox .. + * @library /testlibrary /../../test/lib /compiler/whitebox .. * @build LZcntTestL - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI * -XX:+IgnoreUnrecognizedVMOptions -XX:+UseCountLeadingZerosInstruction LZcntTestL */ --- old/test/compiler/intrinsics/bmi/verifycode/BmiIntrinsicBase.java 2014-12-09 15:13:03.085781074 +0100 +++ new/test/compiler/intrinsics/bmi/verifycode/BmiIntrinsicBase.java 2014-12-09 15:13:02.905781069 +0100 @@ -25,8 +25,8 @@ import com.oracle.java.testlibrary.Asserts; import com.oracle.java.testlibrary.Platform; import com.oracle.java.testlibrary.Utils; -import sun.hotspot.code.NMethod; -import sun.hotspot.cpuinfo.CPUInfo; +import jdk.testlib.code.NMethod; +import jdk.testlib.cpuinfo.CPUInfo; import java.lang.reflect.Executable; import java.lang.reflect.Method; --- old/test/compiler/intrinsics/bmi/verifycode/BlsmskTestL.java 2014-12-09 15:13:03.133781076 +0100 +++ new/test/compiler/intrinsics/bmi/verifycode/BlsmskTestL.java 2014-12-09 15:13:02.837781067 +0100 @@ -24,10 +24,10 @@ /* * @test * @bug 8031321 - * @library /testlibrary /testlibrary/whitebox /compiler/whitebox .. + * @library /testlibrary /../../test/lib /compiler/whitebox .. * @build BlsmskTestL - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI * -XX:+IgnoreUnrecognizedVMOptions -XX:+UseBMI1Instructions BlsmskTestL */ --- old/test/compiler/intrinsics/bmi/verifycode/TZcntTestI.java 2014-12-09 15:13:03.137781076 +0100 +++ new/test/compiler/intrinsics/bmi/verifycode/TZcntTestI.java 2014-12-09 15:13:02.809781066 +0100 @@ -24,10 +24,10 @@ /* * @test * @bug 8031321 - * @library /testlibrary /testlibrary/whitebox /compiler/whitebox .. + * @library /testlibrary /../../test/lib /compiler/whitebox .. * @build TZcntTestI - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI * -XX:+IgnoreUnrecognizedVMOptions -XX:+UseCountTrailingZerosInstruction TZcntTestI */ --- old/test/compiler/intrinsics/mathexact/sanity/AddExactIntTest.java 2014-12-09 15:13:03.193781078 +0100 +++ new/test/compiler/intrinsics/mathexact/sanity/AddExactIntTest.java 2014-12-09 15:13:02.957781070 +0100 @@ -23,11 +23,11 @@ /* * @test - * @library /testlibrary /testlibrary/whitebox /compiler/whitebox + * @library /testlibrary /../../test/lib /compiler/whitebox * /compiler/testlibrary * @build AddExactIntTest - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation * -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod --- old/test/compiler/intrinsics/bmi/verifycode/BlsiTestL.java 2014-12-09 15:13:03.209781078 +0100 +++ new/test/compiler/intrinsics/bmi/verifycode/BlsiTestL.java 2014-12-09 15:13:02.885781068 +0100 @@ -24,10 +24,10 @@ /* * @test * @bug 8031321 - * @library /testlibrary /testlibrary/whitebox /compiler/whitebox .. + * @library /testlibrary /../../test/lib /compiler/whitebox .. * @build BlsiTestL - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI * -XX:+IgnoreUnrecognizedVMOptions -XX:+UseBMI1Instructions BlsiTestL */ --- old/test/compiler/intrinsics/bmi/verifycode/BlsrTestI.java 2014-12-09 15:13:03.257781080 +0100 +++ new/test/compiler/intrinsics/bmi/verifycode/BlsrTestI.java 2014-12-09 15:13:02.953781070 +0100 @@ -24,10 +24,10 @@ /* * @test * @bug 8031321 - * @library /testlibrary /testlibrary/whitebox /compiler/whitebox .. + * @library /testlibrary /../../test/lib /compiler/whitebox .. * @build BlsrTestI - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI * -XX:+IgnoreUnrecognizedVMOptions -XX:+UseBMI1Instructions BlsrTestI */ --- old/test/compiler/intrinsics/bmi/verifycode/TZcntTestL.java 2014-12-09 15:13:03.257781080 +0100 +++ new/test/compiler/intrinsics/bmi/verifycode/TZcntTestL.java 2014-12-09 15:13:03.013781072 +0100 @@ -24,10 +24,10 @@ /* * @test * @bug 8031321 - * @library /testlibrary /testlibrary/whitebox /compiler/whitebox .. + * @library /testlibrary /../../test/lib /compiler/whitebox .. * @build TZcntTestL - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI * -XX:+IgnoreUnrecognizedVMOptions -XX:+UseCountTrailingZerosInstruction TZcntTestL */ --- old/test/compiler/intrinsics/bmi/verifycode/LZcntTestI.java 2014-12-09 15:13:03.277781080 +0100 +++ new/test/compiler/intrinsics/bmi/verifycode/LZcntTestI.java 2014-12-09 15:13:02.969781071 +0100 @@ -24,10 +24,10 @@ /* * @test * @bug 8031321 - * @library /testlibrary /testlibrary/whitebox /compiler/whitebox .. + * @library /testlibrary /../../test/lib /compiler/whitebox .. * @build LZcntTestI - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI * -XX:+IgnoreUnrecognizedVMOptions -XX:+UseCountLeadingZerosInstruction LZcntTestI */ --- old/test/compiler/intrinsics/mathexact/sanity/AddExactLongTest.java 2014-12-09 15:13:03.485781087 +0100 +++ new/test/compiler/intrinsics/mathexact/sanity/AddExactLongTest.java 2014-12-09 15:13:03.413781085 +0100 @@ -23,11 +23,11 @@ /* * @test - * @library /testlibrary /testlibrary/whitebox /compiler/whitebox + * @library /testlibrary /../../test/lib /compiler/whitebox * /compiler/testlibrary * @build AddExactLongTest - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation * -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod --- old/test/compiler/intrinsics/mathexact/sanity/IncrementExactLongTest.java 2014-12-09 15:13:05.265781144 +0100 +++ new/test/compiler/intrinsics/mathexact/sanity/IncrementExactLongTest.java 2014-12-09 15:13:04.969781134 +0100 @@ -23,11 +23,11 @@ /* * @test - * @library /testlibrary /testlibrary/whitebox /compiler/whitebox + * @library /testlibrary /../../test/lib /compiler/whitebox * /compiler/testlibrary * @build IncrementExactLongTest - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation * -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod --- old/test/compiler/intrinsics/mathexact/sanity/MultiplyExactLongTest.java 2014-12-09 15:13:05.253781143 +0100 +++ new/test/compiler/intrinsics/mathexact/sanity/MultiplyExactLongTest.java 2014-12-09 15:13:04.961781134 +0100 @@ -23,11 +23,11 @@ /* * @test - * @library /testlibrary /testlibrary/whitebox /compiler/whitebox + * @library /testlibrary /../../test/lib /compiler/whitebox * /compiler/testlibrary * @build MultiplyExactLongTest - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation * -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod --- old/test/compiler/intrinsics/mathexact/sanity/SubtractExactLongTest.java 2014-12-09 15:13:05.273781144 +0100 +++ new/test/compiler/intrinsics/mathexact/sanity/SubtractExactLongTest.java 2014-12-09 15:13:04.961781134 +0100 @@ -23,11 +23,11 @@ /* * @test - * @library /testlibrary /testlibrary/whitebox /compiler/whitebox + * @library /testlibrary /../../test/lib /compiler/whitebox * /compiler/testlibrary * @build SubtractExactLongTest - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation * -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod --- old/test/compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnSupportedCPU.java 2014-12-09 15:13:05.321781145 +0100 +++ new/test/compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnSupportedCPU.java 2014-12-09 15:13:04.989781135 +0100 @@ -25,10 +25,10 @@ * @test * @bug 8035968 * @summary Verify UseSHA1Intrinsics option processing on supported CPU, - * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary testcases + * @library /testlibrary /../../test/lib /compiler/testlibrary testcases * @build TestUseSHA1IntrinsicsOptionOnSupportedCPU - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI TestUseSHA1IntrinsicsOptionOnSupportedCPU */ --- old/test/compiler/intrinsics/mathexact/sanity/SubtractExactIntTest.java 2014-12-09 15:13:05.333781146 +0100 +++ new/test/compiler/intrinsics/mathexact/sanity/SubtractExactIntTest.java 2014-12-09 15:13:04.977781134 +0100 @@ -23,11 +23,11 @@ /* * @test - * @library /testlibrary /testlibrary/whitebox /compiler/whitebox + * @library /testlibrary /../../test/lib /compiler/whitebox * /compiler/testlibrary * @build SubtractExactIntTest - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation * -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod --- old/test/compiler/intrinsics/mathexact/sanity/NegateExactIntTest.java 2014-12-09 15:13:05.337781146 +0100 +++ new/test/compiler/intrinsics/mathexact/sanity/NegateExactIntTest.java 2014-12-09 15:13:04.965781134 +0100 @@ -23,11 +23,11 @@ /* * @test - * @library /testlibrary /testlibrary/whitebox /compiler/whitebox + * @library /testlibrary /../../test/lib /compiler/whitebox * /compiler/testlibrary * @build NegateExactIntTest - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation * -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod --- old/test/compiler/intrinsics/mathexact/sanity/MultiplyExactIntTest.java 2014-12-09 15:13:05.333781146 +0100 +++ new/test/compiler/intrinsics/mathexact/sanity/MultiplyExactIntTest.java 2014-12-09 15:13:04.973781134 +0100 @@ -23,11 +23,11 @@ /* * @test - * @library /testlibrary /testlibrary/whitebox /compiler/whitebox + * @library /testlibrary /../../test/lib /compiler/whitebox * /compiler/testlibrary * @build MultiplyExactIntTest - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation * -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod --- old/test/compiler/intrinsics/mathexact/sanity/NegateExactLongTest.java 2014-12-09 15:13:05.373781147 +0100 +++ new/test/compiler/intrinsics/mathexact/sanity/NegateExactLongTest.java 2014-12-09 15:13:05.037781136 +0100 @@ -23,11 +23,11 @@ /* * @test - * @library /testlibrary /testlibrary/whitebox /compiler/whitebox + * @library /testlibrary /../../test/lib /compiler/whitebox * /compiler/testlibrary * @build NegateExactLongTest - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation * -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod --- old/test/compiler/intrinsics/mathexact/sanity/IncrementExactIntTest.java 2014-12-09 15:13:05.377781147 +0100 +++ new/test/compiler/intrinsics/mathexact/sanity/IncrementExactIntTest.java 2014-12-09 15:13:04.981781135 +0100 @@ -23,11 +23,11 @@ /* * @test - * @library /testlibrary /testlibrary/whitebox /compiler/whitebox + * @library /testlibrary /../../test/lib /compiler/whitebox * /compiler/testlibrary * @build IncrementExactIntTest - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation * -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod --- old/test/compiler/intrinsics/mathexact/sanity/DecrementExactIntTest.java 2014-12-09 15:13:05.369781147 +0100 +++ new/test/compiler/intrinsics/mathexact/sanity/DecrementExactIntTest.java 2014-12-09 15:13:05.029781136 +0100 @@ -23,11 +23,11 @@ /* * @test - * @library /testlibrary /testlibrary/whitebox /compiler/whitebox + * @library /testlibrary /../../test/lib /compiler/whitebox * /compiler/testlibrary * @build DecrementExactIntTest - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation * -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod --- old/test/compiler/intrinsics/mathexact/sanity/DecrementExactLongTest.java 2014-12-09 15:13:05.373781147 +0100 +++ new/test/compiler/intrinsics/mathexact/sanity/DecrementExactLongTest.java 2014-12-09 15:13:05.049781137 +0100 @@ -23,11 +23,11 @@ /* * @test - * @library /testlibrary /testlibrary/whitebox /compiler/whitebox + * @library /testlibrary /../../test/lib /compiler/whitebox * /compiler/testlibrary * @build DecrementExactLongTest - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation * -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod --- old/test/compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnUnsupportedCPU.java 2014-12-09 15:13:05.409781148 +0100 +++ new/test/compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnUnsupportedCPU.java 2014-12-09 15:13:05.049781137 +0100 @@ -25,10 +25,10 @@ * @test * @bug 8035968 * @summary Verify UseSHA1Intrinsics option processing on unsupported CPU, - * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary testcases + * @library /testlibrary /../../test/lib /compiler/testlibrary testcases * @build TestUseSHA1IntrinsicsOptionOnUnsupportedCPU - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI * TestUseSHA1IntrinsicsOptionOnUnsupportedCPU --- old/test/compiler/intrinsics/sha/cli/TestUseSHA256IntrinsicsOptionOnSupportedCPU.java 2014-12-09 15:13:05.653781156 +0100 +++ new/test/compiler/intrinsics/sha/cli/TestUseSHA256IntrinsicsOptionOnSupportedCPU.java 2014-12-09 15:13:05.581781154 +0100 @@ -25,10 +25,10 @@ * @test * @bug 8035968 * @summary Verify UseSHA256Intrinsics option processing on supported CPU, - * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary testcases + * @library /testlibrary /../../test/lib /compiler/testlibrary testcases * @build TestUseSHA256IntrinsicsOptionOnSupportedCPU - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI * TestUseSHA256IntrinsicsOptionOnSupportedCPU --- old/test/compiler/intrinsics/sha/cli/TestUseSHA256IntrinsicsOptionOnUnsupportedCPU.java 2014-12-09 15:13:07.361781210 +0100 +++ new/test/compiler/intrinsics/sha/cli/TestUseSHA256IntrinsicsOptionOnUnsupportedCPU.java 2014-12-09 15:13:07.081781201 +0100 @@ -25,10 +25,10 @@ * @test * @bug 8035968 * @summary Verify UseSHA256Intrinsics option processing on unsupported CPU, - * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary testcases + * @library /testlibrary /../../test/lib /compiler/testlibrary testcases * @build TestUseSHA256IntrinsicsOptionOnUnsupportedCPU - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI * TestUseSHA256IntrinsicsOptionOnUnsupportedCPU --- old/test/compiler/intrinsics/sha/sanity/TestSHA256Intrinsics.java 2014-12-09 15:13:07.409781212 +0100 +++ new/test/compiler/intrinsics/sha/sanity/TestSHA256Intrinsics.java 2014-12-09 15:13:07.077781201 +0100 @@ -27,10 +27,10 @@ * @test * @bug 8035968 * @summary Verify that SHA-256 intrinsic is actually used. - * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary ../ + * @library /testlibrary /../../test/lib /compiler/testlibrary ../ * @build TestSHA intrinsics.Verifier TestSHA256Intrinsics - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI -Xbatch -XX:CompileThreshold=500 * -XX:Tier4InvocationThreshold=500 --- old/test/compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnUnsupportedCPU.java 2014-12-09 15:13:07.449781213 +0100 +++ new/test/compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnUnsupportedCPU.java 2014-12-09 15:13:07.157781204 +0100 @@ -25,10 +25,10 @@ * @test * @bug 8035968 * @summary Verify UseSHA512Intrinsics option processing on unsupported CPU, - * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary testcases + * @library /testlibrary /../../test/lib /compiler/testlibrary testcases * @build TestUseSHA512IntrinsicsOptionOnUnsupportedCPU - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI * TestUseSHA512IntrinsicsOptionOnUnsupportedCPU --- old/test/compiler/intrinsics/sha/sanity/TestSHA1Intrinsics.java 2014-12-09 15:13:07.405781211 +0100 +++ new/test/compiler/intrinsics/sha/sanity/TestSHA1Intrinsics.java 2014-12-09 15:13:07.133781203 +0100 @@ -25,10 +25,10 @@ * @test * @bug 8035968 * @summary Verify that SHA-1 intrinsic is actually used. - * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary ../ + * @library /testlibrary /../../test/lib /compiler/testlibrary ../ * @build TestSHA intrinsics.Verifier TestSHA1Intrinsics - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI -Xbatch -XX:CompileThreshold=500 * -XX:Tier4InvocationThreshold=500 --- old/test/compiler/intrinsics/sha/sanity/TestSHA512MultiBlockIntrinsics.java 2014-12-09 15:13:07.497781214 +0100 +++ new/test/compiler/intrinsics/sha/sanity/TestSHA512MultiBlockIntrinsics.java 2014-12-09 15:13:07.161781204 +0100 @@ -27,10 +27,10 @@ * @test * @bug 8035968 * @summary Verify that SHA-512 multi block intrinsic is actually used. - * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary ../ + * @library /testlibrary /../../test/lib /compiler/testlibrary ../ * @build TestSHA intrinsics.Verifier TestSHA512MultiBlockIntrinsics - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI -Xbatch -XX:CompileThreshold=500 * -XX:Tier4InvocationThreshold=500 --- old/test/compiler/intrinsics/sha/cli/TestUseSHAOptionOnUnsupportedCPU.java 2014-12-09 15:13:07.449781213 +0100 +++ new/test/compiler/intrinsics/sha/cli/TestUseSHAOptionOnUnsupportedCPU.java 2014-12-09 15:13:07.153781203 +0100 @@ -25,10 +25,10 @@ * @test * @bug 8035968 * @summary Verify UseSHA option processing on unsupported CPU. - * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary testcases + * @library /testlibrary /../../test/lib /compiler/testlibrary testcases * @build TestUseSHAOptionOnUnsupportedCPU - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI TestUseSHAOptionOnUnsupportedCPU */ --- old/test/compiler/intrinsics/sha/sanity/TestSHA256MultiBlockIntrinsics.java 2014-12-09 15:13:07.481781214 +0100 +++ new/test/compiler/intrinsics/sha/sanity/TestSHA256MultiBlockIntrinsics.java 2014-12-09 15:13:07.165781204 +0100 @@ -27,10 +27,10 @@ * @test * @bug 8035968 * @summary Verify that SHA-256 multi block intrinsic is actually used. - * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary ../ + * @library /testlibrary /../../test/lib /compiler/testlibrary ../ * @build TestSHA intrinsics.Verifier TestSHA256MultiBlockIntrinsics - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI -Xbatch -XX:CompileThreshold=500 * -XX:Tier4InvocationThreshold=500 --- old/test/compiler/intrinsics/sha/cli/TestUseSHAOptionOnSupportedCPU.java 2014-12-09 15:13:07.505781215 +0100 +++ new/test/compiler/intrinsics/sha/cli/TestUseSHAOptionOnSupportedCPU.java 2014-12-09 15:13:07.145781203 +0100 @@ -25,10 +25,10 @@ * @test * @bug 8035968 * @summary Verify UseSHA option processing on supported CPU, - * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary testcases + * @library /testlibrary /../../test/lib /compiler/testlibrary testcases * @build TestUseSHAOptionOnSupportedCPU - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI TestUseSHAOptionOnSupportedCPU */ --- old/test/compiler/intrinsics/sha/sanity/TestSHA512Intrinsics.java 2014-12-09 15:13:07.537781216 +0100 +++ new/test/compiler/intrinsics/sha/sanity/TestSHA512Intrinsics.java 2014-12-09 15:13:07.257781207 +0100 @@ -27,10 +27,10 @@ * @test * @bug 8035968 * @summary Verify that SHA-512 intrinsic is actually used. - * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary ../ + * @library /testlibrary /../../test/lib /compiler/testlibrary ../ * @build TestSHA intrinsics.Verifier TestSHA512Intrinsics - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI -Xbatch -XX:CompileThreshold=500 * -XX:Tier4InvocationThreshold=500 --- old/test/compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnSupportedCPU.java 2014-12-09 15:13:07.537781216 +0100 +++ new/test/compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnSupportedCPU.java 2014-12-09 15:13:07.177781204 +0100 @@ -25,10 +25,10 @@ * @test * @bug 8035968 * @summary Verify UseSHA512Intrinsics option processing on supported CPU. - * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary testcases + * @library /testlibrary /../../test/lib /compiler/testlibrary testcases * @build TestUseSHA512IntrinsicsOptionOnSupportedCPU - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI * TestUseSHA512IntrinsicsOptionOnSupportedCPU --- old/test/compiler/intrinsics/sha/sanity/TestSHA1MultiBlockIntrinsics.java 2014-12-09 15:13:07.557781216 +0100 +++ new/test/compiler/intrinsics/sha/sanity/TestSHA1MultiBlockIntrinsics.java 2014-12-09 15:13:07.205781205 +0100 @@ -27,10 +27,10 @@ * @test * @bug 8035968 * @summary Verify that SHA-1 multi block intrinsic is actually used. - * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary ../ + * @library /testlibrary /../../test/lib /compiler/testlibrary ../ * @build TestSHA intrinsics.Verifier TestSHA1MultiBlockIntrinsics - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI -Xbatch -XX:CompileThreshold=500 * -XX:Tier4InvocationThreshold=500 --- old/test/compiler/intrinsics/sha/sanity/SHASanityTestBase.java 2014-12-09 15:13:07.625781218 +0100 +++ new/test/compiler/intrinsics/sha/sanity/SHASanityTestBase.java 2014-12-09 15:13:07.365781210 +0100 @@ -22,7 +22,7 @@ */ import intrinsics.Verifier; -import sun.hotspot.WhiteBox; +import jdk.testlib.WhiteBox; import java.io.FileOutputStream; import java.io.IOException; --- old/test/compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsOptionOnSupportedConfig.java 2014-12-09 15:13:07.825781225 +0100 +++ new/test/compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsOptionOnSupportedConfig.java 2014-12-09 15:13:07.753781222 +0100 @@ -27,10 +27,10 @@ * @bug 8031320 * @summary Verify PrintPreciseRTMLockingStatistics on CPUs with * rtm support and on VM with rtm locking support, - * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary + * @library /testlibrary /../../test/lib /compiler/testlibrary * @build TestPrintPreciseRTMLockingStatisticsOptionOnSupportedConfig - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI * TestPrintPreciseRTMLockingStatisticsOptionOnSupportedConfig --- old/test/compiler/rtm/cli/TestRTMAbortRatioOptionOnUnsupportedConfig.java 2014-12-09 15:13:09.565781280 +0100 +++ new/test/compiler/rtm/cli/TestRTMAbortRatioOptionOnUnsupportedConfig.java 2014-12-09 15:13:09.285781271 +0100 @@ -27,10 +27,10 @@ * @bug 8031320 * @summary Verify RTMAbortRatio option processing on CPU without rtm * support or on VM that does not support rtm locking. - * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary + * @library /testlibrary /../../test/lib /compiler/testlibrary * @build TestRTMAbortRatioOptionOnUnsupportedConfig - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI TestRTMAbortRatioOptionOnUnsupportedConfig */ --- old/test/compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsOptionOnUnsupportedConfig.java 2014-12-09 15:13:09.637781282 +0100 +++ new/test/compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsOptionOnUnsupportedConfig.java 2014-12-09 15:13:09.305781272 +0100 @@ -27,10 +27,10 @@ * @bug 8031320 * @summary Verify PrintPreciseRTMLockingStatistics on CPUs without * rtm support and/or unsupported VM. - * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary + * @library /testlibrary /../../test/lib /compiler/testlibrary * @build TestPrintPreciseRTMLockingStatisticsOptionOnUnsupportedConfig - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI * TestPrintPreciseRTMLockingStatisticsOptionOnUnsupportedConfig --- old/test/compiler/rtm/cli/TestUseRTMDeoptOptionOnSupportedConfig.java 2014-12-09 15:13:09.601781281 +0100 +++ new/test/compiler/rtm/cli/TestUseRTMDeoptOptionOnSupportedConfig.java 2014-12-09 15:13:09.285781271 +0100 @@ -27,10 +27,10 @@ * @bug 8031320 * @summary Verify UseRTMDeopt option processing on CPUs with rtm support * when rtm locking is supported by VM. - * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary + * @library /testlibrary /../../test/lib /compiler/testlibrary * @build TestUseRTMDeoptOptionOnSupportedConfig - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI TestUseRTMDeoptOptionOnSupportedConfig */ --- old/test/compiler/rtm/cli/TestUseRTMForStackLocksOptionOnUnsupportedConfig.java 2014-12-09 15:13:09.677781284 +0100 +++ new/test/compiler/rtm/cli/TestUseRTMForStackLocksOptionOnUnsupportedConfig.java 2014-12-09 15:13:09.337781273 +0100 @@ -27,10 +27,10 @@ * @bug 8031320 * @summary Verify UseRTMForStackLocks option processing on CPUs without * rtm support and/or on VMs without rtm locking support. - * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary + * @library /testlibrary /../../test/lib /compiler/testlibrary * @build TestUseRTMForStackLocksOptionOnUnsupportedConfig - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI * TestUseRTMForStackLocksOptionOnUnsupportedConfig --- old/test/compiler/rtm/cli/TestUseRTMDeoptOptionOnUnsupportedConfig.java 2014-12-09 15:13:09.685781284 +0100 +++ new/test/compiler/rtm/cli/TestUseRTMDeoptOptionOnUnsupportedConfig.java 2014-12-09 15:13:09.305781272 +0100 @@ -27,10 +27,10 @@ * @bug 8031320 * @summary Verify UseRTMDeopt option processing on CPUs without rtm support * or on VMs without rtm locking support. - * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary + * @library /testlibrary /../../test/lib /compiler/testlibrary * @build TestUseRTMDeoptOptionOnUnsupportedConfig - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI TestUseRTMDeoptOptionOnUnsupportedConfig */ --- old/test/compiler/rtm/cli/TestRTMAbortRatioOptionOnSupportedConfig.java 2014-12-09 15:13:09.649781283 +0100 +++ new/test/compiler/rtm/cli/TestRTMAbortRatioOptionOnSupportedConfig.java 2014-12-09 15:13:09.297781271 +0100 @@ -27,10 +27,10 @@ * @bug 8031320 * @summary Verify RTMAbortRatio option processing on CPU with rtm * support and on VM with rtm locking support. - * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary + * @library /testlibrary /../../test/lib /compiler/testlibrary * @build TestRTMAbortRatioOptionOnSupportedConfig - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI TestRTMAbortRatioOptionOnSupportedConfig */ --- old/test/compiler/rtm/cli/TestRTMTotalCountIncrRateOptionOnUnsupportedConfig.java 2014-12-09 15:13:09.669781283 +0100 +++ new/test/compiler/rtm/cli/TestRTMTotalCountIncrRateOptionOnUnsupportedConfig.java 2014-12-09 15:13:09.301781272 +0100 @@ -32,10 +32,10 @@ * @bug 8031320 * @summary Verify RTMTotalCountIncrRate option processing on CPU without * rtm support and/or on VM without rtm locking support. - * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary + * @library /testlibrary /../../test/lib /compiler/testlibrary * @build TestRTMTotalCountIncrRateOptionOnUnsupportedConfig - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI * TestRTMTotalCountIncrRateOptionOnUnsupportedConfig --- old/test/compiler/rtm/cli/TestUseRTMForStackLocksOptionOnSupportedConfig.java 2014-12-09 15:13:09.665781283 +0100 +++ new/test/compiler/rtm/cli/TestUseRTMForStackLocksOptionOnSupportedConfig.java 2014-12-09 15:13:09.321781272 +0100 @@ -27,10 +27,10 @@ * @bug 8031320 * @summary Verify UseRTMForStackLocks option processing on CPU with * rtm support when VM supports rtm locking. - * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary + * @library /testlibrary /../../test/lib /compiler/testlibrary * @build TestUseRTMForStackLocksOptionOnSupportedConfig - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI * TestUseRTMForStackLocksOptionOnSupportedConfig --- old/test/compiler/rtm/cli/TestRTMTotalCountIncrRateOptionOnSupportedConfig.java 2014-12-09 15:13:09.677781284 +0100 +++ new/test/compiler/rtm/cli/TestRTMTotalCountIncrRateOptionOnSupportedConfig.java 2014-12-09 15:13:09.305781272 +0100 @@ -27,10 +27,10 @@ * @bug 8031320 * @summary Verify RTMTotalCountIncrRate option processing on CPU with * rtm support and on VM with rtm locking support. - * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary + * @library /testlibrary /../../test/lib /compiler/testlibrary * @build TestRTMTotalCountIncrRateOptionOnSupportedConfig - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI * TestRTMTotalCountIncrRateOptionOnSupportedConfig --- old/test/compiler/rtm/cli/TestUseRTMLockingOptionOnSupportedConfig.java 2014-12-09 15:13:09.665781283 +0100 +++ new/test/compiler/rtm/cli/TestUseRTMLockingOptionOnSupportedConfig.java 2014-12-09 15:13:09.305781272 +0100 @@ -27,10 +27,10 @@ * @bug 8031320 * @summary Verify UseRTMLocking option processing on CPU with rtm support and * on VM with rtm-locking support. - * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary + * @library /testlibrary /../../test/lib /compiler/testlibrary * @build TestUseRTMLockingOptionOnSupportedConfig - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI TestUseRTMLockingOptionOnSupportedConfig */ --- old/test/compiler/rtm/cli/TestUseRTMLockingOptionOnUnsupportedVM.java 2014-12-09 15:13:09.713781285 +0100 +++ new/test/compiler/rtm/cli/TestUseRTMLockingOptionOnUnsupportedVM.java 2014-12-09 15:13:09.373781274 +0100 @@ -27,10 +27,10 @@ * @bug 8031320 * @summary Verify UseRTMLocking option processing on CPU with rtm support * in case when VM should not support this option. - * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary + * @library /testlibrary /../../test/lib /compiler/testlibrary * @build TestUseRTMLockingOptionOnUnsupportedVM - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI TestUseRTMLockingOptionOnUnsupportedVM */ --- old/test/compiler/rtm/cli/TestUseRTMLockingOptionOnUnsupportedCPU.java 2014-12-09 15:13:09.725781285 +0100 +++ new/test/compiler/rtm/cli/TestUseRTMLockingOptionOnUnsupportedCPU.java 2014-12-09 15:13:09.345781273 +0100 @@ -27,10 +27,10 @@ * @bug 8031320 * @summary Verify UseRTMLocking option processing on CPU without * rtm support. - * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary + * @library /testlibrary /../../test/lib /compiler/testlibrary * @build TestUseRTMLockingOptionOnUnsupportedCPU - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI TestUseRTMLockingOptionOnUnsupportedCPU */ --- old/test/compiler/rtm/cli/TestUseRTMLockingOptionWithBiasedLocking.java 2014-12-09 15:13:09.977781293 +0100 +++ new/test/compiler/rtm/cli/TestUseRTMLockingOptionWithBiasedLocking.java 2014-12-09 15:13:09.905781291 +0100 @@ -27,10 +27,10 @@ * @bug 8031320 * @summary Verify processing of UseRTMLocking and UseBiasedLocking * options combination on CPU and VM with rtm support. - * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary + * @library /testlibrary /../../test/lib /compiler/testlibrary * @build TestUseRTMLockingOptionWithBiasedLocking - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI TestUseRTMLockingOptionWithBiasedLocking */ --- old/test/compiler/rtm/locking/TestRTMLockingCalculationDelay.java 2014-12-09 15:13:10.697781316 +0100 +++ new/test/compiler/rtm/locking/TestRTMLockingCalculationDelay.java 2014-12-09 15:13:10.441781308 +0100 @@ -27,10 +27,10 @@ * @bug 8031320 * @summary Verify that RTMLockingCalculationDelay affect when * abort ratio calculation is started. - * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary + * @library /testlibrary /../../test/lib /compiler/testlibrary * @build TestRTMLockingCalculationDelay - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI TestRTMLockingCalculationDelay */ --- old/test/compiler/rtm/locking/TestRTMAbortThreshold.java 2014-12-09 15:13:10.729781317 +0100 +++ new/test/compiler/rtm/locking/TestRTMAbortThreshold.java 2014-12-09 15:13:10.441781308 +0100 @@ -27,10 +27,10 @@ * @bug 8031320 * @summary Verify that RTMAbortThreshold option affects * amount of aborts after which abort ratio is calculated. - * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary + * @library /testlibrary /../../test/lib /compiler/testlibrary * @build TestRTMAbortThreshold - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI TestRTMAbortThreshold */ --- old/test/compiler/rtm/locking/TestRTMAbortRatio.java 2014-12-09 15:13:10.749781318 +0100 +++ new/test/compiler/rtm/locking/TestRTMAbortRatio.java 2014-12-09 15:13:10.421781307 +0100 @@ -27,10 +27,10 @@ * @bug 8031320 * @summary Verify that RTMAbortRatio affects amount of aborts before * deoptimization. - * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary + * @library /testlibrary /../../test/lib /compiler/testlibrary * @build TestRTMAbortRatio - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI TestRTMAbortRatio */ --- old/test/compiler/rtm/locking/TestRTMRetryCount.java 2014-12-09 15:13:10.737781317 +0100 +++ new/test/compiler/rtm/locking/TestRTMRetryCount.java 2014-12-09 15:13:10.425781307 +0100 @@ -26,10 +26,10 @@ * @test * @bug 8031320 * @summary Verify that RTMRetryCount affects actual amount of retries. - * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary + * @library /testlibrary /../../test/lib /compiler/testlibrary * @build TestRTMRetryCount - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI TestRTMRetryCount */ --- old/test/compiler/rtm/locking/TestRTMDeoptOnHighAbortRatio.java 2014-12-09 15:13:10.785781319 +0100 +++ new/test/compiler/rtm/locking/TestRTMDeoptOnHighAbortRatio.java 2014-12-09 15:13:10.441781308 +0100 @@ -27,10 +27,10 @@ * @bug 8031320 * @summary Verify that on high abort ratio method will be recompiled * without rtm locking. - * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary + * @library /testlibrary /../../test/lib /compiler/testlibrary * @build TestRTMDeoptOnHighAbortRatio - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI TestRTMDeoptOnHighAbortRatio */ --- old/test/compiler/rtm/locking/TestRTMAfterNonRTMDeopt.java 2014-12-09 15:13:10.813781320 +0100 +++ new/test/compiler/rtm/locking/TestRTMAfterNonRTMDeopt.java 2014-12-09 15:13:10.477781309 +0100 @@ -29,10 +29,10 @@ * caused by reason other then rtm_state_change will reset * method's RTM state. And if we don't use RTMDeopt, then * RTM state remain the same after such deoptimization. - * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary + * @library /testlibrary /../../test/lib /compiler/testlibrary * @build TestRTMAfterNonRTMDeopt - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI TestRTMAfterNonRTMDeopt */ --- old/test/compiler/rtm/locking/TestRTMTotalCountIncrRate.java 2014-12-09 15:13:10.789781319 +0100 +++ new/test/compiler/rtm/locking/TestRTMTotalCountIncrRate.java 2014-12-09 15:13:10.445781308 +0100 @@ -27,10 +27,10 @@ * @bug 8031320 * @summary Verify that RTMTotalCountIncrRate option affects * RTM locking statistics. - * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary + * @library /testlibrary /../../test/lib /compiler/testlibrary * @build TestRTMTotalCountIncrRate - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI TestRTMTotalCountIncrRate */ --- old/test/compiler/rtm/locking/TestRTMLockingThreshold.java 2014-12-09 15:13:10.817781320 +0100 +++ new/test/compiler/rtm/locking/TestRTMLockingThreshold.java 2014-12-09 15:13:10.489781309 +0100 @@ -27,10 +27,10 @@ * @bug 8031320 * @summary Verify that RTMLockingThreshold affects rtm state transition * ProfileRTM => UseRTM. - * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary + * @library /testlibrary /../../test/lib /compiler/testlibrary * @build TestRTMLockingThreshold - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI TestRTMLockingThreshold */ --- old/test/compiler/rtm/locking/TestRTMDeoptOnLowAbortRatio.java 2014-12-09 15:13:10.821781320 +0100 +++ new/test/compiler/rtm/locking/TestRTMDeoptOnLowAbortRatio.java 2014-12-09 15:13:10.465781309 +0100 @@ -26,10 +26,10 @@ * @test * @bug 8031320 * @summary Verify that on low abort ratio method will be recompiled. - * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary + * @library /testlibrary /../../test/lib /compiler/testlibrary * @build TestRTMDeoptOnLowAbortRatio - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI TestRTMDeoptOnLowAbortRatio */ --- old/test/compiler/rtm/locking/TestUseRTMAfterLockInflation.java 2014-12-09 15:13:10.837781320 +0100 +++ new/test/compiler/rtm/locking/TestUseRTMAfterLockInflation.java 2014-12-09 15:13:10.485781309 +0100 @@ -27,10 +27,10 @@ * @bug 8031320 * @summary Verify that rtm locking is used for stack locks before * inflation and after it used for inflated locks. - * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary + * @library /testlibrary /../../test/lib /compiler/testlibrary * @build TestUseRTMAfterLockInflation - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI TestUseRTMAfterLockInflation */ --- old/test/compiler/rtm/locking/TestUseRTMDeopt.java 2014-12-09 15:13:10.829781320 +0100 +++ new/test/compiler/rtm/locking/TestUseRTMDeopt.java 2014-12-09 15:13:10.485781309 +0100 @@ -27,10 +27,10 @@ * @bug 8031320 * @summary Verify that UseRTMDeopt affects uncommon trap installation in * copmpiled methods with synchronized block. - * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary + * @library /testlibrary /../../test/lib /compiler/testlibrary * @build TestUseRTMDeopt - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI TestUseRTMDeopt */ --- old/test/compiler/rtm/locking/TestRTMSpinLoopCount.java 2014-12-09 15:13:10.845781321 +0100 +++ new/test/compiler/rtm/locking/TestRTMSpinLoopCount.java 2014-12-09 15:13:10.477781309 +0100 @@ -27,10 +27,10 @@ * @bug 8031320 * @summary Verify that RTMSpinLoopCount affects time spent * between locking attempts. - * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary + * @library /testlibrary /../../test/lib /compiler/testlibrary * @build TestRTMSpinLoopCount - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI TestRTMSpinLoopCount */ --- old/test/compiler/rtm/locking/TestUseRTMForInflatedLocks.java 2014-12-09 15:13:12.597781376 +0100 +++ new/test/compiler/rtm/locking/TestUseRTMForInflatedLocks.java 2014-12-09 15:13:12.417781370 +0100 @@ -26,10 +26,10 @@ * @test * @bug 8031320 * @summary Verify that rtm locking is used for inflated locks. - * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary + * @library /testlibrary /../../test/lib /compiler/testlibrary * @build TestUseRTMForInflatedLocks - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI TestUseRTMForInflatedLocks */ --- old/test/compiler/rtm/method_options/TestUseRTMLockElidingOption.java 2014-12-09 15:13:12.645781378 +0100 +++ new/test/compiler/rtm/method_options/TestUseRTMLockElidingOption.java 2014-12-09 15:13:12.373781369 +0100 @@ -28,10 +28,10 @@ * @summary Verify that UseRTMLockEliding option could be applied to * specified method and that such method will not be deoptimized * on high abort ratio. - * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary + * @library /testlibrary /../../test/lib /compiler/testlibrary * @build TestUseRTMLockElidingOption - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI TestUseRTMLockElidingOption */ --- old/test/compiler/rtm/locking/TestUseRTMXendForLockBusy.java 2014-12-09 15:13:12.681781379 +0100 +++ new/test/compiler/rtm/locking/TestUseRTMXendForLockBusy.java 2014-12-09 15:13:12.385781369 +0100 @@ -27,10 +27,10 @@ * @bug 8031320 * @summary Verify that UseRTMXendForLockBusy option affects * method behaviour if lock is busy. - * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary + * @library /testlibrary /../../test/lib /compiler/testlibrary * @build TestUseRTMXendForLockBusy - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI TestUseRTMXendForLockBusy */ --- old/test/compiler/runtime/8010927/Test8010927.java 2014-12-09 15:13:12.765781381 +0100 +++ new/test/compiler/runtime/8010927/Test8010927.java 2014-12-09 15:13:12.445781371 +0100 @@ -25,14 +25,14 @@ * @test * @bug 8010927 * @summary Kitchensink crashed with SIGSEGV, Problematic frame: v ~StubRoutines::checkcast_arraycopy - * @library /testlibrary/whitebox /testlibrary + * @library /../../test/lib /testlibrary * @build Test8010927 - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. -Xmx64m -XX:NewSize=20971520 -XX:MaxNewSize=32m -XX:-UseTLAB -XX:-UseAdaptiveSizePolicy Test8010927 */ -import sun.hotspot.WhiteBox; +import jdk.testlib.WhiteBox; import java.lang.reflect.Field; import sun.misc.Unsafe; --- old/test/compiler/stable/TestStableDouble.java 2014-12-09 15:13:12.793781382 +0100 +++ new/test/compiler/stable/TestStableDouble.java 2014-12-09 15:13:12.465781372 +0100 @@ -26,9 +26,9 @@ /* * @test TestStableDouble * @summary tests on stable fields and arrays - * @library /testlibrary /testlibrary/whitebox - * @build TestStableDouble StableConfiguration sun.hotspot.WhiteBox - * @run main ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission + * @library /testlibrary /../../test/lib + * @build TestStableDouble StableConfiguration jdk.testlib.WhiteBox + * @run main ClassFileInstaller jdk.testlib.WhiteBox jdk.testlib.WhiteBox$WhiteBoxPermission * @run main ClassFileInstaller * java/lang/invoke/StableConfiguration * java/lang/invoke/TestStableDouble --- old/test/compiler/stable/TestStableByte.java 2014-12-09 15:13:12.821781383 +0100 +++ new/test/compiler/stable/TestStableByte.java 2014-12-09 15:13:12.525781374 +0100 @@ -26,9 +26,9 @@ /* * @test TestStableByte * @summary tests on stable fields and arrays - * @library /testlibrary /testlibrary/whitebox - * @build TestStableByte StableConfiguration sun.hotspot.WhiteBox - * @run main ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission + * @library /testlibrary /../../test/lib + * @build TestStableByte StableConfiguration jdk.testlib.WhiteBox + * @run main ClassFileInstaller jdk.testlib.WhiteBox jdk.testlib.WhiteBox$WhiteBoxPermission * @run main ClassFileInstaller * java/lang/invoke/StableConfiguration * java/lang/invoke/TestStableByte --- old/test/compiler/stable/TestStableChar.java 2014-12-09 15:13:12.797781383 +0100 +++ new/test/compiler/stable/TestStableChar.java 2014-12-09 15:13:12.417781370 +0100 @@ -26,9 +26,9 @@ /* * @test TestStableChar * @summary tests on stable fields and arrays - * @library /testlibrary /testlibrary/whitebox - * @build TestStableChar StableConfiguration sun.hotspot.WhiteBox - * @run main ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission + * @library /testlibrary /../../test/lib + * @build TestStableChar StableConfiguration jdk.testlib.WhiteBox + * @run main ClassFileInstaller jdk.testlib.WhiteBox jdk.testlib.WhiteBox$WhiteBoxPermission * @run main ClassFileInstaller * java/lang/invoke/StableConfiguration * java/lang/invoke/TestStableChar --- old/test/compiler/rtm/method_options/TestNoRTMLockElidingOption.java 2014-12-09 15:13:12.805781383 +0100 +++ new/test/compiler/rtm/method_options/TestNoRTMLockElidingOption.java 2014-12-09 15:13:12.501781373 +0100 @@ -27,10 +27,10 @@ * @bug 8031320 * @summary Verify that NoRTMLockEliding option could be applied to * specified method and that such method will not use rtm. - * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary + * @library /testlibrary /../../test/lib /compiler/testlibrary * @build TestNoRTMLockElidingOption - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI TestNoRTMLockElidingOption */ --- old/test/compiler/rtm/print/TestPrintPreciseRTMLockingStatistics.java 2014-12-09 15:13:12.801781383 +0100 +++ new/test/compiler/rtm/print/TestPrintPreciseRTMLockingStatistics.java 2014-12-09 15:13:12.405781370 +0100 @@ -29,10 +29,10 @@ * on overall aborts and locks count and count of aborts of * different types. Test also verify that VM output does not * contain rtm locking statistics when it should not. - * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary + * @library /testlibrary /../../test/lib /compiler/testlibrary * @build TestPrintPreciseRTMLockingStatistics - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI TestPrintPreciseRTMLockingStatistics */ --- old/test/compiler/stable/StableConfiguration.java 2014-12-09 15:13:12.817781383 +0100 +++ new/test/compiler/stable/StableConfiguration.java 2014-12-09 15:13:12.433781371 +0100 @@ -26,7 +26,7 @@ import java.lang.reflect.Method; import java.util.Properties; -import sun.hotspot.WhiteBox; +import jdk.testlib.WhiteBox; public class StableConfiguration { static final WhiteBox WB = WhiteBox.getWhiteBox(); --- old/test/compiler/rtm/locking/TestUseRTMForStackLocks.java 2014-12-09 15:13:12.849781384 +0100 +++ new/test/compiler/rtm/locking/TestUseRTMForStackLocks.java 2014-12-09 15:13:12.533781374 +0100 @@ -26,10 +26,10 @@ * @test * @bug 8031320 * @summary Verify that rtm locking is used for stack locks. - * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary + * @library /testlibrary /../../test/lib /compiler/testlibrary * @build TestUseRTMForStackLocks - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI TestUseRTMForStackLocks */ --- old/test/compiler/stable/TestStableBoolean.java 2014-12-09 15:13:12.853781384 +0100 +++ new/test/compiler/stable/TestStableBoolean.java 2014-12-09 15:13:12.569781375 +0100 @@ -26,9 +26,9 @@ /* * @test TestStableBoolean * @summary tests on stable fields and arrays - * @library /testlibrary /testlibrary/whitebox - * @build TestStableBoolean StableConfiguration sun.hotspot.WhiteBox - * @run main ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission + * @library /testlibrary /../../test/lib + * @build TestStableBoolean StableConfiguration jdk.testlib.WhiteBox + * @run main ClassFileInstaller jdk.testlib.WhiteBox jdk.testlib.WhiteBox$WhiteBoxPermission * @run main ClassFileInstaller * java/lang/invoke/StableConfiguration * java/lang/invoke/TestStableBoolean --- old/test/compiler/stable/TestStableFloat.java 2014-12-09 15:13:13.105781392 +0100 +++ new/test/compiler/stable/TestStableFloat.java 2014-12-09 15:13:13.033781390 +0100 @@ -26,9 +26,9 @@ /* * @test TestStableFloat * @summary tests on stable fields and arrays - * @library /testlibrary /testlibrary/whitebox - * @build TestStableFloat StableConfiguration sun.hotspot.WhiteBox - * @run main ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission + * @library /testlibrary /../../test/lib + * @build TestStableFloat StableConfiguration jdk.testlib.WhiteBox + * @run main ClassFileInstaller jdk.testlib.WhiteBox jdk.testlib.WhiteBox$WhiteBoxPermission * @run main ClassFileInstaller * java/lang/invoke/StableConfiguration * java/lang/invoke/TestStableFloat --- old/test/compiler/stable/TestStableInt.java 2014-12-09 15:13:13.773781413 +0100 +++ new/test/compiler/stable/TestStableInt.java 2014-12-09 15:13:13.569781407 +0100 @@ -26,9 +26,9 @@ /* * @test TestStableInt * @summary tests on stable fields and arrays - * @library /testlibrary /testlibrary/whitebox - * @build TestStableInt StableConfiguration sun.hotspot.WhiteBox - * @run main ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission + * @library /testlibrary /../../test/lib + * @build TestStableInt StableConfiguration jdk.testlib.WhiteBox + * @run main ClassFileInstaller jdk.testlib.WhiteBox jdk.testlib.WhiteBox$WhiteBoxPermission * @run main ClassFileInstaller * java/lang/invoke/StableConfiguration * java/lang/invoke/TestStableInt --- old/test/compiler/whitebox/AllocationCodeBlobTest.java 2014-12-09 15:13:13.869781417 +0100 +++ new/test/compiler/whitebox/AllocationCodeBlobTest.java 2014-12-09 15:13:13.665781410 +0100 @@ -26,18 +26,18 @@ import java.util.EnumSet; import java.util.ArrayList; -import sun.hotspot.WhiteBox; -import sun.hotspot.code.BlobType; +import jdk.testlib.WhiteBox; +import jdk.testlib.code.BlobType; import com.oracle.java.testlibrary.Asserts; import com.oracle.java.testlibrary.InfiniteLoop; /* * @test AllocationCodeBlobTest * @bug 8059624 8064669 - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build AllocationCodeBlobTest - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI -XX:CompileCommand=compileonly,null::* * -XX:-SegmentedCodeCache AllocationCodeBlobTest --- old/test/compiler/uncommontrap/8009761/Test8009761.java 2014-12-09 15:13:13.821781415 +0100 +++ new/test/compiler/uncommontrap/8009761/Test8009761.java 2014-12-09 15:13:13.577781407 +0100 @@ -21,17 +21,17 @@ * questions. */ -import sun.hotspot.WhiteBox; +import jdk.testlib.WhiteBox; import java.lang.reflect.Method; /* * @test * @bug 8009761 - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @summary Deoptimization on sparc doesn't set Llast_SP correctly in the interpreter frames it creates * @build Test8009761 - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:CompileCommand=exclude,Test8009761::m2 -XX:-UseOnStackReplacement -XX:-BackgroundCompilation -Xss256K Test8009761 */ public class Test8009761 { --- old/test/compiler/stable/TestStableLong.java 2014-12-09 15:13:13.957781419 +0100 +++ new/test/compiler/stable/TestStableLong.java 2014-12-09 15:13:13.569781407 +0100 @@ -26,9 +26,9 @@ /* * @test TestStableLong * @summary tests on stable fields and arrays - * @library /testlibrary /testlibrary/whitebox - * @build TestStableLong StableConfiguration sun.hotspot.WhiteBox - * @run main ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission + * @library /testlibrary /../../test/lib + * @build TestStableLong StableConfiguration jdk.testlib.WhiteBox + * @run main ClassFileInstaller jdk.testlib.WhiteBox jdk.testlib.WhiteBox$WhiteBoxPermission * @run main ClassFileInstaller * java/lang/invoke/StableConfiguration * java/lang/invoke/TestStableLong --- old/test/compiler/stable/TestStableShort.java 2014-12-09 15:13:13.913781418 +0100 +++ new/test/compiler/stable/TestStableShort.java 2014-12-09 15:13:13.549781406 +0100 @@ -26,9 +26,9 @@ /* * @test TestStableShort * @summary tests on stable fields and arrays - * @library /testlibrary /testlibrary/whitebox - * @build TestStableShort StableConfiguration sun.hotspot.WhiteBox - * @run main ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission + * @library /testlibrary /../../test/lib + * @build TestStableShort StableConfiguration jdk.testlib.WhiteBox + * @run main ClassFileInstaller jdk.testlib.WhiteBox jdk.testlib.WhiteBox$WhiteBoxPermission * @run main ClassFileInstaller * java/lang/invoke/StableConfiguration * java/lang/invoke/TestStableShort --- old/test/compiler/types/correctness/OffTest.java 2014-12-09 15:13:13.933781419 +0100 +++ new/test/compiler/types/correctness/OffTest.java 2014-12-09 15:13:13.549781406 +0100 @@ -24,14 +24,14 @@ /* * @test CorrectnessTest * @bug 8038418 - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @ignore 8066173 * @compile execution/TypeConflict.java execution/TypeProfile.java * execution/MethodHandleDelegate.java * @build CorrectnessTest * @build OffTest - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/timeout=1200 OffTest */ --- old/test/compiler/tiered/NonTieredLevelsTest.java 2014-12-09 15:13:13.969781420 +0100 +++ new/test/compiler/tiered/NonTieredLevelsTest.java 2014-12-09 15:13:13.589781408 +0100 @@ -25,10 +25,10 @@ /** * @test NonTieredLevelsTest - * @library /testlibrary /testlibrary/whitebox /compiler/whitebox + * @library /testlibrary /../../test/lib /compiler/whitebox * @build NonTieredLevelsTest - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:-TieredCompilation * -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI * -XX:CompileCommand=compileonly,SimpleTestCase$Helper::* --- old/test/compiler/testlibrary/sha/predicate/IntrinsicPredicates.java 2014-12-09 15:13:14.009781421 +0100 +++ new/test/compiler/testlibrary/sha/predicate/IntrinsicPredicates.java 2014-12-09 15:13:13.793781414 +0100 @@ -27,7 +27,7 @@ import com.oracle.java.testlibrary.cli.predicate.AndPredicate; import com.oracle.java.testlibrary.cli.predicate.CPUSpecificPredicate; import com.oracle.java.testlibrary.cli.predicate.OrPredicate; -import sun.hotspot.WhiteBox; +import jdk.testlib.WhiteBox; import java.util.function.BooleanSupplier; --- old/test/compiler/tiered/TieredLevelsTest.java 2014-12-09 15:13:14.021781421 +0100 +++ new/test/compiler/tiered/TieredLevelsTest.java 2014-12-09 15:13:13.601781408 +0100 @@ -23,10 +23,10 @@ /** * @test TieredLevelsTest - * @library /testlibrary /testlibrary/whitebox /compiler/whitebox + * @library /testlibrary /../../test/lib /compiler/whitebox * @build TieredLevelsTest - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+TieredCompilation * -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI * -XX:CompileCommand=compileonly,SimpleTestCase$Helper::* --- old/test/compiler/stable/TestStableObject.java 2014-12-09 15:13:14.013781421 +0100 +++ new/test/compiler/stable/TestStableObject.java 2014-12-09 15:13:13.609781408 +0100 @@ -26,9 +26,9 @@ /* * @test TestStableObject * @summary tests on stable fields and arrays - * @library /testlibrary /testlibrary/whitebox - * @build TestStableObject StableConfiguration sun.hotspot.WhiteBox - * @run main ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission + * @library /testlibrary /../../test/lib + * @build TestStableObject StableConfiguration jdk.testlib.WhiteBox + * @run main ClassFileInstaller jdk.testlib.WhiteBox jdk.testlib.WhiteBox$WhiteBoxPermission * @run main ClassFileInstaller * java/lang/invoke/StableConfiguration * java/lang/invoke/TestStableObject --- old/test/compiler/types/correctness/CorrectnessTest.java 2014-12-09 15:13:14.053781422 +0100 +++ new/test/compiler/types/correctness/CorrectnessTest.java 2014-12-09 15:13:13.725781412 +0100 @@ -24,13 +24,13 @@ /* * @test CorrectnessTest * @bug 8038418 - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @ignore 8066173 * @compile execution/TypeConflict.java execution/TypeProfile.java * execution/MethodHandleDelegate.java * @build CorrectnessTest - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockExperimentalVMOptions * -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI * -XX:TypeProfileLevel=222 -XX:+UseTypeSpeculation @@ -60,7 +60,7 @@ import execution.TypeProfile; import hierarchies.*; import scenarios.*; -import sun.hotspot.WhiteBox; +import jdk.testlib.WhiteBox; import java.lang.reflect.Constructor; import java.lang.reflect.Method; --- old/test/compiler/testlibrary/rtm/predicate/SupportedCPU.java 2014-12-09 15:13:14.069781423 +0100 +++ new/test/compiler/testlibrary/rtm/predicate/SupportedCPU.java 2014-12-09 15:13:13.753781413 +0100 @@ -24,7 +24,7 @@ package rtm.predicate; -import sun.hotspot.cpuinfo.CPUInfo; +import jdk.testlib.cpuinfo.CPUInfo; import java.util.function.BooleanSupplier; --- old/test/compiler/whitebox/ClearMethodStateTest.java 2014-12-09 15:13:14.273781429 +0100 +++ new/test/compiler/whitebox/ClearMethodStateTest.java 2014-12-09 15:13:14.201781427 +0100 @@ -26,10 +26,10 @@ /* * @test ClearMethodStateTest * @bug 8006683 8007288 8022832 - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build ClearMethodStateTest - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -Xmixed -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:CompileCommand=compileonly,SimpleTestCase$Helper::* ClearMethodStateTest * @summary testing of WB::clearMethodState() * @author igor.ignatyev@oracle.com --- old/test/compiler/whitebox/DeoptimizeMethodTest.java 2014-12-09 15:13:16.041781485 +0100 +++ new/test/compiler/whitebox/DeoptimizeMethodTest.java 2014-12-09 15:13:15.725781475 +0100 @@ -24,10 +24,10 @@ /* * @test DeoptimizeMethodTest * @bug 8006683 8007288 8022832 - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build DeoptimizeMethodTest - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:CompileCommand=compileonly,SimpleTestCase$Helper::* DeoptimizeMethodTest * @summary testing of WB::deoptimizeMethod() * @author igor.ignatyev@oracle.com --- old/test/compiler/whitebox/IsMethodCompilableTest.java 2014-12-09 15:13:16.045781486 +0100 +++ new/test/compiler/whitebox/IsMethodCompilableTest.java 2014-12-09 15:13:15.733781476 +0100 @@ -24,10 +24,10 @@ /* * @test IsMethodCompilableTest * @bug 8007270 8006683 8007288 8022832 - * @library /testlibrary /testlibrary/whitebox /testlibrary/com/oracle/java/testlibrary + * @library /testlibrary /../../test/lib /testlibrary/com/oracle/java/testlibrary * @build IsMethodCompilableTest - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main ClassFileInstaller com.oracle.java.testlibrary.Platform * @run main/othervm/timeout=2400 -Xbootclasspath/a:. -Xmixed -XX:-TieredCompilation -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:PerMethodRecompilationCutoff=3 -XX:CompileCommand=compileonly,SimpleTestCase$Helper::* IsMethodCompilableTest * @summary testing of WB::isMethodCompilable() --- old/test/compiler/whitebox/DeoptimizeMultipleOSRTest.java 2014-12-09 15:13:16.065781486 +0100 +++ new/test/compiler/whitebox/DeoptimizeMultipleOSRTest.java 2014-12-09 15:13:15.733781476 +0100 @@ -21,17 +21,17 @@ * questions. */ -import sun.hotspot.WhiteBox; +import jdk.testlib.WhiteBox; import java.lang.reflect.Executable; import java.lang.reflect.Method; /* * @test DeoptimizeMultipleOSRTest * @bug 8061817 - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build DeoptimizeMultipleOSRTest - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:CompileCommand=compileonly,DeoptimizeMultipleOSRTest::triggerOSR DeoptimizeMultipleOSRTest * @summary testing of WB::deoptimizeMethod() */ --- old/test/compiler/whitebox/ForceNMethodSweepTest.java 2014-12-09 15:13:16.085781487 +0100 +++ new/test/compiler/whitebox/ForceNMethodSweepTest.java 2014-12-09 15:13:15.741781476 +0100 @@ -25,8 +25,8 @@ import java.lang.reflect.Method; import java.util.EnumSet; -import sun.hotspot.WhiteBox; -import sun.hotspot.code.BlobType; +import jdk.testlib.WhiteBox; +import jdk.testlib.code.BlobType; import com.oracle.java.testlibrary.Asserts; import com.oracle.java.testlibrary.InfiniteLoop; @@ -34,10 +34,10 @@ /* * @test * @bug 8059624 8064669 - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build ForceNMethodSweepTest - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:-TieredCompilation -XX:+WhiteBoxAPI * -XX:CompileCommand=compileonly,SimpleTestCase$Helper::* --- old/test/compiler/whitebox/SetDontInlineMethodTest.java 2014-12-09 15:13:16.093781487 +0100 +++ new/test/compiler/whitebox/SetDontInlineMethodTest.java 2014-12-09 15:13:15.745781476 +0100 @@ -24,10 +24,10 @@ /* * @test SetDontInlineMethodTest * @bug 8006683 8007288 8022832 - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build SetDontInlineMethodTest - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:CompileCommand=compileonly,SimpleTestCase$Helper::* SetDontInlineMethodTest * @summary testing of WB::testSetDontInlineMethod() * @author igor.ignatyev@oracle.com --- old/test/compiler/whitebox/GetNMethodTest.java 2014-12-09 15:13:16.129781488 +0100 +++ new/test/compiler/whitebox/GetNMethodTest.java 2014-12-09 15:13:15.753781476 +0100 @@ -22,17 +22,17 @@ * */ -import sun.hotspot.code.BlobType; -import sun.hotspot.code.NMethod; +import jdk.testlib.code.BlobType; +import jdk.testlib.code.NMethod; import com.oracle.java.testlibrary.Asserts; /* * @test GetNMethodTest * @bug 8038240 - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build GetNMethodTest - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -Xmixed -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:CompileCommand=compileonly,SimpleTestCase$Helper::* GetNMethodTest * @summary testing of WB::getNMethod() * @author igor.ignatyev@oracle.com --- old/test/compiler/whitebox/EnqueueMethodForCompilationTest.java 2014-12-09 15:13:16.117781488 +0100 +++ new/test/compiler/whitebox/EnqueueMethodForCompilationTest.java 2014-12-09 15:13:15.757781476 +0100 @@ -24,10 +24,10 @@ /* * @test EnqueueMethodForCompilationTest * @bug 8006683 8007288 8022832 - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build EnqueueMethodForCompilationTest - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm/timeout=600 -Xbootclasspath/a:. -Xmixed -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:CompileCommand=compileonly,SimpleTestCase$Helper::* EnqueueMethodForCompilationTest * @summary testing of WB::enqueueMethodForCompilation() * @author igor.ignatyev@oracle.com --- old/test/compiler/whitebox/GetCodeHeapEntriesTest.java 2014-12-09 15:13:16.121781488 +0100 +++ new/test/compiler/whitebox/GetCodeHeapEntriesTest.java 2014-12-09 15:13:15.781781477 +0100 @@ -25,18 +25,18 @@ import java.util.Arrays; import java.util.EnumSet; -import sun.hotspot.WhiteBox; -import sun.hotspot.code.CodeBlob; -import sun.hotspot.code.BlobType; +import jdk.testlib.WhiteBox; +import jdk.testlib.code.CodeBlob; +import jdk.testlib.code.BlobType; import com.oracle.java.testlibrary.Asserts; /* * @test GetCodeHeapEntriesTest * @bug 8059624 - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build GetCodeHeapEntriesTest - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI -XX:-SegmentedCodeCache * GetCodeHeapEntriesTest --- old/test/compiler/whitebox/LockCompilationTest.java 2014-12-09 15:13:16.081781487 +0100 +++ new/test/compiler/whitebox/LockCompilationTest.java 2014-12-09 15:13:15.729781476 +0100 @@ -24,10 +24,10 @@ /* * @test LockCompilationTest * @bug 8059624 - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build LockCompilationTest - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm/timeout=600 -Xbootclasspath/a:. -Xmixed -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:CompileCommand=compileonly,SimpleTestCase$Helper::* LockCompilationTest * @summary testing of WB::lock/unlockCompilation() */ --- old/test/compiler/whitebox/MakeMethodNotCompilableTest.java 2014-12-09 15:13:16.149781489 +0100 +++ new/test/compiler/whitebox/MakeMethodNotCompilableTest.java 2014-12-09 15:13:15.733781476 +0100 @@ -24,10 +24,10 @@ /* * @test MakeMethodNotCompilableTest * @bug 8012322 8006683 8007288 8022832 - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build MakeMethodNotCompilableTest - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm/timeout=2400 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:CompileCommand=compileonly,SimpleTestCase$Helper::* MakeMethodNotCompilableTest * @summary testing of WB::makeMethodNotCompilable() * @author igor.ignatyev@oracle.com --- old/test/compiler/whitebox/CompilerWhiteBoxTest.java 2014-12-09 15:13:16.157781489 +0100 +++ new/test/compiler/whitebox/CompilerWhiteBoxTest.java 2014-12-09 15:13:15.821781478 +0100 @@ -21,8 +21,8 @@ * questions. */ -import sun.hotspot.WhiteBox; -import sun.hotspot.code.NMethod; +import jdk.testlib.WhiteBox; +import jdk.testlib.code.NMethod; import java.lang.reflect.Constructor; import java.lang.reflect.Executable; --- old/test/compiler/whitebox/DeoptimizeAllTest.java 2014-12-09 15:13:16.145781489 +0100 +++ new/test/compiler/whitebox/DeoptimizeAllTest.java 2014-12-09 15:13:15.753781476 +0100 @@ -24,10 +24,10 @@ /* * @test DeoptimizeAllTest * @bug 8006683 8007288 8022832 - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build DeoptimizeAllTest - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:CompileCommand=compileonly,SimpleTestCase$Helper::* DeoptimizeAllTest * @summary testing of WB::deoptimizeAll() * @author igor.ignatyev@oracle.com --- old/test/compiler/whitebox/SetForceInlineMethodTest.java 2014-12-09 15:13:16.417781497 +0100 +++ new/test/compiler/whitebox/SetForceInlineMethodTest.java 2014-12-09 15:13:16.341781495 +0100 @@ -24,10 +24,10 @@ /* * @test SetForceInlineMethodTest * @bug 8006683 8007288 8022832 - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build SetForceInlineMethodTest - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:CompileCommand=compileonly,SimpleTestCase$Helper::* SetForceInlineMethodTest * @summary testing of WB::testSetForceInlineMethod() * @author igor.ignatyev@oracle.com --- old/test/gc/class_unloading/TestCMSClassUnloadingEnabledHWM.java 2014-12-09 15:13:18.057781549 +0100 +++ new/test/gc/class_unloading/TestCMSClassUnloadingEnabledHWM.java 2014-12-09 15:13:17.909781545 +0100 @@ -25,10 +25,10 @@ * @test * @key gc * @bug 8049831 - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build TestCMSClassUnloadingEnabledHWM - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run driver TestCMSClassUnloadingEnabledHWM * @summary Test that -XX:-CMSClassUnloadingEnabled will trigger a Full GC when more than MetaspaceSize metadata is allocated. */ @@ -39,7 +39,7 @@ import java.lang.management.ManagementFactory; import java.util.ArrayList; import java.util.Arrays; -import sun.hotspot.WhiteBox; +import jdk.testlib.WhiteBox; public class TestCMSClassUnloadingEnabledHWM { private static long MetaspaceSize = 32 * 1024 * 1024; --- old/test/gc/arguments/TestG1HeapSizeFlags.java 2014-12-09 15:13:18.125781552 +0100 +++ new/test/gc/arguments/TestG1HeapSizeFlags.java 2014-12-09 15:13:17.853781543 +0100 @@ -26,10 +26,10 @@ * @key gc * @bug 8006088 * @summary Tests argument processing for initial and maximum heap size for the G1 collector - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build TestG1HeapSizeFlags TestMaxHeapSizeTools - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm TestG1HeapSizeFlags * @author thomas.schatzl@oracle.com */ --- old/test/gc/arguments/TestSerialHeapSizeFlags.java 2014-12-09 15:13:18.177781553 +0100 +++ new/test/gc/arguments/TestSerialHeapSizeFlags.java 2014-12-09 15:13:17.881781544 +0100 @@ -26,10 +26,10 @@ * @key gc * @bug 8006088 * @summary Tests argument processing for initial and maximum heap size for the Serial collector - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build TestSerialHeapSizeFlags TestMaxHeapSizeTools - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm TestSerialHeapSizeFlags * @author thomas.schatzl@oracle.com */ --- old/test/gc/arguments/TestParallelHeapSizeFlags.java 2014-12-09 15:13:18.245781555 +0100 +++ new/test/gc/arguments/TestParallelHeapSizeFlags.java 2014-12-09 15:13:17.937781546 +0100 @@ -27,10 +27,10 @@ * @bug 8006088 * @summary Tests argument processing for initial and maximum heap size for the * parallel collectors. - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build TestParallelHeapSizeFlags TestMaxHeapSizeTools - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm TestParallelHeapSizeFlags * @author thomas.schatzl@oracle.com */ --- old/test/gc/class_unloading/TestG1ClassUnloadingHWM.java 2014-12-09 15:13:18.237781555 +0100 +++ new/test/gc/class_unloading/TestG1ClassUnloadingHWM.java 2014-12-09 15:13:17.885781544 +0100 @@ -25,10 +25,10 @@ * @test * @key gc * @bug 8049831 - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build TestG1ClassUnloadingHWM - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run driver TestG1ClassUnloadingHWM * @summary Test that -XX:-ClassUnloadingWithConcurrentMark will trigger a Full GC when more than MetaspaceSize metadata is allocated. */ @@ -37,7 +37,7 @@ import com.oracle.java.testlibrary.ProcessTools; import java.util.ArrayList; import java.util.Arrays; -import sun.hotspot.WhiteBox; +import jdk.testlib.WhiteBox; public class TestG1ClassUnloadingHWM { private static long MetaspaceSize = 32 * 1024 * 1024; --- old/test/gc/g1/TestShrinkAuxiliaryData00.java 2014-12-09 15:13:18.277781556 +0100 +++ new/test/gc/g1/TestShrinkAuxiliaryData00.java 2014-12-09 15:13:17.961781546 +0100 @@ -26,7 +26,7 @@ * @bug 8038423 * @summary Checks that decommitment occurs for JVM with different * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build TestShrinkAuxiliaryData TestShrinkAuxiliaryData00 * @run driver/timeout=720 TestShrinkAuxiliaryData00 */ --- old/test/gc/arguments/TestCMSHeapSizeFlags.java 2014-12-09 15:13:18.277781556 +0100 +++ new/test/gc/arguments/TestCMSHeapSizeFlags.java 2014-12-09 15:13:17.941781546 +0100 @@ -26,10 +26,10 @@ * @key gc * @bug 8006088 * @summary Tests argument processing for initial and maximum heap size for the CMS collector - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build TestCMSHeapSizeFlags TestMaxHeapSizeTools - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm TestCMSHeapSizeFlags * @author thomas.schatzl@oracle.com */ --- old/test/gc/arguments/TestMaxHeapSizeTools.java 2014-12-09 15:13:18.301781557 +0100 +++ new/test/gc/arguments/TestMaxHeapSizeTools.java 2014-12-09 15:13:18.017781548 +0100 @@ -27,7 +27,7 @@ import java.util.Arrays; import com.oracle.java.testlibrary.*; -import sun.hotspot.WhiteBox; +import jdk.testlib.WhiteBox; class ErgoArgsPrinter { public static void main(String[] args) throws Exception { --- old/test/gc/arguments/TestMinInitialErgonomics.java 2014-12-09 15:13:18.297781557 +0100 +++ new/test/gc/arguments/TestMinInitialErgonomics.java 2014-12-09 15:13:17.921781545 +0100 @@ -26,10 +26,10 @@ * @key gc * @bug 8006088 * @summary Test ergonomics decisions related to minimum and initial heap size. - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build TestMinInitialErgonomics TestMaxHeapSizeTools - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm TestMinInitialErgonomics * @author thomas.schatzl@oracle.com */ --- old/test/gc/g1/TestHumongousCodeCacheRoots.java 2014-12-09 15:13:18.305781557 +0100 +++ new/test/gc/g1/TestHumongousCodeCacheRoots.java 2014-12-09 15:13:18.053781549 +0100 @@ -26,16 +26,16 @@ * @key regression * @key gc * @bug 8027756 - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build TestHumongousCodeCacheRoots - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @summary Humongous objects may have references from the code cache * @run main TestHumongousCodeCacheRoots */ import com.oracle.java.testlibrary.*; -import sun.hotspot.WhiteBox; +import jdk.testlib.WhiteBox; import java.util.ArrayList; import java.util.Arrays; --- old/test/gc/arguments/TestUseCompressedOopsErgo.java 2014-12-09 15:13:18.325781558 +0100 +++ new/test/gc/arguments/TestUseCompressedOopsErgo.java 2014-12-09 15:13:18.001781548 +0100 @@ -26,10 +26,10 @@ * @key gc * @bug 8010722 * @summary Tests ergonomics for UseCompressedOops. - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build TestUseCompressedOopsErgo TestUseCompressedOopsErgoTools - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm TestUseCompressedOopsErgo -XX:+UseG1GC * @run main/othervm TestUseCompressedOopsErgo -XX:+UseParallelGC * @run main/othervm TestUseCompressedOopsErgo -XX:+UseParallelGC -XX:-UseParallelOldGC --- old/test/gc/arguments/TestUseCompressedOopsErgoTools.java 2014-12-09 15:13:18.333781558 +0100 +++ new/test/gc/arguments/TestUseCompressedOopsErgoTools.java 2014-12-09 15:13:17.961781546 +0100 @@ -31,7 +31,7 @@ import java.util.Arrays; import com.oracle.java.testlibrary.*; -import sun.hotspot.WhiteBox; +import jdk.testlib.WhiteBox; class DetermineMaxHeapForCompressedOops { public static void main(String[] args) throws Exception { --- old/test/gc/g1/TestShrinkAuxiliaryData05.java 2014-12-09 15:13:18.589781566 +0100 +++ new/test/gc/g1/TestShrinkAuxiliaryData05.java 2014-12-09 15:13:18.513781564 +0100 @@ -27,7 +27,7 @@ * @summary Checks that decommitment occurs for JVM with different * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values * @requires vm.gc=="G1" | vm.gc=="null" - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build TestShrinkAuxiliaryData TestShrinkAuxiliaryData05 * @run driver/timeout=720 TestShrinkAuxiliaryData05 */ --- old/test/gc/survivorAlignment/TestPromotionFromEdenToTenured.java 2014-12-09 15:13:20.317781621 +0100 +++ new/test/gc/survivorAlignment/TestPromotionFromEdenToTenured.java 2014-12-09 15:13:20.057781613 +0100 @@ -26,11 +26,11 @@ * @bug 8031323 * @summary Verify that objects promoted from eden space to tenured space during * full GC are not aligned to SurvivorAlignmentInBytes value. - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build TestPromotionFromEdenToTenured SurvivorAlignmentTestMain * AlignmentHelper - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI -XX:NewSize=64m -XX:MaxNewSize=64m * -XX:OldSize=32m -XX:SurvivorRatio=1 --- old/test/gc/metaspace/TestCapacityUntilGCWrapAround.java 2014-12-09 15:13:20.305781621 +0100 +++ new/test/gc/metaspace/TestCapacityUntilGCWrapAround.java 2014-12-09 15:13:20.081781614 +0100 @@ -25,14 +25,14 @@ * @test * @key gc * @bug 8049831 - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build TestCapacityUntilGCWrapAround - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI TestCapacityUntilGCWrapAround */ -import sun.hotspot.WhiteBox; +import jdk.testlib.WhiteBox; import com.oracle.java.testlibrary.Asserts; import com.oracle.java.testlibrary.Platform; --- old/test/gc/g1/TestShrinkAuxiliaryData10.java 2014-12-09 15:13:20.337781622 +0100 +++ new/test/gc/g1/TestShrinkAuxiliaryData10.java 2014-12-09 15:13:20.041781612 +0100 @@ -27,7 +27,7 @@ * @summary Checks that decommitment occurs for JVM with different * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values * @requires vm.gc=="G1" | vm.gc=="null" - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build TestShrinkAuxiliaryData TestShrinkAuxiliaryData10 * @run driver/timeout=720 TestShrinkAuxiliaryData10 */ --- old/test/gc/g1/TestShrinkAuxiliaryData30.java 2014-12-09 15:13:20.397781624 +0100 +++ new/test/gc/g1/TestShrinkAuxiliaryData30.java 2014-12-09 15:13:20.045781612 +0100 @@ -27,7 +27,7 @@ * @summary Checks that decommitment occurs for JVM with different * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values * @requires vm.gc=="G1" | vm.gc=="null" - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build TestShrinkAuxiliaryData TestShrinkAuxiliaryData30 * @run driver/timeout=720 TestShrinkAuxiliaryData30 */ --- old/test/gc/survivorAlignment/TestPromotionFromSurvivorToTenuredAfterMinorGC.java 2014-12-09 15:13:20.409781624 +0100 +++ new/test/gc/survivorAlignment/TestPromotionFromSurvivorToTenuredAfterMinorGC.java 2014-12-09 15:13:20.097781614 +0100 @@ -27,11 +27,11 @@ * @summary Verify that objects promoted from survivor space to tenured space * when their age exceeded tenuring threshold are not aligned to * SurvivorAlignmentInBytes value. - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build TestPromotionFromSurvivorToTenuredAfterMinorGC * SurvivorAlignmentTestMain AlignmentHelper - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI -XX:NewSize=128m -XX:MaxNewSize=128m * -XX:OldSize=32M -XX:SurvivorRatio=1 --- old/test/gc/survivorAlignment/TestAllocationInEden.java 2014-12-09 15:13:20.421781624 +0100 +++ new/test/gc/survivorAlignment/TestAllocationInEden.java 2014-12-09 15:13:20.085781614 +0100 @@ -26,10 +26,10 @@ * @bug 8031323 * @summary Verify that object's alignment in eden space is not affected by * SurvivorAlignmentInBytes option. - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build TestAllocationInEden SurvivorAlignmentTestMain AlignmentHelper - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI -XX:NewSize=64m -XX:MaxNewSize=64m * -XX:SurvivorRatio=1 -XX:+UnlockExperimentalVMOptions --- old/test/gc/survivorAlignment/AlignmentHelper.java 2014-12-09 15:13:20.437781625 +0100 +++ new/test/gc/survivorAlignment/AlignmentHelper.java 2014-12-09 15:13:20.141781615 +0100 @@ -24,7 +24,7 @@ import java.lang.management.MemoryPoolMXBean; import java.util.Optional; -import sun.hotspot.WhiteBox; +import jdk.testlib.WhiteBox; /** * Helper class aimed to provide information about alignment of objects in --- old/test/gc/g1/TestShrinkAuxiliaryData25.java 2014-12-09 15:13:20.461781626 +0100 +++ new/test/gc/g1/TestShrinkAuxiliaryData25.java 2014-12-09 15:13:20.085781614 +0100 @@ -27,7 +27,7 @@ * @summary Checks that decommitment occurs for JVM with different * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values * @requires vm.gc=="G1" | vm.gc=="null" - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build TestShrinkAuxiliaryData TestShrinkAuxiliaryData25 * @run driver/timeout=720 TestShrinkAuxiliaryData25 */ --- old/test/gc/g1/TestShrinkAuxiliaryData15.java 2014-12-09 15:13:20.473781626 +0100 +++ new/test/gc/g1/TestShrinkAuxiliaryData15.java 2014-12-09 15:13:20.157781616 +0100 @@ -27,7 +27,7 @@ * @summary Checks that decommitment occurs for JVM with different * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values * @requires vm.gc=="G1" | vm.gc=="null" - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build TestShrinkAuxiliaryData TestShrinkAuxiliaryData15 * @run driver/timeout=720 TestShrinkAuxiliaryData15 */ --- old/test/gc/survivorAlignment/SurvivorAlignmentTestMain.java 2014-12-09 15:13:20.469781626 +0100 +++ new/test/gc/survivorAlignment/SurvivorAlignmentTestMain.java 2014-12-09 15:13:20.097781614 +0100 @@ -30,7 +30,7 @@ import com.oracle.java.testlibrary.Asserts; import com.sun.management.ThreadMXBean; -import sun.hotspot.WhiteBox; +import jdk.testlib.WhiteBox; import sun.misc.Unsafe; /** --- old/test/gc/g1/TestShrinkAuxiliaryData20.java 2014-12-09 15:13:20.481781626 +0100 +++ new/test/gc/g1/TestShrinkAuxiliaryData20.java 2014-12-09 15:13:20.217781618 +0100 @@ -27,7 +27,7 @@ * @summary Checks that decommitment occurs for JVM with different * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values * @requires vm.gc=="G1" | vm.gc=="null" - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build TestShrinkAuxiliaryData TestShrinkAuxiliaryData20 * @run driver/timeout=720 TestShrinkAuxiliaryData20 */ --- old/test/gc/survivorAlignment/TestPromotionFromSurvivorToTenuredAfterFullGC.java 2014-12-09 15:13:20.493781627 +0100 +++ new/test/gc/survivorAlignment/TestPromotionFromSurvivorToTenuredAfterFullGC.java 2014-12-09 15:13:20.189781617 +0100 @@ -26,11 +26,11 @@ * @bug 8031323 * @summary Verify that objects promoted from survivor space to tenured space * during full GC are not aligned to SurvivorAlignmentInBytes value. - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build TestPromotionFromSurvivorToTenuredAfterFullGC * SurvivorAlignmentTestMain AlignmentHelper - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI -XX:NewSize=128m -XX:MaxNewSize=128m * -XX:OldSize=32m -XX:SurvivorRatio=1 --- old/test/gc/survivorAlignment/TestPromotionToSurvivor.java 2014-12-09 15:13:20.737781634 +0100 +++ new/test/gc/survivorAlignment/TestPromotionToSurvivor.java 2014-12-09 15:13:20.661781632 +0100 @@ -26,11 +26,11 @@ * @bug 8031323 * @summary Verify that objects promoted from eden space to survivor space after * minor GC are aligned to SurvivorAlignmentInBytes. - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build TestPromotionToSurvivor * SurvivorAlignmentTestMain AlignmentHelper - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI -XX:NewSize=128m -XX:MaxNewSize=128m * -XX:SurvivorRatio=1 -XX:+UnlockExperimentalVMOptions --- old/test/gc/whitebox/TestWBGC.java 2014-12-09 15:13:22.461781689 +0100 +++ new/test/gc/whitebox/TestWBGC.java 2014-12-09 15:13:22.189781680 +0100 @@ -25,13 +25,13 @@ * @test TestWBGC * @bug 8055098 * @summary Test verify that WB methods isObjectInOldGen and youngGC works correctly. - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build TestWBGC - * @run main ClassFileInstaller sun.hotspot.WhiteBox + * @run main ClassFileInstaller jdk.testlib.WhiteBox * @run driver TestWBGC */ import com.oracle.java.testlibrary.*; -import sun.hotspot.WhiteBox; +import jdk.testlib.WhiteBox; public class TestWBGC { --- old/test/gc/whitebox/TestConcMarkCycleWB.java 2014-12-09 15:13:22.537781691 +0100 +++ new/test/gc/whitebox/TestConcMarkCycleWB.java 2014-12-09 15:13:22.185781680 +0100 @@ -25,16 +25,16 @@ * @test TestConMarkCycleWB * @bug 8065579 * @requires vm.gc=="null" | vm.gc=="G1" - * @library /testlibrary /testlibrary/whitebox - * @build ClassFileInstaller com.oracle.java.testlibrary.* sun.hotspot.WhiteBox TestConcMarkCycleWB - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @library /testlibrary /../../test/lib + * @build ClassFileInstaller com.oracle.java.testlibrary.* jdk.testlib.WhiteBox TestConcMarkCycleWB + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:+UseG1GC TestConcMarkCycleWB * @summary Verifies that ConcurrentMarking-related WB works properly */ import static com.oracle.java.testlibrary.Asserts.assertFalse; import static com.oracle.java.testlibrary.Asserts.assertTrue; -import sun.hotspot.WhiteBox; +import jdk.testlib.WhiteBox; public class TestConcMarkCycleWB { --- old/test/runtime/ClassUnload/KeepAliveSoftReference.java 2014-12-09 15:13:22.537781691 +0100 +++ new/test/runtime/ClassUnload/KeepAliveSoftReference.java 2014-12-09 15:13:22.213781681 +0100 @@ -24,17 +24,17 @@ /* * @test KeepAliveSoftReference * @summary This test case uses a java.lang.ref.SoftReference referencing a class instance to keep a class alive. - * @library /testlibrary /testlibrary/whitebox /runtime/testlibrary + * @library /testlibrary /../../test/lib /runtime/testlibrary * @library classes * @build KeepAliveSoftReference test.Empty * @build ClassUnloadCommon - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -Xmn8m -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI KeepAliveSoftReference */ import java.lang.ref.SoftReference; -import sun.hotspot.WhiteBox; +import jdk.testlib.WhiteBox; /** * Test that verifies that classes are not unloaded when specific types of references are kept to them. --- old/test/runtime/NMT/MallocSiteHashOverflow.java 2014-12-09 15:13:22.505781690 +0100 +++ new/test/runtime/NMT/MallocSiteHashOverflow.java 2014-12-09 15:13:22.197781681 +0100 @@ -26,14 +26,14 @@ * @summary Test corner case that overflows malloc site hashtable bucket * @requires sun.arch.data.model == "32" * @key nmt jcmd stress - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build MallocSiteHashOverflow - * @run main ClassFileInstaller sun.hotspot.WhiteBox + * @run main ClassFileInstaller jdk.testlib.WhiteBox * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail MallocSiteHashOverflow */ import com.oracle.java.testlibrary.*; -import sun.hotspot.WhiteBox; +import jdk.testlib.WhiteBox; public class MallocSiteHashOverflow { --- old/test/runtime/ClassUnload/KeepAliveClass.java 2014-12-09 15:13:22.521781691 +0100 +++ new/test/runtime/ClassUnload/KeepAliveClass.java 2014-12-09 15:13:22.197781681 +0100 @@ -24,17 +24,17 @@ /* * @test KeepAliveClass * @summary This test case uses a java.lang.Class instance to keep a class alive. - * @library /testlibrary /testlibrary/whitebox /runtime/testlibrary + * @library /testlibrary /../../test/lib /runtime/testlibrary * @library classes * @build KeepAliveClass test.Empty * @build ClassUnloadCommon - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -Xmn8m -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI KeepAliveClass */ import java.lang.ref.SoftReference; -import sun.hotspot.WhiteBox; +import jdk.testlib.WhiteBox; /** * Test that verifies that classes are not unloaded when specific types of references are kept to them. --- old/test/runtime/NMT/JcmdSummaryDiff.java 2014-12-09 15:13:22.569781693 +0100 +++ new/test/runtime/NMT/JcmdSummaryDiff.java 2014-12-09 15:13:22.213781681 +0100 @@ -25,15 +25,15 @@ * @test * @summary run NMT baseline, allocate memory and verify output from summary.diff * @key nmt jcmd - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build JcmdSummaryDiff - * @run main ClassFileInstaller sun.hotspot.WhiteBox + * @run main ClassFileInstaller jdk.testlib.WhiteBox * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=summary JcmdSummaryDiff */ import com.oracle.java.testlibrary.*; -import sun.hotspot.WhiteBox; +import jdk.testlib.WhiteBox; public class JcmdSummaryDiff { --- old/test/runtime/ClassUnload/KeepAliveClassLoader.java 2014-12-09 15:13:22.577781693 +0100 +++ new/test/runtime/ClassUnload/KeepAliveClassLoader.java 2014-12-09 15:13:22.221781681 +0100 @@ -24,16 +24,16 @@ /* * @test KeepAliveClassLoader * @summary This test case uses a java.lang.ClassLoader instance to keep a class alive. - * @library /testlibrary /testlibrary/whitebox /runtime/testlibrary + * @library /testlibrary /../../test/lib /runtime/testlibrary * @library classes * @build KeepAliveClassLoader test.Empty * @build ClassUnloadCommon - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -Xmn8m -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI KeepAliveClassLoader */ -import sun.hotspot.WhiteBox; +import jdk.testlib.WhiteBox; /** * Test that verifies that classes are not unloaded when specific types of references are kept to them. --- old/test/runtime/ClassUnload/KeepAliveObject.java 2014-12-09 15:13:22.569781693 +0100 +++ new/test/runtime/ClassUnload/KeepAliveObject.java 2014-12-09 15:13:22.193781681 +0100 @@ -24,16 +24,16 @@ /* * @test KeepAliveObject * @summary This test case uses a class instance to keep the class alive. - * @library /testlibrary /testlibrary/whitebox /runtime/testlibrary + * @library /testlibrary /../../test/lib /runtime/testlibrary * @library classes * @build KeepAliveObject test.Empty * @build ClassUnloadCommon - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -Xmn8m -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI KeepAliveObject */ -import sun.hotspot.WhiteBox; +import jdk.testlib.WhiteBox; /** * Test that verifies that classes are not unloaded when specific types of references are kept to them. --- old/test/runtime/NMT/ChangeTrackingLevel.java 2014-12-09 15:13:22.597781693 +0100 +++ new/test/runtime/NMT/ChangeTrackingLevel.java 2014-12-09 15:13:22.305781684 +0100 @@ -26,15 +26,15 @@ * @bug 8059100 * @summary Test that you can decrease NMT tracking level but not increase it. * @key nmt - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build ChangeTrackingLevel - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail ChangeTrackingLevel */ import com.oracle.java.testlibrary.*; -import sun.hotspot.WhiteBox; +import jdk.testlib.WhiteBox; public class ChangeTrackingLevel { --- old/test/runtime/NMT/JcmdDetailDiff.java 2014-12-09 15:13:22.601781694 +0100 +++ new/test/runtime/NMT/JcmdDetailDiff.java 2014-12-09 15:13:22.225781682 +0100 @@ -25,16 +25,16 @@ * @test * @summary run NMT baseline, allocate memory and verify output from detail.diff * @key nmt jcmd - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @ignore * @build JcmdDetailDiff - * @run main ClassFileInstaller sun.hotspot.WhiteBox + * @run main ClassFileInstaller jdk.testlib.WhiteBox * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail JcmdDetailDiff */ import com.oracle.java.testlibrary.*; -import sun.hotspot.WhiteBox; +import jdk.testlib.WhiteBox; public class JcmdDetailDiff { --- old/test/runtime/ClassUnload/UnloadTest.java 2014-12-09 15:13:22.601781694 +0100 +++ new/test/runtime/ClassUnload/UnloadTest.java 2014-12-09 15:13:22.209781681 +0100 @@ -23,15 +23,15 @@ /* * @test UnloadTest - * @library /runtime/testlibrary /testlibrary /testlibrary/whitebox + * @library /runtime/testlibrary /testlibrary /../../test/lib * @library classes * @build ClassUnloadCommon test.Empty * @build UnloadTest - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -Xmn8m -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI UnloadTest */ -import sun.hotspot.WhiteBox; +import jdk.testlib.WhiteBox; /** * Test that verifies that classes are unloaded when they are no longer reachable. --- old/test/runtime/NMT/MallocRoundingReportTest.java 2014-12-09 15:13:22.637781695 +0100 +++ new/test/runtime/NMT/MallocRoundingReportTest.java 2014-12-09 15:13:22.281781683 +0100 @@ -25,16 +25,16 @@ * @test * @summary Test consistency of NMT by creating allocations of the Test type with various sizes and verifying visibility with jcmd * @key nmt jcmd - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build MallocRoundingReportTest - * @run main ClassFileInstaller sun.hotspot.WhiteBox + * @run main ClassFileInstaller jdk.testlib.WhiteBox * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail MallocRoundingReportTest * */ import com.oracle.java.testlibrary.*; -import sun.hotspot.WhiteBox; +import jdk.testlib.WhiteBox; public class MallocRoundingReportTest { private static long K = 1024; --- old/test/runtime/NMT/MallocStressTest.java 2014-12-09 15:13:22.877781702 +0100 +++ new/test/runtime/NMT/MallocStressTest.java 2014-12-09 15:13:22.801781700 +0100 @@ -25,10 +25,10 @@ * @test * @summary Stress test for malloc tracking * @key nmt jcmd stress - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build MallocStressTest * @ignore - This test is disabled since it will stress NMT and timeout during normal testing - * @run main ClassFileInstaller sun.hotspot.WhiteBox + * @run main ClassFileInstaller jdk.testlib.WhiteBox * @run main/othervm/timeout=600 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail MallocStressTest */ @@ -37,7 +37,7 @@ import java.util.List; import java.util.Random; import com.oracle.java.testlibrary.*; -import sun.hotspot.WhiteBox; +import jdk.testlib.WhiteBox; public class MallocStressTest { private static int K = 1024; --- old/test/runtime/NMT/ReleaseNoCommit.java 2014-12-09 15:13:24.549781755 +0100 +++ new/test/runtime/NMT/ReleaseNoCommit.java 2014-12-09 15:13:24.333781748 +0100 @@ -25,9 +25,9 @@ * @test * @summary Release uncommitted memory and make sure NMT handles it correctly * @key nmt regression - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build ReleaseNoCommit - * @run main ClassFileInstaller sun.hotspot.WhiteBox + * @run main ClassFileInstaller jdk.testlib.WhiteBox * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=summary ReleaseNoCommit */ @@ -35,7 +35,7 @@ import com.oracle.java.testlibrary.OutputAnalyzer; import com.oracle.java.testlibrary.ProcessTools; -import sun.hotspot.WhiteBox; +import jdk.testlib.WhiteBox; public class ReleaseNoCommit { --- old/test/runtime/memory/ReadFromNoaccessArea.java 2014-12-09 15:13:24.593781757 +0100 +++ new/test/runtime/memory/ReadFromNoaccessArea.java 2014-12-09 15:13:24.329781748 +0100 @@ -24,15 +24,15 @@ /* * @test * @summary Test that touching noaccess area in class ReservedHeapSpace results in SIGSEGV/ACCESS_VIOLATION - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build ReadFromNoaccessArea - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main ReadFromNoaccessArea */ import com.oracle.java.testlibrary.*; -import sun.hotspot.WhiteBox; +import jdk.testlib.WhiteBox; public class ReadFromNoaccessArea { --- old/test/runtime/NMT/MallocTestType.java 2014-12-09 15:13:24.613781757 +0100 +++ new/test/runtime/NMT/MallocTestType.java 2014-12-09 15:13:24.381781750 +0100 @@ -25,15 +25,15 @@ * @test * @summary Test consistency of NMT by leaking a few select allocations of the Test type and then verify visibility with jcmd * @key nmt jcmd - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build MallocTestType - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail MallocTestType */ import com.oracle.java.testlibrary.*; -import sun.hotspot.WhiteBox; +import jdk.testlib.WhiteBox; public class MallocTestType { --- old/test/runtime/NMT/VirtualAllocCommitUncommitRecommit.java 2014-12-09 15:13:24.649781758 +0100 +++ new/test/runtime/NMT/VirtualAllocCommitUncommitRecommit.java 2014-12-09 15:13:24.345781749 +0100 @@ -25,16 +25,16 @@ * @test * @summary Test reserve/commit/uncommit/release of virtual memory and that we track it correctly * @key nmt jcmd - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build VirtualAllocCommitUncommitRecommit - * @run main ClassFileInstaller sun.hotspot.WhiteBox + * @run main ClassFileInstaller jdk.testlib.WhiteBox * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail VirtualAllocCommitUncommitRecommit * */ import com.oracle.java.testlibrary.*; -import sun.hotspot.WhiteBox; +import jdk.testlib.WhiteBox; public class VirtualAllocCommitUncommitRecommit { --- old/test/runtime/interned/SanityTest.java 2014-12-09 15:13:24.701781760 +0100 +++ new/test/runtime/interned/SanityTest.java 2014-12-09 15:13:24.421781751 +0100 @@ -24,15 +24,15 @@ /* * @test SanityTest * @summary Sanity check of String.intern() & GC - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build SanityTest - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI SanityTest */ import java.util.*; -import sun.hotspot.WhiteBox; +import jdk.testlib.WhiteBox; public class SanityTest { --- old/test/runtime/NMT/VirtualAllocTestType.java 2014-12-09 15:13:24.689781760 +0100 +++ new/test/runtime/NMT/VirtualAllocTestType.java 2014-12-09 15:13:24.353781749 +0100 @@ -25,15 +25,15 @@ * @test * @summary Test Reserve/Commit/Uncommit/Release of virtual memory and that we track it correctly * @key nmt jcmd - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build VirtualAllocTestType - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail VirtualAllocTestType */ import com.oracle.java.testlibrary.*; -import sun.hotspot.WhiteBox; +import jdk.testlib.WhiteBox; public class VirtualAllocTestType { --- old/test/runtime/NMT/MallocTrackingVerify.java 2014-12-09 15:13:24.749781762 +0100 +++ new/test/runtime/NMT/MallocTrackingVerify.java 2014-12-09 15:13:24.365781749 +0100 @@ -26,9 +26,9 @@ * @bug 8054836 * @summary Test to verify correctness of malloc tracking * @key nmt jcmd - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build MallocTrackingVerify - * @run main ClassFileInstaller sun.hotspot.WhiteBox + * @run main ClassFileInstaller jdk.testlib.WhiteBox * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail MallocTrackingVerify * */ @@ -38,7 +38,7 @@ import com.oracle.java.testlibrary.*; -import sun.hotspot.WhiteBox; +import jdk.testlib.WhiteBox; public class MallocTrackingVerify { private static int MAX_ALLOC = 4 * 1024; --- old/test/runtime/NMT/ThreadedMallocTestType.java 2014-12-09 15:13:24.705781760 +0100 +++ new/test/runtime/NMT/ThreadedMallocTestType.java 2014-12-09 15:13:24.357781749 +0100 @@ -24,15 +24,15 @@ /* * @test * @key nmt jcmd - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build ThreadedMallocTestType - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail ThreadedMallocTestType */ import com.oracle.java.testlibrary.*; -import sun.hotspot.WhiteBox; +import jdk.testlib.WhiteBox; public class ThreadedMallocTestType { public static long memAlloc1; --- old/test/runtime/NMT/ReleaseCommittedMemory.java 2014-12-09 15:13:24.737781761 +0100 +++ new/test/runtime/NMT/ReleaseCommittedMemory.java 2014-12-09 15:13:24.361781749 +0100 @@ -26,14 +26,14 @@ * @bug 8013120 * @summary Release committed memory and make sure NMT handles it correctly * @key nmt regression - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build ReleaseCommittedMemory - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail ReleaseCommittedMemory */ -import sun.hotspot.WhiteBox; +import jdk.testlib.WhiteBox; public class ReleaseCommittedMemory { --- old/test/runtime/NMT/SummarySanityCheck.java 2014-12-09 15:13:24.769781762 +0100 +++ new/test/runtime/NMT/SummarySanityCheck.java 2014-12-09 15:13:24.437781752 +0100 @@ -25,10 +25,10 @@ * @test * @key nmt jcmd * @summary Sanity check the output of NMT - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build SummarySanityCheck - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:NativeMemoryTracking=summary -XX:+WhiteBoxAPI SummarySanityCheck */ @@ -36,7 +36,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import sun.hotspot.WhiteBox; +import jdk.testlib.WhiteBox; public class SummarySanityCheck { --- old/test/runtime/memory/ReadVMPageSize.java 2014-12-09 15:13:24.785781763 +0100 +++ new/test/runtime/memory/ReadVMPageSize.java 2014-12-09 15:13:24.401781751 +0100 @@ -24,14 +24,14 @@ /* * @test * @summary Using WhiteBox to get VM page size - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build ReadVMPageSize - * @run main ClassFileInstaller sun.hotspot.WhiteBox + * @run main ClassFileInstaller jdk.testlib.WhiteBox * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI ReadVMPageSize */ import com.oracle.java.testlibrary.*; -import sun.hotspot.WhiteBox; +import jdk.testlib.WhiteBox; public class ReadVMPageSize { public static void main(String args[]) throws Exception { --- old/test/runtime/NMT/ThreadedVirtualAllocTestType.java 2014-12-09 15:13:24.789781763 +0100 +++ new/test/runtime/NMT/ThreadedVirtualAllocTestType.java 2014-12-09 15:13:24.401781751 +0100 @@ -24,15 +24,15 @@ /* * @test * @key nmt jcmd - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build ThreadedVirtualAllocTestType - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail ThreadedVirtualAllocTestType */ import com.oracle.java.testlibrary.*; -import sun.hotspot.WhiteBox; +import jdk.testlib.WhiteBox; public class ThreadedVirtualAllocTestType { public static long addr; --- old/test/runtime/memory/ReserveMemory.java 2014-12-09 15:13:25.029781771 +0100 +++ new/test/runtime/memory/ReserveMemory.java 2014-12-09 15:13:24.949781768 +0100 @@ -26,16 +26,16 @@ * @key regression * @bug 8012015 * @summary Make sure reserved (but uncommitted) memory is not accessible - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build ReserveMemory - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main ReserveMemory */ import com.oracle.java.testlibrary.*; -import sun.hotspot.WhiteBox; +import jdk.testlib.WhiteBox; public class ReserveMemory { private static boolean isWindows() { --- old/test/runtime/whitebox/WBStackSize.java 2014-12-09 15:13:25.497781785 +0100 +++ new/test/runtime/whitebox/WBStackSize.java 2014-12-09 15:13:25.357781781 +0100 @@ -24,10 +24,10 @@ /* * @test WBStackSize * @summary verify that whitebox functions getThreadFullStackSize() and getThreadRemainingStackSize are working - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build WBStackSize - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xss512k WBStackSize */ @@ -40,7 +40,7 @@ * Please file a test bug, if this is a problem. */ -import sun.hotspot.WhiteBox; +import jdk.testlib.WhiteBox; public class WBStackSize { --- old/test/testlibrary/ctw/test/JarsTest.java 2014-12-09 15:13:25.649781790 +0100 +++ new/test/testlibrary/ctw/test/JarsTest.java 2014-12-09 15:13:25.417781783 +0100 @@ -24,10 +24,10 @@ /* * @test * @bug 8012447 - * @library /testlibrary /testlibrary/whitebox /testlibrary/ctw/src - * @build ClassFileInstaller com.oracle.java.testlibrary.* sun.hotspot.tools.ctw.CompileTheWorld sun.hotspot.WhiteBox Foo Bar - * @run main ClassFileInstaller sun.hotspot.WhiteBox Foo Bar - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @library /testlibrary /../../test/lib /testlibrary/ctw/src + * @build ClassFileInstaller com.oracle.java.testlibrary.* sun.hotspot.tools.ctw.CompileTheWorld jdk.testlib.WhiteBox Foo Bar + * @run main ClassFileInstaller jdk.testlib.WhiteBox Foo Bar + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main JarsTest prepare * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Dsun.hotspot.tools.ctw.logfile=ctw.log sun.hotspot.tools.ctw.CompileTheWorld foo.jar bar.jar * @run main JarsTest check ctw.log --- old/test/testlibrary/com/oracle/java/testlibrary/cli/predicate/CPUSpecificPredicate.java 2014-12-09 15:13:25.809781795 +0100 +++ new/test/testlibrary/com/oracle/java/testlibrary/cli/predicate/CPUSpecificPredicate.java 2014-12-09 15:13:25.509781786 +0100 @@ -24,7 +24,7 @@ package com.oracle.java.testlibrary.cli.predicate; import com.oracle.java.testlibrary.Platform; -import sun.hotspot.cpuinfo.CPUInfo; +import jdk.testlib.cpuinfo.CPUInfo; import java.util.function.BooleanSupplier; --- old/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/Compiler.java 2014-12-09 15:13:25.805781795 +0100 +++ new/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/Compiler.java 2014-12-09 15:13:25.509781786 +0100 @@ -23,7 +23,7 @@ package sun.hotspot.tools.ctw; -import sun.hotspot.WhiteBox; +import jdk.testlib.WhiteBox; import sun.misc.SharedSecrets; import sun.reflect.ConstantPool; --- old/test/sanity/WBApi.java 2014-12-09 15:13:25.865781797 +0100 +++ new/test/sanity/WBApi.java 2014-12-09 15:13:25.609781789 +0100 @@ -24,14 +24,14 @@ /* * @test WBApi * @summary verify that whitebox functions can be linked and executed - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build WBApi - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI WBApi */ -import sun.hotspot.WhiteBox; +import jdk.testlib.WhiteBox; public class WBApi { public static void main(String... args) { System.out.printf("args at: %x\n",WhiteBox.getWhiteBox().getObjectAddress(args)); --- old/test/runtime/memory/StressVirtualSpaceResize.java 2014-12-09 15:13:25.873781797 +0100 +++ new/test/runtime/memory/StressVirtualSpaceResize.java 2014-12-09 15:13:25.597781789 +0100 @@ -24,14 +24,14 @@ /* * @test * @summary Stress test that expands/shrinks VirtualSpace - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build StressVirtualSpaceResize - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI StressVirtualSpaceResize */ -import sun.hotspot.WhiteBox; +import jdk.testlib.WhiteBox; public class StressVirtualSpaceResize { --- old/test/testlibrary/ctw/test/JarDirTest.java 2014-12-09 15:13:25.885781798 +0100 +++ new/test/testlibrary/ctw/test/JarDirTest.java 2014-12-09 15:13:25.653781790 +0100 @@ -24,10 +24,10 @@ /* * @test * @bug 8012447 - * @library /testlibrary /testlibrary/whitebox /testlibrary/ctw/src - * @build ClassFileInstaller com.oracle.java.testlibrary.* sun.hotspot.tools.ctw.CompileTheWorld sun.hotspot.WhiteBox Foo Bar - * @run main ClassFileInstaller sun.hotspot.WhiteBox Foo Bar - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @library /testlibrary /../../test/lib /testlibrary/ctw/src + * @build ClassFileInstaller com.oracle.java.testlibrary.* sun.hotspot.tools.ctw.CompileTheWorld jdk.testlib.WhiteBox Foo Bar + * @run main ClassFileInstaller jdk.testlib.WhiteBox Foo Bar + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main JarDirTest prepare * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Dsun.hotspot.tools.ctw.logfile=ctw.log sun.hotspot.tools.ctw.CompileTheWorld jars/* * @run main JarDirTest check ctw.log --- old/test/runtime/memory/RunUnitTestsConcurrently.java 2014-12-09 15:13:25.917781799 +0100 +++ new/test/runtime/memory/RunUnitTestsConcurrently.java 2014-12-09 15:13:25.633781790 +0100 @@ -24,15 +24,15 @@ /* * @test * @summary Test launches unit tests inside vm concurrently - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build RunUnitTestsConcurrently - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI RunUnitTestsConcurrently 30 15000 */ import com.oracle.java.testlibrary.*; -import sun.hotspot.WhiteBox; +import jdk.testlib.WhiteBox; public class RunUnitTestsConcurrently { --- old/test/serviceability/ParserTest.java 2014-12-09 15:13:25.925781799 +0100 +++ new/test/serviceability/ParserTest.java 2014-12-09 15:13:25.621781789 +0100 @@ -24,18 +24,18 @@ /* * @test * @summary Test that the diagnostic command arguemnt parser works - * @library /testlibrary /testlibrary/whitebox - * @build ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.parser.* - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @library /testlibrary /../../test/lib + * @build ClassFileInstaller jdk.testlib.WhiteBox jdk.testlib.parser.* + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI ParserTest */ import java.math.BigInteger; -import sun.hotspot.parser.DiagnosticCommand; -import sun.hotspot.parser.DiagnosticCommand.DiagnosticArgumentType; -import sun.hotspot.WhiteBox; +import jdk.testlib.parser.DiagnosticCommand; +import jdk.testlib.parser.DiagnosticCommand.DiagnosticArgumentType; +import jdk.testlib.WhiteBox; public class ParserTest { WhiteBox wb; --- old/test/testlibrary/ctw/test/ClassesDirTest.java 2014-12-09 15:13:25.949781800 +0100 +++ new/test/testlibrary/ctw/test/ClassesDirTest.java 2014-12-09 15:13:25.633781790 +0100 @@ -24,10 +24,10 @@ /* * @test * @bug 8012447 - * @library /testlibrary /testlibrary/whitebox /testlibrary/ctw/src - * @build ClassFileInstaller sun.hotspot.tools.ctw.CompileTheWorld sun.hotspot.WhiteBox Foo Bar - * @run main ClassFileInstaller sun.hotspot.WhiteBox Foo Bar - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @library /testlibrary /../../test/lib /testlibrary/ctw/src + * @build ClassFileInstaller sun.hotspot.tools.ctw.CompileTheWorld jdk.testlib.WhiteBox Foo Bar + * @run main ClassFileInstaller jdk.testlib.WhiteBox Foo Bar + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main ClassesDirTest prepare * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Dsun.hotspot.tools.ctw.logfile=ctw.log sun.hotspot.tools.ctw.CompileTheWorld classes * @run main ClassesDirTest check ctw.log --- old/test/testlibrary/ctw/test/ClassesListTest.java 2014-12-09 15:13:26.009781802 +0100 +++ new/test/testlibrary/ctw/test/ClassesListTest.java 2014-12-09 15:13:25.713781792 +0100 @@ -24,10 +24,10 @@ /* * @test * @bug 8012447 - * @library /testlibrary /testlibrary/whitebox /testlibrary/ctw/src - * @build ClassFileInstaller sun.hotspot.tools.ctw.CompileTheWorld sun.hotspot.WhiteBox Foo Bar - * @run main ClassFileInstaller sun.hotspot.WhiteBox Foo Bar - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @library /testlibrary /../../test/lib /testlibrary/ctw/src + * @build ClassFileInstaller sun.hotspot.tools.ctw.CompileTheWorld jdk.testlib.WhiteBox Foo Bar + * @run main ClassFileInstaller jdk.testlib.WhiteBox Foo Bar + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main ClassesListTest prepare * @run main/othervm/timeout=600 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Dsun.hotspot.tools.ctw.logfile=ctw.log sun.hotspot.tools.ctw.CompileTheWorld classes.lst * @run main ClassesListTest check ctw.log --- old/test/sanity/WhiteBox.java 2014-12-09 15:13:26.045781803 +0100 +++ new/test/sanity/WhiteBox.java 2014-12-09 15:13:25.769781794 +0100 @@ -28,12 +28,12 @@ * @author igor.ignatyev@oracle.com * @library /testlibrary * @compile WhiteBox.java - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI sun.hotspot.WhiteBox - * @clean sun.hotspot.WhiteBox + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI jdk.testlib.WhiteBox + * @clean jdk.testlib.WhiteBox */ -package sun.hotspot; +package jdk.testlib; public class WhiteBox { private static native void registerNatives(); --- old/test/testlibrary_tests/ctw/ClassesListTest.java 2014-12-09 15:13:26.269781810 +0100 +++ new/test/testlibrary_tests/ctw/ClassesListTest.java 2014-12-09 15:13:26.189781807 +0100 @@ -24,10 +24,10 @@ /* * @test * @bug 8012447 - * @library /testlibrary /testlibrary/whitebox /testlibrary/ctw/src - * @build ClassFileInstaller sun.hotspot.tools.ctw.CompileTheWorld sun.hotspot.WhiteBox Foo Bar - * @run main ClassFileInstaller sun.hotspot.WhiteBox Foo Bar - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @library /testlibrary /../../test/lib /testlibrary/ctw/src + * @build ClassFileInstaller sun.hotspot.tools.ctw.CompileTheWorld jdk.testlib.WhiteBox Foo Bar + * @run main ClassFileInstaller jdk.testlib.WhiteBox Foo Bar + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main ClassesListTest prepare * @run main/othervm/timeout=600 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Dsun.hotspot.tools.ctw.logfile=ctw.log sun.hotspot.tools.ctw.CompileTheWorld classes.lst * @run main ClassesListTest check ctw.log --- old/test/testlibrary_tests/ctw/ClassesDirTest.java 2014-12-09 15:13:26.269781810 +0100 +++ new/test/testlibrary_tests/ctw/ClassesDirTest.java 2014-12-09 15:13:26.185781807 +0100 @@ -24,10 +24,10 @@ /* * @test * @bug 8012447 - * @library /testlibrary /testlibrary/whitebox /testlibrary/ctw/src - * @build ClassFileInstaller sun.hotspot.tools.ctw.CompileTheWorld sun.hotspot.WhiteBox Foo Bar - * @run main ClassFileInstaller sun.hotspot.WhiteBox Foo Bar - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @library /testlibrary /../../test/lib /testlibrary/ctw/src + * @build ClassFileInstaller sun.hotspot.tools.ctw.CompileTheWorld jdk.testlib.WhiteBox Foo Bar + * @run main ClassFileInstaller jdk.testlib.WhiteBox Foo Bar + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main ClassesDirTest prepare * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Dsun.hotspot.tools.ctw.logfile=ctw.log sun.hotspot.tools.ctw.CompileTheWorld classes * @run main ClassesDirTest check ctw.log --- old/test/testlibrary_tests/whitebox/vm_flags/BooleanTest.java 2014-12-09 15:13:27.893781861 +0100 +++ new/test/testlibrary_tests/whitebox/vm_flags/BooleanTest.java 2014-12-09 15:13:27.709781856 +0100 @@ -24,16 +24,16 @@ /* * @test BooleanTest * @bug 8028756 - * @library /testlibrary /testlibrary/whitebox - * @build BooleanTest ClassFileInstaller sun.hotspot.WhiteBox com.oracle.java.testlibrary.* - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @library /testlibrary /../../test/lib + * @build BooleanTest ClassFileInstaller jdk.testlib.WhiteBox com.oracle.java.testlibrary.* + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm/timeout=600 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI BooleanTest * @summary testing of WB::set/getBooleanVMFlag() * @author igor.ignatyev@oracle.com */ -import sun.hotspot.WhiteBox; +import jdk.testlib.WhiteBox; import com.oracle.java.testlibrary.*; import sun.management.*; import com.sun.management.*; --- old/test/testlibrary_tests/whitebox/vm_flags/UintxTest.java 2014-12-09 15:13:27.969781864 +0100 +++ new/test/testlibrary_tests/whitebox/vm_flags/UintxTest.java 2014-12-09 15:13:27.669781854 +0100 @@ -24,10 +24,10 @@ /* * @test UintxTest * @bug 8028756 - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build UintxTest - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm/timeout=600 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI UintxTest * @summary testing of WB::set/getUintxVMFlag() * @author igor.ignatyev@oracle.com --- old/test/testlibrary_tests/whitebox/vm_flags/SizeTTest.java 2014-12-09 15:13:28.053781866 +0100 +++ new/test/testlibrary_tests/whitebox/vm_flags/SizeTTest.java 2014-12-09 15:13:27.801781858 +0100 @@ -24,10 +24,10 @@ /* * @test SizeTTest * @bug 8054823 - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build SizeTTest - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm/timeout=600 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:+UnlockExperimentalVMOptions SizeTTest * @summary testing of WB::set/getSizeTVMFlag() */ --- old/test/testlibrary/whitebox/sun/hotspot/WhiteBox.java 2014-12-09 15:13:28.013781865 +0100 +++ /dev/null 2014-12-09 10:24:54.869534011 +0100 @@ -1,243 +0,0 @@ -/* - * Copyright (c) 2012, 2014, 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 - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - * - */ - -package sun.hotspot; - -import java.lang.reflect.Executable; -import java.util.Arrays; -import java.util.List; -import java.util.function.Function; -import java.util.stream.Stream; -import java.security.BasicPermission; - -import sun.hotspot.parser.DiagnosticCommand; - -public class WhiteBox { - - @SuppressWarnings("serial") - public static class WhiteBoxPermission extends BasicPermission { - public WhiteBoxPermission(String s) { - super(s); - } - } - - private WhiteBox() {} - private static final WhiteBox instance = new WhiteBox(); - private static native void registerNatives(); - - /** - * Returns the singleton WhiteBox instance. - * - * The returned WhiteBox object should be carefully guarded - * by the caller, since it can be used to read and write data - * at arbitrary memory addresses. It must never be passed to - * untrusted code. - */ - public synchronized static WhiteBox getWhiteBox() { - SecurityManager sm = System.getSecurityManager(); - if (sm != null) { - sm.checkPermission(new WhiteBoxPermission("getInstance")); - } - return instance; - } - - static { - registerNatives(); - } - - // Get the maximum heap size supporting COOPs - public native long getCompressedOopsMaxHeapSize(); - // Arguments - public native void printHeapSizes(); - - // Memory - public native long getObjectAddress(Object o); - public native int getHeapOopSize(); - public native int getVMPageSize(); - public native boolean isObjectInOldGen(Object o); - public native long getObjectSize(Object o); - - // Runtime - // Make sure class name is in the correct format - public boolean isClassAlive(String name) { - return isClassAlive0(name.replace('.', '/')); - } - private native boolean isClassAlive0(String name); - - // JVMTI - public native void addToBootstrapClassLoaderSearch(String segment); - public native void addToSystemClassLoaderSearch(String segment); - - // G1 - public native boolean g1InConcurrentMark(); - public native boolean g1IsHumongous(Object o); - public native long g1NumFreeRegions(); - public native int g1RegionSize(); - public native Object[] parseCommandLine(String commandline, char delim, DiagnosticCommand[] args); - - // NMT - public native long NMTMalloc(long size); - public native void NMTFree(long mem); - public native long NMTReserveMemory(long size); - public native void NMTCommitMemory(long addr, long size); - public native void NMTUncommitMemory(long addr, long size); - public native void NMTReleaseMemory(long addr, long size); - public native long NMTMallocWithPseudoStack(long size, int index); - public native boolean NMTIsDetailSupported(); - public native boolean NMTChangeTrackingLevel(); - public native int NMTGetHashSize(); - - // Compiler - public native void deoptimizeAll(); - public boolean isMethodCompiled(Executable method) { - return isMethodCompiled(method, false /*not osr*/); - } - public native boolean isMethodCompiled(Executable method, boolean isOsr); - public boolean isMethodCompilable(Executable method) { - return isMethodCompilable(method, -1 /*any*/); - } - public boolean isMethodCompilable(Executable method, int compLevel) { - return isMethodCompilable(method, compLevel, false /*not osr*/); - } - public native boolean isMethodCompilable(Executable method, int compLevel, boolean isOsr); - public native boolean isMethodQueuedForCompilation(Executable method); - public int deoptimizeMethod(Executable method) { - return deoptimizeMethod(method, false /*not osr*/); - } - public native int deoptimizeMethod(Executable method, boolean isOsr); - public void makeMethodNotCompilable(Executable method) { - makeMethodNotCompilable(method, -1 /*any*/); - } - public void makeMethodNotCompilable(Executable method, int compLevel) { - makeMethodNotCompilable(method, compLevel, false /*not osr*/); - } - public native void makeMethodNotCompilable(Executable method, int compLevel, boolean isOsr); - public int getMethodCompilationLevel(Executable method) { - return getMethodCompilationLevel(method, false /*not ost*/); - } - public native int getMethodCompilationLevel(Executable method, boolean isOsr); - public native boolean testSetDontInlineMethod(Executable method, boolean value); - public int getCompileQueuesSize() { - return getCompileQueueSize(-1 /*any*/); - } - public native int getCompileQueueSize(int compLevel); - public native boolean testSetForceInlineMethod(Executable method, boolean value); - public boolean enqueueMethodForCompilation(Executable method, int compLevel) { - return enqueueMethodForCompilation(method, compLevel, -1 /*InvocationEntryBci*/); - } - public native boolean enqueueMethodForCompilation(Executable method, int compLevel, int entry_bci); - public native void clearMethodState(Executable method); - public native void lockCompilation(); - public native void unlockCompilation(); - public native int getMethodEntryBci(Executable method); - public native Object[] getNMethod(Executable method, boolean isOsr); - public native long allocateCodeBlob(int size, int type); - public native void freeCodeBlob(long addr); - public void forceNMethodSweep() { - try { - forceNMethodSweep0().join(); - } catch (InterruptedException e) { - Thread.currentThread().interrupt(); - } - } - public native Thread forceNMethodSweep0(); - public native Object[] getCodeHeapEntries(int type); - public native int getCompilationActivityMode(); - public native Object[] getCodeBlob(long addr); - - // Intered strings - public native boolean isInStringTable(String str); - - // Memory - public native void readReservedMemory(); - public native long allocateMetaspace(ClassLoader classLoader, long size); - public native void freeMetaspace(ClassLoader classLoader, long addr, long size); - public native long incMetaspaceCapacityUntilGC(long increment); - public native long metaspaceCapacityUntilGC(); - - // Force Young GC - public native void youngGC(); - - // Force Full GC - public native void fullGC(); - - // Method tries to start concurrent mark cycle. - // It returns false if CM Thread is always in concurrent cycle. - public native boolean g1StartConcMarkCycle(); - - // Tests on ReservedSpace/VirtualSpace classes - public native int stressVirtualSpaceResize(long reservedSpaceSize, long magnitude, long iterations); - public native void runMemoryUnitTests(); - public native void readFromNoaccessArea(); - public native long getThreadStackSize(); - public native long getThreadRemainingStackSize(); - - // CPU features - public native String getCPUFeatures(); - - // Native extensions - public native long getHeapUsageForContext(int context); - public native long getHeapRegionCountForContext(int context); - public native int getContextForObject(Object obj); - public native void printRegionInfo(int context); - - // VM flags - public native boolean isConstantVMFlag(String name); - public native boolean isLockedVMFlag(String name); - public native void setBooleanVMFlag(String name, boolean value); - public native void setIntxVMFlag(String name, long value); - public native void setUintxVMFlag(String name, long value); - public native void setUint64VMFlag(String name, long value); - public native void setSizeTVMFlag(String name, long value); - public native void setStringVMFlag(String name, String value); - public native void setDoubleVMFlag(String name, double value); - public native Boolean getBooleanVMFlag(String name); - public native Long getIntxVMFlag(String name); - public native Long getUintxVMFlag(String name); - public native Long getUint64VMFlag(String name); - public native Long getSizeTVMFlag(String name); - public native String getStringVMFlag(String name); - public native Double getDoubleVMFlag(String name); - private final List> flagsGetters = Arrays.asList( - this::getBooleanVMFlag, this::getIntxVMFlag, this::getUintxVMFlag, - this::getUint64VMFlag, this::getSizeTVMFlag, this::getStringVMFlag, - this::getDoubleVMFlag); - - public Object getVMFlag(String name) { - return flagsGetters.stream() - .map(f -> f.apply(name)) - .filter(x -> x != null) - .findAny() - .orElse(null); - } - public native int getOffsetForName0(String name); - public int getOffsetForName(String name) throws Exception { - int offset = getOffsetForName0(name); - if (offset == -1) { - throw new RuntimeException(name + " not found"); - } - return offset; - } - -} --- old/test/testlibrary_tests/whitebox/vm_flags/Uint64Test.java 2014-12-09 15:13:28.073781867 +0100 +++ new/test/testlibrary_tests/whitebox/vm_flags/Uint64Test.java 2014-12-09 15:13:27.801781858 +0100 @@ -24,10 +24,10 @@ /* * @test Uint64Test * @bug 8028756 - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build Uint64Test - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm/timeout=600 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI Uint64Test * @summary testing of WB::set/getUint64VMFlag() * @author igor.ignatyev@oracle.com --- old/test/testlibrary_tests/ctw/JarsTest.java 2014-12-09 15:13:28.057781867 +0100 +++ new/test/testlibrary_tests/ctw/JarsTest.java 2014-12-09 15:13:27.753781857 +0100 @@ -24,10 +24,10 @@ /* * @test * @bug 8012447 - * @library /testlibrary /testlibrary/whitebox /testlibrary/ctw/src - * @build ClassFileInstaller com.oracle.java.testlibrary.* sun.hotspot.tools.ctw.CompileTheWorld sun.hotspot.WhiteBox Foo Bar - * @run main ClassFileInstaller sun.hotspot.WhiteBox Foo Bar - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @library /testlibrary /../../test/lib /testlibrary/ctw/src + * @build ClassFileInstaller com.oracle.java.testlibrary.* sun.hotspot.tools.ctw.CompileTheWorld jdk.testlib.WhiteBox Foo Bar + * @run main ClassFileInstaller jdk.testlib.WhiteBox Foo Bar + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main JarsTest prepare * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Dsun.hotspot.tools.ctw.logfile=ctw.log sun.hotspot.tools.ctw.CompileTheWorld foo.jar bar.jar * @run main JarsTest check ctw.log --- old/test/testlibrary/whitebox/Makefile 2014-12-09 15:13:28.105781868 +0100 +++ /dev/null 2014-12-09 10:24:54.869534011 +0100 @@ -1,63 +0,0 @@ -# -# Copyright (c) 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 -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# -# - -ifneq "x$(ALT_BOOTDIR)" "x" - BOOTDIR := $(ALT_BOOTDIR) -endif - -ifeq "x$(BOOTDIR)" "x" - JDK_HOME := $(shell dirname $(shell which java))/.. -else - JDK_HOME := $(BOOTDIR) -endif - -SRC_DIR = ./ -BUILD_DIR = build -OUTPUT_DIR = $(BUILD_DIR)/classes - -JAVAC = $(JDK_HOME)/bin/javac -JAR = $(JDK_HOME)/bin/jar - -SRC_FILES = $(shell find $(SRC_DIR) -name '*.java') - -.PHONY: filelist clean cleantmp - -all: wb.jar cleantmp - -wb.jar: filelist - @mkdir -p $(OUTPUT_DIR) - $(JAVAC) -sourcepath $(SRC_DIR) -d $(OUTPUT_DIR) -cp $(OUTPUT_DIR) @filelist - $(JAR) cf wb.jar -C $(OUTPUT_DIR) . - @rm -rf $(OUTPUT_DIR) - -filelist: $(SRC_FILES) - @rm -f $@ - @echo $(SRC_FILES) > $@ - -clean: cleantmp - @rm -rf wb.jar - -cleantmp: - @rm -rf filelist - @rm -rf $(BUILD_DIR) --- old/test/testlibrary_tests/whitebox/vm_flags/VmFlagTest.java 2014-12-09 15:13:28.161781870 +0100 +++ new/test/testlibrary_tests/whitebox/vm_flags/VmFlagTest.java 2014-12-09 15:13:27.861781860 +0100 @@ -24,7 +24,7 @@ import java.util.Objects; import java.util.function.BiConsumer; import java.util.function.Function; -import sun.hotspot.WhiteBox; +import jdk.testlib.WhiteBox; import sun.management.*; import com.sun.management.*; import com.oracle.java.testlibrary.*; --- old/test/testlibrary_tests/whitebox/vm_flags/IntxTest.java 2014-12-09 15:13:28.193781871 +0100 +++ new/test/testlibrary_tests/whitebox/vm_flags/IntxTest.java 2014-12-09 15:13:27.885781861 +0100 @@ -24,10 +24,10 @@ /* * @test IntxTest * @bug 8028756 - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build IntxTest - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm/timeout=600 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI IntxTest * @summary testing of WB::set/getIntxVMFlag() * @author igor.ignatyev@oracle.com --- old/test/testlibrary_tests/whitebox/vm_flags/DoubleTest.java 2014-12-09 15:13:28.217781872 +0100 +++ new/test/testlibrary_tests/whitebox/vm_flags/DoubleTest.java 2014-12-09 15:13:27.941781863 +0100 @@ -24,10 +24,10 @@ /* * @test DoubleTest * @bug 8028756 - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build DoubleTest - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm/timeout=600 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI DoubleTest * @summary testing of WB::set/getDoubleVMFlag() * @author igor.ignatyev@oracle.com --- old/test/testlibrary_tests/whitebox/vm_flags/StringTest.java 2014-12-09 15:13:28.229781872 +0100 +++ new/test/testlibrary_tests/whitebox/vm_flags/StringTest.java 2014-12-09 15:13:27.941781863 +0100 @@ -24,10 +24,10 @@ /* * @test StringTest * @bug 8028756 - * @library /testlibrary /testlibrary/whitebox + * @library /testlibrary /../../test/lib * @build StringTest - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @run main ClassFileInstaller jdk.testlib.WhiteBox + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main/othervm/timeout=600 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI StringTest * @summary testing of WB::set/getStringVMFlag() * @author igor.ignatyev@oracle.com --- old/test/testlibrary_tests/ctw/JarDirTest.java 2014-12-09 15:13:28.253781873 +0100 +++ new/test/testlibrary_tests/ctw/JarDirTest.java 2014-12-09 15:13:27.945781863 +0100 @@ -24,10 +24,10 @@ /* * @test * @bug 8012447 - * @library /testlibrary /testlibrary/whitebox /testlibrary/ctw/src - * @build ClassFileInstaller com.oracle.java.testlibrary.* sun.hotspot.tools.ctw.CompileTheWorld sun.hotspot.WhiteBox Foo Bar - * @run main ClassFileInstaller sun.hotspot.WhiteBox Foo Bar - * sun.hotspot.WhiteBox$WhiteBoxPermission + * @library /testlibrary /../../test/lib /testlibrary/ctw/src + * @build ClassFileInstaller com.oracle.java.testlibrary.* sun.hotspot.tools.ctw.CompileTheWorld jdk.testlib.WhiteBox Foo Bar + * @run main ClassFileInstaller jdk.testlib.WhiteBox Foo Bar + * jdk.testlib.WhiteBox$WhiteBoxPermission * @run main JarDirTest prepare * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Dsun.hotspot.tools.ctw.logfile=ctw.log sun.hotspot.tools.ctw.CompileTheWorld jars/* * @run main JarDirTest check ctw.log --- old/test/testlibrary/whitebox/sun/hotspot/code/BlobType.java 2014-12-09 15:13:28.405781878 +0100 +++ /dev/null 2014-12-09 10:24:54.869534011 +0100 @@ -1,90 +0,0 @@ -/* - * Copyright (c) 2014, 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 - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - * - */ - -package sun.hotspot.code; - -import java.lang.management.ManagementFactory; -import java.lang.management.MemoryPoolMXBean; -import java.util.EnumSet; - -import sun.hotspot.WhiteBox; - -public enum BlobType { - // Execution level 1 and 4 (non-profiled) nmethods (including native nmethods) - MethodNonProfiled(0, "CodeHeap 'non-profiled nmethods'"), - // Execution level 2 and 3 (profiled) nmethods - MethodProfiled(1, "CodeHeap 'profiled nmethods'"), - // Non-nmethods like Buffers, Adapters and Runtime Stubs - NonNMethod(2, "CodeHeap 'non-nmethods'") { - @Override - public boolean allowTypeWhenOverflow(BlobType type) { - return super.allowTypeWhenOverflow(type) - || type == BlobType.MethodNonProfiled; - } - }, - // All types (No code cache segmentation) - All(3, "CodeCache"); - - public final int id; - private final String beanName; - - private BlobType(int id, String beanName) { - this.id = id; - this.beanName = beanName; - } - - public MemoryPoolMXBean getMemoryPool() { - for (MemoryPoolMXBean bean : ManagementFactory.getMemoryPoolMXBeans()) { - String name = bean.getName(); - if (beanName.equals(name)) { - return bean; - } - } - return null; - } - - public boolean allowTypeWhenOverflow(BlobType type) { - return type == this; - } - - public static EnumSet getAvailable() { - WhiteBox whiteBox = WhiteBox.getWhiteBox(); - if (!whiteBox.getBooleanVMFlag("SegmentedCodeCache")) { - // only All for non segmented world - return EnumSet.of(All); - } - if (System.getProperty("java.vm.info").startsWith("interpreted ")) { - // only NonNMethod for -Xint - return EnumSet.of(NonNMethod); - } - - EnumSet result = EnumSet.complementOf(EnumSet.of(All)); - if (!whiteBox.getBooleanVMFlag("TieredCompilation") - || whiteBox.getIntxVMFlag("TieredStopAtLevel") <= 1) { - // there is no MethodProfiled in non tiered world or pure C1 - result.remove(MethodProfiled); - } - return result; - } -} --- old/test/testlibrary/whitebox/sun/hotspot/cpuinfo/CPUInfo.java 2014-12-09 15:13:29.685781918 +0100 +++ /dev/null 2014-12-09 10:24:54.869534011 +0100 @@ -1,98 +0,0 @@ -/* - * Copyright (c) 2014, 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 - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - * - */ - -package sun.hotspot.cpuinfo; - -import java.util.List; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.regex.Pattern; -import java.util.regex.Matcher; - -import sun.hotspot.WhiteBox; - -/** - * Information about CPU on test box. - * - * CPUInfo uses WhiteBox to gather information, - * so WhiteBox class should be added to bootclasspath - * and option -XX:+WhiteBoxAPI should expclicetly - * specified on command line. - */ -public class CPUInfo { - - private static final List features; - private static final String additionalCPUInfo; - - static { - WhiteBox wb = WhiteBox.getWhiteBox(); - - Pattern additionalCPUInfoRE = - Pattern.compile("([^(]*\\([^)]*\\)[^,]*),\\s*"); - - String cpuFeaturesString = wb.getCPUFeatures(); - Matcher matcher = additionalCPUInfoRE.matcher(cpuFeaturesString); - if (matcher.find()) { - additionalCPUInfo = matcher.group(1); - } else { - additionalCPUInfo = ""; - } - String splittedFeatures[] = matcher.replaceAll("").split("(, )| "); - - features = Collections.unmodifiableList(Arrays. - asList(splittedFeatures)); - } - - /** - * Get additional information about CPU. - * For example, on X86 in will be family/model/stepping - * and number of cores. - * - * @return additional CPU info - */ - public static String getAdditionalCPUInfo() { - return additionalCPUInfo; - } - - /** - * Get all known features supported by CPU. - * - * @return unmodifiable list with names of all known features - * supported by CPU. - */ - public static List getFeatures() { - return features; - } - - /** - * Check if some feature is supported by CPU. - * - * @param feature Name of feature to be tested. - * @return true if tested feature is supported by CPU. - */ - public static boolean hasFeature(String feature) { - return features.contains(feature.toLowerCase()); - } -} --- old/test/testlibrary/whitebox/sun/hotspot/code/NMethod.java 2014-12-09 15:13:29.685781918 +0100 +++ /dev/null 2014-12-09 10:24:54.869534011 +0100 @@ -1,56 +0,0 @@ -/* - * Copyright (c) 2014, 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 - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - * - */ - -package sun.hotspot.code; - -import java.lang.reflect.Executable; -import sun.hotspot.WhiteBox; - -public class NMethod extends CodeBlob { - private static final WhiteBox wb = WhiteBox.getWhiteBox(); - public static NMethod get(Executable method, boolean isOsr) { - Object[] obj = wb.getNMethod(method, isOsr); - return obj == null ? null : new NMethod(obj); - } - private NMethod(Object[] obj) { - super((Object[])obj[0]); - assert obj.length == 4; - comp_level = (Integer) obj[1]; - insts = (byte[]) obj[2]; - compile_id = (Integer) obj[3]; - } - public final byte[] insts; - public final int comp_level; - public final int compile_id; - - @Override - public String toString() { - return "NMethod{" - + super.toString() - + ", insts=" + insts - + ", comp_level=" + comp_level - + ", compile_id=" + compile_id - + '}'; - } -} --- old/test/testlibrary/whitebox/sun/hotspot/code/CodeBlob.java 2014-12-09 15:13:29.689781918 +0100 +++ /dev/null 2014-12-09 10:24:54.869534011 +0100 @@ -1,68 +0,0 @@ -/* - * Copyright (c) 2014, 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 - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - * - */ - -package sun.hotspot.code; - -import sun.hotspot.WhiteBox; - -public class CodeBlob { - private static final WhiteBox WB = WhiteBox.getWhiteBox(); - public static CodeBlob[] getCodeBlobs(BlobType type) { - Object[] obj = WB.getCodeHeapEntries(type.id); - if (obj == null) { - return null; - } - CodeBlob[] result = new CodeBlob[obj.length]; - for (int i = 0, n = result.length; i < n; ++i) { - result[i] = new CodeBlob((Object[]) obj[i]); - } - return result; - } - public static CodeBlob getCodeBlob(long addr) { - Object[] obj = WB.getCodeBlob(addr); - if (obj == null) { - return null; - } - return new CodeBlob(obj); - } - protected CodeBlob(Object[] obj) { - assert obj.length == 3; - name = (String) obj[0]; - size = (Integer) obj[1]; - code_blob_type = BlobType.values()[(Integer) obj[2]]; - assert code_blob_type.id == (Integer) obj[2]; - } - public final String name; - public final int size; - public final BlobType code_blob_type; - - @Override - public String toString() { - return "CodeBlob{" - + "name=" + name - + ", size=" + size - + ", code_blob_type=" + code_blob_type - + '}'; - } -} --- old/test/testlibrary/whitebox/sun/hotspot/parser/DiagnosticCommand.java 2014-12-09 15:13:29.697781919 +0100 +++ /dev/null 2014-12-09 10:24:54.869534011 +0100 @@ -1,77 +0,0 @@ -/* - * Copyright (c) 2012, 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 - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -package sun.hotspot.parser; - -public class DiagnosticCommand { - - public enum DiagnosticArgumentType { - JLONG, BOOLEAN, STRING, NANOTIME, STRINGARRAY, MEMORYSIZE - } - - private String name; - private String desc; - private DiagnosticArgumentType type; - private boolean mandatory; - private String defaultValue; - private boolean argument; - - public DiagnosticCommand(String name, String desc, DiagnosticArgumentType type, - boolean mandatory, String defaultValue) { - this(name, desc, type, false, mandatory, defaultValue); - } - - public DiagnosticCommand(String name, String desc, DiagnosticArgumentType type, - boolean argument, boolean mandatory, String defaultValue) { - this.name = name; - this.desc = desc; - this.type = type; - this.mandatory = mandatory; - this.defaultValue = defaultValue; - this.argument = argument; - } - - public String getName() { - return name; - } - - public String getDesc() { - return desc; - } - - public DiagnosticArgumentType getType() { - return type; - } - - public boolean isMandatory() { - return mandatory; - } - - public boolean isArgument() { - return argument; - } - - public String getDefaultValue() { - return defaultValue; - } -}