--- old/test/compiler/arguments/BMISupportedCPUTest.java 2016-08-11 13:10:00.081926100 -0400 +++ new/test/compiler/arguments/BMISupportedCPUTest.java 2016-08-11 13:09:59.665504800 -0400 @@ -23,7 +23,7 @@ package compiler.arguments; -import jdk.test.lib.ExitCode; +import jdk.test.lib.process.ExitCode; import jdk.test.lib.cli.CommandLineOptionTest; /** --- old/test/compiler/arguments/BMIUnsupportedCPUTest.java 2016-08-11 13:10:02.452881600 -0400 +++ new/test/compiler/arguments/BMIUnsupportedCPUTest.java 2016-08-11 13:10:02.041874100 -0400 @@ -23,7 +23,7 @@ package compiler.arguments; -import jdk.test.lib.ExitCode; +import jdk.test.lib.process.ExitCode; import jdk.test.lib.Platform; import jdk.test.lib.cli.CommandLineOptionTest; --- old/test/compiler/arguments/CheckCICompilerCount.java 2016-08-11 13:10:04.878510300 -0400 +++ new/test/compiler/arguments/CheckCICompilerCount.java 2016-08-11 13:10:04.463080500 -0400 @@ -26,7 +26,7 @@ * @bug 8130858 * @bug 8132525 * @summary Check that correct range of values for CICompilerCount are allowed depending on whether tiered is enabled or not - * @library /testlibrary / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * @run driver compiler.arguments.CheckCICompilerCount @@ -34,8 +34,8 @@ package compiler.arguments; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; public class CheckCICompilerCount { private static final String[][] NON_TIERED_ARGUMENTS = { --- old/test/compiler/arguments/CheckCompileThresholdScaling.java 2016-08-11 13:10:07.303125400 -0400 +++ new/test/compiler/arguments/CheckCompileThresholdScaling.java 2016-08-11 13:10:06.883145300 -0400 @@ -25,7 +25,7 @@ * @test CheckCompileThresholdScaling * @bug 8059604 * @summary Add CompileThresholdScaling flag to control when methods are first compiled (with +/-TieredCompilation) - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run driver compiler.arguments.CheckCompileThresholdScaling @@ -33,8 +33,8 @@ package compiler.arguments; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; public class CheckCompileThresholdScaling { --- old/test/compiler/arguments/TestUseBMI1InstructionsOnSupportedCPU.java 2016-08-11 13:10:09.738991000 -0400 +++ new/test/compiler/arguments/TestUseBMI1InstructionsOnSupportedCPU.java 2016-08-11 13:10:09.313266100 -0400 @@ -26,11 +26,10 @@ * @bug 8031321 * @summary Verify processing of UseBMI1Instructions option on CPU with * BMI1 feature support. - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management - * @build compiler.arguments.TestUseBMI1InstructionsOnSupportedCPU - * compiler.arguments.BMISupportedCPUTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/arguments/TestUseBMI1InstructionsOnUnsupportedCPU.java 2016-08-11 13:10:12.169664800 -0400 +++ new/test/compiler/arguments/TestUseBMI1InstructionsOnUnsupportedCPU.java 2016-08-11 13:10:11.759771900 -0400 @@ -26,11 +26,10 @@ * @bug 8031321 * @summary Verify processing of UseBMI1Instructions option on CPU without * BMI1 feature support. - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management - * @build compiler.arguments.TestUseBMI1InstructionsOnUnsupportedCPU - * compiler.arguments.BMIUnsupportedCPUTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/arguments/TestUseCountLeadingZerosInstructionOnSupportedCPU.java 2016-08-11 13:10:14.607275000 -0400 +++ new/test/compiler/arguments/TestUseCountLeadingZerosInstructionOnSupportedCPU.java 2016-08-11 13:10:14.205186200 -0400 @@ -26,11 +26,11 @@ * @bug 8031321 * @summary Verify processing of UseCountLeadingZerosInstruction option * on CPU with LZCNT support. - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.arguments.TestUseCountLeadingZerosInstructionOnSupportedCPU + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/arguments/TestUseCountLeadingZerosInstructionOnUnsupportedCPU.java 2016-08-11 13:10:17.033806100 -0400 +++ new/test/compiler/arguments/TestUseCountLeadingZerosInstructionOnUnsupportedCPU.java 2016-08-11 13:10:16.625910100 -0400 @@ -26,11 +26,11 @@ * @bug 8031321 * @summary Verify processing of UseCountLeadingZerosInstruction option * on CPU without LZCNT support. - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.arguments.TestUseCountLeadingZerosInstructionOnUnsupportedCPU + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/arguments/TestUseCountTrailingZerosInstructionOnSupportedCPU.java 2016-08-11 13:10:19.460514300 -0400 +++ new/test/compiler/arguments/TestUseCountTrailingZerosInstructionOnSupportedCPU.java 2016-08-11 13:10:19.046506100 -0400 @@ -26,11 +26,11 @@ * @bug 8031321 * @summary Verify processing of UseCountTrailingZerosInstruction option * on CPU with TZCNT (BMI1 feature) support. - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.arguments.TestUseCountTrailingZerosInstructionOnSupportedCPU + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/arguments/TestUseCountTrailingZerosInstructionOnUnsupportedCPU.java 2016-08-11 13:10:21.906553500 -0400 +++ new/test/compiler/arguments/TestUseCountTrailingZerosInstructionOnUnsupportedCPU.java 2016-08-11 13:10:21.483215500 -0400 @@ -26,11 +26,11 @@ * @bug 8031321 * @summary Verify processing of UseCountTrailingZerosInstruction option * on CPU without TZCNT instruction (BMI1 feature) support. - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.arguments.TestUseCountTrailingZerosInstructionOnUnsupportedCPU + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/arraycopy/TestArrayCopyNoInitDeopt.java 2016-08-11 13:10:24.337663500 -0400 +++ new/test/compiler/arraycopy/TestArrayCopyNoInitDeopt.java 2016-08-11 13:10:23.930808900 -0400 @@ -26,13 +26,12 @@ * @bug 8072016 * @summary Infinite deoptimization/recompilation cycles in case of arraycopy with tightly coupled allocation * @requires vm.flavor == "server" - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.arraycopy.TestArrayCopyNoInitDeopt + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission - * jdk.test.lib.Platform * @run main/othervm -Xmixed -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI * -XX:-BackgroundCompilation -XX:-UseOnStackReplacement -XX:TypeProfileLevel=020 * compiler.arraycopy.TestArrayCopyNoInitDeopt --- old/test/compiler/c2/PolynomialRoot.java 2016-08-11 13:10:26.776189800 -0400 +++ new/test/compiler/c2/PolynomialRoot.java 2016-08-11 13:10:26.361055000 -0400 @@ -13,7 +13,7 @@ * @test * @bug 8005956 * @summary C2: assert(!def_outside->member(r)) failed: Use of external LRG overlaps the same LRG defined in this block - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * --- old/test/compiler/c2/Test5057225.java 2016-08-11 13:10:29.237681600 -0400 +++ new/test/compiler/c2/Test5057225.java 2016-08-11 13:10:28.826552600 -0400 @@ -26,7 +26,7 @@ * @bug 5057225 * @summary Remove useless I2L conversions * @modules java.base/jdk.internal.misc - * @library /testlibrary + * @library /test/lib * * @run main/othervm -Xcomp * -XX:CompileCommand=compileonly,compiler.c2.Test5057225::doload --- old/test/compiler/c2/Test6603011.java 2016-08-11 13:10:31.672909500 -0400 +++ new/test/compiler/c2/Test6603011.java 2016-08-11 13:10:31.263115800 -0400 @@ -26,7 +26,7 @@ * @bug 6603011 * @summary long/int division by constant * @modules java.base/jdk.internal.misc - * @library /testlibrary + * @library /test/lib * * @run main/othervm -Xcomp -Xbatch -XX:-Inline compiler.c2.Test6603011 */ --- old/test/compiler/c2/Test6800154.java 2016-08-11 13:10:34.075609500 -0400 +++ new/test/compiler/c2/Test6800154.java 2016-08-11 13:10:33.667959400 -0400 @@ -26,7 +26,7 @@ * @bug 6800154 * @summary Add comments to long_by_long_mulhi() for better understandability * @modules java.base/jdk.internal.misc - * @library /testlibrary + * @library /test/lib * * @run main/othervm -Xcomp * -XX:CompileCommand=compileonly,compiler.c2.Test6800154::divcomp --- old/test/compiler/c2/Test6805724.java 2016-08-11 13:10:36.495946300 -0400 +++ new/test/compiler/c2/Test6805724.java 2016-08-11 13:10:36.090933800 -0400 @@ -27,7 +27,7 @@ * @summary ModLNode::Ideal() generates functionally incorrect graph * when divisor is any (2^k-1) constant. * @modules java.base/jdk.internal.misc - * @library /testlibrary + * @library /test/lib * * @run main/othervm -Xcomp * -XX:CompileCommand=compileonly,compiler.c2.Test6805724::fcomp --- old/test/compiler/c2/Test6857159.java 2016-08-11 13:10:38.917181700 -0400 +++ new/test/compiler/c2/Test6857159.java 2016-08-11 13:10:38.512462200 -0400 @@ -26,7 +26,7 @@ * @test * @bug 6857159 * @summary local schedule failed with checkcast of Thread.currentThread() - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @@ -35,8 +35,8 @@ package compiler.c2; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; public class Test6857159 { public static void main(String[] args) throws Throwable { --- old/test/compiler/c2/Test7068051.java 2016-08-11 13:10:41.358392600 -0400 +++ new/test/compiler/c2/Test7068051.java 2016-08-11 13:10:40.947126800 -0400 @@ -26,7 +26,7 @@ * @test * @bug 7068051 * @summary SIGSEGV in PhaseIdealLoop::build_loop_late_post on T5440 - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @@ -36,7 +36,7 @@ package compiler.c2; import jdk.test.lib.JDKToolLauncher; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import java.io.IOException; import java.io.InputStream; --- old/test/compiler/c2/Test7177917.java 2016-08-11 13:10:43.794456200 -0400 +++ new/test/compiler/c2/Test7177917.java 2016-08-11 13:10:43.382926100 -0400 @@ -27,7 +27,7 @@ * @bug 7177917 * @summary Micro-benchmark for Math.pow() and Math.exp() * @modules java.base/jdk.internal.misc - * @library /testlibrary + * @library /test/lib * * @run main compiler.c2.Test7177917 */ --- old/test/compiler/c2/cr6589834/Test_ia32.java 2016-08-11 13:10:46.237111100 -0400 +++ new/test/compiler/c2/cr6589834/Test_ia32.java 2016-08-11 13:10:45.826154900 -0400 @@ -26,15 +26,13 @@ * @bug 6589834 * @summary Safepoint placed between stack pointer increment and decrement leads * to interpreter's stack corruption after deoptimization. - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.compiler * java.management * jdk.jvmstat/sun.jvmstat.monitor * - * @build ClassFileInstaller sun.hotspot.WhiteBox jdk.test.lib.* - * compiler.c2.cr6589834.Test_ia32 - * compiler.c2.cr6589834.InlinedArrayCloneTestCase + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/c2/stemmer/Stemmer.java 2016-08-11 13:10:48.672914600 -0400 +++ new/test/compiler/c2/stemmer/Stemmer.java 2016-08-11 13:10:48.261458000 -0400 @@ -3,7 +3,7 @@ * @bug 7070134 * @summary Hotspot crashes with sigsegv from PorterStemmer * @modules java.base/jdk.internal.misc - * @library /testlibrary + * @library /test/lib * * @run driver jdk.test.lib.FileInstaller words words * @run main/othervm -Xbatch compiler.c2.stemmer.Stemmer words --- old/test/compiler/calls/fromCompiled/CompiledInvokeDynamic2CompiledTest.java 2016-08-11 13:10:51.106918000 -0400 +++ new/test/compiler/calls/fromCompiled/CompiledInvokeDynamic2CompiledTest.java 2016-08-11 13:10:50.698499800 -0400 @@ -24,12 +24,11 @@ /* * @test * @summary check calls from compiled to compiled using InvokeDynamic - * @library /test/lib /testlibrary / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.base/jdk.internal.org.objectweb.asm * - * @build compiler.calls.common.InvokeDynamic - * compiler.calls.common.InvokeDynamicPatcher + * @build sun.hotspot.WhiteBox * @run main compiler.calls.common.InvokeDynamicPatcher * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission --- old/test/compiler/calls/fromCompiled/CompiledInvokeDynamic2InterpretedTest.java 2016-08-11 13:10:53.526495700 -0400 +++ new/test/compiler/calls/fromCompiled/CompiledInvokeDynamic2InterpretedTest.java 2016-08-11 13:10:53.118754900 -0400 @@ -24,12 +24,11 @@ /* * @test * @summary check calls from compiled to interpreted using InvokeDynamic - * @library /test/lib /testlibrary / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.base/jdk.internal.org.objectweb.asm * - * @build compiler.calls.common.InvokeDynamic - * @build compiler.calls.common.InvokeDynamicPatcher + * @build sun.hotspot.WhiteBox * @run main compiler.calls.common.InvokeDynamicPatcher * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission --- old/test/compiler/calls/fromCompiled/CompiledInvokeDynamic2NativeTest.java 2016-08-11 13:10:55.960846800 -0400 +++ new/test/compiler/calls/fromCompiled/CompiledInvokeDynamic2NativeTest.java 2016-08-11 13:10:55.550486900 -0400 @@ -24,12 +24,11 @@ /* * @test * @summary check calls from compiled to native using InvokeDynamic - * @library /test/lib /testlibrary / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.base/jdk.internal.org.objectweb.asm * - * @build compiler.calls.common.InvokeDynamic - * compiler.calls.common.InvokeDynamicPatcher + * @build sun.hotspot.WhiteBox * @run main compiler.calls.common.InvokeDynamicPatcher * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission --- old/test/compiler/calls/fromCompiled/CompiledInvokeInterface2CompiledTest.java 2016-08-11 13:10:58.391027900 -0400 +++ new/test/compiler/calls/fromCompiled/CompiledInvokeInterface2CompiledTest.java 2016-08-11 13:10:57.984292200 -0400 @@ -25,9 +25,9 @@ * @test * @modules java.base/jdk.internal.misc * @summary check calls from compiled to compiled using InvokeInterface - * @library /test/lib /testlibrary / + * @library /test/lib / * - * @build compiler.calls.common.InvokeInterface + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. --- old/test/compiler/calls/fromCompiled/CompiledInvokeInterface2InterpretedTest.java 2016-08-11 13:11:00.824322200 -0400 +++ new/test/compiler/calls/fromCompiled/CompiledInvokeInterface2InterpretedTest.java 2016-08-11 13:11:00.418276400 -0400 @@ -25,9 +25,9 @@ * @test * @summary check calls from compiled to interpreted using InvokeInterface * @modules java.base/jdk.internal.misc - * @library /test/lib /testlibrary / + * @library /test/lib / * - * @build compiler.calls.common.InvokeInterface + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. --- old/test/compiler/calls/fromCompiled/CompiledInvokeInterface2NativeTest.java 2016-08-11 13:11:03.250972700 -0400 +++ new/test/compiler/calls/fromCompiled/CompiledInvokeInterface2NativeTest.java 2016-08-11 13:11:02.842447100 -0400 @@ -25,9 +25,9 @@ * @test * @summary check calls from compiled to native using InvokeInterface * @modules java.base/jdk.internal.misc - * @library /test/lib /testlibrary / + * @library /test/lib / * - * @build compiler.calls.common.InvokeInterface + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. --- old/test/compiler/calls/fromCompiled/CompiledInvokeSpecial2CompiledTest.java 2016-08-11 13:11:05.672933500 -0400 +++ new/test/compiler/calls/fromCompiled/CompiledInvokeSpecial2CompiledTest.java 2016-08-11 13:11:05.258825600 -0400 @@ -25,9 +25,9 @@ * @test * @summary check calls from compiled to compiled using InvokeSpecial * @modules java.base/jdk.internal.misc - * @library /test/lib /testlibrary / + * @library /test/lib / * - * @build compiler.calls.common.InvokeSpecial + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. --- old/test/compiler/calls/fromCompiled/CompiledInvokeSpecial2InterpretedTest.java 2016-08-11 13:11:08.095928400 -0400 +++ new/test/compiler/calls/fromCompiled/CompiledInvokeSpecial2InterpretedTest.java 2016-08-11 13:11:07.689376600 -0400 @@ -25,9 +25,9 @@ * @test * @summary check calls from compiled to interpreted using InvokeSpecial * @modules java.base/jdk.internal.misc - * @library /test/lib /testlibrary / + * @library /test/lib / * - * @build compiler.calls.common.InvokeSpecial + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. --- old/test/compiler/calls/fromCompiled/CompiledInvokeSpecial2NativeTest.java 2016-08-11 13:11:10.522381700 -0400 +++ new/test/compiler/calls/fromCompiled/CompiledInvokeSpecial2NativeTest.java 2016-08-11 13:11:10.113764600 -0400 @@ -25,9 +25,9 @@ * @test * @summary check calls from compiled to native using InvokeSpecial * @modules java.base/jdk.internal.misc - * @library /test/lib /testlibrary / + * @library /test/lib / * - * @build compiler.calls.common.InvokeSpecial + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. --- old/test/compiler/calls/fromCompiled/CompiledInvokeStatic2CompiledTest.java 2016-08-11 13:11:12.958365800 -0400 +++ new/test/compiler/calls/fromCompiled/CompiledInvokeStatic2CompiledTest.java 2016-08-11 13:11:12.547602500 -0400 @@ -25,9 +25,9 @@ * @test * @summary check calls from compiled to compiled using InvokeStatic * @modules java.base/jdk.internal.misc - * @library /test/lib /testlibrary / + * @library /test/lib / * - * @build compiler.calls.common.InvokeStatic + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. --- old/test/compiler/calls/fromCompiled/CompiledInvokeStatic2InterpretedTest.java 2016-08-11 13:11:15.404257400 -0400 +++ new/test/compiler/calls/fromCompiled/CompiledInvokeStatic2InterpretedTest.java 2016-08-11 13:11:14.973942900 -0400 @@ -25,9 +25,9 @@ * @test * @summary check calls from compiled to interpreted using InvokeStatic * @modules java.base/jdk.internal.misc - * @library /test/lib /testlibrary / + * @library /test/lib / * - * @build compiler.calls.common.InvokeStatic + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. --- old/test/compiler/calls/fromCompiled/CompiledInvokeStatic2NativeTest.java 2016-08-11 13:11:17.826356300 -0400 +++ new/test/compiler/calls/fromCompiled/CompiledInvokeStatic2NativeTest.java 2016-08-11 13:11:17.413582900 -0400 @@ -25,9 +25,9 @@ * @test * @summary check calls from compiled to native using InvokeStatic * @modules java.base/jdk.internal.misc - * @library /test/lib /testlibrary / + * @library /test/lib / * - * @build compiler.calls.common.InvokeStatic + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. --- old/test/compiler/calls/fromCompiled/CompiledInvokeVirtual2CompiledTest.java 2016-08-11 13:11:20.254049500 -0400 +++ new/test/compiler/calls/fromCompiled/CompiledInvokeVirtual2CompiledTest.java 2016-08-11 13:11:19.842244800 -0400 @@ -25,9 +25,9 @@ * @test * @summary check calls from compiled to compiled using InvokeVirtual * @modules java.base/jdk.internal.misc - * @library /test/lib /testlibrary / + * @library /test/lib / * - * @build compiler.calls.common.InvokeVirtual + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. --- old/test/compiler/calls/fromCompiled/CompiledInvokeVirtual2InterpretedTest.java 2016-08-11 13:11:22.661349300 -0400 +++ new/test/compiler/calls/fromCompiled/CompiledInvokeVirtual2InterpretedTest.java 2016-08-11 13:11:22.256918500 -0400 @@ -25,9 +25,9 @@ * @test * @summary check calls from compiled to interpreted using InvokeVirtual * @modules java.base/jdk.internal.misc - * @library /test/lib /testlibrary / + * @library /test/lib / * - * @build compiler.calls.common.InvokeVirtual + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. --- old/test/compiler/calls/fromCompiled/CompiledInvokeVirtual2NativeTest.java 2016-08-11 13:11:25.106878300 -0400 +++ new/test/compiler/calls/fromCompiled/CompiledInvokeVirtual2NativeTest.java 2016-08-11 13:11:24.694452900 -0400 @@ -25,9 +25,9 @@ * @test * @summary check calls from compiled to native using InvokeVirtual * @modules java.base/jdk.internal.misc - * @library /test/lib /testlibrary / + * @library /test/lib / * - * @build compiler.calls.common.InvokeVirtual + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. --- old/test/compiler/calls/fromInterpreted/InterpretedInvokeDynamic2CompiledTest.java 2016-08-11 13:11:27.563116700 -0400 +++ new/test/compiler/calls/fromInterpreted/InterpretedInvokeDynamic2CompiledTest.java 2016-08-11 13:11:27.145870000 -0400 @@ -24,12 +24,11 @@ /* * @test * @summary check calls from interpreted to compiled using InvokeDynamic - * @library /test/lib /testlibrary / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.base/jdk.internal.org.objectweb.asm * - * @build compiler.calls.common.InvokeDynamic - * compiler.calls.common.InvokeDynamicPatcher + * @build sun.hotspot.WhiteBox * @run main compiler.calls.common.InvokeDynamicPatcher * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission --- old/test/compiler/calls/fromInterpreted/InterpretedInvokeDynamic2InterpretedTest.java 2016-08-11 13:11:29.992826000 -0400 +++ new/test/compiler/calls/fromInterpreted/InterpretedInvokeDynamic2InterpretedTest.java 2016-08-11 13:11:29.576427400 -0400 @@ -24,12 +24,11 @@ /* * @test * @summary check calls from interpreted to interpreted using InvokeDynamic - * @library /test/lib /testlibrary / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.base/jdk.internal.org.objectweb.asm * - * @build compiler.calls.common.InvokeDynamic - * compiler.calls.common.InvokeDynamicPatcher + * @build sun.hotspot.WhiteBox * @run main compiler.calls.common.InvokeDynamicPatcher * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission --- old/test/compiler/calls/fromInterpreted/InterpretedInvokeDynamic2NativeTest.java 2016-08-11 13:11:32.439601300 -0400 +++ new/test/compiler/calls/fromInterpreted/InterpretedInvokeDynamic2NativeTest.java 2016-08-11 13:11:32.031325500 -0400 @@ -24,12 +24,11 @@ /* * @test * @summary check calls from interpreted to native using InvokeDynamic - * @library /test/lib /testlibrary / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.base/jdk.internal.org.objectweb.asm * - * @build compiler.calls.common.InvokeDynamic - * compiler.calls.common.InvokeDynamicPatcher + * @build sun.hotspot.WhiteBox * @run main compiler.calls.common.InvokeDynamicPatcher * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission --- old/test/compiler/calls/fromInterpreted/InterpretedInvokeInterface2CompiledTest.java 2016-08-11 13:11:34.892841100 -0400 +++ new/test/compiler/calls/fromInterpreted/InterpretedInvokeInterface2CompiledTest.java 2016-08-11 13:11:34.483696200 -0400 @@ -25,9 +25,9 @@ * @test * @summary check calls from interpreted to compiled using InvokeInterface * @modules java.base/jdk.internal.misc - * @library /test/lib /testlibrary / + * @library /test/lib / * - * @build compiler.calls.common.InvokeInterface + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. --- old/test/compiler/calls/fromInterpreted/InterpretedInvokeInterface2InterpretedTest.java 2016-08-11 13:11:37.329849100 -0400 +++ new/test/compiler/calls/fromInterpreted/InterpretedInvokeInterface2InterpretedTest.java 2016-08-11 13:11:36.915501700 -0400 @@ -25,9 +25,9 @@ * @test * @summary check calls from interpreted to interpreted using InvokeInterface * @modules java.base/jdk.internal.misc - * @library /test/lib /testlibrary / + * @library /test/lib / * - * @build compiler.calls.common.InvokeInterface + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. --- old/test/compiler/calls/fromInterpreted/InterpretedInvokeInterface2NativeTest.java 2016-08-11 13:11:39.793384000 -0400 +++ new/test/compiler/calls/fromInterpreted/InterpretedInvokeInterface2NativeTest.java 2016-08-11 13:11:39.366092400 -0400 @@ -25,9 +25,9 @@ * @test * @summary check calls from interpreted to native using InvokeInterface * @modules java.base/jdk.internal.misc - * @library /test/lib /testlibrary / + * @library /test/lib / * - * @build compiler.calls.common.InvokeInterface + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. --- old/test/compiler/calls/fromInterpreted/InterpretedInvokeSpecial2CompiledTest.java 2016-08-11 13:11:42.238014800 -0400 +++ new/test/compiler/calls/fromInterpreted/InterpretedInvokeSpecial2CompiledTest.java 2016-08-11 13:11:41.816557000 -0400 @@ -24,8 +24,8 @@ /* * @test * @modules java.base/jdk.internal.misc - * @library /test/lib /testlibrary / - * @build compiler.calls.common.InvokeSpecial + * @library /test/lib / + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. --- old/test/compiler/calls/fromInterpreted/InterpretedInvokeSpecial2InterpretedTest.java 2016-08-11 13:11:44.685531200 -0400 +++ new/test/compiler/calls/fromInterpreted/InterpretedInvokeSpecial2InterpretedTest.java 2016-08-11 13:11:44.273039600 -0400 @@ -25,9 +25,9 @@ * @test * @summary check calls from interpreted to interpreted using InvokeSpecial * @modules java.base/jdk.internal.misc - * @library /test/lib /testlibrary / + * @library /test/lib / * - * @build compiler.calls.common.InvokeSpecial + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. --- old/test/compiler/calls/fromInterpreted/InterpretedInvokeSpecial2NativeTest.java 2016-08-11 13:11:47.132557500 -0400 +++ new/test/compiler/calls/fromInterpreted/InterpretedInvokeSpecial2NativeTest.java 2016-08-11 13:11:46.716185900 -0400 @@ -25,7 +25,7 @@ * @test * @summary check calls from interpreted to native using InvokeSpecial * @modules java.base/jdk.internal.misc - * @library /test/lib /testlibrary / + * @library /test/lib / * * @build compiler.calls.common.InvokeSpecial * @run driver ClassFileInstaller sun.hotspot.WhiteBox --- old/test/compiler/calls/fromInterpreted/InterpretedInvokeStatic2CompiledTest.java 2016-08-11 13:11:49.569500500 -0400 +++ new/test/compiler/calls/fromInterpreted/InterpretedInvokeStatic2CompiledTest.java 2016-08-11 13:11:49.159615200 -0400 @@ -25,9 +25,9 @@ * @test * @summary check calls from interpreted to compiled using InvokeStatic * @modules java.base/jdk.internal.misc - * @library /test/lib /testlibrary / + * @library /test/lib / * - * @build compiler.calls.common.InvokeStatic + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. --- old/test/compiler/calls/fromInterpreted/InterpretedInvokeStatic2InterpretedTest.java 2016-08-11 13:11:51.995077400 -0400 +++ new/test/compiler/calls/fromInterpreted/InterpretedInvokeStatic2InterpretedTest.java 2016-08-11 13:11:51.582324100 -0400 @@ -25,9 +25,9 @@ * @test * @summary check calls from interpreted to interpreted using InvokeStatic * @modules java.base/jdk.internal.misc - * @library /test/lib /testlibrary / + * @library /test/lib / * - * @build compiler.calls.common.InvokeStatic + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. --- old/test/compiler/calls/fromInterpreted/InterpretedInvokeStatic2NativeTest.java 2016-08-11 13:11:54.428768600 -0400 +++ new/test/compiler/calls/fromInterpreted/InterpretedInvokeStatic2NativeTest.java 2016-08-11 13:11:54.013555600 -0400 @@ -25,9 +25,9 @@ * @test * @summary check calls from interpreted to native using InvokeStatic * @modules java.base/jdk.internal.misc - * @library /test/lib /testlibrary / + * @library /test/lib / * - * @build compiler.calls.common.InvokeStatic + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. --- old/test/compiler/calls/fromInterpreted/InterpretedInvokeVirtual2CompiledTest.java 2016-08-11 13:11:56.848298400 -0400 +++ new/test/compiler/calls/fromInterpreted/InterpretedInvokeVirtual2CompiledTest.java 2016-08-11 13:11:56.435084400 -0400 @@ -25,9 +25,9 @@ * @test * @summary check calls from interpreted to compiled using InvokeVirtual * @modules java.base/jdk.internal.misc - * @library /test/lib /testlibrary / + * @library /test/lib / * - * @build compiler.calls.common.InvokeVirtual + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. --- old/test/compiler/calls/fromInterpreted/InterpretedInvokeVirtual2InterpretedTest.java 2016-08-11 13:11:59.284410300 -0400 +++ new/test/compiler/calls/fromInterpreted/InterpretedInvokeVirtual2InterpretedTest.java 2016-08-11 13:11:58.871239100 -0400 @@ -25,9 +25,9 @@ * @test * @summary check calls from interpreted to interpreted using InvokeVirtual * @modules java.base/jdk.internal.misc - * @library /test/lib /testlibrary / + * @library /test/lib / * - * @build compiler.calls.common.InvokeVirtual + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. --- old/test/compiler/calls/fromInterpreted/InterpretedInvokeVirtual2NativeTest.java 2016-08-11 13:12:01.739641500 -0400 +++ new/test/compiler/calls/fromInterpreted/InterpretedInvokeVirtual2NativeTest.java 2016-08-11 13:12:01.325571300 -0400 @@ -25,9 +25,9 @@ * @test * @summary check calls from interpreted to native using InvokeVirtual * @modules java.base/jdk.internal.misc - * @library /test/lib /testlibrary / + * @library /test/lib / * - * @build compiler.calls.common.InvokeVirtual + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. --- old/test/compiler/calls/fromNative/NativeInvokeSpecial2CompiledTest.java 2016-08-11 13:12:04.178389800 -0400 +++ new/test/compiler/calls/fromNative/NativeInvokeSpecial2CompiledTest.java 2016-08-11 13:12:03.769196100 -0400 @@ -25,9 +25,9 @@ * @test * @summary check calls from native to compiled using InvokeSpecial * @modules java.base/jdk.internal.misc - * @library /test/lib /testlibrary / + * @library /test/lib / * - * @build compiler.calls.common.InvokeSpecial + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. --- old/test/compiler/calls/fromNative/NativeInvokeSpecial2InterpretedTest.java 2016-08-11 13:12:06.630825100 -0400 +++ new/test/compiler/calls/fromNative/NativeInvokeSpecial2InterpretedTest.java 2016-08-11 13:12:06.217810900 -0400 @@ -25,9 +25,9 @@ * @test * @summary check calls from native to interpreted using InvokeSpecial * @modules java.base/jdk.internal.misc - * @library /test/lib /testlibrary / + * @library /test/lib / * - * @build compiler.calls.common.InvokeSpecial + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. --- old/test/compiler/calls/fromNative/NativeInvokeSpecial2NativeTest.java 2016-08-11 13:12:09.066513200 -0400 +++ new/test/compiler/calls/fromNative/NativeInvokeSpecial2NativeTest.java 2016-08-11 13:12:08.657308500 -0400 @@ -25,9 +25,9 @@ * @test * @summary check calls from native to native using InvokeSpecial * @modules java.base/jdk.internal.misc - * @library /test/lib /testlibrary / + * @library /test/lib / * - * @build compiler.calls.common.InvokeSpecial + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. --- old/test/compiler/calls/fromNative/NativeInvokeStatic2CompiledTest.java 2016-08-11 13:12:11.487721300 -0400 +++ new/test/compiler/calls/fromNative/NativeInvokeStatic2CompiledTest.java 2016-08-11 13:12:11.084431100 -0400 @@ -25,9 +25,9 @@ * @test * @summary check calls from native to compiled using InvokeStatic * @modules java.base/jdk.internal.misc - * @library /test/lib /testlibrary / + * @library /test/lib / * - * @build compiler.calls.common.InvokeStatic + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. --- old/test/compiler/calls/fromNative/NativeInvokeStatic2InterpretedTest.java 2016-08-11 13:12:13.940288400 -0400 +++ new/test/compiler/calls/fromNative/NativeInvokeStatic2InterpretedTest.java 2016-08-11 13:12:13.516607800 -0400 @@ -25,9 +25,9 @@ * @test * @summary check calls from native to interpreted using InvokeStatic * @modules java.base/jdk.internal.misc - * @library /test/lib /testlibrary / + * @library /test/lib / * - * @build compiler.calls.common.InvokeStatic + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. --- old/test/compiler/calls/fromNative/NativeInvokeStatic2NativeTest.java 2016-08-11 13:12:16.387115800 -0400 +++ new/test/compiler/calls/fromNative/NativeInvokeStatic2NativeTest.java 2016-08-11 13:12:15.980354400 -0400 @@ -25,9 +25,9 @@ * @test * @summary check calls from native to native using InvokeStatic * @modules java.base/jdk.internal.misc - * @library /test/lib /testlibrary / + * @library /test/lib / * - * @build compiler.calls.common.InvokeStatic + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. --- old/test/compiler/calls/fromNative/NativeInvokeVirtual2CompiledTest.java 2016-08-11 13:12:18.829608500 -0400 +++ new/test/compiler/calls/fromNative/NativeInvokeVirtual2CompiledTest.java 2016-08-11 13:12:18.422569200 -0400 @@ -25,9 +25,9 @@ * @test * @summary check calls from native to compiled using InvokeVirtual * @modules java.base/jdk.internal.misc - * @library /test/lib /testlibrary / + * @library /test/lib / * - * @build compiler.calls.common.InvokeVirtual + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. --- old/test/compiler/calls/fromNative/NativeInvokeVirtual2InterpretedTest.java 2016-08-11 13:12:21.278353300 -0400 +++ new/test/compiler/calls/fromNative/NativeInvokeVirtual2InterpretedTest.java 2016-08-11 13:12:20.875785100 -0400 @@ -25,8 +25,8 @@ * @test * @summary check calls from native to interpreted using InvokeVirtual * @modules java.base/jdk.internal.misc - * @library /test/lib /testlibrary / - * @build compiler.calls.common.InvokeVirtual + * @library /test/lib / + * @build sun.hotspot.WhiteBox * * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission --- old/test/compiler/calls/fromNative/NativeInvokeVirtual2NativeTest.java 2016-08-11 13:12:23.747548300 -0400 +++ new/test/compiler/calls/fromNative/NativeInvokeVirtual2NativeTest.java 2016-08-11 13:12:23.334246200 -0400 @@ -25,9 +25,9 @@ * @test * @summary check calls from native to native using InvokeVirtual * @modules java.base/jdk.internal.misc - * @library /test/lib /testlibrary / + * @library /test/lib / * - * @build compiler.calls.common.InvokeVirtual + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. --- old/test/compiler/classUnloading/anonymousClass/TestAnonymousClassUnloading.java 2016-08-11 13:12:26.325833500 -0400 +++ new/test/compiler/classUnloading/anonymousClass/TestAnonymousClassUnloading.java 2016-08-11 13:12:25.908571800 -0400 @@ -25,7 +25,7 @@ * @test TestAnonymousClassUnloading * @bug 8054402 * @summary "Tests unloading of anonymous classes." - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI --- old/test/compiler/classUnloading/methodUnloading/TestMethodUnloading.java 2016-08-11 13:12:28.830857000 -0400 +++ new/test/compiler/classUnloading/methodUnloading/TestMethodUnloading.java 2016-08-11 13:12:28.412247200 -0400 @@ -26,9 +26,9 @@ * @bug 8029443 * @summary Tests the unloading of methods to to class unloading * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib / + * @library /test/lib / * - * @build compiler.classUnloading.methodUnloading.TestMethodUnloading + * @build sun.hotspot.WhiteBox * compiler.classUnloading.methodUnloading.WorkerClass * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission --- old/test/compiler/codecache/CheckReservedInitialCodeCacheSizeArgOrder.java 2016-08-11 13:12:31.375886700 -0400 +++ new/test/compiler/codecache/CheckReservedInitialCodeCacheSizeArgOrder.java 2016-08-11 13:12:30.955031500 -0400 @@ -26,7 +26,7 @@ * @bug 8013496 * @summary Test checks that the order in which ReversedCodeCacheSize and * InitialCodeCacheSize are passed to the VM is irrelevant. - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @@ -35,8 +35,8 @@ package compiler.codecache; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; public class CheckReservedInitialCodeCacheSizeArgOrder { public static void main(String[] args) throws Exception { --- old/test/compiler/codecache/CheckSegmentedCodeCache.java 2016-08-11 13:12:33.885349600 -0400 +++ new/test/compiler/codecache/CheckSegmentedCodeCache.java 2016-08-11 13:12:33.466448600 -0400 @@ -25,11 +25,11 @@ * @test CheckSegmentedCodeCache * @bug 8015774 * @summary Checks VM options related to the segmented code cache - * @library /testlibrary /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.codecache.CheckSegmentedCodeCache + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions @@ -39,9 +39,9 @@ package compiler.codecache; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.Platform; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.ProcessTools; import sun.hotspot.WhiteBox; public class CheckSegmentedCodeCache { --- old/test/compiler/codecache/CheckUpperLimit.java 2016-08-11 13:12:36.401742500 -0400 +++ new/test/compiler/codecache/CheckUpperLimit.java 2016-08-11 13:12:35.974146000 -0400 @@ -25,7 +25,7 @@ * @test * @bug 8015635 * @summary Test ensures that the ReservedCodeCacheSize is at most MAXINT - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @@ -34,8 +34,8 @@ package compiler.codecache; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; public class CheckUpperLimit { public static void main(String[] args) throws Exception { --- old/test/compiler/codecache/OverflowCodeCacheTest.java 2016-08-11 13:12:38.966404700 -0400 +++ new/test/compiler/codecache/OverflowCodeCacheTest.java 2016-08-11 13:12:38.533178900 -0400 @@ -26,11 +26,11 @@ * @test OverflowCodeCacheTest * @bug 8059550 * @summary testing of code cache segments overflow - * @library /testlibrary /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.codecache.OverflowCodeCacheTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/codecache/cli/TestSegmentedCodeCacheOption.java 2016-08-11 13:12:41.418159200 -0400 +++ new/test/compiler/codecache/cli/TestSegmentedCodeCacheOption.java 2016-08-11 13:12:41.009280300 -0400 @@ -25,20 +25,19 @@ * @test * @bug 8015774 * @summary Verify SegmentedCodeCache option's processing - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.compiler * java.management * jdk.jvmstat/sun.jvmstat.monitor * - * @build jdk.test.lib.* * @run driver compiler.codecache.cli.TestSegmentedCodeCacheOption */ package compiler.codecache.cli; import compiler.codecache.cli.common.CodeCacheOptions; -import jdk.test.lib.ExitCode; +import jdk.test.lib.process.ExitCode; import jdk.test.lib.Platform; import jdk.test.lib.cli.CommandLineOptionTest; import sun.hotspot.code.BlobType; --- old/test/compiler/codecache/cli/codeheapsize/CodeCacheFreeSpaceRunner.java 2016-08-11 13:12:43.855861300 -0400 +++ new/test/compiler/codecache/cli/codeheapsize/CodeCacheFreeSpaceRunner.java 2016-08-11 13:12:43.442225200 -0400 @@ -25,7 +25,7 @@ import compiler.codecache.cli.common.CodeCacheCLITestCase; import compiler.codecache.cli.common.CodeCacheOptions; -import jdk.test.lib.ExitCode; +import jdk.test.lib.process.ExitCode; import jdk.test.lib.Platform; import jdk.test.lib.cli.CommandLineOptionTest; import sun.hotspot.code.BlobType; --- old/test/compiler/codecache/cli/codeheapsize/JVMStartupRunner.java 2016-08-11 13:12:46.289442200 -0400 +++ new/test/compiler/codecache/cli/codeheapsize/JVMStartupRunner.java 2016-08-11 13:12:45.884489100 -0400 @@ -25,7 +25,7 @@ import compiler.codecache.cli.common.CodeCacheCLITestCase; import compiler.codecache.cli.common.CodeCacheOptions; -import jdk.test.lib.ExitCode; +import jdk.test.lib.process.ExitCode; import jdk.test.lib.Utils; import jdk.test.lib.cli.CommandLineOptionTest; import sun.hotspot.code.BlobType; --- old/test/compiler/codecache/cli/codeheapsize/TestCodeHeapSizeOptions.java 2016-08-11 13:12:48.719153200 -0400 +++ new/test/compiler/codecache/cli/codeheapsize/TestCodeHeapSizeOptions.java 2016-08-11 13:12:48.307572200 -0400 @@ -25,13 +25,12 @@ * @test * @bug 8015774 * @summary Verify processing of options related to code heaps sizing. - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.compiler * java.management * jdk.jvmstat/sun.jvmstat.monitor * - * @build compiler.codecache.cli.codeheapsize.TestCodeHeapSizeOptions jdk.test.lib.* * @run driver/timeout=240 compiler.codecache.cli.codeheapsize.TestCodeHeapSizeOptions */ --- old/test/compiler/codecache/cli/printcodecache/PrintCodeCacheRunner.java 2016-08-11 13:12:51.159232900 -0400 +++ new/test/compiler/codecache/cli/printcodecache/PrintCodeCacheRunner.java 2016-08-11 13:12:50.749315100 -0400 @@ -26,7 +26,7 @@ import compiler.codecache.cli.common.CodeCacheCLITestCase; import compiler.codecache.cli.common.CodeCacheInfoFormatter; import compiler.codecache.cli.common.CodeCacheOptions; -import jdk.test.lib.ExitCode; +import jdk.test.lib.process.ExitCode; import jdk.test.lib.cli.CommandLineOptionTest; import sun.hotspot.code.BlobType; --- old/test/compiler/codecache/cli/printcodecache/TestPrintCodeCacheOption.java 2016-08-11 13:12:53.613626200 -0400 +++ new/test/compiler/codecache/cli/printcodecache/TestPrintCodeCacheOption.java 2016-08-11 13:12:53.183595700 -0400 @@ -25,13 +25,12 @@ * @test * @bug 8015774 * @summary Verify that PrintCodeCache option print correct information. - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.compiler * java.management * jdk.jvmstat/sun.jvmstat.monitor * - * @build jdk.test.lib.* compiler.codecache.cli.common.* * @run main/timeout=240 compiler.codecache.cli.printcodecache.TestPrintCodeCacheOption */ --- old/test/compiler/codecache/dtrace/SegmentedCodeCacheDtraceTest.java 2016-08-11 13:12:56.059398500 -0400 +++ new/test/compiler/codecache/dtrace/SegmentedCodeCacheDtraceTest.java 2016-08-11 13:12:55.636914200 -0400 @@ -27,9 +27,9 @@ * @summary testing of dtrace for segmented code cache * @requires os.family=="solaris" * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib / + * @library /test/lib / * - * @build compiler.codecache.dtrace.SegmentedCodeCacheDtraceTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm/timeout=600 -Xbootclasspath/a:. @@ -42,10 +42,8 @@ import compiler.testlibrary.CompilerUtils; import jdk.test.lib.Asserts; import jdk.test.lib.JDKToolFinder; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.Utils; -import jdk.test.lib.dtrace.DtraceResultsAnalyzer; -import jdk.test.lib.dtrace.DtraceRunner; import java.io.IOException; import java.lang.reflect.Executable; --- old/test/compiler/codecache/jmx/BeanTypeTest.java 2016-08-11 13:12:58.489261800 -0400 +++ new/test/compiler/codecache/jmx/BeanTypeTest.java 2016-08-11 13:12:58.077903200 -0400 @@ -26,9 +26,9 @@ * @summary verify types of code cache memory pool bean * @modules java.base/jdk.internal.misc * java.management - * @library /testlibrary /test/lib + * @library /test/lib * - * @build compiler.codecache.jmx.BeanTypeTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/codecache/jmx/CodeHeapBeanPresenceTest.java 2016-08-11 13:13:00.921506100 -0400 +++ new/test/compiler/codecache/jmx/CodeHeapBeanPresenceTest.java 2016-08-11 13:13:00.511454500 -0400 @@ -26,9 +26,9 @@ * @summary verify CodeHeap bean presence * @modules java.base/jdk.internal.misc * java.management - * @library /testlibrary /test/lib + * @library /test/lib * - * @build compiler.codecache.jmx.CodeHeapBeanPresenceTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/codecache/jmx/GetUsageTest.java 2016-08-11 13:13:03.353855200 -0400 +++ new/test/compiler/codecache/jmx/GetUsageTest.java 2016-08-11 13:13:02.948074100 -0400 @@ -26,9 +26,9 @@ * @summary testing of getUsage() for segmented code cache * @modules java.base/jdk.internal.misc * java.management - * @library /testlibrary /test/lib / + * @library /test/lib / * - * @build compiler.codecache.jmx.GetUsageTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/codecache/jmx/InitialAndMaxUsageTest.java 2016-08-11 13:13:05.793226200 -0400 +++ new/test/compiler/codecache/jmx/InitialAndMaxUsageTest.java 2016-08-11 13:13:05.374422600 -0400 @@ -26,9 +26,9 @@ * @summary testing of initial and max usage * @modules java.base/jdk.internal.misc * java.management - * @library /testlibrary /test/lib / + * @library /test/lib / * - * @build compiler.codecache.jmx.InitialAndMaxUsageTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:-UseCodeCacheFlushing --- old/test/compiler/codecache/jmx/ManagerNamesTest.java 2016-08-11 13:13:08.243301500 -0400 +++ new/test/compiler/codecache/jmx/ManagerNamesTest.java 2016-08-11 13:13:07.811823200 -0400 @@ -26,9 +26,9 @@ * @summary verify getMemoryManageNames calls in case of segmented code cache * @modules java.base/jdk.internal.misc * java.management - * @library /testlibrary /test/lib + * @library /test/lib * - * @build compiler.codecache.jmx.ManagerNamesTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/codecache/jmx/MemoryPoolsPresenceTest.java 2016-08-11 13:13:10.687573000 -0400 +++ new/test/compiler/codecache/jmx/MemoryPoolsPresenceTest.java 2016-08-11 13:13:10.272892100 -0400 @@ -26,9 +26,9 @@ * @summary verify that MemoryManagerMXBean exists for every code cache segment * @modules java.base/jdk.internal.misc * java.management - * @library /testlibrary /test/lib + * @library /test/lib * - * @build compiler.codecache.jmx.MemoryPoolsPresenceTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/codecache/jmx/PeakUsageTest.java 2016-08-11 13:13:13.151000600 -0400 +++ new/test/compiler/codecache/jmx/PeakUsageTest.java 2016-08-11 13:13:12.742781700 -0400 @@ -23,12 +23,12 @@ /* * @test PeakUsageTest - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * * @ignore 8151345 - * @build ompiler.codecache.jmx.PeakUsageTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/codecache/jmx/PoolsIndependenceTest.java 2016-08-11 13:13:15.668811800 -0400 +++ new/test/compiler/codecache/jmx/PoolsIndependenceTest.java 2016-08-11 13:13:15.250799000 -0400 @@ -26,9 +26,9 @@ * @summary testing of getUsageThreshold() * @modules java.base/jdk.internal.misc * java.management - * @library /testlibrary /test/lib / + * @library /test/lib / * - * @build compiler.codecache.jmx.PoolsIndependenceTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/codecache/jmx/ThresholdNotificationsTest.java 2016-08-11 13:13:18.240498000 -0400 +++ new/test/compiler/codecache/jmx/ThresholdNotificationsTest.java 2016-08-11 13:13:17.787347100 -0400 @@ -24,11 +24,11 @@ /* * @test ThresholdNotificationsTest * @summary testing of getUsageThreshold() - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.codecache.jmx.ThresholdNotificationsTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:-UseCodeCacheFlushing --- old/test/compiler/codecache/jmx/UsageThresholdExceededSeveralTimesTest.java 2016-08-11 13:13:20.791730100 -0400 +++ new/test/compiler/codecache/jmx/UsageThresholdExceededSeveralTimesTest.java 2016-08-11 13:13:20.323226200 -0400 @@ -25,11 +25,11 @@ * @test UsageThresholdExceededSeveralTimesTest * @summary verifying that getUsageThresholdCount() returns correct value * after threshold has been hit several times - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.codecache.jmx.UsageThresholdExceededTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/codecache/jmx/UsageThresholdExceededTest.java 2016-08-11 13:13:23.283634500 -0400 +++ new/test/compiler/codecache/jmx/UsageThresholdExceededTest.java 2016-08-11 13:13:22.853949500 -0400 @@ -25,11 +25,11 @@ * @test UsageThresholdExceededTest * @summary verifying that getUsageThresholdCount() returns correct value * after threshold has been hit - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.codecache.jmx.UsageThresholdExceededTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/codecache/jmx/UsageThresholdIncreasedTest.java 2016-08-11 13:13:25.726845300 -0400 +++ new/test/compiler/codecache/jmx/UsageThresholdIncreasedTest.java 2016-08-11 13:13:25.302654500 -0400 @@ -25,13 +25,13 @@ * @test UsageThresholdIncreasedTest * @summary verifying that threshold hasn't been hit after allocation smaller * than threshold value and that threshold value can be changed - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission - * @build compiler.codecache.jmx.UsageThresholdIncreasedTest * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI -XX:-UseCodeCacheFlushing -XX:-MethodFlushing * -XX:CompileCommand=compileonly,null::* --- old/test/compiler/codecache/jmx/UsageThresholdNotExceededTest.java 2016-08-11 13:13:28.179785800 -0400 +++ new/test/compiler/codecache/jmx/UsageThresholdNotExceededTest.java 2016-08-11 13:13:27.762406900 -0400 @@ -25,13 +25,13 @@ * @test UsageThresholdNotExceededTest * @summary verifying that usage threshold not exceeded while allocating less * than usage threshold - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission - * @build compiler.codecache.jmx.UsageThresholdNotExceededTest * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI -XX:-UseCodeCacheFlushing -XX:-MethodFlushing * -XX:CompileCommand=compileonly,null::* --- old/test/compiler/codecache/stress/CodeCacheStressRunner.java 2016-08-11 13:13:30.672805100 -0400 +++ new/test/compiler/codecache/stress/CodeCacheStressRunner.java 2016-08-11 13:13:30.240763600 -0400 @@ -24,7 +24,7 @@ package compiler.codecache.stress; -import jdk.test.lib.TimeLimitedRunner; +import jdk.test.lib.apps.TimeLimitedRunner; import jdk.test.lib.Utils; public class CodeCacheStressRunner { --- old/test/compiler/codecache/stress/Helper.java 2016-08-11 13:13:33.139224000 -0400 +++ new/test/compiler/codecache/stress/Helper.java 2016-08-11 13:13:32.727099400 -0400 @@ -26,7 +26,7 @@ import jdk.test.lib.Asserts; import jdk.test.lib.ByteCodeLoader; -import jdk.test.lib.InfiniteLoop; +import jdk.test.lib.apps.InfiniteLoop; import jdk.test.lib.Utils; import sun.hotspot.WhiteBox; --- old/test/compiler/codecache/stress/OverloadCompileQueueTest.java 2016-08-11 13:13:35.574684100 -0400 +++ new/test/compiler/codecache/stress/OverloadCompileQueueTest.java 2016-08-11 13:13:35.159091300 -0400 @@ -25,12 +25,12 @@ /* * @test OverloadCompileQueueTest * @summary stressing code cache by overloading compile queues - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * * @ignore 8071905 - * @build compiler.codecache.stress.OverloadCompileQueueTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/codecache/stress/RandomAllocationTest.java 2016-08-11 13:13:38.044908600 -0400 +++ new/test/compiler/codecache/stress/RandomAllocationTest.java 2016-08-11 13:13:37.631723700 -0400 @@ -26,11 +26,11 @@ * @test RandomAllocationTest * @key stress * @summary stressing code cache by allocating randomly sized "dummy" code blobs - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.codecache.stress.RandomAllocationTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/codecache/stress/UnexpectedDeoptimizationTest.java 2016-08-11 13:13:40.473481600 -0400 +++ new/test/compiler/codecache/stress/UnexpectedDeoptimizationTest.java 2016-08-11 13:13:40.061613100 -0400 @@ -26,11 +26,11 @@ * @test UnexpectedDeoptimizationTest * @key stress * @summary stressing code cache by forcing unexpected deoptimizations - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.codecache.stress.UnexpectedDeoptimizationTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/codegen/Test6823354.java 2016-08-11 13:13:42.936814200 -0400 +++ new/test/compiler/codegen/Test6823354.java 2016-08-11 13:13:42.514100200 -0400 @@ -26,7 +26,7 @@ * @bug 6823354 * @summary These methods can be instrinsified by using bit scan, bit test, and population count instructions. * @modules java.base/jdk.internal.misc - * @library /testlibrary + * @library /test/lib * * @run main/othervm -Xcomp * -XX:CompileCommand=compileonly,compiler.codegen.Test6823354::lzcomp --- old/test/compiler/codegen/Test6896617.java 2016-08-11 13:13:45.392296000 -0400 +++ new/test/compiler/codegen/Test6896617.java 2016-08-11 13:13:44.977089400 -0400 @@ -25,7 +25,7 @@ * @test * @bug 6896617 * @summary Optimize sun.nio.cs.ISO_8859_1$Encode.encodeArrayLoop() with SSE instructions on x86 - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.base/sun.nio.cs * java.management --- old/test/compiler/codegen/Test7100757.java 2016-08-11 13:13:47.837852300 -0400 +++ new/test/compiler/codegen/Test7100757.java 2016-08-11 13:13:47.423009300 -0400 @@ -26,7 +26,7 @@ * @test * @bug 7100757 * @summary The BitSet.nextSetBit() produces incorrect result in 32bit VM on Sparc - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * --- old/test/compiler/codegen/aes/TestAESMain.java 2016-08-11 13:13:50.296878900 -0400 +++ new/test/compiler/codegen/aes/TestAESMain.java 2016-08-11 13:13:49.876092200 -0400 @@ -27,7 +27,7 @@ * @bug 7184394 * @key stress * @summary add intrinsics to use AES instructions - * @library /testlibrary / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * --- old/test/compiler/compilercontrol/InlineMatcherTest.java 2016-08-11 13:13:52.808577500 -0400 +++ new/test/compiler/compilercontrol/InlineMatcherTest.java 2016-08-11 13:13:52.398778200 -0400 @@ -26,9 +26,9 @@ * @bug 8074095 * @summary Testing of compiler/InlineMatcher * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib + * @library /test/lib * - * @build compiler.compilercontrol.InlineMatcherTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI --- old/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityBase.java 2016-08-11 13:13:55.323382300 -0400 +++ new/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityBase.java 2016-08-11 13:13:54.891547400 -0400 @@ -25,16 +25,12 @@ * @test TestCompilerDirectivesCompatibilityBase * @bug 8137167 * @summary Test compiler control compatibility with compile command - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.compiler * java.management * - * @build jdk.test.lib.* - * jdk.test.lib.dcmd.* - * sun.hotspot.WhiteBox - * compiler.testlibrary.CompilerUtils - * compiler.compilercontrol.TestCompilerDirectivesCompatibilityBase + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run testng/othervm -Xbootclasspath/a:. -Xmixed -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityCommandOff.java 2016-08-11 13:13:57.843598400 -0400 +++ new/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityCommandOff.java 2016-08-11 13:13:57.410021900 -0400 @@ -25,16 +25,12 @@ * @test TestCompilerDirectivesCompatibilityCommandOff * @bug 8137167 * @summary Test compiler control compatibility with compile command - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.compiler * java.management * - * @build jdk.test.lib.* - * jdk.test.lib.dcmd.* - * sun.hotspot.WhiteBox - * compiler.testlibrary.CompilerUtils - * compiler.compilercontrol.TestCompilerDirectivesCompatibilityCommandOff + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run testng/othervm -Xbootclasspath/a:. -Xmixed -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityCommandOn.java 2016-08-11 13:14:00.344075500 -0400 +++ new/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityCommandOn.java 2016-08-11 13:13:59.900165000 -0400 @@ -25,16 +25,12 @@ * @test TestCompilerDirectivesCompatibilityCommandOn * @bug 8137167 * @summary Test compiler control compatibility with compile command - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.compiler * java.management * - * @build jdk.test.lib.* - * jdk.test.lib.dcmd.* - * sun.hotspot.WhiteBox - * compiler.testlibrary.CompilerUtils - * compiler.compilercontrol.TestCompilerDirectivesCompatibilityCommandOn + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run testng/othervm -Xbootclasspath/a:. -Xmixed -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityFlag.java 2016-08-11 13:14:02.791289200 -0400 +++ new/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityFlag.java 2016-08-11 13:14:02.366543600 -0400 @@ -24,16 +24,12 @@ /* * @test TestCompilerDirectivesCompatibilityFlag * @bug 8137167 - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.compiler * java.management * - * @build jdk.test.lib.* - * jdk.test.lib.dcmd.* - * sun.hotspot.WhiteBox - * compiler.testlibrary.CompilerUtils - * compiler.compilercontrol.TestCompilerDirectivesCompatibilityFlag + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run testng/othervm -Xbootclasspath/a:. -Xmixed -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/compilercontrol/commandfile/CompileOnlyTest.java 2016-08-11 13:14:05.248070300 -0400 +++ new/test/compiler/compilercontrol/commandfile/CompileOnlyTest.java 2016-08-11 13:14:04.831451000 -0400 @@ -26,14 +26,9 @@ * @bug 8137167 * @summary Tests CompileCommand=compileonly * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib / + * @library /test/lib / * - * @build compiler.compilercontrol.commandfile.CompileOnlyTest - * compiler.compilercontrol.share.pool.sub.* - * compiler.compilercontrol.share.pool.subpack.* - * sun.hotspot.WhiteBox - * compiler.testlibrary.CompilerUtils - * compiler.compilercontrol.share.actions.* + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run driver compiler.compilercontrol.commandfile.CompileOnlyTest --- old/test/compiler/compilercontrol/commandfile/ExcludeTest.java 2016-08-11 13:14:07.697872400 -0400 +++ new/test/compiler/compilercontrol/commandfile/ExcludeTest.java 2016-08-11 13:14:07.281984400 -0400 @@ -26,14 +26,9 @@ * @bug 8137167 * @summary Tests CompileCommand=exclude * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib / + * @library /test/lib / * - * @build compiler.compilercontrol.commandfile.ExcludeTest - * compiler.compilercontrol.share.pool.sub.* - * compiler.compilercontrol.share.pool.subpack.* - * sun.hotspot.WhiteBox - * compiler.testlibrary.CompilerUtils - * compiler.compilercontrol.share.actions.* + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run driver compiler.compilercontrol.commandfile.ExcludeTest --- old/test/compiler/compilercontrol/commandfile/LogTest.java 2016-08-11 13:14:10.146514100 -0400 +++ new/test/compiler/compilercontrol/commandfile/LogTest.java 2016-08-11 13:14:09.729006900 -0400 @@ -26,14 +26,9 @@ * @bug 8137167 * @summary Tests CompileCommand=log * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib / + * @library /test/lib / * - * @build compiler.compilercontrol.commandfile.LogTest - * compiler.compilercontrol.share.pool.sub.* - * compiler.compilercontrol.share.pool.subpack.* - * sun.hotspot.WhiteBox - * compiler.testlibrary.CompilerUtils - * compiler.compilercontrol.share.actions.* + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run driver compiler.compilercontrol.commandfile.LogTest --- old/test/compiler/compilercontrol/commandfile/PrintTest.java 2016-08-11 13:14:12.604111300 -0400 +++ new/test/compiler/compilercontrol/commandfile/PrintTest.java 2016-08-11 13:14:12.178433400 -0400 @@ -26,14 +26,9 @@ * @bug 8137167 * @summary Tests CompileCommand=print * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib / + * @library /test/lib / * - * @build compiler.compilercontrol.commandfile.PrintTest - * compiler.compilercontrol.share.pool.sub.* - * compiler.compilercontrol.share.pool.subpack.* - * sun.hotspot.WhiteBox - * compiler.testlibrary.CompilerUtils - * compiler.compilercontrol.share.actions.* + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run driver compiler.compilercontrol.commandfile.PrintTest --- old/test/compiler/compilercontrol/commands/CompileOnlyTest.java 2016-08-11 13:14:15.077538800 -0400 +++ new/test/compiler/compilercontrol/commands/CompileOnlyTest.java 2016-08-11 13:14:14.642390000 -0400 @@ -26,14 +26,9 @@ * @bug 8137167 * @summary Tests CompileCommand=compileonly * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib / + * @library /test/lib / * - * @build compiler.compilercontrol.commands.CompileOnlyTest - * compiler.compilercontrol.share.pool.sub.* - * compiler.compilercontrol.share.pool.subpack.* - * sun.hotspot.WhiteBox - * compiler.testlibrary.CompilerUtils - * compiler.compilercontrol.share.actions.* + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run driver compiler.compilercontrol.commands.CompileOnlyTest --- old/test/compiler/compilercontrol/commands/ExcludeTest.java 2016-08-11 13:14:17.551947000 -0400 +++ new/test/compiler/compilercontrol/commands/ExcludeTest.java 2016-08-11 13:14:17.128765100 -0400 @@ -26,14 +26,9 @@ * @bug 8137167 * @summary Tests CompileCommand=exclude * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib / + * @library /test/lib / * - * @build compiler.compilercontrol.commands.ExcludeTest - * compiler.compilercontrol.share.pool.sub.* - * compiler.compilercontrol.share.pool.subpack.* - * sun.hotspot.WhiteBox - * compiler.testlibrary.CompilerUtils - * compiler.compilercontrol.share.actions.* + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run driver compiler.compilercontrol.commands.ExcludeTest --- old/test/compiler/compilercontrol/commands/LogTest.java 2016-08-11 13:14:20.064923900 -0400 +++ new/test/compiler/compilercontrol/commands/LogTest.java 2016-08-11 13:14:19.648021500 -0400 @@ -26,14 +26,9 @@ * @bug 8137167 * @summary Tests CompileCommand=log * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib / + * @library /test/lib / * - * @build compiler.compilercontrol.commands.LogTest - * compiler.compilercontrol.share.pool.sub.* - * compiler.compilercontrol.share.pool.subpack.* - * sun.hotspot.WhiteBox - * compiler.testlibrary.CompilerUtils - * compiler.compilercontrol.share.actions.* + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run driver compiler.compilercontrol.commands.LogTest --- old/test/compiler/compilercontrol/commands/PrintTest.java 2016-08-11 13:14:22.572941300 -0400 +++ new/test/compiler/compilercontrol/commands/PrintTest.java 2016-08-11 13:14:22.149322300 -0400 @@ -26,14 +26,9 @@ * @bug 8137167 * @summary Tests CompileCommand=print * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib / + * @library /test/lib / * - * @build compiler.compilercontrol.commands.PrintTest - * compiler.compilercontrol.share.pool.sub.* - * compiler.compilercontrol.share.pool.subpack.* - * sun.hotspot.WhiteBox - * compiler.testlibrary.CompilerUtils - * compiler.compilercontrol.share.actions.* + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run driver compiler.compilercontrol.commands.PrintTest --- old/test/compiler/compilercontrol/directives/CompileOnlyTest.java 2016-08-11 13:14:25.040151000 -0400 +++ new/test/compiler/compilercontrol/directives/CompileOnlyTest.java 2016-08-11 13:14:24.623139500 -0400 @@ -26,14 +26,9 @@ * @bug 8137167 * @summary Tests directives to be able to compile only specified methods * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib / + * @library /test/lib / * - * @build compiler.compilercontrol.directives.CompileOnlyTest - * compiler.compilercontrol.share.pool.sub.* - * compiler.compilercontrol.share.pool.subpack.* - * sun.hotspot.WhiteBox - * compiler.testlibrary.CompilerUtils - * compiler.compilercontrol.share.actions.* + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run driver compiler.compilercontrol.directives.CompileOnlyTest --- old/test/compiler/compilercontrol/directives/ExcludeTest.java 2016-08-11 13:14:27.506648100 -0400 +++ new/test/compiler/compilercontrol/directives/ExcludeTest.java 2016-08-11 13:14:27.086375000 -0400 @@ -26,14 +26,9 @@ * @bug 8137167 * @summary Tests directives to be able to exclude methods from compilation * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib / + * @library /test/lib / * - * @build compiler.compilercontrol.directives.ExcludeTest - * compiler.compilercontrol.share.pool.sub.* - * compiler.compilercontrol.share.pool.subpack.* - * sun.hotspot.WhiteBox - * compiler.testlibrary.CompilerUtils - * compiler.compilercontrol.share.actions.* + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run driver compiler.compilercontrol.directives.ExcludeTest --- old/test/compiler/compilercontrol/directives/LogTest.java 2016-08-11 13:14:29.961578600 -0400 +++ new/test/compiler/compilercontrol/directives/LogTest.java 2016-08-11 13:14:29.544880200 -0400 @@ -26,14 +26,9 @@ * @bug 8137167 * @summary Tests directives to be able to turn on LogCompilation * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib / + * @library /test/lib / * - * @build compiler.compilercontrol.directives.LogTest - * compiler.compilercontrol.share.pool.sub.* - * compiler.compilercontrol.share.pool.subpack.* - * sun.hotspot.WhiteBox - * compiler.testlibrary.CompilerUtils - * compiler.compilercontrol.share.actions.* + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run driver compiler.compilercontrol.directives.LogTest --- old/test/compiler/compilercontrol/directives/PrintTest.java 2016-08-11 13:14:32.406345000 -0400 +++ new/test/compiler/compilercontrol/directives/PrintTest.java 2016-08-11 13:14:31.988254400 -0400 @@ -26,14 +26,9 @@ * @bug 8137167 * @summary Tests directives to be able to turn on print_assembly * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib / + * @library /test/lib / * - * @build compiler.compilercontrol.directives.PrintTest - * compiler.compilercontrol.share.pool.sub.* - * compiler.compilercontrol.share.pool.subpack.* - * sun.hotspot.WhiteBox - * compiler.testlibrary.CompilerUtils - * compiler.compilercontrol.share.actions.* + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run driver compiler.compilercontrol.directives.PrintTest --- old/test/compiler/compilercontrol/jcmd/AddAndRemoveTest.java 2016-08-11 13:14:34.861322600 -0400 +++ new/test/compiler/compilercontrol/jcmd/AddAndRemoveTest.java 2016-08-11 13:14:34.447356700 -0400 @@ -26,14 +26,9 @@ * @bug 8137167 * @summary Tests directives to be able to add and remove directives * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib / + * @library /test/lib / * - * @build compiler.compilercontrol.jcmd.AddAndRemoveTest - * compiler.compilercontrol.share.pool.sub.* - * compiler.compilercontrol.share.pool.subpack.* - * sun.hotspot.WhiteBox - * compiler.testlibrary.CompilerUtils - * compiler.compilercontrol.share.actions.* + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run driver compiler.compilercontrol.jcmd.AddAndRemoveTest --- old/test/compiler/compilercontrol/jcmd/AddCompileOnlyTest.java 2016-08-11 13:14:37.304113000 -0400 +++ new/test/compiler/compilercontrol/jcmd/AddCompileOnlyTest.java 2016-08-11 13:14:36.887613400 -0400 @@ -26,14 +26,9 @@ * @bug 8137167 * @summary Tests jcmd to be able to add a directive to compile only specified methods * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib / + * @library /test/lib / * - * @build compiler.compilercontrol.jcmd.AddCompileOnlyTest - * compiler.compilercontrol.share.pool.sub.* - * compiler.compilercontrol.share.pool.subpack.* - * sun.hotspot.WhiteBox - * compiler.testlibrary.CompilerUtils - * compiler.compilercontrol.share.actions.* + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run driver compiler.compilercontrol.jcmd.AddCompileOnlyTest --- old/test/compiler/compilercontrol/jcmd/AddExcludeTest.java 2016-08-11 13:14:39.754013400 -0400 +++ new/test/compiler/compilercontrol/jcmd/AddExcludeTest.java 2016-08-11 13:14:39.339210900 -0400 @@ -26,14 +26,9 @@ * @bug 8137167 * @summary Tests jcmd to be able to add a directive to exclude only specified methods * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib / + * @library /test/lib / * - * @build compiler.compilercontrol.jcmd.AddExcludeTest - * compiler.compilercontrol.share.pool.sub.* - * compiler.compilercontrol.share.pool.subpack.* - * sun.hotspot.WhiteBox - * compiler.testlibrary.CompilerUtils - * compiler.compilercontrol.share.actions.* + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run driver compiler.compilercontrol.jcmd.AddExcludeTest --- old/test/compiler/compilercontrol/jcmd/AddLogTest.java 2016-08-11 13:14:42.220691800 -0400 +++ new/test/compiler/compilercontrol/jcmd/AddLogTest.java 2016-08-11 13:14:41.803302300 -0400 @@ -26,14 +26,9 @@ * @bug 8137167 * @summary Tests jcmd to be able to add a directive to log only specified methods * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib / + * @library /test/lib / * - * @build compiler.compilercontrol.jcmd.AddLogTest - * compiler.compilercontrol.share.pool.sub.* - * compiler.compilercontrol.share.pool.subpack.* - * sun.hotspot.WhiteBox - * compiler.testlibrary.CompilerUtils - * compiler.compilercontrol.share.actions.* + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run driver compiler.compilercontrol.jcmd.AddLogTest --- old/test/compiler/compilercontrol/jcmd/AddPrintAssemblyTest.java 2016-08-11 13:14:44.669864700 -0400 +++ new/test/compiler/compilercontrol/jcmd/AddPrintAssemblyTest.java 2016-08-11 13:14:44.254089300 -0400 @@ -27,14 +27,9 @@ * @summary Tests jcmd to be able to add a directive to print assembly * only for specified methods * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib / + * @library /test/lib / * - * @build compiler.compilercontrol.jcmd.AddPrintAssemblyTest - * compiler.compilercontrol.share.pool.sub.* - * compiler.compilercontrol.share.pool.subpack.* - * sun.hotspot.WhiteBox - * compiler.testlibrary.CompilerUtils - * compiler.compilercontrol.share.actions.* + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run driver compiler.compilercontrol.jcmd.AddPrintAssemblyTest --- old/test/compiler/compilercontrol/jcmd/ClearDirectivesFileStackTest.java 2016-08-11 13:14:47.114942500 -0400 +++ new/test/compiler/compilercontrol/jcmd/ClearDirectivesFileStackTest.java 2016-08-11 13:14:46.701456900 -0400 @@ -26,15 +26,10 @@ * @bug 8137167 * @summary Tests jcmd to be able to clear directives added via options * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib / + * @library /test/lib / * * @ignore 8140405 - * @build compiler.compilercontrol.jcmd.ClearDirectivesFileStackTest - * compiler.compilercontrol.share.pool.sub.* - * compiler.compilercontrol.share.pool.subpack.* - * sun.hotspot.WhiteBox - * compiler.testlibrary.CompilerUtils - * compiler.compilercontrol.share.actions.* + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run driver compiler.compilercontrol.jcmd.ClearDirectivesFileStackTest --- old/test/compiler/compilercontrol/jcmd/ClearDirectivesStackTest.java 2016-08-11 13:14:49.587747200 -0400 +++ new/test/compiler/compilercontrol/jcmd/ClearDirectivesStackTest.java 2016-08-11 13:14:49.177311100 -0400 @@ -26,14 +26,9 @@ * @bug 8137167 * @summary Tests clear JCMD command * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib / + * @library /test/lib / * - * @build compiler.compilercontrol.jcmd.ClearDirectivesStackTest - * compiler.compilercontrol.share.pool.sub.* - * compiler.compilercontrol.share.pool.subpack.* - * sun.hotspot.WhiteBox - * compiler.testlibrary.CompilerUtils - * compiler.compilercontrol.share.actions.* + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run driver compiler.compilercontrol.jcmd.ClearDirectivesStackTest --- old/test/compiler/compilercontrol/jcmd/PrintDirectivesTest.java 2016-08-11 13:14:52.049974700 -0400 +++ new/test/compiler/compilercontrol/jcmd/PrintDirectivesTest.java 2016-08-11 13:14:51.641569700 -0400 @@ -26,15 +26,10 @@ * @bug 8137167 * @summary Tests jcmd to be able to add a directive to compile only specified methods * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib / + * @library /test/lib / * @requires vm.flavor != "minimal" * - * @build compiler.compilercontrol.jcmd.PrintDirectivesTest - * compiler.compilercontrol.share.pool.sub.* - * compiler.compilercontrol.share.pool.subpack.* - * sun.hotspot.WhiteBox - * compiler.testlibrary.CompilerUtils - * compiler.compilercontrol.share.actions.* + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run driver compiler.compilercontrol.jcmd.PrintDirectivesTest --- old/test/compiler/compilercontrol/jcmd/StressAddJcmdBase.java 2016-08-11 13:14:54.522627200 -0400 +++ new/test/compiler/compilercontrol/jcmd/StressAddJcmdBase.java 2016-08-11 13:14:54.104752200 -0400 @@ -28,8 +28,8 @@ import compiler.compilercontrol.share.method.MethodDescriptor; import compiler.compilercontrol.share.pool.PoolHelper; import compiler.compilercontrol.share.scenario.Executor; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.TimeLimitedRunner; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.apps.TimeLimitedRunner; import jdk.test.lib.Utils; import java.util.ArrayList; --- old/test/compiler/compilercontrol/jcmd/StressAddMultiThreadedTest.java 2016-08-11 13:14:56.986393900 -0400 +++ new/test/compiler/compilercontrol/jcmd/StressAddMultiThreadedTest.java 2016-08-11 13:14:56.572490100 -0400 @@ -27,14 +27,9 @@ * @summary Tests jcmd to be able to add a lot of huge directive files with * parallel executed jcmds until timeout has reached * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib / + * @library /test/lib / * - * @build compiler.compilercontrol.jcmd.StressAddMultiThreadedTest - * compiler.compilercontrol.share.pool.sub.* - * compiler.compilercontrol.share.pool.subpack.* - * sun.hotspot.WhiteBox - * compiler.testlibrary.CompilerUtils - * compiler.compilercontrol.share.actions.* + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run driver compiler.compilercontrol.jcmd.StressAddMultiThreadedTest --- old/test/compiler/compilercontrol/logcompilation/LogTest.java 2016-08-11 13:14:59.422183800 -0400 +++ new/test/compiler/compilercontrol/logcompilation/LogTest.java 2016-08-11 13:14:59.013540600 -0400 @@ -26,14 +26,9 @@ * @bug 8137167 * @summary Tests LogCompilation executed standalone without log commands or directives * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib / + * @library /test/lib / * - * @build compiler.compilercontrol.logcompilation.LogTest - * compiler.compilercontrol.share.pool.sub.* - * compiler.compilercontrol.share.pool.subpack.* - * sun.hotspot.WhiteBox - * compiler.testlibrary.CompilerUtils - * compiler.compilercontrol.share.actions.* + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run driver compiler.compilercontrol.logcompilation.LogTest --- old/test/compiler/compilercontrol/matcher/MethodMatcherTest.java 2016-08-11 13:15:01.915228000 -0400 +++ new/test/compiler/compilercontrol/matcher/MethodMatcherTest.java 2016-08-11 13:15:01.500210400 -0400 @@ -26,9 +26,9 @@ * @bug 8135068 * @summary Tests CompilerCommand's method matcher * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib / + * @library /test/lib / * - * @build compiler.compilercontrol.matcher.MethodMatcherTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions @@ -40,7 +40,7 @@ import compiler.compilercontrol.share.method.MethodDescriptor; import compiler.compilercontrol.share.method.MethodGenerator; import compiler.compilercontrol.share.pool.PoolHelper; -import jdk.test.lib.Pair; +import jdk.test.lib.util.Pair; import sun.hotspot.WhiteBox; import java.lang.reflect.Executable; --- old/test/compiler/compilercontrol/mixed/RandomCommandsTest.java 2016-08-11 13:15:04.351183000 -0400 +++ new/test/compiler/compilercontrol/mixed/RandomCommandsTest.java 2016-08-11 13:15:03.939411600 -0400 @@ -26,14 +26,9 @@ * @bug 8137167 * @summary Randomly generates commands with random types * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib / + * @library /test/lib / * - * @build compiler.compilercontrol.mixed.RandomCommandsTest - * compiler.compilercontrol.share.pool.sub.* - * compiler.compilercontrol.share.pool.subpack.* - * sun.hotspot.WhiteBox - * compiler.testlibrary.CompilerUtils - * compiler.compilercontrol.share.actions.* + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run driver/timeout=600 compiler.compilercontrol.mixed.RandomCommandsTest --- old/test/compiler/compilercontrol/mixed/RandomValidCommandsTest.java 2016-08-11 13:15:06.800812600 -0400 +++ new/test/compiler/compilercontrol/mixed/RandomValidCommandsTest.java 2016-08-11 13:15:06.387899300 -0400 @@ -26,14 +26,9 @@ * @bug 8137167 * @summary Randomly generates valid commands with random types * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib / + * @library /test/lib / * - * @build compiler.compilercontrol.mixed.RandomValidCommandsTest - * compiler.compilercontrol.share.pool.sub.* - * compiler.compilercontrol.share.pool.subpack.* - * sun.hotspot.WhiteBox - * compiler.testlibrary.CompilerUtils - * compiler.compilercontrol.share.actions.* + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run driver/timeout=600 compiler.compilercontrol.mixed.RandomValidCommandsTest --- old/test/compiler/compilercontrol/parser/DirectiveParserTest.java 2016-08-11 13:15:09.263569200 -0400 +++ new/test/compiler/compilercontrol/parser/DirectiveParserTest.java 2016-08-11 13:15:08.856219300 -0400 @@ -26,7 +26,7 @@ * @bug 8137167 * @summary Tests directive json parser * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib / + * @library /test/lib / * * @run driver compiler.compilercontrol.parser.DirectiveParserTest */ @@ -35,7 +35,7 @@ import compiler.compilercontrol.share.JSONFile; import jdk.test.lib.Asserts; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.Utils; public class DirectiveParserTest { --- old/test/compiler/compilercontrol/parser/DirectiveStressTest.java 2016-08-11 13:15:11.729806700 -0400 +++ new/test/compiler/compilercontrol/parser/DirectiveStressTest.java 2016-08-11 13:15:11.310241000 -0400 @@ -26,7 +26,7 @@ * @bug 8137167 * @summary Stress directive json parser * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib / + * @library /test/lib / * * @run driver compiler.compilercontrol.parser.DirectiveStressTest */ @@ -38,7 +38,7 @@ import compiler.compilercontrol.share.method.MethodDescriptor; import compiler.compilercontrol.share.pool.PoolHelper; import compiler.compilercontrol.share.scenario.DirectiveWriter; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import java.util.List; import java.util.stream.Collectors; --- old/test/compiler/compilercontrol/parser/HugeDirectiveUtil.java 2016-08-11 13:15:14.214777700 -0400 +++ new/test/compiler/compilercontrol/parser/HugeDirectiveUtil.java 2016-08-11 13:15:13.785292000 -0400 @@ -27,8 +27,8 @@ import compiler.compilercontrol.share.method.MethodDescriptor; import compiler.compilercontrol.share.scenario.DirectiveWriter; import compiler.compilercontrol.share.scenario.Scenario; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; import jdk.test.lib.Utils; import java.util.EnumSet; --- old/test/compiler/compilercontrol/share/AbstractTestBase.java 2016-08-11 13:15:16.657485100 -0400 +++ new/test/compiler/compilercontrol/share/AbstractTestBase.java 2016-08-11 13:15:16.250531300 -0400 @@ -26,7 +26,7 @@ import compiler.compilercontrol.share.method.MethodDescriptor; import compiler.compilercontrol.share.method.MethodGenerator; import compiler.compilercontrol.share.pool.PoolHelper; -import jdk.test.lib.Pair; +import jdk.test.lib.util.Pair; import java.lang.reflect.Executable; import java.util.List; --- old/test/compiler/compilercontrol/share/actions/BaseAction.java 2016-08-11 13:15:19.108752400 -0400 +++ new/test/compiler/compilercontrol/share/actions/BaseAction.java 2016-08-11 13:15:18.693237900 -0400 @@ -25,8 +25,8 @@ import compiler.compilercontrol.share.pool.PoolHelper; import compiler.compilercontrol.share.scenario.State; -import jdk.test.lib.Pair; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.util.Pair; +import jdk.test.lib.process.ProcessTools; import java.io.BufferedReader; import java.io.IOException; --- old/test/compiler/compilercontrol/share/actions/CompileAction.java 2016-08-11 13:15:21.588739500 -0400 +++ new/test/compiler/compilercontrol/share/actions/CompileAction.java 2016-08-11 13:15:21.152803300 -0400 @@ -27,7 +27,7 @@ import compiler.compilercontrol.share.scenario.State; import compiler.testlibrary.CompilerUtils; import jdk.test.lib.Asserts; -import jdk.test.lib.Pair; +import jdk.test.lib.util.Pair; import jdk.test.lib.Utils; import sun.hotspot.WhiteBox; --- old/test/compiler/compilercontrol/share/method/MethodDescriptor.java 2016-08-11 13:15:24.046503500 -0400 +++ new/test/compiler/compilercontrol/share/method/MethodDescriptor.java 2016-08-11 13:15:23.629744800 -0400 @@ -23,7 +23,7 @@ package compiler.compilercontrol.share.method; -import jdk.test.lib.Triple; +import jdk.test.lib.util.Triple; import java.lang.reflect.Executable; import java.util.function.Function; --- old/test/compiler/compilercontrol/share/method/MethodGenerator.java 2016-08-11 13:15:26.509462300 -0400 +++ new/test/compiler/compilercontrol/share/method/MethodGenerator.java 2016-08-11 13:15:26.096912500 -0400 @@ -26,8 +26,8 @@ import compiler.compilercontrol.share.method.MethodDescriptor.PatternType; import compiler.compilercontrol.share.method.MethodDescriptor.Separator; import compiler.compilercontrol.share.pool.PoolHelper; -import jdk.test.lib.Pair; -import jdk.test.lib.Triple; +import jdk.test.lib.util.Pair; +import jdk.test.lib.util.Triple; import jdk.test.lib.Utils; import java.lang.reflect.Executable; --- old/test/compiler/compilercontrol/share/pool/MethodHolder.java 2016-08-11 13:15:28.986956800 -0400 +++ new/test/compiler/compilercontrol/share/pool/MethodHolder.java 2016-08-11 13:15:28.549246100 -0400 @@ -23,7 +23,7 @@ package compiler.compilercontrol.share.pool; -import jdk.test.lib.Pair; +import jdk.test.lib.util.Pair; import java.lang.reflect.Executable; import java.lang.reflect.Method; --- old/test/compiler/compilercontrol/share/pool/PoolHelper.java 2016-08-11 13:15:31.444762300 -0400 +++ new/test/compiler/compilercontrol/share/pool/PoolHelper.java 2016-08-11 13:15:31.027797400 -0400 @@ -23,7 +23,7 @@ package compiler.compilercontrol.share.pool; -import jdk.test.lib.Pair; +import jdk.test.lib.util.Pair; import java.lang.reflect.Executable; import java.util.ArrayList; --- old/test/compiler/compilercontrol/share/pool/SubMethodHolder.java 2016-08-11 13:15:33.906707400 -0400 +++ new/test/compiler/compilercontrol/share/pool/SubMethodHolder.java 2016-08-11 13:15:33.496536500 -0400 @@ -1,6 +1,6 @@ package compiler.compilercontrol.share.pool; -import jdk.test.lib.Pair; +import jdk.test.lib.util.Pair; import java.lang.reflect.Constructor; import java.lang.reflect.Executable; --- old/test/compiler/compilercontrol/share/processors/CommandProcessor.java 2016-08-11 13:15:36.369180400 -0400 +++ new/test/compiler/compilercontrol/share/processors/CommandProcessor.java 2016-08-11 13:15:35.949841400 -0400 @@ -25,7 +25,7 @@ import compiler.compilercontrol.share.scenario.CompileCommand; import jdk.test.lib.Asserts; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import java.util.Iterator; import java.util.List; --- old/test/compiler/compilercontrol/share/processors/LogProcessor.java 2016-08-11 13:15:38.840064800 -0400 +++ new/test/compiler/compilercontrol/share/processors/LogProcessor.java 2016-08-11 13:15:38.421803600 -0400 @@ -28,7 +28,7 @@ import compiler.compilercontrol.share.pool.PoolHelper; import compiler.compilercontrol.share.scenario.State; import jdk.test.lib.Asserts; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import java.io.File; import java.io.FileNotFoundException; --- old/test/compiler/compilercontrol/share/processors/PrintDirectivesProcessor.java 2016-08-11 13:15:41.333799700 -0400 +++ new/test/compiler/compilercontrol/share/processors/PrintDirectivesProcessor.java 2016-08-11 13:15:40.904577100 -0400 @@ -26,7 +26,7 @@ import compiler.compilercontrol.share.method.MethodDescriptor; import compiler.compilercontrol.share.scenario.CompileCommand; import jdk.test.lib.Asserts; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import java.util.ArrayList; import java.util.Iterator; --- old/test/compiler/compilercontrol/share/processors/PrintProcessor.java 2016-08-11 13:15:43.797740900 -0400 +++ new/test/compiler/compilercontrol/share/processors/PrintProcessor.java 2016-08-11 13:15:43.372158400 -0400 @@ -28,7 +28,7 @@ import compiler.compilercontrol.share.method.MethodGenerator; import compiler.compilercontrol.share.pool.PoolHelper; import compiler.compilercontrol.share.scenario.State; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import java.lang.management.ManagementFactory; import java.lang.reflect.Executable; --- old/test/compiler/compilercontrol/share/scenario/AbstractCommandBuilder.java 2016-08-11 13:15:46.273345000 -0400 +++ new/test/compiler/compilercontrol/share/scenario/AbstractCommandBuilder.java 2016-08-11 13:15:45.846886100 -0400 @@ -25,7 +25,7 @@ import compiler.compilercontrol.share.method.MethodDescriptor; import compiler.compilercontrol.share.pool.PoolHelper; -import jdk.test.lib.Pair; +import jdk.test.lib.util.Pair; import java.lang.reflect.Executable; import java.util.ArrayList; --- old/test/compiler/compilercontrol/share/scenario/DirectiveBuilder.java 2016-08-11 13:15:48.747691200 -0400 +++ new/test/compiler/compilercontrol/share/scenario/DirectiveBuilder.java 2016-08-11 13:15:48.340949900 -0400 @@ -27,7 +27,7 @@ import compiler.compilercontrol.share.method.MethodDescriptor; import compiler.compilercontrol.share.method.MethodGenerator; import compiler.compilercontrol.share.pool.PoolHelper; -import jdk.test.lib.Pair; +import jdk.test.lib.util.Pair; import java.lang.reflect.Executable; import java.util.ArrayList; --- old/test/compiler/compilercontrol/share/scenario/Executor.java 2016-08-11 13:15:51.224237000 -0400 +++ new/test/compiler/compilercontrol/share/scenario/Executor.java 2016-08-11 13:15:50.806361600 -0400 @@ -25,8 +25,8 @@ import compiler.compilercontrol.share.actions.BaseAction; import jdk.test.lib.Asserts; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; import jdk.test.lib.dcmd.CommandExecutor; import jdk.test.lib.dcmd.PidJcmdExecutor; --- old/test/compiler/compilercontrol/share/scenario/JcmdStateBuilder.java 2016-08-11 13:15:53.692432100 -0400 +++ new/test/compiler/compilercontrol/share/scenario/JcmdStateBuilder.java 2016-08-11 13:15:53.272356200 -0400 @@ -26,7 +26,7 @@ import compiler.compilercontrol.share.method.MethodDescriptor; import compiler.compilercontrol.share.method.MethodGenerator; import compiler.compilercontrol.share.pool.PoolHelper; -import jdk.test.lib.Pair; +import jdk.test.lib.util.Pair; import java.lang.reflect.Executable; import java.util.ArrayList; --- old/test/compiler/compilercontrol/share/scenario/Scenario.java 2016-08-11 13:15:56.155508500 -0400 +++ new/test/compiler/compilercontrol/share/scenario/Scenario.java 2016-08-11 13:15:55.729549600 -0400 @@ -30,8 +30,8 @@ import compiler.compilercontrol.share.processors.PrintDirectivesProcessor; import compiler.compilercontrol.share.processors.PrintProcessor; import jdk.test.lib.Asserts; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.Pair; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.util.Pair; import java.lang.reflect.Executable; import java.util.ArrayList; --- old/test/compiler/cpuflags/RestoreMXCSR.java 2016-08-11 13:15:58.643425500 -0400 +++ new/test/compiler/cpuflags/RestoreMXCSR.java 2016-08-11 13:15:58.204413800 -0400 @@ -25,7 +25,7 @@ * @test * @bug 8020433 * @summary Crash when using -XX:+RestoreMXCSROnJNICalls - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @@ -34,8 +34,8 @@ package compiler.cpuflags; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; public class RestoreMXCSR { public static void main(String[] args) throws Exception { --- old/test/compiler/cpuflags/TestAESIntrinsicsOnSupportedConfig.java 2016-08-11 13:16:01.105590500 -0400 +++ new/test/compiler/cpuflags/TestAESIntrinsicsOnSupportedConfig.java 2016-08-11 13:16:00.690442900 -0400 @@ -24,12 +24,11 @@ /* * @test - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * @ignore 8146128 - * @build compiler.cpuflags.TestAESIntrinsicsOnSupportedConfig - * compiler.codegen.aes.TestAESMain + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions @@ -39,9 +38,9 @@ package compiler.cpuflags; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.Platform; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.ProcessTools; public class TestAESIntrinsicsOnSupportedConfig extends AESIntrinsicsBase { --- old/test/compiler/cpuflags/TestAESIntrinsicsOnUnsupportedConfig.java 2016-08-11 13:16:03.585255900 -0400 +++ new/test/compiler/cpuflags/TestAESIntrinsicsOnUnsupportedConfig.java 2016-08-11 13:16:03.170461200 -0400 @@ -24,12 +24,11 @@ /* * @test - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.cpuflags.TestAESIntrinsicsOnUnsupportedConfig - * compiler.codegen.aes.TestAESMain + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions @@ -39,8 +38,8 @@ package compiler.cpuflags; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; import jdk.test.lib.cli.predicate.NotPredicate; public class TestAESIntrinsicsOnUnsupportedConfig extends AESIntrinsicsBase { --- old/test/compiler/debug/VerifyAdapterSharing.java 2016-08-11 13:16:06.038917500 -0400 +++ new/test/compiler/debug/VerifyAdapterSharing.java 2016-08-11 13:16:05.630861900 -0400 @@ -25,7 +25,7 @@ * @test * @bug 8030783 * @summary Regression test for 8026478 - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @@ -34,8 +34,8 @@ package compiler.debug; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; public class VerifyAdapterSharing { public static void main(String[] args) throws Exception { --- old/test/compiler/eliminateAutobox/UnsignedLoads.java 2016-08-11 13:16:08.506861100 -0400 +++ new/test/compiler/eliminateAutobox/UnsignedLoads.java 2016-08-11 13:16:08.088061800 -0400 @@ -26,7 +26,7 @@ /* * @test * @modules java.base/jdk.internal.misc - * @library /testlibrary + * @library /test/lib * * @run main/othervm -Xbatch -XX:+IgnoreUnrecognizedVMOptions -XX:+EliminateAutoBox * -XX:CompileOnly=::valueOf,::byteValue,::shortValue,::testUnsignedByte,::testUnsignedShort --- old/test/compiler/floatingpoint/TestPow2.java 2016-08-11 13:16:10.971845400 -0400 +++ new/test/compiler/floatingpoint/TestPow2.java 2016-08-11 13:16:10.551288400 -0400 @@ -25,11 +25,11 @@ * @test * @bug 8063086 * @summary X^2 special case for C2 yields different result than interpreter - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.floatingpoint.TestPow2 + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI --- old/test/compiler/gcbarriers/PreserveFPRegistersTest.java 2016-08-11 13:16:13.438979000 -0400 +++ new/test/compiler/gcbarriers/PreserveFPRegistersTest.java 2016-08-11 13:16:13.021072700 -0400 @@ -26,7 +26,7 @@ * @test * @bug 8148175 * @requires vm.gc=="G1" | vm.gc=="null" - * @library /testlibrary /test/lib + * @library /test/lib * @run main/bootclasspath/othervm -Xbatch -XX:+UnlockDiagnosticVMOptions * -XX:+WhiteBoxAPI -Xmx300m -XX:+UseG1GC * compiler.gcbarriers.PreserveFPRegistersTest --- old/test/compiler/inlining/InlineAccessors.java 2016-08-11 13:16:15.907376400 -0400 +++ new/test/compiler/inlining/InlineAccessors.java 2016-08-11 13:16:15.492619700 -0400 @@ -26,15 +26,15 @@ * @bug 8140650 * @summary Method::is_accessor should cover getters and setters for all types * @modules java.base/jdk.internal.misc - * @library /testlibrary + * @library /test/lib * * @run driver compiler.inlining.InlineAccessors */ package compiler.inlining; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; public class InlineAccessors { public static void main(String[] args) throws Exception { --- old/test/compiler/interpreter/DisableOSRTest.java 2016-08-11 13:16:18.378298400 -0400 +++ new/test/compiler/interpreter/DisableOSRTest.java 2016-08-11 13:16:17.969887900 -0400 @@ -26,7 +26,7 @@ * @bug 8159620 * @summary testing that -XX:-UseOnStackReplacement works with both -XX:(+/-)TieredCompilation * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib / + * @library /test/lib / * * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox --- old/test/compiler/intrinsics/IntrinsicAvailableTest.java 2016-08-11 13:16:20.846662400 -0400 +++ new/test/compiler/intrinsics/IntrinsicAvailableTest.java 2016-08-11 13:16:20.435551900 -0400 @@ -25,9 +25,9 @@ * @test * @bug 8130832 * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib / + * @library /test/lib / * - * @build compiler.intrinsics.IntrinsicAvailableTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. --- old/test/compiler/intrinsics/IntrinsicDisabledTest.java 2016-08-11 13:16:23.289619200 -0400 +++ new/test/compiler/intrinsics/IntrinsicDisabledTest.java 2016-08-11 13:16:22.873467400 -0400 @@ -25,9 +25,9 @@ * @test * @bug 8138651 * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib + * @library /test/lib * - * @build compiler.intrinsics.IntrinsicDisabledTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. --- old/test/compiler/intrinsics/bigInteger/MontgomeryMultiplyTest.java 2016-08-11 13:16:25.760338100 -0400 +++ new/test/compiler/intrinsics/bigInteger/MontgomeryMultiplyTest.java 2016-08-11 13:16:25.335198300 -0400 @@ -28,9 +28,9 @@ * @summary Verify that the Montgomery multiply and square intrinsic works and correctly checks their arguments. * @requires vm.flavor == "server" * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib + * @library /test/lib * - * @build compiler.intrinsics.bigInteger.MontgomeryMultiplyTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI --- old/test/compiler/intrinsics/bmi/BMITestRunner.java 2016-08-11 13:16:28.358013700 -0400 +++ new/test/compiler/intrinsics/bmi/BMITestRunner.java 2016-08-11 13:16:27.929947600 -0400 @@ -25,8 +25,8 @@ package compiler.intrinsics.bmi; import jdk.test.lib.Asserts; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; import jdk.test.lib.Utils; import java.io.IOException; --- old/test/compiler/intrinsics/bmi/TestAndnI.java 2016-08-11 13:16:30.823933900 -0400 +++ new/test/compiler/intrinsics/bmi/TestAndnI.java 2016-08-11 13:16:30.412605600 -0400 @@ -27,12 +27,10 @@ * @bug 8031321 * @summary Verify that results of computations are the same w/ * and w/o usage of ANDN instruction - * @library /testlibrary /test/lib + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management - * @build compiler.intrinsics.bmi.TestAndnI - * compiler.intrinsics.bmi.BMITestRunner - * compiler.intrinsics.bmi.Expr + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/intrinsics/bmi/TestAndnL.java 2016-08-11 13:16:33.332644900 -0400 +++ new/test/compiler/intrinsics/bmi/TestAndnL.java 2016-08-11 13:16:32.918128600 -0400 @@ -27,11 +27,11 @@ * @bug 8031321 * @summary Verify that results of computations are the same w/ * and w/o usage of ANDN instruction - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.intrinsics.bmi.TestAndnL + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/intrinsics/bmi/TestBlsiI.java 2016-08-11 13:16:35.842115600 -0400 +++ new/test/compiler/intrinsics/bmi/TestBlsiI.java 2016-08-11 13:16:35.404068800 -0400 @@ -27,11 +27,11 @@ * @bug 8031321 * @summary Verify that results of computations are the same w/ * and w/o usage of BLSI instruction - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.intrinsics.bmi.TestBlsiI + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/intrinsics/bmi/TestBlsiL.java 2016-08-11 13:16:38.342190200 -0400 +++ new/test/compiler/intrinsics/bmi/TestBlsiL.java 2016-08-11 13:16:37.912942400 -0400 @@ -27,11 +27,11 @@ * @bug 8031321 * @summary Verify that results of computations are the same w/ * and w/o usage of BLSI instruction - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.intrinsics.bmi.TestBlsiL + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/intrinsics/bmi/TestBlsmskI.java 2016-08-11 13:16:40.857973300 -0400 +++ new/test/compiler/intrinsics/bmi/TestBlsmskI.java 2016-08-11 13:16:40.440738500 -0400 @@ -27,11 +27,11 @@ * @bug 8031321 * @summary Verify that results of computations are the same w/ * and w/o usage of BLSMSK instruction - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.intrinsics.bmi.TestBlsmskI + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/intrinsics/bmi/TestBlsmskL.java 2016-08-11 13:16:43.333941700 -0400 +++ new/test/compiler/intrinsics/bmi/TestBlsmskL.java 2016-08-11 13:16:42.900358300 -0400 @@ -27,11 +27,11 @@ * @bug 8031321 * @summary Verify that results of computations are the same w/ * and w/o usage of BLSMSK instruction - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.intrinsics.bmi.TestBlsmskL + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/intrinsics/bmi/TestBlsrI.java 2016-08-11 13:16:45.849104200 -0400 +++ new/test/compiler/intrinsics/bmi/TestBlsrI.java 2016-08-11 13:16:45.431281700 -0400 @@ -27,11 +27,11 @@ * @bug 8031321 * @summary Verify that results of computations are the same w/ * and w/o usage of BLSR instruction - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.intrinsics.bmi.TestBlsrI + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/intrinsics/bmi/TestBlsrL.java 2016-08-11 13:16:48.335978000 -0400 +++ new/test/compiler/intrinsics/bmi/TestBlsrL.java 2016-08-11 13:16:47.922903400 -0400 @@ -27,11 +27,11 @@ * @bug 8031321 * @summary Verify that results of computations are the same w/ * and w/o usage of BLSR instruction - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.intrinsics.bmi.TestBlsrL + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/intrinsics/bmi/TestLzcntI.java 2016-08-11 13:16:50.822477100 -0400 +++ new/test/compiler/intrinsics/bmi/TestLzcntI.java 2016-08-11 13:16:50.388419800 -0400 @@ -27,11 +27,11 @@ * @bug 8031321 * @summary Verify that results of computations are the same w/ * and w/o usage of intrinsic - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.intrinsics.bmi.TestLzcntI + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/intrinsics/bmi/TestLzcntL.java 2016-08-11 13:16:53.501856200 -0400 +++ new/test/compiler/intrinsics/bmi/TestLzcntL.java 2016-08-11 13:16:53.079813700 -0400 @@ -27,11 +27,11 @@ * @bug 8031321 * @summary Verify that results of computations are the same w/ * and w/o usage of intrinsic - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.intrinsics.bmi.TestLzcntL + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/intrinsics/bmi/TestTzcntI.java 2016-08-11 13:16:56.150128500 -0400 +++ new/test/compiler/intrinsics/bmi/TestTzcntI.java 2016-08-11 13:16:55.733706000 -0400 @@ -27,11 +27,11 @@ * @bug 8031321 * @summary Verify that results of computations are the same w/ * and w/o usage of intrinsic - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.intrinsics.bmi.TestTzcntI BMITestRunner Expr + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/intrinsics/bmi/TestTzcntL.java 2016-08-11 13:16:58.704005900 -0400 +++ new/test/compiler/intrinsics/bmi/TestTzcntL.java 2016-08-11 13:16:58.292797900 -0400 @@ -27,11 +27,11 @@ * @bug 8031321 * @summary Verify that results of computations are the same w/ * and w/o usage of intrinsic - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.intrinsics.bmi.TestTzcntL + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/intrinsics/bmi/verifycode/AndnTestI.java 2016-08-11 13:17:01.189940100 -0400 +++ new/test/compiler/intrinsics/bmi/verifycode/AndnTestI.java 2016-08-11 13:17:00.774825500 -0400 @@ -25,11 +25,11 @@ * @test * @bug 8031321 * @requires vm.flavor == "server" - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.intrinsics.bmi.verifycode.AndnTestI + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/bootclasspath/othervm -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI --- old/test/compiler/intrinsics/bmi/verifycode/AndnTestL.java 2016-08-11 13:17:03.671192700 -0400 +++ new/test/compiler/intrinsics/bmi/verifycode/AndnTestL.java 2016-08-11 13:17:03.253106900 -0400 @@ -25,11 +25,11 @@ * @test * @bug 8031321 * @requires vm.flavor == "server" - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.intrinsics.bmi.verifycode.AndnTestL + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/bootclasspath/othervm -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI --- old/test/compiler/intrinsics/bmi/verifycode/BlsiTestI.java 2016-08-11 13:17:06.175992100 -0400 +++ new/test/compiler/intrinsics/bmi/verifycode/BlsiTestI.java 2016-08-11 13:17:05.736922200 -0400 @@ -25,11 +25,11 @@ * @test * @bug 8031321 * @requires vm.flavor == "server" - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.intrinsics.bmi.verifycode.BlsiTestI + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI --- old/test/compiler/intrinsics/bmi/verifycode/BlsiTestL.java 2016-08-11 13:17:08.643682900 -0400 +++ new/test/compiler/intrinsics/bmi/verifycode/BlsiTestL.java 2016-08-11 13:17:08.227244100 -0400 @@ -25,11 +25,11 @@ * @test * @bug 8031321 * @requires vm.flavor == "server" - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.intrinsics.bmi.verifycode.BlsiTestL + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI --- old/test/compiler/intrinsics/bmi/verifycode/BlsmskTestI.java 2016-08-11 13:17:11.159553200 -0400 +++ new/test/compiler/intrinsics/bmi/verifycode/BlsmskTestI.java 2016-08-11 13:17:10.727433800 -0400 @@ -25,11 +25,11 @@ * @test * @bug 8031321 * @requires vm.flavor == "server" - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.intrinsics.bmi.verifycode.BlsmskTestI + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI --- old/test/compiler/intrinsics/bmi/verifycode/BlsmskTestL.java 2016-08-11 13:17:13.641891300 -0400 +++ new/test/compiler/intrinsics/bmi/verifycode/BlsmskTestL.java 2016-08-11 13:17:13.221800000 -0400 @@ -25,11 +25,11 @@ * @test * @bug 8031321 * @requires vm.flavor == "server" - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.intrinsics.bmi.verifycode.BlsmskTestL + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI --- old/test/compiler/intrinsics/bmi/verifycode/BlsrTestI.java 2016-08-11 13:17:16.114280800 -0400 +++ new/test/compiler/intrinsics/bmi/verifycode/BlsrTestI.java 2016-08-11 13:17:15.696756900 -0400 @@ -25,11 +25,11 @@ * @test * @bug 8031321 * @requires vm.flavor == "server" - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.intrinsics.bmi.verifycode.BlsrTestI + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI --- old/test/compiler/intrinsics/bmi/verifycode/BlsrTestL.java 2016-08-11 13:17:18.584205900 -0400 +++ new/test/compiler/intrinsics/bmi/verifycode/BlsrTestL.java 2016-08-11 13:17:18.170659600 -0400 @@ -25,11 +25,11 @@ * @test * @bug 8031321 * @requires vm.flavor == "server" - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.intrinsics.bmi.verifycode.BlsrTestL + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI --- old/test/compiler/intrinsics/bmi/verifycode/LZcntTestI.java 2016-08-11 13:17:21.044915500 -0400 +++ new/test/compiler/intrinsics/bmi/verifycode/LZcntTestI.java 2016-08-11 13:17:20.630441500 -0400 @@ -25,11 +25,11 @@ * @test * @bug 8031321 * @requires vm.flavor == "server" - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.intrinsics.bmi.verifycode.LZcntTestI + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI --- old/test/compiler/intrinsics/bmi/verifycode/LZcntTestL.java 2016-08-11 13:17:23.494293200 -0400 +++ new/test/compiler/intrinsics/bmi/verifycode/LZcntTestL.java 2016-08-11 13:17:23.084921700 -0400 @@ -25,11 +25,11 @@ * @test * @bug 8031321 * @requires vm.flavor == "server" - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.intrinsics.bmi.verifycode.LZcntTestL + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI --- old/test/compiler/intrinsics/bmi/verifycode/TZcntTestI.java 2016-08-11 13:17:25.958266100 -0400 +++ new/test/compiler/intrinsics/bmi/verifycode/TZcntTestI.java 2016-08-11 13:17:25.542297800 -0400 @@ -25,11 +25,11 @@ * @test * @bug 8031321 * @requires vm.flavor == "server" - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.intrinsics.bmi.verifycode.TZcntTestI + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI --- old/test/compiler/intrinsics/bmi/verifycode/TZcntTestL.java 2016-08-11 13:17:28.422456700 -0400 +++ new/test/compiler/intrinsics/bmi/verifycode/TZcntTestL.java 2016-08-11 13:17:28.012943500 -0400 @@ -25,11 +25,11 @@ * @test * @bug 8031321 * @requires vm.flavor == "server" - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.intrinsics.bmi.verifycode.TZcntTestL + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI --- old/test/compiler/intrinsics/klass/CastNullCheckDroppingsTest.java 2016-08-11 13:17:30.904207100 -0400 +++ new/test/compiler/intrinsics/klass/CastNullCheckDroppingsTest.java 2016-08-11 13:17:30.491662900 -0400 @@ -26,15 +26,13 @@ * @bug 8054492 * @summary Casting can result in redundant null checks in generated code * @requires vm.flavor == "server" - * @library /testlibrary /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * - * @build ClassFileInstaller sun.hotspot.WhiteBox jdk.test.lib.* - * @build compiler.intrinsics.klass.CastNullCheckDroppingsTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission - * jdk.test.lib.Platform * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI * -Xmixed -XX:-BackgroundCompilation -XX:-TieredCompilation -XX:CompileThreshold=1000 * -XX:CompileCommand=exclude,compiler.intrinsics.klass.CastNullCheckDroppingsTest::runTest --- old/test/compiler/intrinsics/mathexact/AddExactIConstantTest.java 2016-08-11 13:17:33.363385100 -0400 +++ new/test/compiler/intrinsics/mathexact/AddExactIConstantTest.java 2016-08-11 13:17:32.952473000 -0400 @@ -25,7 +25,7 @@ * @test * @bug 8024924 * @summary Test constant addExact - * @library /testlibrary / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * --- old/test/compiler/intrinsics/mathexact/AddExactILoadTest.java 2016-08-11 13:17:35.824028800 -0400 +++ new/test/compiler/intrinsics/mathexact/AddExactILoadTest.java 2016-08-11 13:17:35.408365800 -0400 @@ -25,7 +25,7 @@ * @test * @bug 8024924 * @summary Test non constant addExact - * @library /testlibrary / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * --- old/test/compiler/intrinsics/mathexact/AddExactILoopDependentTest.java 2016-08-11 13:17:38.270548700 -0400 +++ new/test/compiler/intrinsics/mathexact/AddExactILoopDependentTest.java 2016-08-11 13:17:37.859760200 -0400 @@ -25,7 +25,7 @@ * @test * @bug 8024924 * @summary Test non constant addExact - * @library /testlibrary / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * --- old/test/compiler/intrinsics/mathexact/AddExactINonConstantTest.java 2016-08-11 13:17:40.724814600 -0400 +++ new/test/compiler/intrinsics/mathexact/AddExactINonConstantTest.java 2016-08-11 13:17:40.313810100 -0400 @@ -25,7 +25,7 @@ * @test * @bug 8024924 * @summary Test non constant addExact - * @library /testlibrary / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * --- old/test/compiler/intrinsics/mathexact/AddExactIRepeatTest.java 2016-08-11 13:17:43.181096200 -0400 +++ new/test/compiler/intrinsics/mathexact/AddExactIRepeatTest.java 2016-08-11 13:17:42.768456600 -0400 @@ -25,7 +25,7 @@ * @test * @bug 8025657 * @summary Test repeating addExact - * @library /testlibrary / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * --- old/test/compiler/intrinsics/mathexact/AddExactLConstantTest.java 2016-08-11 13:17:45.638249900 -0400 +++ new/test/compiler/intrinsics/mathexact/AddExactLConstantTest.java 2016-08-11 13:17:45.227552900 -0400 @@ -25,7 +25,7 @@ * @test * @bug 8026844 * @summary Test constant addExact - * @library /testlibrary / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * --- old/test/compiler/intrinsics/mathexact/AddExactLNonConstantTest.java 2016-08-11 13:17:48.124372300 -0400 +++ new/test/compiler/intrinsics/mathexact/AddExactLNonConstantTest.java 2016-08-11 13:17:47.694326300 -0400 @@ -25,7 +25,7 @@ * @test * @bug 8026844 * @summary Test non constant addExact - * @library /testlibrary / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * --- old/test/compiler/intrinsics/mathexact/DecExactITest.java 2016-08-11 13:17:50.583756400 -0400 +++ new/test/compiler/intrinsics/mathexact/DecExactITest.java 2016-08-11 13:17:50.152146400 -0400 @@ -25,7 +25,7 @@ * @test * @bug 8026844 * @summary Test decrementExact - * @library /testlibrary / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * --- old/test/compiler/intrinsics/mathexact/DecExactLTest.java 2016-08-11 13:17:53.040904100 -0400 +++ new/test/compiler/intrinsics/mathexact/DecExactLTest.java 2016-08-11 13:17:52.631054400 -0400 @@ -25,7 +25,7 @@ * @test * @bug 8026844 * @summary Test decrementExact - * @library /testlibrary / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * --- old/test/compiler/intrinsics/mathexact/IncExactITest.java 2016-08-11 13:17:55.484245800 -0400 +++ new/test/compiler/intrinsics/mathexact/IncExactITest.java 2016-08-11 13:17:55.079273500 -0400 @@ -25,7 +25,7 @@ * @test * @bug 8026844 * @summary Test incrementExact - * @library /testlibrary / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * --- old/test/compiler/intrinsics/mathexact/IncExactLTest.java 2016-08-11 13:17:57.921149000 -0400 +++ new/test/compiler/intrinsics/mathexact/IncExactLTest.java 2016-08-11 13:17:57.509059000 -0400 @@ -25,7 +25,7 @@ * @test * @bug 8026844 * @summary Test incrementExact - * @library /testlibrary / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * --- old/test/compiler/intrinsics/mathexact/MulExactIConstantTest.java 2016-08-11 13:18:00.378599900 -0400 +++ new/test/compiler/intrinsics/mathexact/MulExactIConstantTest.java 2016-08-11 13:17:59.954391600 -0400 @@ -25,7 +25,7 @@ * @test * @bug 8026844 * @summary Test constant multiplyExact - * @library /testlibrary / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * --- old/test/compiler/intrinsics/mathexact/MulExactILoadTest.java 2016-08-11 13:18:02.824469800 -0400 +++ new/test/compiler/intrinsics/mathexact/MulExactILoadTest.java 2016-08-11 13:18:02.403335300 -0400 @@ -25,7 +25,7 @@ * @test * @bug 8026844 * @summary Test multiplyExact - * @library /testlibrary / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * --- old/test/compiler/intrinsics/mathexact/MulExactILoopDependentTest.java 2016-08-11 13:18:05.276883700 -0400 +++ new/test/compiler/intrinsics/mathexact/MulExactILoopDependentTest.java 2016-08-11 13:18:04.857036200 -0400 @@ -25,7 +25,7 @@ * @test * @bug 8026844 * @summary Test loop dependent multiplyExact - * @library /testlibrary / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * --- old/test/compiler/intrinsics/mathexact/MulExactINonConstantTest.java 2016-08-11 13:18:07.747780100 -0400 +++ new/test/compiler/intrinsics/mathexact/MulExactINonConstantTest.java 2016-08-11 13:18:07.333221500 -0400 @@ -25,7 +25,7 @@ * @test * @bug 8026844 * @summary Test non constant multiplyExact - * @library /testlibrary / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * --- old/test/compiler/intrinsics/mathexact/MulExactIRepeatTest.java 2016-08-11 13:18:10.212910800 -0400 +++ new/test/compiler/intrinsics/mathexact/MulExactIRepeatTest.java 2016-08-11 13:18:09.786109300 -0400 @@ -25,7 +25,7 @@ * @test * @bug 8026844 * @summary Test repeating multiplyExact - * @library /testlibrary / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * --- old/test/compiler/intrinsics/mathexact/MulExactLConstantTest.java 2016-08-11 13:18:12.668498300 -0400 +++ new/test/compiler/intrinsics/mathexact/MulExactLConstantTest.java 2016-08-11 13:18:12.255706000 -0400 @@ -25,7 +25,7 @@ * @test * @bug 8026844 * @summary Test constant mulExact - * @library /testlibrary / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * --- old/test/compiler/intrinsics/mathexact/MulExactLNonConstantTest.java 2016-08-11 13:18:15.123743100 -0400 +++ new/test/compiler/intrinsics/mathexact/MulExactLNonConstantTest.java 2016-08-11 13:18:14.708998400 -0400 @@ -25,7 +25,7 @@ * @test * @bug 8026844 * @summary Test non constant mulExact - * @library /testlibrary / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * --- old/test/compiler/intrinsics/mathexact/NegExactIConstantTest.java 2016-08-11 13:18:17.583730300 -0400 +++ new/test/compiler/intrinsics/mathexact/NegExactIConstantTest.java 2016-08-11 13:18:17.158942500 -0400 @@ -25,7 +25,7 @@ * @test * @bug 8026844 * @summary Test constant negExact - * @library /testlibrary / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * --- old/test/compiler/intrinsics/mathexact/NegExactILoadTest.java 2016-08-11 13:18:20.015318500 -0400 +++ new/test/compiler/intrinsics/mathexact/NegExactILoadTest.java 2016-08-11 13:18:19.609689700 -0400 @@ -25,7 +25,7 @@ * @test * @bug 8026844 * @summary Test negExact - * @library /testlibrary / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * --- old/test/compiler/intrinsics/mathexact/NegExactILoopDependentTest.java 2016-08-11 13:18:22.473674100 -0400 +++ new/test/compiler/intrinsics/mathexact/NegExactILoopDependentTest.java 2016-08-11 13:18:22.055643800 -0400 @@ -25,7 +25,7 @@ * @test * @bug 8026844 * @summary Test negExact loop dependent - * @library /testlibrary / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * --- old/test/compiler/intrinsics/mathexact/NegExactINonConstantTest.java 2016-08-11 13:18:24.928976700 -0400 +++ new/test/compiler/intrinsics/mathexact/NegExactINonConstantTest.java 2016-08-11 13:18:24.523767900 -0400 @@ -25,7 +25,7 @@ * @test * @bug 8026844 * @summary Test non constant negExact - * @library /testlibrary / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * --- old/test/compiler/intrinsics/mathexact/NegExactLConstantTest.java 2016-08-11 13:18:27.380971100 -0400 +++ new/test/compiler/intrinsics/mathexact/NegExactLConstantTest.java 2016-08-11 13:18:26.958873000 -0400 @@ -25,7 +25,7 @@ * @test * @bug 8026844 * @summary Test constant negExact - * @library /testlibrary / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * --- old/test/compiler/intrinsics/mathexact/NegExactLNonConstantTest.java 2016-08-11 13:18:29.835071000 -0400 +++ new/test/compiler/intrinsics/mathexact/NegExactLNonConstantTest.java 2016-08-11 13:18:29.413337800 -0400 @@ -25,7 +25,7 @@ * @test * @bug 8026844 * @summary Test constant negExact - * @library /testlibrary / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * --- old/test/compiler/intrinsics/mathexact/SubExactICondTest.java 2016-08-11 13:18:32.298719700 -0400 +++ new/test/compiler/intrinsics/mathexact/SubExactICondTest.java 2016-08-11 13:18:31.885157600 -0400 @@ -25,7 +25,7 @@ * @test * @bug 8026844 * @summary Test subtractExact as condition - * @library /testlibrary / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * --- old/test/compiler/intrinsics/mathexact/SubExactIConstantTest.java 2016-08-11 13:18:34.753613000 -0400 +++ new/test/compiler/intrinsics/mathexact/SubExactIConstantTest.java 2016-08-11 13:18:34.340193800 -0400 @@ -25,7 +25,7 @@ * @test * @bug 8026844 * @summary Test constant subtractExact - * @library /testlibrary / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * --- old/test/compiler/intrinsics/mathexact/SubExactILoadTest.java 2016-08-11 13:18:37.217986700 -0400 +++ new/test/compiler/intrinsics/mathexact/SubExactILoadTest.java 2016-08-11 13:18:36.807018900 -0400 @@ -25,7 +25,7 @@ * @test * @bug 8026844 * @summary Test non constant subtractExact - * @library /testlibrary / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * --- old/test/compiler/intrinsics/mathexact/SubExactILoopDependentTest.java 2016-08-11 13:18:39.677156500 -0400 +++ new/test/compiler/intrinsics/mathexact/SubExactILoopDependentTest.java 2016-08-11 13:18:39.266184900 -0400 @@ -25,7 +25,7 @@ * @test * @bug 8026844 * @summary Test non constant subtractExact - * @library /testlibrary / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * --- old/test/compiler/intrinsics/mathexact/SubExactINonConstantTest.java 2016-08-11 13:18:42.123617800 -0400 +++ new/test/compiler/intrinsics/mathexact/SubExactINonConstantTest.java 2016-08-11 13:18:41.714975100 -0400 @@ -25,7 +25,7 @@ * @test * @bug 8026844 * @summary Test non constant subtractExact - * @library /testlibrary / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * --- old/test/compiler/intrinsics/mathexact/SubExactIRepeatTest.java 2016-08-11 13:18:44.591786000 -0400 +++ new/test/compiler/intrinsics/mathexact/SubExactIRepeatTest.java 2016-08-11 13:18:44.173669300 -0400 @@ -25,7 +25,7 @@ * @test * @bug 8026844 * @summary Test repeating subtractExact - * @library /testlibrary / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * --- old/test/compiler/intrinsics/mathexact/SubExactLConstantTest.java 2016-08-11 13:18:47.047929400 -0400 +++ new/test/compiler/intrinsics/mathexact/SubExactLConstantTest.java 2016-08-11 13:18:46.635397600 -0400 @@ -26,7 +26,7 @@ * @bug 8026844 * @bug 8027353 * @summary Test constant subtractExact - * @library /testlibrary / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * --- old/test/compiler/intrinsics/mathexact/SubExactLNonConstantTest.java 2016-08-11 13:18:49.494313300 -0400 +++ new/test/compiler/intrinsics/mathexact/SubExactLNonConstantTest.java 2016-08-11 13:18:49.084729600 -0400 @@ -26,7 +26,7 @@ * @bug 8026844 * @bug 8027353 * @summary Test non constant subtractExact - * @library /testlibrary / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * --- old/test/compiler/intrinsics/mathexact/sanity/AddExactIntTest.java 2016-08-11 13:18:51.951209100 -0400 +++ new/test/compiler/intrinsics/mathexact/sanity/AddExactIntTest.java 2016-08-11 13:18:51.543954700 -0400 @@ -23,11 +23,11 @@ /* * @test - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.intrinsics.mathexact.sanity.AddExactIntTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/intrinsics/mathexact/sanity/AddExactLongTest.java 2016-08-11 13:18:54.407041700 -0400 +++ new/test/compiler/intrinsics/mathexact/sanity/AddExactLongTest.java 2016-08-11 13:18:53.994920000 -0400 @@ -23,11 +23,11 @@ /* * @test - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.intrinsics.mathexact.sanity.AddExactLongTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/intrinsics/mathexact/sanity/DecrementExactIntTest.java 2016-08-11 13:18:56.872919100 -0400 +++ new/test/compiler/intrinsics/mathexact/sanity/DecrementExactIntTest.java 2016-08-11 13:18:56.463750700 -0400 @@ -23,11 +23,11 @@ /* * @test - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.intrinsics.mathexact.sanity.DecrementExactIntTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/intrinsics/mathexact/sanity/DecrementExactLongTest.java 2016-08-11 13:18:59.311619400 -0400 +++ new/test/compiler/intrinsics/mathexact/sanity/DecrementExactLongTest.java 2016-08-11 13:18:58.899615800 -0400 @@ -23,11 +23,11 @@ /* * @test - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.intrinsics.mathexact.sanity.DecrementExactLongTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/intrinsics/mathexact/sanity/IncrementExactIntTest.java 2016-08-11 13:19:01.774611200 -0400 +++ new/test/compiler/intrinsics/mathexact/sanity/IncrementExactIntTest.java 2016-08-11 13:19:01.363596800 -0400 @@ -23,11 +23,11 @@ /* * @test - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.intrinsics.mathexact.sanity.IncrementExactIntTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/intrinsics/mathexact/sanity/IncrementExactLongTest.java 2016-08-11 13:19:04.241591600 -0400 +++ new/test/compiler/intrinsics/mathexact/sanity/IncrementExactLongTest.java 2016-08-11 13:19:03.822609300 -0400 @@ -23,11 +23,11 @@ /* * @test - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.intrinsics.mathexact.sanity.IncrementExactLongTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/intrinsics/mathexact/sanity/MultiplyExactIntTest.java 2016-08-11 13:19:06.701709200 -0400 +++ new/test/compiler/intrinsics/mathexact/sanity/MultiplyExactIntTest.java 2016-08-11 13:19:06.288804500 -0400 @@ -23,11 +23,11 @@ /* * @test - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.intrinsics.mathexact.sanity.MultiplyExactIntTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/intrinsics/mathexact/sanity/MultiplyExactLongTest.java 2016-08-11 13:19:09.158528900 -0400 +++ new/test/compiler/intrinsics/mathexact/sanity/MultiplyExactLongTest.java 2016-08-11 13:19:08.746492300 -0400 @@ -23,11 +23,11 @@ /* * @test - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.intrinsics.mathexact.sanity.MultiplyExactLongTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/intrinsics/mathexact/sanity/NegateExactIntTest.java 2016-08-11 13:19:11.613980800 -0400 +++ new/test/compiler/intrinsics/mathexact/sanity/NegateExactIntTest.java 2016-08-11 13:19:11.203482700 -0400 @@ -23,11 +23,11 @@ /* * @test - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.intrinsics.mathexact.sanity.NegateExactIntTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/intrinsics/mathexact/sanity/NegateExactLongTest.java 2016-08-11 13:19:14.120788200 -0400 +++ new/test/compiler/intrinsics/mathexact/sanity/NegateExactLongTest.java 2016-08-11 13:19:13.689906100 -0400 @@ -23,11 +23,11 @@ /* * @test - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.intrinsics.mathexact.sanity.NegateExactLongTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/intrinsics/mathexact/sanity/SubtractExactIntTest.java 2016-08-11 13:19:16.570648400 -0400 +++ new/test/compiler/intrinsics/mathexact/sanity/SubtractExactIntTest.java 2016-08-11 13:19:16.160601100 -0400 @@ -23,11 +23,11 @@ /* * @test - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.intrinsics.mathexact.sanity.SubtractExactIntTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/intrinsics/mathexact/sanity/SubtractExactLongTest.java 2016-08-11 13:19:19.048229300 -0400 +++ new/test/compiler/intrinsics/mathexact/sanity/SubtractExactLongTest.java 2016-08-11 13:19:18.625104700 -0400 @@ -23,10 +23,10 @@ /* * @test - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management - * @build compiler.intrinsics.mathexact.sanity.SubtractExactLongTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/intrinsics/object/TestClone.java 2016-08-11 13:19:21.511994700 -0400 +++ new/test/compiler/intrinsics/object/TestClone.java 2016-08-11 13:19:21.101338300 -0400 @@ -27,7 +27,7 @@ * @bug 8033626 * @summary assert(ex_map->jvms()->same_calls_as(_exceptions->jvms())) failed: all collected exceptions must come from the same place * @modules java.base/jdk.internal.misc - * @library /testlibrary + * @library /test/lib * * @run main/othervm -XX:-TieredCompilation -Xbatch * -XX:CompileCommand=compileonly,compiler.intrinsics.object.TestClone::f --- old/test/compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnSupportedCPU.java 2016-08-11 13:19:23.963775300 -0400 +++ new/test/compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnSupportedCPU.java 2016-08-11 13:19:23.554873300 -0400 @@ -25,11 +25,11 @@ * @test * @bug 8035968 * @summary Verify UseSHA1Intrinsics option processing on supported CPU. - * @library /testlibrary /test/lib testcases / + * @library /test/lib testcases / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.intrinsics.sha.cli.TestUseSHA1IntrinsicsOptionOnSupportedCPU + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnUnsupportedCPU.java 2016-08-11 13:19:26.434731500 -0400 +++ new/test/compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnUnsupportedCPU.java 2016-08-11 13:19:26.017405300 -0400 @@ -25,11 +25,11 @@ * @test * @bug 8035968 * @summary Verify UseSHA1Intrinsics option processing on unsupported CPU. - * @library /testlibrary /test/lib testcases / + * @library /test/lib testcases / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.intrinsics.sha.cli.TestUseSHA1IntrinsicsOptionOnUnsupportedCPU + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/intrinsics/sha/cli/TestUseSHA256IntrinsicsOptionOnSupportedCPU.java 2016-08-11 13:19:28.902722200 -0400 +++ new/test/compiler/intrinsics/sha/cli/TestUseSHA256IntrinsicsOptionOnSupportedCPU.java 2016-08-11 13:19:28.475469500 -0400 @@ -25,11 +25,11 @@ * @test * @bug 8035968 * @summary Verify UseSHA256Intrinsics option processing on supported CPU. - * @library /testlibrary /test/lib testcases / + * @library /test/lib testcases / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.intrinsics.sha.cli.TestUseSHA256IntrinsicsOptionOnSupportedCPU + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/intrinsics/sha/cli/TestUseSHA256IntrinsicsOptionOnUnsupportedCPU.java 2016-08-11 13:19:31.369496000 -0400 +++ new/test/compiler/intrinsics/sha/cli/TestUseSHA256IntrinsicsOptionOnUnsupportedCPU.java 2016-08-11 13:19:30.954812500 -0400 @@ -25,11 +25,11 @@ * @test * @bug 8035968 * @summary Verify UseSHA256Intrinsics option processing on unsupported CPU. - * @library /testlibrary /test/lib testcases / + * @library /test/lib testcases / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.intrinsics.sha.cli.TestUseSHA256IntrinsicsOptionOnUnsupportedCPU + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnSupportedCPU.java 2016-08-11 13:19:33.826104400 -0400 +++ new/test/compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnSupportedCPU.java 2016-08-11 13:19:33.409261000 -0400 @@ -25,11 +25,11 @@ * @test * @bug 8035968 * @summary Verify UseSHA512Intrinsics option processing on supported CPU. - * @library /testlibrary /test/lib testcases / + * @library /test/lib testcases / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.intrinsics.sha.cli.TestUseSHA512IntrinsicsOptionOnSupportedCPU + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnUnsupportedCPU.java 2016-08-11 13:19:36.271140600 -0400 +++ new/test/compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnUnsupportedCPU.java 2016-08-11 13:19:35.860049700 -0400 @@ -25,11 +25,11 @@ * @test * @bug 8035968 * @summary Verify UseSHA512Intrinsics option processing on unsupported CPU. - * @library /testlibrary /test/lib testcases / + * @library /test/lib testcases / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.intrinsics.sha.cli.TestUseSHA512IntrinsicsOptionOnUnsupportedCPU + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/intrinsics/sha/cli/TestUseSHAOptionOnSupportedCPU.java 2016-08-11 13:19:38.720630500 -0400 +++ new/test/compiler/intrinsics/sha/cli/TestUseSHAOptionOnSupportedCPU.java 2016-08-11 13:19:38.308558900 -0400 @@ -25,11 +25,11 @@ * @test * @bug 8035968 * @summary Verify UseSHA option processing on supported CPU. - * @library /testlibrary /test/lib testcases / + * @library /test/lib testcases / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.intrinsics.sha.cli.TestUseSHAOptionOnSupportedCPU + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/intrinsics/sha/cli/TestUseSHAOptionOnUnsupportedCPU.java 2016-08-11 13:19:41.182259600 -0400 +++ new/test/compiler/intrinsics/sha/cli/TestUseSHAOptionOnUnsupportedCPU.java 2016-08-11 13:19:40.762752000 -0400 @@ -25,10 +25,10 @@ * @test * @bug 8035968 * @summary Verify UseSHA option processing on unsupported CPU. - * @library /testlibrary /test/lib testcases / + * @library /test/lib testcases / * @modules java.base/jdk.internal.misc * java.management - * @build compiler.intrinsics.sha.cli.TestUseSHAOptionOnUnsupportedCPU + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForOtherCPU.java 2016-08-11 13:19:43.629613500 -0400 +++ new/test/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForOtherCPU.java 2016-08-11 13:19:43.198898600 -0400 @@ -24,7 +24,7 @@ package compiler.intrinsics.sha.cli.testcases; import compiler.intrinsics.sha.cli.SHAOptionsBase; -import jdk.test.lib.ExitCode; +import jdk.test.lib.process.ExitCode; import jdk.test.lib.Platform; import jdk.test.lib.cli.CommandLineOptionTest; import jdk.test.lib.cli.predicate.NotPredicate; --- old/test/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForSupportedCPU.java 2016-08-11 13:19:46.086684600 -0400 +++ new/test/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForSupportedCPU.java 2016-08-11 13:19:45.670731300 -0400 @@ -24,7 +24,7 @@ package compiler.intrinsics.sha.cli.testcases; import compiler.intrinsics.sha.cli.SHAOptionsBase; -import jdk.test.lib.ExitCode; +import jdk.test.lib.process.ExitCode; import jdk.test.lib.Platform; import jdk.test.lib.cli.CommandLineOptionTest; import jdk.test.lib.cli.predicate.AndPredicate; --- old/test/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForUnsupportedAArch64CPU.java 2016-08-11 13:19:48.546049900 -0400 +++ new/test/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForUnsupportedAArch64CPU.java 2016-08-11 13:19:48.135575300 -0400 @@ -24,7 +24,7 @@ package compiler.intrinsics.sha.cli.testcases; import compiler.intrinsics.sha.cli.SHAOptionsBase; -import jdk.test.lib.ExitCode; +import jdk.test.lib.process.ExitCode; import jdk.test.lib.Platform; import jdk.test.lib.cli.CommandLineOptionTest; import jdk.test.lib.cli.predicate.AndPredicate; --- old/test/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForUnsupportedSparcCPU.java 2016-08-11 13:19:51.009942800 -0400 +++ new/test/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForUnsupportedSparcCPU.java 2016-08-11 13:19:50.593659300 -0400 @@ -24,7 +24,7 @@ package compiler.intrinsics.sha.cli.testcases; import compiler.intrinsics.sha.cli.SHAOptionsBase; -import jdk.test.lib.ExitCode; +import jdk.test.lib.process.ExitCode; import jdk.test.lib.Platform; import jdk.test.lib.cli.CommandLineOptionTest; import jdk.test.lib.cli.predicate.AndPredicate; --- old/test/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForUnsupportedX86CPU.java 2016-08-11 13:19:53.489213900 -0400 +++ new/test/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForUnsupportedX86CPU.java 2016-08-11 13:19:53.071524100 -0400 @@ -24,7 +24,7 @@ package compiler.intrinsics.sha.cli.testcases; import compiler.intrinsics.sha.cli.SHAOptionsBase; -import jdk.test.lib.ExitCode; +import jdk.test.lib.process.ExitCode; import jdk.test.lib.Platform; import jdk.test.lib.cli.CommandLineOptionTest; import jdk.test.lib.cli.predicate.AndPredicate; --- old/test/compiler/intrinsics/sha/cli/testcases/UseSHAIntrinsicsSpecificTestCaseForUnsupportedCPU.java 2016-08-11 13:19:55.969454200 -0400 +++ new/test/compiler/intrinsics/sha/cli/testcases/UseSHAIntrinsicsSpecificTestCaseForUnsupportedCPU.java 2016-08-11 13:19:55.542353800 -0400 @@ -25,7 +25,7 @@ import compiler.intrinsics.sha.cli.SHAOptionsBase; import compiler.testlibrary.sha.predicate.IntrinsicPredicates; -import jdk.test.lib.ExitCode; +import jdk.test.lib.process.ExitCode; import jdk.test.lib.Platform; import jdk.test.lib.cli.CommandLineOptionTest; import jdk.test.lib.cli.predicate.AndPredicate; --- old/test/compiler/intrinsics/sha/cli/testcases/UseSHASpecificTestCaseForSupportedCPU.java 2016-08-11 13:19:58.442563900 -0400 +++ new/test/compiler/intrinsics/sha/cli/testcases/UseSHASpecificTestCaseForSupportedCPU.java 2016-08-11 13:19:58.022769000 -0400 @@ -26,7 +26,7 @@ import compiler.intrinsics.sha.cli.SHAOptionsBase; import compiler.testlibrary.sha.predicate.IntrinsicPredicates; import jdk.test.lib.Asserts; -import jdk.test.lib.ExitCode; +import jdk.test.lib.process.ExitCode; import jdk.test.lib.Platform; import jdk.test.lib.cli.CommandLineOptionTest; import jdk.test.lib.cli.predicate.AndPredicate; --- old/test/compiler/intrinsics/sha/cli/testcases/UseSHASpecificTestCaseForUnsupportedCPU.java 2016-08-11 13:20:00.917148800 -0400 +++ new/test/compiler/intrinsics/sha/cli/testcases/UseSHASpecificTestCaseForUnsupportedCPU.java 2016-08-11 13:20:00.501406700 -0400 @@ -26,7 +26,7 @@ import compiler.intrinsics.sha.cli.SHAOptionsBase; import compiler.testlibrary.sha.predicate.IntrinsicPredicates; import jdk.test.lib.Asserts; -import jdk.test.lib.ExitCode; +import jdk.test.lib.process.ExitCode; import jdk.test.lib.Platform; import jdk.test.lib.cli.CommandLineOptionTest; import jdk.test.lib.cli.predicate.AndPredicate; --- old/test/compiler/intrinsics/sha/sanity/TestSHA1Intrinsics.java 2016-08-11 13:20:03.420728800 -0400 +++ new/test/compiler/intrinsics/sha/sanity/TestSHA1Intrinsics.java 2016-08-11 13:20:03.004288300 -0400 @@ -25,12 +25,11 @@ * @test * @bug 8035968 * @summary Verify that SHA-1 intrinsic is actually used. - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.testlibrary.intrinsics.Verifier - * compiler.intrinsics.sha.sanity.TestSHA1Intrinsics + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/intrinsics/sha/sanity/TestSHA1MultiBlockIntrinsics.java 2016-08-11 13:20:05.865073400 -0400 +++ new/test/compiler/intrinsics/sha/sanity/TestSHA1MultiBlockIntrinsics.java 2016-08-11 13:20:05.453891900 -0400 @@ -25,12 +25,11 @@ * @test * @bug 8035968 * @summary Verify that SHA-1 multi block intrinsic is actually used. - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.testlibrary.intrinsics.Verifier - * compiler.intrinsics.sha.sanity.TestSHA1MultiBlockIntrinsics + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/intrinsics/sha/sanity/TestSHA256Intrinsics.java 2016-08-11 13:20:08.333925500 -0400 +++ new/test/compiler/intrinsics/sha/sanity/TestSHA256Intrinsics.java 2016-08-11 13:20:07.907574000 -0400 @@ -25,12 +25,11 @@ * @test * @bug 8035968 * @summary Verify that SHA-256 intrinsic is actually used. - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.testlibrary.intrinsics.Verifier - * compiler.intrinsics.sha.sanity.TestSHA256Intrinsics + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/intrinsics/sha/sanity/TestSHA256MultiBlockIntrinsics.java 2016-08-11 13:20:10.800057800 -0400 +++ new/test/compiler/intrinsics/sha/sanity/TestSHA256MultiBlockIntrinsics.java 2016-08-11 13:20:10.371738400 -0400 @@ -25,12 +25,11 @@ * @test * @bug 8035968 * @summary Verify that SHA-256 multi block intrinsic is actually used. - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.testlibrary.intrinsics.Verifier - * compiler.intrinsics.sha.sanity.TestSHA256MultiBlockIntrinsics + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/intrinsics/sha/sanity/TestSHA512Intrinsics.java 2016-08-11 13:20:13.251905000 -0400 +++ new/test/compiler/intrinsics/sha/sanity/TestSHA512Intrinsics.java 2016-08-11 13:20:12.842927400 -0400 @@ -25,12 +25,11 @@ * @test * @bug 8035968 * @summary Verify that SHA-512 intrinsic is actually used. - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.testlibrary.intrinsics.Verifier - * compiler.intrinsics.sha.sanity.TestSHA512Intrinsics + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/intrinsics/sha/sanity/TestSHA512MultiBlockIntrinsics.java 2016-08-11 13:20:15.725678100 -0400 +++ new/test/compiler/intrinsics/sha/sanity/TestSHA512MultiBlockIntrinsics.java 2016-08-11 13:20:15.313335400 -0400 @@ -25,12 +25,11 @@ * @test * @bug 8035968 * @summary Verify that SHA-512 multi block intrinsic is actually used. - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.testlibrary.intrinsics.Verifier - * compiler.intrinsics.sha.sanity.TestSHA512MultiBlockIntrinsics + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/intrinsics/string/TestHasNegatives.java 2016-08-11 13:20:18.193806900 -0400 +++ new/test/compiler/intrinsics/string/TestHasNegatives.java 2016-08-11 13:20:17.782323000 -0400 @@ -30,7 +30,6 @@ * @library /compiler/patches * * @build java.base/java.lang.Helper - * @build compiler.intrinsics.string.TestHasNegatives * @run main compiler.intrinsics.string.TestHasNegatives */ --- old/test/compiler/intrinsics/string/TestStringIntrinsicMemoryFlow.java 2016-08-11 13:20:20.629692600 -0400 +++ new/test/compiler/intrinsics/string/TestStringIntrinsicMemoryFlow.java 2016-08-11 13:20:20.218780000 -0400 @@ -26,7 +26,7 @@ * @bug 8144212 * @summary Check for correct memory flow with the String compress/inflate intrinsics. * @modules java.base/jdk.internal.misc - * @library /testlibrary + * @library /test/lib * * @run main compiler.intrinsics.string.TestStringIntrinsicMemoryFlow */ --- old/test/compiler/intrinsics/string/TestStringIntrinsicRangeChecks.java 2016-08-11 13:20:23.102625700 -0400 +++ new/test/compiler/intrinsics/string/TestStringIntrinsicRangeChecks.java 2016-08-11 13:20:22.679480600 -0400 @@ -27,9 +27,8 @@ * @test * @bug 8155608 * @summary Verifies that string intrinsics throw array out of bounds exceptions. - * @library /compiler/patches /testlibrary /test/lib + * @library /compiler/patches /test/lib * @build java.base/java.lang.Helper - * @build compiler.intrinsics.string.TestStringIntrinsicRangeChecks * @run main/othervm -Xbatch -XX:CompileThreshold=100 -XX:-TieredCompilation compiler.intrinsics.string.TestStringIntrinsicRangeChecks */ package compiler.intrinsics.string; --- old/test/compiler/intrinsics/string/TestStringIntrinsics2.java 2016-08-11 13:20:25.547972000 -0400 +++ new/test/compiler/intrinsics/string/TestStringIntrinsics2.java 2016-08-11 13:20:25.144672800 -0400 @@ -27,7 +27,7 @@ * @bug 8145336 * @summary PPC64: fix string intrinsics after CompactStrings change * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib + * @library /test/lib * * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox --- old/test/compiler/intrinsics/unsafe/DirectByteBufferTest.java 2016-08-11 13:20:28.008699500 -0400 +++ new/test/compiler/intrinsics/unsafe/DirectByteBufferTest.java 2016-08-11 13:20:27.599305700 -0400 @@ -26,7 +26,7 @@ * @test * @bug 8026049 8151163 * @modules java.base/jdk.internal.misc - * @library /testlibrary + * @library /test/lib * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:-UseUnalignedAccesses -Djdk.test.lib.random.seed=0 DirectByteBufferTest * @run main/othervm -Djdk.test.lib.random.seed=0 DirectByteBufferTest * @summary Verify that direct byte buffers are correctly accessed. --- old/test/compiler/intrinsics/unsafe/HeapByteBufferTest.java 2016-08-11 13:20:30.464820300 -0400 +++ new/test/compiler/intrinsics/unsafe/HeapByteBufferTest.java 2016-08-11 13:20:30.056456400 -0400 @@ -27,7 +27,7 @@ * @bug 8026049 8151163 * @summary Verify that byte buffers are correctly accessed. * @modules java.base/jdk.internal.misc - * @library /testlibrary + * @library /test/lib * * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:-UseUnalignedAccesses -Djdk.test.lib.random.seed=0 * HeapByteBufferTest --- old/test/compiler/intrinsics/unsafe/TestUnsafeMismatchedArrayFieldAccess.java 2016-08-11 13:20:32.931346500 -0400 +++ new/test/compiler/intrinsics/unsafe/TestUnsafeMismatchedArrayFieldAccess.java 2016-08-11 13:20:32.516611700 -0400 @@ -27,7 +27,7 @@ * @bug 8142386 * @summary Unsafe access to an array is wrongly marked as mismatched * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib + * @library /test/lib * * @run main/othervm -XX:-UseOnStackReplacement -XX:-BackgroundCompilation -XX:-TieredCompilation * compiler.intrinsics.unsafe.TestUnsafeMismatchedArrayFieldAccess --- old/test/compiler/jsr292/ConcurrentClassLoadingTest.java 2016-08-11 13:20:35.384836600 -0400 +++ new/test/compiler/jsr292/ConcurrentClassLoadingTest.java 2016-08-11 13:20:34.976865300 -0400 @@ -25,7 +25,7 @@ * @test * @bug 8022595 * @summary JSR292: deadlock during class loading of MethodHandles, MethodHandleImpl & MethodHandleNatives - * @library /testlibrary / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * --- old/test/compiler/jsr292/ContinuousCallSiteTargetChange.java 2016-08-11 13:20:37.821652500 -0400 +++ new/test/compiler/jsr292/ContinuousCallSiteTargetChange.java 2016-08-11 13:20:37.413747500 -0400 @@ -24,15 +24,15 @@ /** * @test * @modules java.base/jdk.internal.misc - * @library /testlibrary / + * @library /test/lib / * * @run driver compiler.jsr292.ContinuousCallSiteTargetChange */ package compiler.jsr292; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; import java.lang.invoke.CallSite; import java.lang.invoke.MethodHandle; --- old/test/compiler/jsr292/MHInlineTest.java 2016-08-11 13:20:40.267687900 -0400 +++ new/test/compiler/jsr292/MHInlineTest.java 2016-08-11 13:20:39.862054300 -0400 @@ -26,15 +26,15 @@ * @bug 8062280 * @summary C2: inlining failure due to access checks being too strict * @modules java.base/jdk.internal.misc - * @library /testlibrary / + * @library /test/lib / * * @run main/othervm compiler.jsr292.MHInlineTest */ package compiler.jsr292; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; --- old/test/compiler/jsr292/NonInlinedCall/Agent.java 2016-08-11 13:20:42.719824700 -0400 +++ new/test/compiler/jsr292/NonInlinedCall/Agent.java 2016-08-11 13:20:42.303326000 -0400 @@ -24,7 +24,7 @@ package compiler.jsr292.NonInlinedCall; import jdk.test.lib.JDKToolLauncher; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import java.io.File; import java.io.PrintStream; --- old/test/compiler/jsr292/NonInlinedCall/GCTest.java 2016-08-11 13:20:45.173828000 -0400 +++ new/test/compiler/jsr292/NonInlinedCall/GCTest.java 2016-08-11 13:20:44.761797000 -0400 @@ -24,7 +24,7 @@ /* * @test * @bug 8072008 - * @library /testlibrary /test/lib ../patches + * @library /test/lib ../patches * @modules java.base/jdk.internal.misc * java.base/jdk.internal.vm.annotation * --- old/test/compiler/jsr292/NonInlinedCall/InvokeTest.java 2016-08-11 13:20:47.632704400 -0400 +++ new/test/compiler/jsr292/NonInlinedCall/InvokeTest.java 2016-08-11 13:20:47.216586000 -0400 @@ -24,13 +24,12 @@ /* * @test * @bug 8072008 - * @library /testlibrary /test/lib / ../patches + * @library /test/lib / ../patches * @modules java.base/jdk.internal.misc * java.base/jdk.internal.vm.annotation * * @build java.base/java.lang.invoke.MethodHandleHelper * sun.hotspot.WhiteBox - * compiler.jsr292.NonInlinedCall.InvokeTest * @run main/bootclasspath/othervm -XX:+IgnoreUnrecognizedVMOptions * -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI * -Xbatch -XX:-TieredCompilation -XX:CICompilerCount=1 --- old/test/compiler/jsr292/NonInlinedCall/RedefineTest.java 2016-08-11 13:20:50.106386800 -0400 +++ new/test/compiler/jsr292/NonInlinedCall/RedefineTest.java 2016-08-11 13:20:49.696854500 -0400 @@ -27,7 +27,7 @@ * @modules java.base/jdk.internal.org.objectweb.asm * java.base/jdk.internal.misc * java.base/jdk.internal.vm.annotation - * @library /testlibrary /test/lib / ../patches + * @library /test/lib / ../patches * @requires vm.flavor != "minimal" * * @build sun.hotspot.WhiteBox --- old/test/compiler/jsr292/PollutedTrapCounts.java 2016-08-11 13:20:52.566245300 -0400 +++ new/test/compiler/jsr292/PollutedTrapCounts.java 2016-08-11 13:20:52.158357800 -0400 @@ -25,15 +25,15 @@ * @test * @bug 8074551 * @modules java.base/jdk.internal.misc - * @library /testlibrary + * @library /test/lib * * @run driver compiler.jsr292.PollutedTrapCounts */ package compiler.jsr292; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; --- old/test/compiler/jvmci/JVM_GetJVMCIRuntimeTest.java 2016-08-11 13:20:55.014380600 -0400 +++ new/test/compiler/jvmci/JVM_GetJVMCIRuntimeTest.java 2016-08-11 13:20:54.606187800 -0400 @@ -26,7 +26,7 @@ * @test * @bug 8136421 * @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64") - * @library /testlibrary / + * @library /test/lib / * @modules java.base/jdk.internal.misc * @modules jdk.vm.ci/jdk.vm.ci.runtime * @run main/othervm -XX:+UnlockExperimentalVMOptions --- old/test/compiler/jvmci/SecurityRestrictionsTest.java 2016-08-11 13:20:57.475568300 -0400 +++ new/test/compiler/jvmci/SecurityRestrictionsTest.java 2016-08-11 13:20:57.057847300 -0400 @@ -26,7 +26,7 @@ * @test * @bug 8136421 * @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64") - * @library /testlibrary /test/lib / + * @library /test/lib / * @library common/patches * @modules java.base/jdk.internal.misc * @modules jdk.vm.ci/jdk.vm.ci.hotspot --- old/test/compiler/jvmci/compilerToVM/AllocateCompileIdTest.java 2016-08-11 13:20:59.952240300 -0400 +++ new/test/compiler/jvmci/compilerToVM/AllocateCompileIdTest.java 2016-08-11 13:20:59.534896900 -0400 @@ -25,7 +25,7 @@ * @test * @bug 8136421 * @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64") - * @library /testlibrary /test/lib / + * @library /test/lib / * @library ../common/patches * @modules java.base/jdk.internal.misc * @modules java.base/jdk.internal.org.objectweb.asm @@ -33,9 +33,7 @@ * jdk.vm.ci/jdk.vm.ci.hotspot * jdk.vm.ci/jdk.vm.ci.code * - * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper - * @build compiler.jvmci.compilerToVM.AllocateCompileIdTest - * @build sun.hotspot.WhiteBox + * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. @@ -49,7 +47,7 @@ import compiler.jvmci.common.CTVMUtilities; import jdk.test.lib.Asserts; -import jdk.test.lib.Pair; +import jdk.test.lib.util.Pair; import jdk.test.lib.Utils; import jdk.vm.ci.hotspot.CompilerToVMHelper; import jdk.vm.ci.hotspot.HotSpotResolvedJavaMethod; --- old/test/compiler/jvmci/compilerToVM/CanInlineMethodTest.java 2016-08-11 13:21:02.423836000 -0400 +++ new/test/compiler/jvmci/compilerToVM/CanInlineMethodTest.java 2016-08-11 13:21:02.011780200 -0400 @@ -26,7 +26,7 @@ * @test * @bug 8136421 * @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64") - * @library /testlibrary /test/lib / + * @library /test/lib / * @library ../common/patches * @modules java.base/jdk.internal.misc * @modules java.base/jdk.internal.org.objectweb.asm @@ -34,9 +34,7 @@ * jdk.vm.ci/jdk.vm.ci.hotspot * jdk.vm.ci/jdk.vm.ci.code * - * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper - * @build compiler.jvmci.compilerToVM.CanInlineMethodTest - * @build sun.hotspot.WhiteBox + * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. --- old/test/compiler/jvmci/compilerToVM/CollectCountersTest.java 2016-08-11 13:21:04.887431200 -0400 +++ new/test/compiler/jvmci/compilerToVM/CollectCountersTest.java 2016-08-11 13:21:04.477399700 -0400 @@ -25,12 +25,11 @@ * @test * @bug 8136421 * @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64") - * @library / /testlibrary /test/lib/ + * @library / /test/lib/ * @library ../common/patches * @modules java.base/jdk.internal.misc * @modules jdk.vm.ci/jdk.vm.ci.hotspot - * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper - * @build compiler.jvmci.compilerToVM.CollectCountersTest + * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper sun.hotspot.WhiteBox * @run main/othervm -XX:+UnlockExperimentalVMOptions * -XX:+EnableJVMCI * -XX:JVMCICounterSize=0 --- old/test/compiler/jvmci/compilerToVM/CompileCodeTestCase.java 2016-08-11 13:21:07.378289900 -0400 +++ new/test/compiler/jvmci/compilerToVM/CompileCodeTestCase.java 2016-08-11 13:21:06.953070000 -0400 @@ -26,7 +26,7 @@ import compiler.jvmci.common.CTVMUtilities; import compiler.testlibrary.CompilerUtils; -import jdk.test.lib.Pair; +import jdk.test.lib.util.Pair; import jdk.test.lib.Utils; import jdk.vm.ci.code.InstalledCode; import sun.hotspot.WhiteBox; --- old/test/compiler/jvmci/compilerToVM/DebugOutputTest.java 2016-08-11 13:21:09.958809700 -0400 +++ new/test/compiler/jvmci/compilerToVM/DebugOutputTest.java 2016-08-11 13:21:09.538410900 -0400 @@ -25,12 +25,11 @@ * @test * @bug 8136421 * @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64") - * @library / /testlibrary /test/lib + * @library / /test/lib * @library ../common/patches * @modules java.base/jdk.internal.misc * @modules jdk.vm.ci/jdk.vm.ci.hotspot * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper - * @build compiler.jvmci.compilerToVM.DebugOutputTest * @run main/othervm compiler.jvmci.compilerToVM.DebugOutputTest */ @@ -38,8 +37,8 @@ package compiler.jvmci.compilerToVM; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; import jdk.vm.ci.hotspot.CompilerToVMHelper; import java.util.Arrays; --- old/test/compiler/jvmci/compilerToVM/DisassembleCodeBlobTest.java 2016-08-11 13:21:12.438625700 -0400 +++ new/test/compiler/jvmci/compilerToVM/DisassembleCodeBlobTest.java 2016-08-11 13:21:12.027327800 -0400 @@ -26,7 +26,7 @@ * @test * @bug 8136421 * @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64") - * @library /testlibrary /test/lib / + * @library /test/lib / * @library ../common/patches * @modules java.base/jdk.internal.misc * @modules java.base/jdk.internal.org.objectweb.asm @@ -35,9 +35,7 @@ * jdk.vm.ci/jdk.vm.ci.code * * @ignore 8139700 - * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper - * @build sun.hotspot.WhiteBox - * compiler.jvmci.compilerToVM.DisassembleCodeBlobTest + * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. --- old/test/compiler/jvmci/compilerToVM/DoNotInlineOrCompileTest.java 2016-08-11 13:21:14.892407900 -0400 +++ new/test/compiler/jvmci/compilerToVM/DoNotInlineOrCompileTest.java 2016-08-11 13:21:14.480944000 -0400 @@ -26,7 +26,7 @@ * @test * @bug 8136421 * @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64") - * @library /testlibrary /test/lib / + * @library /test/lib / * @library ../common/patches * @modules java.base/jdk.internal.misc * @modules java.base/jdk.internal.org.objectweb.asm @@ -34,9 +34,7 @@ * jdk.vm.ci/jdk.vm.ci.hotspot * jdk.vm.ci/jdk.vm.ci.code * - * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper - * @build compiler.jvmci.compilerToVM.DoNotInlineOrCompileTest - * @build sun.hotspot.WhiteBox + * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. --- old/test/compiler/jvmci/compilerToVM/ExecuteInstalledCodeTest.java 2016-08-11 13:21:17.382055700 -0400 +++ new/test/compiler/jvmci/compilerToVM/ExecuteInstalledCodeTest.java 2016-08-11 13:21:16.964171300 -0400 @@ -1,7 +1,7 @@ package compiler.jvmci.compilerToVM; import jdk.test.lib.Asserts; -import jdk.test.lib.Pair; +import jdk.test.lib.util.Pair; import jdk.test.lib.Utils; import jdk.vm.ci.code.InstalledCode; import jdk.vm.ci.code.InvalidInstalledCodeException; @@ -17,7 +17,7 @@ * @test * @bug 8136421 * @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64") - * @library /testlibrary /test/lib / + * @library /test/lib / * @library ../common/patches * @ignore 8139383 * @modules java.base/jdk.internal.misc @@ -25,9 +25,7 @@ * java.base/jdk.internal.org.objectweb.asm.tree * jdk.vm.ci/jdk.vm.ci.hotspot * jdk.vm.ci/jdk.vm.ci.code - * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper - * @build compiler.jvmci.compilerToVM.ExecuteInstalledCodeTest - * @build sun.hotspot.WhiteBox + * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. --- old/test/compiler/jvmci/compilerToVM/FindUniqueConcreteMethodTest.java 2016-08-11 13:21:19.951260500 -0400 +++ new/test/compiler/jvmci/compilerToVM/FindUniqueConcreteMethodTest.java 2016-08-11 13:21:19.540600700 -0400 @@ -25,7 +25,7 @@ * @test * @bug 8136421 * @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64") - * @library / /testlibrary /test/lib + * @library / /test/lib * @library ../common/patches * @modules java.base/jdk.internal.misc * @modules java.base/jdk.internal.org.objectweb.asm @@ -33,7 +33,6 @@ * jdk.vm.ci/jdk.vm.ci.hotspot * jdk.vm.ci/jdk.vm.ci.code * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper - * @build compiler.jvmci.compilerToVM.FindUniqueConcreteMethodTest * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI * compiler.jvmci.compilerToVM.FindUniqueConcreteMethodTest */ --- old/test/compiler/jvmci/compilerToVM/GetBytecodeTest.java 2016-08-11 13:21:22.413665800 -0400 +++ new/test/compiler/jvmci/compilerToVM/GetBytecodeTest.java 2016-08-11 13:21:22.005813900 -0400 @@ -26,7 +26,7 @@ * @test * @bug 8136421 * @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64") - * @library /testlibrary /test/lib / + * @library /test/lib / * @library ../common/patches * @modules java.base/jdk.internal.misc * @modules java.base/jdk.internal.org.objectweb.asm @@ -34,7 +34,6 @@ * jdk.vm.ci/jdk.vm.ci.hotspot * jdk.vm.ci/jdk.vm.ci.code * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper - * @build compiler.jvmci.compilerToVM.GetBytecodeTest * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI * compiler.jvmci.compilerToVM.GetBytecodeTest */ --- old/test/compiler/jvmci/compilerToVM/GetClassInitializerTest.java 2016-08-11 13:21:24.866248300 -0400 +++ new/test/compiler/jvmci/compilerToVM/GetClassInitializerTest.java 2016-08-11 13:21:24.455267800 -0400 @@ -25,12 +25,11 @@ * @test * @bug 8136421 * @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64") - * @library / /testlibrary /test/lib + * @library / /test/lib * @library ../common/patches * @modules java.base/jdk.internal.misc * @modules jdk.vm.ci/jdk.vm.ci.hotspot * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper - * @build compiler.jvmci.compilerToVM.GetClassInitializerTest * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI * compiler.jvmci.compilerToVM.GetClassInitializerTest */ --- old/test/compiler/jvmci/compilerToVM/GetConstantPoolTest.java 2016-08-11 13:21:27.317184600 -0400 +++ new/test/compiler/jvmci/compilerToVM/GetConstantPoolTest.java 2016-08-11 13:21:26.898698800 -0400 @@ -26,7 +26,7 @@ * @test * @bug 8136421 * @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64") - * @library /testlibrary /test/lib / + * @library /test/lib / * @library ../common/patches * @modules java.base/jdk.internal.misc * @modules jdk.vm.ci/jdk.vm.ci.hotspot @@ -34,7 +34,6 @@ * * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper * @build jdk.vm.ci/jdk.vm.ci.hotspot.PublicMetaspaceWrapperObject - * @build compiler.jvmci.compilerToVM.GetConstantPoolTest * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission --- old/test/compiler/jvmci/compilerToVM/GetExceptionTableTest.java 2016-08-11 13:21:29.761732800 -0400 +++ new/test/compiler/jvmci/compilerToVM/GetExceptionTableTest.java 2016-08-11 13:21:29.356160500 -0400 @@ -26,7 +26,7 @@ * @test * @bug 8136421 * @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64") - * @library /testlibrary /test/lib / + * @library /test/lib / * @library ../common/patches * @modules java.base/jdk.internal.misc * @modules java.base/jdk.internal.org.objectweb.asm @@ -34,7 +34,6 @@ * jdk.vm.ci/jdk.vm.ci.hotspot * jdk.vm.ci/jdk.vm.ci.code * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper - * @build compiler.jvmci.compilerToVM.GetExceptionTableTest * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI * compiler.jvmci.compilerToVM.GetExceptionTableTest */ --- old/test/compiler/jvmci/compilerToVM/GetImplementorTest.java 2016-08-11 13:21:32.292307700 -0400 +++ new/test/compiler/jvmci/compilerToVM/GetImplementorTest.java 2016-08-11 13:21:31.870903800 -0400 @@ -25,12 +25,11 @@ * @test * @bug 8136421 * @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64") - * @library / /testlibrary /test/lib/ + * @library / /test/lib/ * @library ../common/patches * @modules java.base/jdk.internal.misc * @modules jdk.vm.ci/jdk.vm.ci.hotspot * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper - * @build compiler.jvmci.compilerToVM.GetImplementorTest * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI * compiler.jvmci.compilerToVM.GetImplementorTest */ --- old/test/compiler/jvmci/compilerToVM/GetLineNumberTableTest.java 2016-08-11 13:21:34.772560000 -0400 +++ new/test/compiler/jvmci/compilerToVM/GetLineNumberTableTest.java 2016-08-11 13:21:34.359127400 -0400 @@ -26,7 +26,7 @@ * @test * @bug 8136421 * @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64") - * @library /testlibrary /test/lib / + * @library /test/lib / * @library ../common/patches * @library ../common/patches * @modules java.base/jdk.internal.misc @@ -35,7 +35,6 @@ * jdk.vm.ci/jdk.vm.ci.hotspot * jdk.vm.ci/jdk.vm.ci.code * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper - * @build compiler.jvmci.compilerToVM.GetLineNumberTableTest * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI * compiler.jvmci.compilerToVM.GetLineNumberTableTest */ --- old/test/compiler/jvmci/compilerToVM/GetLocalVariableTableTest.java 2016-08-11 13:21:37.204789300 -0400 +++ new/test/compiler/jvmci/compilerToVM/GetLocalVariableTableTest.java 2016-08-11 13:21:36.788720800 -0400 @@ -26,7 +26,7 @@ * @test * @bug 8136421 * @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64") - * @library /testlibrary /test/lib / + * @library /test/lib / * @library ../common/patches * @modules java.base/jdk.internal.misc * @modules java.base/jdk.internal.org.objectweb.asm @@ -38,7 +38,6 @@ * @compile -g DummyAbstractClass.java * @compile -g DummyClass.java * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper - * @build compiler.jvmci.compilerToVM.GetLocalVariableTableTest * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI * compiler.jvmci.compilerToVM.GetLocalVariableTableTest * @clean compiler.jvmci.compilerToVM.* --- old/test/compiler/jvmci/compilerToVM/GetMaxCallTargetOffsetTest.java 2016-08-11 13:21:39.689638000 -0400 +++ new/test/compiler/jvmci/compilerToVM/GetMaxCallTargetOffsetTest.java 2016-08-11 13:21:39.242978600 -0400 @@ -25,12 +25,11 @@ * @test * @bug 8136421 * @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64") - * @library / /testlibrary /test/lib/ + * @library / /test/lib/ * @library ../common/patches * @modules java.base/jdk.internal.misc * @modules jdk.vm.ci/jdk.vm.ci.hotspot * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper - * @build compiler.jvmci.compilerToVM.GetMaxCallTargetOffsetTest * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI * compiler.jvmci.compilerToVM.GetMaxCallTargetOffsetTest */ --- old/test/compiler/jvmci/compilerToVM/GetNextStackFrameTest.java 2016-08-11 13:21:42.199296000 -0400 +++ new/test/compiler/jvmci/compilerToVM/GetNextStackFrameTest.java 2016-08-11 13:21:41.776608500 -0400 @@ -25,7 +25,7 @@ * @test * @bug 8136421 * @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64") - * @library / /testlibrary /test/lib + * @library / /test/lib * @library ../common/patches * @modules java.base/jdk.internal.misc * @modules java.base/jdk.internal.org.objectweb.asm @@ -34,7 +34,6 @@ * jdk.vm.ci/jdk.vm.ci.code * jdk.vm.ci/jdk.vm.ci.meta * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper - * @build compiler.jvmci.compilerToVM.GetNextStackFrameTest * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI * compiler.jvmci.compilerToVM.GetNextStackFrameTest */ --- old/test/compiler/jvmci/compilerToVM/GetResolvedJavaMethodAtSlotTest.java 2016-08-11 13:21:44.662320600 -0400 +++ new/test/compiler/jvmci/compilerToVM/GetResolvedJavaMethodAtSlotTest.java 2016-08-11 13:21:44.253319000 -0400 @@ -26,7 +26,7 @@ * @test * @bug 8136421 * @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64") - * @library /testlibrary /test/lib / + * @library /test/lib / * @library ../common/patches * @modules java.base/jdk.internal.misc * @modules java.base/jdk.internal.org.objectweb.asm @@ -35,7 +35,6 @@ * jdk.vm.ci/jdk.vm.ci.code * jdk.vm.ci/jdk.vm.ci.meta * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper - * @build compiler.jvmci.compilerToVM.GetNextStackFrameTest * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI * compiler.jvmci.compilerToVM.GetResolvedJavaMethodAtSlotTest */ --- old/test/compiler/jvmci/compilerToVM/GetResolvedJavaMethodTest.java 2016-08-11 13:21:47.139208200 -0400 +++ new/test/compiler/jvmci/compilerToVM/GetResolvedJavaMethodTest.java 2016-08-11 13:21:46.723100400 -0400 @@ -25,14 +25,14 @@ * @test * @bug 8136421 * @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64") - * @library / /testlibrary /test/lib + * @library / /test/lib * @library ../common/patches * @modules java.base/jdk.internal.misc * @modules jdk.vm.ci/jdk.vm.ci.hotspot * * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper * jdk.vm.ci/jdk.vm.ci.hotspot.PublicMetaspaceWrapperObject - * @build compiler.jvmci.compilerToVM.GetResolvedJavaMethodTest + * sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. --- old/test/compiler/jvmci/compilerToVM/GetResolvedJavaTypeTest.java 2016-08-11 13:21:49.605547900 -0400 +++ new/test/compiler/jvmci/compilerToVM/GetResolvedJavaTypeTest.java 2016-08-11 13:21:49.190006400 -0400 @@ -25,7 +25,7 @@ * @test * @bug 8136421 * @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64") - * @library / /testlibrary /test/lib + * @library / /test/lib * @library ../common/patches * @modules java.base/jdk.internal.misc * @modules jdk.vm.ci/jdk.vm.ci.hotspot @@ -34,8 +34,7 @@ * @ignore 8158860 * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper * jdk.vm.ci/jdk.vm.ci.hotspot.PublicMetaspaceWrapperObject - * @build compiler.jvmci.compilerToVM.GetResolvedJavaTypeTest - * @build sun.hotspot.WhiteBox + * sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. --- old/test/compiler/jvmci/compilerToVM/GetStackTraceElementTest.java 2016-08-11 13:21:52.174566600 -0400 +++ new/test/compiler/jvmci/compilerToVM/GetStackTraceElementTest.java 2016-08-11 13:21:51.738730100 -0400 @@ -26,7 +26,7 @@ * @test * @bug 8136421 * @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64") - * @library /testlibrary /test/lib / + * @library /test/lib / * @library ../common/patches * @modules java.base/jdk.internal.misc * @modules java.base/jdk.internal.org.objectweb.asm @@ -34,7 +34,6 @@ * jdk.vm.ci/jdk.vm.ci.hotspot * jdk.vm.ci/jdk.vm.ci.code * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper - * @build compiler.jvmci.compilerToVM.GetStackTraceElementTest * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI * compiler.jvmci.compilerToVM.GetStackTraceElementTest */ --- old/test/compiler/jvmci/compilerToVM/GetSymbolTest.java 2016-08-11 13:21:54.694467500 -0400 +++ new/test/compiler/jvmci/compilerToVM/GetSymbolTest.java 2016-08-11 13:21:54.260509000 -0400 @@ -25,7 +25,7 @@ * @test * @bug 8136421 * @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64") - * @library / /testlibrary /test/lib + * @library / /test/lib * @library ../common/patches * @modules java.base/jdk.internal.misc * @modules java.base/jdk.internal.org.objectweb.asm @@ -34,7 +34,6 @@ * jdk.vm.ci/jdk.vm.ci.code * jdk.vm.ci/jdk.vm.ci.meta * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper - * @build compiler.jvmci.compilerToVM.GetSymbolTest * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI * compiler.jvmci.compilerToVM.GetSymbolTest */ --- old/test/compiler/jvmci/compilerToVM/GetVtableIndexForInterfaceTest.java 2016-08-11 13:21:57.186306400 -0400 +++ new/test/compiler/jvmci/compilerToVM/GetVtableIndexForInterfaceTest.java 2016-08-11 13:21:56.772407300 -0400 @@ -25,7 +25,7 @@ * @test * @bug 8136421 * @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64") - * @library / /testlibrary /test/lib + * @library / /test/lib * @library ../common/patches * @modules java.base/jdk.internal.misc * @modules java.base/jdk.internal.org.objectweb.asm @@ -33,7 +33,6 @@ * jdk.vm.ci/jdk.vm.ci.hotspot * jdk.vm.ci/jdk.vm.ci.code * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper - * @build compiler.jvmci.compilerToVM.GetVtableIndexForInterfaceTest * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI * compiler.jvmci.compilerToVM.GetVtableIndexForInterfaceTest */ --- old/test/compiler/jvmci/compilerToVM/HasCompiledCodeForOSRTest.java 2016-08-11 13:21:59.696144900 -0400 +++ new/test/compiler/jvmci/compilerToVM/HasCompiledCodeForOSRTest.java 2016-08-11 13:21:59.270657800 -0400 @@ -26,7 +26,7 @@ * @test * @bug 8136421 * @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64") - * @library /testlibrary /test/lib / + * @library /test/lib / * @library ../common/patches * @modules java.base/jdk.internal.misc * @modules java.base/jdk.internal.org.objectweb.asm @@ -34,9 +34,7 @@ * jdk.vm.ci/jdk.vm.ci.hotspot * jdk.vm.ci/jdk.vm.ci.code * - * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper - * @build compiler.jvmci.compilerToVM.HasCompiledCodeForOSRTest - * @build sun.hotspot.WhiteBox + * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. --- old/test/compiler/jvmci/compilerToVM/HasFinalizableSubclassTest.java 2016-08-11 13:22:02.190326800 -0400 +++ new/test/compiler/jvmci/compilerToVM/HasFinalizableSubclassTest.java 2016-08-11 13:22:01.779602400 -0400 @@ -25,12 +25,11 @@ * @test * @bug 8136421 * @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64") - * @library / /testlibrary /test/lib + * @library / /test/lib * @library ../common/patches * @modules java.base/jdk.internal.misc * @modules jdk.vm.ci/jdk.vm.ci.hotspot * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper - * @build compiler.jvmci.compilerToVM.HasFinalizableSubclassTest * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI * compiler.jvmci.compilerToVM.HasFinalizableSubclassTest */ --- old/test/compiler/jvmci/compilerToVM/InitializeConfigurationTest.java 2016-08-11 13:22:04.661871100 -0400 +++ new/test/compiler/jvmci/compilerToVM/InitializeConfigurationTest.java 2016-08-11 13:22:04.244981900 -0400 @@ -25,12 +25,11 @@ * @test * @bug 8136421 * @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64") - * @library / /testlibrary + * @library / /test/lib * @library ../common/patches * @modules java.base/jdk.internal.misc * @modules jdk.vm.ci/jdk.vm.ci.hotspot * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper - * @build compiler.jvmci.compilerToVM.InitializeConfigurationTest * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI * compiler.jvmci.compilerToVM.InitializeConfigurationTest */ --- old/test/compiler/jvmci/compilerToVM/InvalidateInstalledCodeTest.java 2016-08-11 13:22:07.135654500 -0400 +++ new/test/compiler/jvmci/compilerToVM/InvalidateInstalledCodeTest.java 2016-08-11 13:22:06.714140600 -0400 @@ -26,7 +26,7 @@ * @test * @bug 8136421 * @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64") - * @library /testlibrary /test/lib / + * @library /test/lib / * @library ../common/patches * @modules java.base/jdk.internal.misc * @modules java.base/jdk.internal.org.objectweb.asm @@ -36,9 +36,7 @@ * jdk.vm.ci/jdk.vm.ci.runtime * * @ignore 8139700 - * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper - * @build compiler.jvmci.compilerToVM.InvalidateInstalledCodeTest - * @build sun.hotspot.WhiteBox + * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. --- old/test/compiler/jvmci/compilerToVM/IsMatureTest.java 2016-08-11 13:22:09.758226600 -0400 +++ new/test/compiler/jvmci/compilerToVM/IsMatureTest.java 2016-08-11 13:22:09.313194200 -0400 @@ -25,13 +25,12 @@ * @test * @bug 8136421 * @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64") - * @library / /testlibrary /test/lib + * @library / /test/lib * ../common/patches * @modules java.base/jdk.internal.misc * jdk.vm.ci/jdk.vm.ci.hotspot * * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper - * compiler.jvmci.compilerToVM.IsMatureTest * sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission --- old/test/compiler/jvmci/compilerToVM/JVM_RegisterJVMCINatives.java 2016-08-11 13:22:12.298431900 -0400 +++ new/test/compiler/jvmci/compilerToVM/JVM_RegisterJVMCINatives.java 2016-08-11 13:22:11.837686800 -0400 @@ -26,7 +26,7 @@ * @test * @bug 8136421 * @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64") - * @library /testlibrary / + * @library /test/lib / * @modules java.base/jdk.internal.misc * @modules jdk.vm.ci/jdk.vm.ci.hotspot * jdk.vm.ci/jdk.vm.ci.runtime --- old/test/compiler/jvmci/compilerToVM/LookupKlassInPoolTest.java 2016-08-11 13:22:14.776218900 -0400 +++ new/test/compiler/jvmci/compilerToVM/LookupKlassInPoolTest.java 2016-08-11 13:22:14.357254100 -0400 @@ -27,7 +27,7 @@ * @bug 8136421 * @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64") * @summary Testing compiler.jvmci.CompilerToVM.lookupKlassInPool method - * @library /testlibrary /test/lib / + * @library /test/lib / * @library ../common/patches * @modules java.base/jdk.internal.misc * java.base/jdk.internal.reflect @@ -37,9 +37,7 @@ * jdk.vm.ci/jdk.vm.ci.runtime * jdk.vm.ci/jdk.vm.ci.meta * - * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper - * @build sun.hotspot.WhiteBox - * compiler.jvmci.compilerToVM.LookupKlassInPoolTest + * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. --- old/test/compiler/jvmci/compilerToVM/LookupKlassRefIndexInPoolTest.java 2016-08-11 13:22:17.224009500 -0400 +++ new/test/compiler/jvmci/compilerToVM/LookupKlassRefIndexInPoolTest.java 2016-08-11 13:22:16.814893200 -0400 @@ -26,7 +26,7 @@ * @test * @bug 8138708 * @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64") - * @library /testlibrary /test/lib / + * @library /test/lib / * @library ../common/patches * @modules java.base/jdk.internal.misc * java.base/jdk.internal.reflect @@ -36,9 +36,7 @@ * jdk.vm.ci/jdk.vm.ci.runtime * jdk.vm.ci/jdk.vm.ci.meta * - * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper - * @build sun.hotspot.WhiteBox - * compiler.jvmci.compilerToVM.LookupKlassRefIndexInPoolTest + * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/jvmci/compilerToVM/LookupMethodInPoolTest.java 2016-08-11 13:22:19.701529200 -0400 +++ new/test/compiler/jvmci/compilerToVM/LookupMethodInPoolTest.java 2016-08-11 13:22:19.288408800 -0400 @@ -26,7 +26,7 @@ * @test * @bug 8138708 * @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64") - * @library /testlibrary /test/lib / + * @library /test/lib / * @library ../common/patches * @modules java.base/jdk.internal.misc * java.base/jdk.internal.reflect @@ -36,9 +36,7 @@ * jdk.vm.ci/jdk.vm.ci.meta * jdk.vm.ci/jdk.vm.ci.runtime * - * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper - * @build sun.hotspot.WhiteBox - * compiler.jvmci.compilerToVM.LookupMethodInPoolTest + * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/jvmci/compilerToVM/LookupNameAndTypeRefIndexInPoolTest.java 2016-08-11 13:22:22.171158300 -0400 +++ new/test/compiler/jvmci/compilerToVM/LookupNameAndTypeRefIndexInPoolTest.java 2016-08-11 13:22:21.747225400 -0400 @@ -26,7 +26,7 @@ * @test * @bug 8138708 * @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64") - * @library /testlibrary /test/lib / + * @library /test/lib / * @library ../common/patches * @modules java.base/jdk.internal.misc * java.base/jdk.internal.reflect @@ -36,9 +36,7 @@ * jdk.vm.ci/jdk.vm.ci.runtime * jdk.vm.ci/jdk.vm.ci.meta * - * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper - * @build sun.hotspot.WhiteBox - * compiler.jvmci.compilerToVM.LookupNameAndTypeRefIndexInPoolTest + * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/jvmci/compilerToVM/LookupNameInPoolTest.java 2016-08-11 13:22:24.657749800 -0400 +++ new/test/compiler/jvmci/compilerToVM/LookupNameInPoolTest.java 2016-08-11 13:22:24.227871600 -0400 @@ -26,7 +26,7 @@ * @test * @bug 8138708 * @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64") - * @library /testlibrary /test/lib / + * @library /test/lib / * @library ../common/patches * @modules java.base/jdk.internal.misc * java.base/jdk.internal.reflect @@ -38,7 +38,6 @@ * * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper * @build sun.hotspot.WhiteBox - * compiler.jvmci.compilerToVM.LookupNameInPoolTest * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/jvmci/compilerToVM/LookupSignatureInPoolTest.java 2016-08-11 13:22:27.140222200 -0400 +++ new/test/compiler/jvmci/compilerToVM/LookupSignatureInPoolTest.java 2016-08-11 13:22:26.704961400 -0400 @@ -26,7 +26,7 @@ * @test * @bug 8138708 * @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64") - * @library /testlibrary /test/lib / + * @library /test/lib / * @library ../common/patches * @modules java.base/jdk.internal.misc * java.base/jdk.internal.reflect @@ -38,7 +38,6 @@ * * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper * @build sun.hotspot.WhiteBox - * compiler.jvmci.compilerToVM.LookupSignatureInPoolTest * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/jvmci/compilerToVM/LookupTypeTest.java 2016-08-11 13:22:29.602065600 -0400 +++ new/test/compiler/jvmci/compilerToVM/LookupTypeTest.java 2016-08-11 13:22:29.188286200 -0400 @@ -25,12 +25,11 @@ * @test * @bug 8136421 * @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64") - * @library / /testlibrary + * @library / /test/lib * @library ../common/patches * @modules java.base/jdk.internal.misc * @modules jdk.vm.ci/jdk.vm.ci.hotspot * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper - * @build compiler.jvmci.compilerToVM.LookupTypeTest * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI * compiler.jvmci.compilerToVM.LookupTypeTest */ --- old/test/compiler/jvmci/compilerToVM/MaterializeVirtualObjectTest.java 2016-08-11 13:22:32.040375500 -0400 +++ new/test/compiler/jvmci/compilerToVM/MaterializeVirtualObjectTest.java 2016-08-11 13:22:31.636229900 -0400 @@ -27,7 +27,7 @@ * @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64") * & (vm.compMode != "Xcomp" | vm.opt.TieredCompilation == null | vm.opt.TieredCompilation == true) * @summary no "-Xcomp -XX:-TieredCompilation" combination allowed until JDK-8140018 is resolved - * @library / /testlibrary /test/lib + * @library / /test/lib * @library ../common/patches * @modules java.base/jdk.internal.misc * @modules java.base/jdk.internal.org.objectweb.asm @@ -36,9 +36,7 @@ * jdk.vm.ci/jdk.vm.ci.code * jdk.vm.ci/jdk.vm.ci.meta * - * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper - * @build compiler.jvmci.compilerToVM.MaterializeVirtualObjectTest - * @build sun.hotspot.WhiteBox + * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xmixed -Xbootclasspath/a:. --- old/test/compiler/jvmci/compilerToVM/MethodIsIgnoredBySecurityStackWalkTest.java 2016-08-11 13:22:34.497192200 -0400 +++ new/test/compiler/jvmci/compilerToVM/MethodIsIgnoredBySecurityStackWalkTest.java 2016-08-11 13:22:34.084558600 -0400 @@ -26,7 +26,7 @@ * @test * @bug 8136421 * @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64") - * @library /testlibrary /test/lib / + * @library /test/lib / * @library ../common/patches * @modules java.base/jdk.internal.misc * @modules java.base/jdk.internal.reflect @@ -35,7 +35,6 @@ * jdk.vm.ci/jdk.vm.ci.hotspot * jdk.vm.ci/jdk.vm.ci.code * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper - * @build compiler.jvmci.compilerToVM.MethodIsIgnoredBySecurityStackWalkTest * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI * compiler.jvmci.compilerToVM.MethodIsIgnoredBySecurityStackWalkTest */ --- old/test/compiler/jvmci/compilerToVM/ReprofileTest.java 2016-08-11 13:22:36.955650800 -0400 +++ new/test/compiler/jvmci/compilerToVM/ReprofileTest.java 2016-08-11 13:22:36.537239000 -0400 @@ -26,7 +26,7 @@ * @test * @bug 8136421 * @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64") & (vm.opt.TieredStopAtLevel == null | vm.opt.TieredStopAtLevel == 3) - * @library /testlibrary /test/lib / + * @library /test/lib / * @library ../common/patches * @modules java.base/jdk.internal.misc * @modules java.base/jdk.internal.org.objectweb.asm @@ -35,9 +35,7 @@ * jdk.vm.ci/jdk.vm.ci.code * jdk.vm.ci/jdk.vm.ci.meta * - * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper - * @build sun.hotspot.WhiteBox - * @build compiler.jvmci.compilerToVM.ReprofileTest + * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. --- old/test/compiler/jvmci/compilerToVM/ResolveConstantInPoolTest.java 2016-08-11 13:22:39.439024300 -0400 +++ new/test/compiler/jvmci/compilerToVM/ResolveConstantInPoolTest.java 2016-08-11 13:22:39.014816800 -0400 @@ -26,7 +26,7 @@ * @test * @bug 8136421 * @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64") - * @library /testlibrary /test/lib / + * @library /test/lib / * @library ../common/patches * @modules java.base/jdk.internal.misc * java.base/jdk.internal.reflect @@ -35,9 +35,7 @@ * jdk.vm.ci/jdk.vm.ci.runtime * jdk.vm.ci/jdk.vm.ci.meta * - * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper - * @build sun.hotspot.WhiteBox - * compiler.jvmci.compilerToVM.ResolveConstantInPoolTest + * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. --- old/test/compiler/jvmci/compilerToVM/ResolveFieldInPoolTest.java 2016-08-11 13:22:41.901584900 -0400 +++ new/test/compiler/jvmci/compilerToVM/ResolveFieldInPoolTest.java 2016-08-11 13:22:41.483617500 -0400 @@ -26,7 +26,7 @@ * @test * @bug 8138708 * @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64") - * @library /testlibrary /test/lib / + * @library /test/lib / * @library ../common/patches * @modules java.base/jdk.internal.misc * java.base/jdk.internal.reflect @@ -36,9 +36,7 @@ * jdk.vm.ci/jdk.vm.ci.meta * jdk.vm.ci/jdk.vm.ci.runtime * - * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper - * @build sun.hotspot.WhiteBox - * compiler.jvmci.compilerToVM.ResolveFieldInPoolTest + * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/jvmci/compilerToVM/ResolveMethodTest.java 2016-08-11 13:22:44.355941100 -0400 +++ new/test/compiler/jvmci/compilerToVM/ResolveMethodTest.java 2016-08-11 13:22:43.950938000 -0400 @@ -25,7 +25,7 @@ * @test * @bug 8136421 * @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64") - * @library / /testlibrary /test/lib + * @library / /test/lib * @library ../common/patches * @modules java.base/jdk.internal.misc * @modules java.base/jdk.internal.org.objectweb.asm @@ -33,7 +33,6 @@ * jdk.vm.ci/jdk.vm.ci.hotspot * jdk.vm.ci/jdk.vm.ci.code * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper - * @build compiler.jvmci.compilerToVM.ResolveMethodTest * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI * compiler.jvmci.compilerToVM.ResolveMethodTest */ --- old/test/compiler/jvmci/compilerToVM/ResolvePossiblyCachedConstantInPoolTest.java 2016-08-11 13:22:46.829017000 -0400 +++ new/test/compiler/jvmci/compilerToVM/ResolvePossiblyCachedConstantInPoolTest.java 2016-08-11 13:22:46.412507600 -0400 @@ -26,7 +26,7 @@ * @test * @bug 8138708 * @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64") - * @library /testlibrary /test/lib / + * @library /test/lib / * @library ../common/patches * @modules java.base/jdk.internal.misc * java.base/jdk.internal.reflect @@ -36,9 +36,7 @@ * jdk.vm.ci/jdk.vm.ci.runtime * jdk.vm.ci/jdk.vm.ci.meta * - * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper - * @build sun.hotspot.WhiteBox - * compiler.jvmci.compilerToVM.ResolvePossiblyCachedConstantInPoolTest + * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/jvmci/compilerToVM/ResolveTypeInPoolTest.java 2016-08-11 13:22:49.302689200 -0400 +++ new/test/compiler/jvmci/compilerToVM/ResolveTypeInPoolTest.java 2016-08-11 13:22:48.888385800 -0400 @@ -27,7 +27,7 @@ * @bug 8136421 * @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64") * @summary Testing compiler.jvmci.CompilerToVM.resolveTypeInPool method - * @library /testlibrary /test/lib / + * @library /test/lib / * @library ../common/patches * @modules java.base/jdk.internal.misc * java.base/jdk.internal.reflect @@ -36,9 +36,7 @@ * jdk.vm.ci/jdk.vm.ci.runtime * jdk.vm.ci/jdk.vm.ci.meta * - * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper - * @build sun.hotspot.WhiteBox - * compiler.jvmci.compilerToVM.ResolveTypeInPoolTest + * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. --- old/test/compiler/jvmci/compilerToVM/ShouldDebugNonSafepointsTest.java 2016-08-11 13:22:51.784856600 -0400 +++ new/test/compiler/jvmci/compilerToVM/ShouldDebugNonSafepointsTest.java 2016-08-11 13:22:51.363695600 -0400 @@ -25,12 +25,11 @@ * @test * @bug 8136421 * @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64") - * @library / /testlibrary /test/lib/ + * @library / /test/lib/ * @library ../common/patches * @modules java.base/jdk.internal.misc * @modules jdk.vm.ci/jdk.vm.ci.hotspot * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper - * @build compiler.jvmci.compilerToVM.ShouldDebugNonSafepointsTest * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI * -XX:+UnlockDiagnosticVMOptions * -XX:+DebugNonSafepoints --- old/test/compiler/jvmci/compilerToVM/ShouldInlineMethodTest.java 2016-08-11 13:22:54.266826500 -0400 +++ new/test/compiler/jvmci/compilerToVM/ShouldInlineMethodTest.java 2016-08-11 13:22:53.840339400 -0400 @@ -26,7 +26,7 @@ * @test * @bug 8136421 * @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64") - * @library /testlibrary /test/lib / + * @library /test/lib / * @library ../common/patches * @modules java.base/jdk.internal.misc * @modules java.base/jdk.internal.org.objectweb.asm @@ -34,9 +34,7 @@ * jdk.vm.ci/jdk.vm.ci.hotspot * jdk.vm.ci/jdk.vm.ci.code * - * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper - * @build compiler.jvmci.compilerToVM.ShouldInlineMethodTest - * @build sun.hotspot.WhiteBox + * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. --- old/test/compiler/jvmci/errors/TestInvalidCompilationResult.java 2016-08-11 13:22:56.761516400 -0400 +++ new/test/compiler/jvmci/errors/TestInvalidCompilationResult.java 2016-08-11 13:22:56.347294800 -0400 @@ -31,7 +31,6 @@ * jdk.vm.ci/jdk.vm.ci.runtime * jdk.vm.ci/jdk.vm.ci.common * @compile CodeInstallerTest.java - * @build compiler.jvmci.errors.TestInvalidCompilationResult * @run junit/othervm -da:jdk.vm.ci... -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.jvmci.errors.TestInvalidCompilationResult */ --- old/test/compiler/jvmci/events/JvmciNotifyBootstrapFinishedEventTest.java 2016-08-11 13:22:59.242636900 -0400 +++ new/test/compiler/jvmci/events/JvmciNotifyBootstrapFinishedEventTest.java 2016-08-11 13:22:58.837126500 -0400 @@ -25,7 +25,7 @@ * @test * @bug 8156034 * @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64") - * @library / /testlibrary + * @library / /test/lib * @library ../common/patches * @modules java.base/jdk.internal.misc * java.base/jdk.internal.org.objectweb.asm @@ -37,7 +37,6 @@ * * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper * @build compiler.jvmci.common.JVMCIHelpers - * compiler.jvmci.events.JvmciNotifyBootstrapFinishedEventTest * @run driver jdk.test.lib.FileInstaller ../common/services/ ./META-INF/services/ * @run driver jdk.test.lib.FileInstaller ./JvmciNotifyBootstrapFinishedEventTest.config * ./META-INF/services/jdk.vm.ci.hotspot.services.HotSpotVMEventListener @@ -46,9 +45,6 @@ * compiler.jvmci.common.JVMCIHelpers$EmptyCompilerFactory * compiler.jvmci.common.JVMCIHelpers$EmptyCompilationRequestResult * compiler.jvmci.common.JVMCIHelpers$EmptyVMEventListener - * compiler.jvmci.events.JvmciNotifyBootstrapFinishedEventTest - * jdk.test.lib.Asserts - * jdk.test.lib.Utils * @run main/othervm -XX:+UnlockExperimentalVMOptions * -Djvmci.Compiler=EmptyCompiler -Xbootclasspath/a:. * -XX:+UseJVMCICompiler -XX:-BootstrapJVMCI --- old/test/compiler/jvmci/events/JvmciNotifyInstallEventTest.java 2016-08-11 13:23:01.748683000 -0400 +++ new/test/compiler/jvmci/events/JvmciNotifyInstallEventTest.java 2016-08-11 13:23:01.327250400 -0400 @@ -25,7 +25,7 @@ * @test * @bug 8136421 * @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64") - * @library / /testlibrary + * @library / /test/lib * @library ../common/patches * @modules java.base/jdk.internal.misc * @modules java.base/jdk.internal.org.objectweb.asm @@ -38,7 +38,6 @@ * * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper * @build compiler.jvmci.common.JVMCIHelpers - * compiler.jvmci.events.JvmciNotifyInstallEventTest * @run driver jdk.test.lib.FileInstaller ../common/services/ ./META-INF/services/ * @run driver jdk.test.lib.FileInstaller ./JvmciNotifyInstallEventTest.config * ./META-INF/services/jdk.vm.ci.hotspot.services.HotSpotVMEventListener @@ -46,12 +45,7 @@ * compiler.jvmci.common.JVMCIHelpers$EmptyHotspotCompiler * compiler.jvmci.common.JVMCIHelpers$EmptyCompilerFactory * compiler.jvmci.common.JVMCIHelpers$EmptyCompilationRequestResult - * compiler.jvmci.common.JVMCIHelpers$EmptyVMEventListener - * compiler.jvmci.events.JvmciNotifyInstallEventTest - * compiler.jvmci.common.CTVMUtilities - * compiler.jvmci.common.testcases.SimpleClass - * jdk.test.lib.Asserts - * jdk.test.lib.Utils + * compiler.jvmci.common.JVMCIHelpers$EmptyVMEventListener * @run main/othervm -XX:+UnlockExperimentalVMOptions * -Xbootclasspath/a:. -Xmixed * -XX:+UseJVMCICompiler -XX:-BootstrapJVMCI --- old/test/compiler/jvmci/events/JvmciShutdownEventTest.java 2016-08-11 13:23:04.212026300 -0400 +++ new/test/compiler/jvmci/events/JvmciShutdownEventTest.java 2016-08-11 13:23:03.802686000 -0400 @@ -25,7 +25,7 @@ * @test * @bug 8136421 * @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64") - * @library /testlibrary / + * @library /test/lib / * @modules java.base/jdk.internal.misc * @modules jdk.vm.ci/jdk.vm.ci.hotspot * jdk.vm.ci/jdk.vm.ci.code @@ -34,7 +34,6 @@ * * @build compiler.jvmci.common.JVMCIHelpers * compiler.jvmci.events.JvmciShutdownEventListener - * compiler.jvmci.events.JvmciShutdownEventTest * @run driver jdk.test.lib.FileInstaller ../common/services/ ./META-INF/services/ * @run driver jdk.test.lib.FileInstaller ./JvmciShutdownEventTest.config * ./META-INF/services/jdk.vm.ci.hotspot.services.HotSpotVMEventListener @@ -49,7 +48,7 @@ package compiler.jvmci.events; -import jdk.test.lib.ExitCode; +import jdk.test.lib.process.ExitCode; import jdk.test.lib.cli.CommandLineOptionTest; public class JvmciShutdownEventTest { --- old/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/NativeCallTest.java 2016-08-11 13:23:06.694758700 -0400 +++ new/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/NativeCallTest.java 2016-08-11 13:23:06.275155800 -0400 @@ -24,7 +24,7 @@ /** * @test * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64" - * @library /test/lib /testlibrary / + * @library /test/lib / * @modules jdk.vm.ci/jdk.vm.ci.hotspot * jdk.vm.ci/jdk.vm.ci.code * jdk.vm.ci/jdk.vm.ci.code.site --- old/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/HotSpotConstantReflectionProviderTest.java 2016-08-11 13:23:09.192088900 -0400 +++ new/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/HotSpotConstantReflectionProviderTest.java 2016-08-11 13:23:08.771048900 -0400 @@ -29,7 +29,7 @@ * jdk.vm.ci/jdk.vm.ci.hotspot * java.base/jdk.internal.vm.annotation * java.base/jdk.internal.misc - * @library /testlibrary /test/lib /compiler/jvmci/jdk.vm.ci.hotspot.test/src + * @library /test/lib /compiler/jvmci/jdk.vm.ci.hotspot.test/src * @build jdk.vm.ci.hotspot.test.DummyClass * @run driver ClassFileInstaller jdk.vm.ci.hotspot.test.DummyClass * @run testng/othervm/timeout=300 -Xbootclasspath/a:. --- old/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/MemoryAccessProviderTest.java 2016-08-11 13:23:11.654817600 -0400 +++ new/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/MemoryAccessProviderTest.java 2016-08-11 13:23:11.244277500 -0400 @@ -25,7 +25,7 @@ * @test * @bug 8152341 * @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64") - * @library /testlibrary /test/lib /compiler/jvmci/jdk.vm.ci.hotspot.test/src + * @library /test/lib /compiler/jvmci/jdk.vm.ci.hotspot.test/src * @modules jdk.vm.ci/jdk.vm.ci.meta * jdk.vm.ci/jdk.vm.ci.common * jdk.vm.ci/jdk.vm.ci.runtime --- old/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/MethodHandleAccessProviderTest.java 2016-08-11 13:23:14.126193000 -0400 +++ new/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/MethodHandleAccessProviderTest.java 2016-08-11 13:23:13.714728300 -0400 @@ -26,7 +26,7 @@ * @bug 8152343 * @bug 8161068 * @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64") - * @library /testlibrary /test/lib /compiler/jvmci/jdk.vm.ci.hotspot.test/src + * @library /test/lib /compiler/jvmci/jdk.vm.ci.hotspot.test/src * @modules jdk.vm.ci/jdk.vm.ci.meta * jdk.vm.ci/jdk.vm.ci.runtime * jdk.vm.ci/jdk.vm.ci.hotspot --- old/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/ConstantTest.java 2016-08-11 13:23:16.605166000 -0400 +++ new/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/ConstantTest.java 2016-08-11 13:23:16.193016500 -0400 @@ -28,7 +28,6 @@ * @modules jdk.vm.ci/jdk.vm.ci.meta * jdk.vm.ci/jdk.vm.ci.runtime * java.base/jdk.internal.misc - * @build jdk.vm.ci.runtime.test.ConstantTest * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI jdk.vm.ci.runtime.test.ConstantTest */ package jdk.vm.ci.runtime.test; --- old/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/RedefineClassTest.java 2016-08-11 13:23:19.050906600 -0400 +++ new/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/RedefineClassTest.java 2016-08-11 13:23:18.646300000 -0400 @@ -28,7 +28,6 @@ * @modules jdk.vm.ci/jdk.vm.ci.meta * jdk.vm.ci/jdk.vm.ci.runtime * java.base/jdk.internal.misc - * @build jdk.vm.ci.runtime.test.RedefineClassTest * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI jdk.vm.ci.runtime.test.RedefineClassTest */ --- old/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestConstantReflectionProvider.java 2016-08-11 13:23:21.513838100 -0400 +++ new/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestConstantReflectionProvider.java 2016-08-11 13:23:21.098571100 -0400 @@ -28,7 +28,6 @@ * @modules jdk.vm.ci/jdk.vm.ci.meta * jdk.vm.ci/jdk.vm.ci.runtime * java.base/jdk.internal.misc - * @build jdk.vm.ci.runtime.test.TestConstantReflectionProvider * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI jdk.vm.ci.runtime.test.TestConstantReflectionProvider */ --- old/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestJavaField.java 2016-08-11 13:23:23.983807200 -0400 +++ new/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestJavaField.java 2016-08-11 13:23:23.572930600 -0400 @@ -28,7 +28,6 @@ * @modules jdk.vm.ci/jdk.vm.ci.meta * jdk.vm.ci/jdk.vm.ci.runtime * java.base/jdk.internal.misc - * @build jdk.vm.ci.runtime.test.TestJavaField * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI jdk.vm.ci.runtime.test.TestJavaField */ --- old/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestJavaMethod.java 2016-08-11 13:23:26.526735600 -0400 +++ new/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestJavaMethod.java 2016-08-11 13:23:26.116988600 -0400 @@ -28,7 +28,6 @@ * @modules jdk.vm.ci/jdk.vm.ci.meta * jdk.vm.ci/jdk.vm.ci.runtime * java.base/jdk.internal.misc - * @build jdk.vm.ci.runtime.test.TestJavaMethod * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI jdk.vm.ci.runtime.test.TestJavaMethod */ --- old/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestJavaType.java 2016-08-11 13:23:28.984835000 -0400 +++ new/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestJavaType.java 2016-08-11 13:23:28.576569000 -0400 @@ -28,7 +28,6 @@ * @modules jdk.vm.ci/jdk.vm.ci.meta * jdk.vm.ci/jdk.vm.ci.runtime * java.base/jdk.internal.misc - * @build jdk.vm.ci.runtime.test.TestJavaType * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI jdk.vm.ci.runtime.test.TestJavaType */ --- old/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestMetaAccessProvider.java 2016-08-11 13:23:31.440969500 -0400 +++ new/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestMetaAccessProvider.java 2016-08-11 13:23:31.034260700 -0400 @@ -28,7 +28,6 @@ * @modules jdk.vm.ci/jdk.vm.ci.meta * jdk.vm.ci/jdk.vm.ci.runtime * java.base/jdk.internal.misc - * @build jdk.vm.ci.runtime.test.TestMetaAccessProvider * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI jdk.vm.ci.runtime.test.TestMetaAccessProvider */ --- old/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaField.java 2016-08-11 13:23:33.909330500 -0400 +++ new/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaField.java 2016-08-11 13:23:33.497131900 -0400 @@ -28,7 +28,6 @@ * @modules jdk.vm.ci/jdk.vm.ci.meta * jdk.vm.ci/jdk.vm.ci.runtime * java.base/jdk.internal.misc - * @build jdk.vm.ci.runtime.test.TestResolvedJavaField * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI jdk.vm.ci.runtime.test.TestResolvedJavaField */ --- old/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaMethod.java 2016-08-11 13:23:36.343762500 -0400 +++ new/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaMethod.java 2016-08-11 13:23:35.933101000 -0400 @@ -28,7 +28,6 @@ * @modules jdk.vm.ci/jdk.vm.ci.meta * jdk.vm.ci/jdk.vm.ci.runtime * java.base/jdk.internal.misc - * @build jdk.vm.ci.runtime.test.TestResolvedJavaMethod * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI jdk.vm.ci.runtime.test.TestResolvedJavaMethod */ --- old/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaType.java 2016-08-11 13:23:38.786595200 -0400 +++ new/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaType.java 2016-08-11 13:23:38.375273800 -0400 @@ -31,7 +31,6 @@ * jdk.vm.ci/jdk.vm.ci.runtime * jdk.vm.ci/jdk.vm.ci.common * java.base/jdk.internal.misc - * @build jdk.vm.ci.runtime.test.TestResolvedJavaType * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI jdk.vm.ci.runtime.test.TestResolvedJavaType */ --- old/test/compiler/jvmci/meta/StableFieldTest.java 2016-08-11 13:23:41.248958200 -0400 +++ new/test/compiler/jvmci/meta/StableFieldTest.java 2016-08-11 13:23:40.837382300 -0400 @@ -25,7 +25,7 @@ * @test * @bug 8151664 * @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64") - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * @modules java.base/jdk.internal.vm.annotation * jdk.vm.ci/jdk.vm.ci.hotspot --- old/test/compiler/loopopts/UseCountedLoopSafepoints.java 2016-08-11 13:23:43.681103700 -0400 +++ new/test/compiler/loopopts/UseCountedLoopSafepoints.java 2016-08-11 13:23:43.279925500 -0400 @@ -26,7 +26,7 @@ * @test * @bug 6869327 * @summary Test that C2 flag UseCountedLoopSafepoints ensures a safepoint is kept in a CountedLoop - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * @ignore 8146096 * @run driver compiler.loopopts.UseCountedLoopSafepoints @@ -34,8 +34,8 @@ package compiler.loopopts; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; import java.util.concurrent.atomic.AtomicLong; --- old/test/compiler/loopopts/superword/TestVectorizationWithInvariant.java 2016-08-11 13:23:46.116576300 -0400 +++ new/test/compiler/loopopts/superword/TestVectorizationWithInvariant.java 2016-08-11 13:23:45.695084700 -0400 @@ -27,7 +27,7 @@ * @bug 8078497 * @summary Tests correct alignment of vectors with loop invariant offset. * @modules java.base/jdk.internal.misc - * @library /testlibrary + * @library /test/lib * @run main compiler.loopopts.superword.TestVectorizationWithInvariant */ --- old/test/compiler/onSpinWait/TestOnSpinWait.java 2016-08-11 13:23:48.596503000 -0400 +++ new/test/compiler/onSpinWait/TestOnSpinWait.java 2016-08-11 13:23:48.181325500 -0400 @@ -26,7 +26,7 @@ * @test TestOnSpinWait * @summary (x86 only) checks that java.lang.Thread.onSpinWait is intrinsified * @bug 8147844 - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * @requires os.arch=="x86" | os.arch=="amd64" | os.arch=="x86_64" * @run driver compiler.onSpinWait.TestOnSpinWait @@ -34,8 +34,8 @@ package compiler.onSpinWait; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; public class TestOnSpinWait { --- old/test/compiler/oracle/CheckCompileCommandOption.java 2016-08-11 13:23:51.206677100 -0400 +++ new/test/compiler/oracle/CheckCompileCommandOption.java 2016-08-11 13:23:50.798763600 -0400 @@ -25,7 +25,7 @@ * @test CheckCompileCommandOption * @summary Checks parsing of -XX:CompileCommand=option * @bug 8055286 8056964 8059847 8069035 - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run driver compiler.oracle.CheckCompileCommandOption @@ -33,8 +33,8 @@ package compiler.oracle; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; import java.io.File; --- old/test/compiler/oracle/GetMethodOptionTest.java 2016-08-11 13:23:53.652385300 -0400 +++ new/test/compiler/oracle/GetMethodOptionTest.java 2016-08-11 13:23:53.242820800 -0400 @@ -24,9 +24,9 @@ /* * @test * @bug 8074980 - * @library /testlibrary /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc - * @build sun.hotspot.WhiteBox jdk.test.lib.Asserts compiler.oracle.GetMethodOptionTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI --- old/test/compiler/oracle/MethodMatcherTest.java 2016-08-11 13:23:56.081804600 -0400 +++ new/test/compiler/oracle/MethodMatcherTest.java 2016-08-11 13:23:55.674662600 -0400 @@ -25,7 +25,7 @@ * @test MethodMatcherTest * @summary Testing of compiler/MethodMatcher * @bug 8135068 - * @library /testlibrary /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox --- old/test/compiler/oracle/TestCompileCommand.java 2016-08-11 13:23:58.516745100 -0400 +++ new/test/compiler/oracle/TestCompileCommand.java 2016-08-11 13:23:58.111473000 -0400 @@ -25,7 +25,7 @@ * @test TestCompileCommand * @bug 8069389 * @summary Regression tests of -XX:CompileCommand - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run driver compiler.oracle.TestCompileCommand @@ -33,8 +33,8 @@ package compiler.oracle; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; public class TestCompileCommand { --- old/test/compiler/print/TestProfileReturnTypePrinting.java 2016-08-11 13:24:00.961659000 -0400 +++ new/test/compiler/print/TestProfileReturnTypePrinting.java 2016-08-11 13:24:00.552324200 -0400 @@ -24,7 +24,6 @@ /** * @test * @bug 8073154 - * @build compiler.print.TestProfileReturnTypePrinting * @run main/othervm -XX:TypeProfileLevel=020 * -XX:CompileCommand=compileonly,compiler.print.TestProfileReturnTypePrinting::testMethod * -XX:+IgnoreUnrecognizedVMOptions -XX:+PrintLIR --- old/test/compiler/profiling/spectrapredefineclass/Launcher.java 2016-08-11 13:24:03.402833600 -0400 +++ new/test/compiler/profiling/spectrapredefineclass/Launcher.java 2016-08-11 13:24:02.999894100 -0400 @@ -24,7 +24,7 @@ /* * @test * @bug 8038636 - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.instrument * java.management --- old/test/compiler/profiling/spectrapredefineclass_classloaders/Launcher.java 2016-08-11 13:24:05.848886900 -0400 +++ new/test/compiler/profiling/spectrapredefineclass_classloaders/Launcher.java 2016-08-11 13:24:05.435006500 -0400 @@ -24,7 +24,7 @@ /* * @test * @bug 8040237 - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.instrument * java.management --- old/test/compiler/rangechecks/TestExplicitRangeChecks.java 2016-08-11 13:24:08.271749300 -0400 +++ new/test/compiler/rangechecks/TestExplicitRangeChecks.java 2016-08-11 13:24:07.863268100 -0400 @@ -25,9 +25,8 @@ * @test * @bug 8073480 * @summary explicit range checks should be recognized by C2 - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc - * @build compiler.rangechecks.TestExplicitRangeChecks * @run driver ClassFileInstaller sun.hotspot.WhiteBox * jdk.test.lib.Platform * @run main/othervm -ea -Xmixed -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI --- old/test/compiler/rangechecks/TestRangeCheckSmearing.java 2016-08-11 13:24:10.688296300 -0400 +++ new/test/compiler/rangechecks/TestRangeCheckSmearing.java 2016-08-11 13:24:10.279383200 -0400 @@ -25,12 +25,10 @@ * @test * @bug 8066103 * @summary C2's range check smearing allows out of bound array accesses - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management - * @build compiler.rangechecks.TestRangeCheckSmearing * @run driver ClassFileInstaller sun.hotspot.WhiteBox - * jdk.test.lib.Platform * @run main/othervm -ea -Xmixed -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI * -XX:-BackgroundCompilation -XX:-UseOnStackReplacement * compiler.rangechecks.TestRangeCheckSmearing --- old/test/compiler/rtm/cli/RTMGenericCommandLineOptionTest.java 2016-08-11 13:24:13.126453000 -0400 +++ new/test/compiler/rtm/cli/RTMGenericCommandLineOptionTest.java 2016-08-11 13:24:12.721018400 -0400 @@ -24,7 +24,7 @@ package compiler.rtm.cli; -import jdk.test.lib.ExitCode; +import jdk.test.lib.process.ExitCode; import jdk.test.lib.Platform; import jdk.test.lib.cli.CommandLineOptionTest; --- old/test/compiler/rtm/cli/RTMLockingAwareTest.java 2016-08-11 13:24:15.578089900 -0400 +++ new/test/compiler/rtm/cli/RTMLockingAwareTest.java 2016-08-11 13:24:15.171086000 -0400 @@ -26,7 +26,7 @@ import compiler.testlibrary.rtm.predicate.SupportedCPU; import compiler.testlibrary.rtm.predicate.SupportedVM; -import jdk.test.lib.ExitCode; +import jdk.test.lib.process.ExitCode; import jdk.test.lib.cli.CommandLineOptionTest; import jdk.test.lib.cli.predicate.AndPredicate; --- old/test/compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsBase.java 2016-08-11 13:24:18.016007100 -0400 +++ new/test/compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsBase.java 2016-08-11 13:24:17.601705100 -0400 @@ -24,7 +24,7 @@ package compiler.rtm.cli; -import jdk.test.lib.ExitCode; +import jdk.test.lib.process.ExitCode; import jdk.test.lib.Platform; import jdk.test.lib.cli.CommandLineOptionTest; --- old/test/compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsOptionOnSupportedConfig.java 2016-08-11 13:24:20.464955100 -0400 +++ new/test/compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsOptionOnSupportedConfig.java 2016-08-11 13:24:20.035764100 -0400 @@ -27,11 +27,11 @@ * @bug 8031320 * @summary Verify PrintPreciseRTMLockingStatistics on CPUs with * rtm support and on VM with rtm locking support, - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.rtm.cli.TestPrintPreciseRTMLockingStatisticsOptionOnSupportedConfig + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsOptionOnUnsupportedConfig.java 2016-08-11 13:24:22.904832900 -0400 +++ new/test/compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsOptionOnUnsupportedConfig.java 2016-08-11 13:24:22.492689000 -0400 @@ -27,7 +27,7 @@ * @bug 8031320 * @summary Verify PrintPreciseRTMLockingStatistics on CPUs without * rtm support and/or unsupported VM. - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * --- old/test/compiler/rtm/cli/TestRTMAbortRatioOptionOnSupportedConfig.java 2016-08-11 13:24:25.351551200 -0400 +++ new/test/compiler/rtm/cli/TestRTMAbortRatioOptionOnSupportedConfig.java 2016-08-11 13:24:24.927205600 -0400 @@ -27,11 +27,11 @@ * @bug 8031320 * @summary Verify RTMAbortRatio option processing on CPU with rtm * support and on VM with rtm locking support. - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.rtm.cli.TestRTMAbortRatioOptionOnSupportedConfig + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/rtm/cli/TestRTMAbortRatioOptionOnUnsupportedConfig.java 2016-08-11 13:24:27.797011700 -0400 +++ new/test/compiler/rtm/cli/TestRTMAbortRatioOptionOnUnsupportedConfig.java 2016-08-11 13:24:27.382994100 -0400 @@ -27,11 +27,11 @@ * @bug 8031320 * @summary Verify RTMAbortRatio option processing on CPU without rtm * support or on VM that does not support rtm locking. - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.rtm.cli.TestRTMAbortRatioOptionOnUnsupportedConfig + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/rtm/cli/TestRTMAbortThresholdOption.java 2016-08-11 13:24:30.237656800 -0400 +++ new/test/compiler/rtm/cli/TestRTMAbortThresholdOption.java 2016-08-11 13:24:29.816046300 -0400 @@ -26,11 +26,10 @@ * @test * @bug 8031320 * @summary Verify processing of RTMAbortThreshold option. - * @library /testlibrary / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.rtm.cli.TestRTMAbortThresholdOption * @run main/othervm compiler.rtm.cli.TestRTMAbortThresholdOption */ --- old/test/compiler/rtm/cli/TestRTMLockingCalculationDelayOption.java 2016-08-11 13:24:32.765378500 -0400 +++ new/test/compiler/rtm/cli/TestRTMLockingCalculationDelayOption.java 2016-08-11 13:24:32.317840300 -0400 @@ -26,11 +26,10 @@ * @test * @bug 8031320 * @summary Verify processing of RTMLockingCalculationDelay option. - * @library /testlibrary / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.rtm.cli.TestRTMLockingCalculationDelayOption * @run main/othervm compiler.rtm.cli.TestRTMLockingCalculationDelayOption */ --- old/test/compiler/rtm/cli/TestRTMLockingThresholdOption.java 2016-08-11 13:24:35.210630300 -0400 +++ new/test/compiler/rtm/cli/TestRTMLockingThresholdOption.java 2016-08-11 13:24:34.787679800 -0400 @@ -26,11 +26,10 @@ * @test * @bug 8031320 * @summary Verify processing of RTMLockingThreshold option. - * @library /testlibrary / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.rtm.cli.TestRTMLockingThresholdOption * @run main/othervm compiler.rtm.cli.TestRTMLockingThresholdOption */ --- old/test/compiler/rtm/cli/TestRTMRetryCountOption.java 2016-08-11 13:24:37.658951200 -0400 +++ new/test/compiler/rtm/cli/TestRTMRetryCountOption.java 2016-08-11 13:24:37.253436600 -0400 @@ -26,11 +26,10 @@ * @test * @bug 8031320 * @summary Verify processing of RTMRetryCount option. - * @library /testlibrary / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.rtm.cli.TestRTMRetryCountOption * @run main/othervm compiler.rtm.cli.TestRTMRetryCountOption */ --- old/test/compiler/rtm/cli/TestRTMSpinLoopCountOption.java 2016-08-11 13:24:40.113934400 -0400 +++ new/test/compiler/rtm/cli/TestRTMSpinLoopCountOption.java 2016-08-11 13:24:39.702861000 -0400 @@ -26,11 +26,10 @@ * @test * @bug 8031320 * @summary Verify processing of RTMSpinLoopCount option. - * @library /testlibrary / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.rtm.cli.TestRTMSpinLoopCountOption * @run main/othervm compiler.rtm.cli.TestRTMSpinLoopCountOption */ --- old/test/compiler/rtm/cli/TestRTMTotalCountIncrRateOptionOnSupportedConfig.java 2016-08-11 13:24:42.544869100 -0400 +++ new/test/compiler/rtm/cli/TestRTMTotalCountIncrRateOptionOnSupportedConfig.java 2016-08-11 13:24:42.136077000 -0400 @@ -27,11 +27,11 @@ * @bug 8031320 * @summary Verify RTMTotalCountIncrRate option processing on CPU with * rtm support and on VM with rtm locking support. - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.rtm.cli.TestRTMTotalCountIncrRateOptionOnSupportedConfig + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/rtm/cli/TestRTMTotalCountIncrRateOptionOnUnsupportedConfig.java 2016-08-11 13:24:44.975636500 -0400 +++ new/test/compiler/rtm/cli/TestRTMTotalCountIncrRateOptionOnUnsupportedConfig.java 2016-08-11 13:24:44.566573800 -0400 @@ -27,11 +27,11 @@ * @bug 8031320 * @summary Verify RTMTotalCountIncrRate option processing on CPU without * rtm support and/or on VM without rtm locking support. - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.rtm.cli.TestRTMTotalCountIncrRateOptionOnUnsupportedConfig + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/rtm/cli/TestUseRTMDeoptOptionOnSupportedConfig.java 2016-08-11 13:24:47.406662300 -0400 +++ new/test/compiler/rtm/cli/TestUseRTMDeoptOptionOnSupportedConfig.java 2016-08-11 13:24:46.989676500 -0400 @@ -27,11 +27,11 @@ * @bug 8031320 * @summary Verify UseRTMDeopt option processing on CPUs with rtm support * when rtm locking is supported by VM. - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.rtm.cli.TestUseRTMDeoptOptionOnSupportedConfig + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions @@ -43,7 +43,7 @@ import compiler.testlibrary.rtm.predicate.SupportedCPU; import compiler.testlibrary.rtm.predicate.SupportedVM; -import jdk.test.lib.ExitCode; +import jdk.test.lib.process.ExitCode; import jdk.test.lib.cli.CommandLineOptionTest; import jdk.test.lib.cli.predicate.AndPredicate; --- old/test/compiler/rtm/cli/TestUseRTMDeoptOptionOnUnsupportedConfig.java 2016-08-11 13:24:49.836930700 -0400 +++ new/test/compiler/rtm/cli/TestUseRTMDeoptOptionOnUnsupportedConfig.java 2016-08-11 13:24:49.436613400 -0400 @@ -27,11 +27,11 @@ * @bug 8031320 * @summary Verify UseRTMDeopt option processing on CPUs without rtm support * or on VMs without rtm locking support. - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.rtm.cli.TestUseRTMDeoptOptionOnUnsupportedConfig + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/rtm/cli/TestUseRTMForStackLocksOptionOnSupportedConfig.java 2016-08-11 13:24:52.294716500 -0400 +++ new/test/compiler/rtm/cli/TestUseRTMForStackLocksOptionOnSupportedConfig.java 2016-08-11 13:24:51.886357700 -0400 @@ -27,11 +27,11 @@ * @bug 8031320 * @summary Verify UseRTMForStackLocks option processing on CPU with * rtm support when VM supports rtm locking. - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.rtm.cli.TestUseRTMForStackLocksOptionOnSupportedConfig + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions @@ -43,7 +43,7 @@ import compiler.testlibrary.rtm.predicate.SupportedCPU; import compiler.testlibrary.rtm.predicate.SupportedVM; -import jdk.test.lib.ExitCode; +import jdk.test.lib.process.ExitCode; import jdk.test.lib.cli.CommandLineOptionTest; import jdk.test.lib.cli.predicate.AndPredicate; --- old/test/compiler/rtm/cli/TestUseRTMForStackLocksOptionOnUnsupportedConfig.java 2016-08-11 13:24:54.742302200 -0400 +++ new/test/compiler/rtm/cli/TestUseRTMForStackLocksOptionOnUnsupportedConfig.java 2016-08-11 13:24:54.336191800 -0400 @@ -27,11 +27,11 @@ * @bug 8031320 * @summary Verify UseRTMForStackLocks option processing on CPUs without * rtm support and/or on VMs without rtm locking support. - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.rtm.cli.TestUseRTMForStackLocksOptionOnUnsupportedConfig + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions @@ -43,7 +43,7 @@ import compiler.testlibrary.rtm.predicate.SupportedCPU; import compiler.testlibrary.rtm.predicate.SupportedVM; -import jdk.test.lib.ExitCode; +import jdk.test.lib.process.ExitCode; import jdk.test.lib.cli.CommandLineOptionTest; import jdk.test.lib.cli.predicate.AndPredicate; import jdk.test.lib.cli.predicate.NotPredicate; --- old/test/compiler/rtm/cli/TestUseRTMLockingOptionOnSupportedConfig.java 2016-08-11 13:24:57.175380100 -0400 +++ new/test/compiler/rtm/cli/TestUseRTMLockingOptionOnSupportedConfig.java 2016-08-11 13:24:56.766834000 -0400 @@ -27,11 +27,11 @@ * @bug 8031320 * @summary Verify UseRTMLocking option processing on CPU with rtm support and * on VM with rtm-locking support. - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.rtm.cli.TestUseRTMLockingOptionOnSupportedConfig + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions @@ -43,7 +43,7 @@ import compiler.testlibrary.rtm.predicate.SupportedCPU; import compiler.testlibrary.rtm.predicate.SupportedVM; -import jdk.test.lib.ExitCode; +import jdk.test.lib.process.ExitCode; import jdk.test.lib.cli.CommandLineOptionTest; import jdk.test.lib.cli.predicate.AndPredicate; --- old/test/compiler/rtm/cli/TestUseRTMLockingOptionOnUnsupportedCPU.java 2016-08-11 13:24:59.616039300 -0400 +++ new/test/compiler/rtm/cli/TestUseRTMLockingOptionOnUnsupportedCPU.java 2016-08-11 13:24:59.202138000 -0400 @@ -27,11 +27,11 @@ * @bug 8031320 * @summary Verify UseRTMLocking option processing on CPU without * rtm support. - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.rtm.cli.TestUseRTMLockingOptionOnUnsupportedCPU + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions @@ -43,7 +43,7 @@ import compiler.testlibrary.rtm.predicate.SupportedCPU; import compiler.testlibrary.rtm.predicate.SupportedVM; -import jdk.test.lib.ExitCode; +import jdk.test.lib.process.ExitCode; import jdk.test.lib.Platform; import jdk.test.lib.cli.CommandLineOptionTest; import jdk.test.lib.cli.predicate.AndPredicate; --- old/test/compiler/rtm/cli/TestUseRTMLockingOptionOnUnsupportedVM.java 2016-08-11 13:25:02.050403200 -0400 +++ new/test/compiler/rtm/cli/TestUseRTMLockingOptionOnUnsupportedVM.java 2016-08-11 13:25:01.644715400 -0400 @@ -27,11 +27,11 @@ * @bug 8031320 * @summary Verify UseRTMLocking option processing on CPU with rtm support * in case when VM should not support this option. - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.rtm.cli.TestUseRTMLockingOptionOnUnsupportedVM + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions @@ -43,7 +43,7 @@ import compiler.testlibrary.rtm.predicate.SupportedCPU; import compiler.testlibrary.rtm.predicate.SupportedVM; -import jdk.test.lib.ExitCode; +import jdk.test.lib.process.ExitCode; import jdk.test.lib.cli.CommandLineOptionTest; import jdk.test.lib.cli.predicate.AndPredicate; import jdk.test.lib.cli.predicate.NotPredicate; --- old/test/compiler/rtm/cli/TestUseRTMLockingOptionWithBiasedLocking.java 2016-08-11 13:25:04.487258100 -0400 +++ new/test/compiler/rtm/cli/TestUseRTMLockingOptionWithBiasedLocking.java 2016-08-11 13:25:04.083836200 -0400 @@ -27,11 +27,11 @@ * @bug 8031320 * @summary Verify processing of UseRTMLocking and UseBiasedLocking * options combination on CPU and VM with rtm support. - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.rtm.cli.TestUseRTMLockingOptionWithBiasedLocking + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions @@ -43,7 +43,7 @@ import compiler.testlibrary.rtm.predicate.SupportedCPU; import compiler.testlibrary.rtm.predicate.SupportedVM; -import jdk.test.lib.ExitCode; +import jdk.test.lib.process.ExitCode; import jdk.test.lib.cli.CommandLineOptionTest; import jdk.test.lib.cli.predicate.AndPredicate; --- old/test/compiler/rtm/cli/TestUseRTMXendForLockBusyOption.java 2016-08-11 13:25:06.930704600 -0400 +++ new/test/compiler/rtm/cli/TestUseRTMXendForLockBusyOption.java 2016-08-11 13:25:06.524028300 -0400 @@ -26,11 +26,10 @@ * @test * @bug 8031320 * @summary Verify processing of UseRTMXendForLockBusy option. - * @library /testlibrary / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.rtm.cli.TestUseRTMXendForLockBusyOption * @run main/othervm compiler.rtm.cli.TestUseRTMXendForLockBusyOption */ --- old/test/compiler/rtm/locking/TestRTMAbortRatio.java 2016-08-11 13:25:09.365545000 -0400 +++ new/test/compiler/rtm/locking/TestRTMAbortRatio.java 2016-08-11 13:25:08.957932900 -0400 @@ -27,10 +27,10 @@ * @bug 8031320 * @summary Verify that RTMAbortRatio affects amount of aborts before * deoptimization. - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management - * @build compiler.rtm.locking.TestRTMAbortRatio + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions @@ -48,7 +48,7 @@ import compiler.testlibrary.rtm.predicate.SupportedVM; import jdk.internal.misc.Unsafe; import jdk.test.lib.Asserts; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.Utils; import jdk.test.lib.cli.CommandLineOptionTest; import jdk.test.lib.cli.predicate.AndPredicate; --- old/test/compiler/rtm/locking/TestRTMAbortThreshold.java 2016-08-11 13:25:11.818134700 -0400 +++ new/test/compiler/rtm/locking/TestRTMAbortThreshold.java 2016-08-11 13:25:11.406058000 -0400 @@ -27,10 +27,10 @@ * @bug 8031320 * @summary Verify that RTMAbortThreshold option affects * amount of aborts after which abort ratio is calculated. - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management - * @build compiler.rtm.locking.TestRTMAbortThreshold + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions @@ -47,7 +47,7 @@ import compiler.testlibrary.rtm.predicate.SupportedCPU; import compiler.testlibrary.rtm.predicate.SupportedVM; import jdk.test.lib.Asserts; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.cli.CommandLineOptionTest; import jdk.test.lib.cli.predicate.AndPredicate; --- old/test/compiler/rtm/locking/TestRTMAfterNonRTMDeopt.java 2016-08-11 13:25:14.243254500 -0400 +++ new/test/compiler/rtm/locking/TestRTMAfterNonRTMDeopt.java 2016-08-11 13:25:13.834180200 -0400 @@ -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 /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management - * @build compiler.rtm.locking.TestRTMAfterNonRTMDeopt + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions @@ -50,7 +50,7 @@ import compiler.testlibrary.rtm.predicate.SupportedVM; import jdk.internal.misc.Unsafe; import jdk.test.lib.Asserts; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.Utils; import jdk.test.lib.cli.CommandLineOptionTest; import jdk.test.lib.cli.predicate.AndPredicate; --- old/test/compiler/rtm/locking/TestRTMDeoptOnHighAbortRatio.java 2016-08-11 13:25:16.674617300 -0400 +++ new/test/compiler/rtm/locking/TestRTMDeoptOnHighAbortRatio.java 2016-08-11 13:25:16.265225600 -0400 @@ -27,10 +27,10 @@ * @bug 8031320 * @summary Verify that on high abort ratio method will be recompiled * without rtm locking. - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management - * @build compiler.rtm.locking.TestRTMDeoptOnHighAbortRatio + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions @@ -47,7 +47,7 @@ import compiler.testlibrary.rtm.predicate.SupportedCPU; import compiler.testlibrary.rtm.predicate.SupportedVM; import jdk.test.lib.Asserts; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.cli.CommandLineOptionTest; import jdk.test.lib.cli.predicate.AndPredicate; --- old/test/compiler/rtm/locking/TestRTMDeoptOnLowAbortRatio.java 2016-08-11 13:25:19.105705100 -0400 +++ new/test/compiler/rtm/locking/TestRTMDeoptOnLowAbortRatio.java 2016-08-11 13:25:18.701642500 -0400 @@ -26,10 +26,10 @@ * @test * @bug 8031320 * @summary Verify that on low abort ratio method will be recompiled. - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management - * @build compiler.rtm.locking.TestRTMDeoptOnLowAbortRatio + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions @@ -47,7 +47,7 @@ import compiler.testlibrary.rtm.predicate.SupportedVM; import jdk.internal.misc.Unsafe; import jdk.test.lib.Asserts; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.Utils; import jdk.test.lib.cli.CommandLineOptionTest; import jdk.test.lib.cli.predicate.AndPredicate; --- old/test/compiler/rtm/locking/TestRTMLockingCalculationDelay.java 2016-08-11 13:25:21.547231200 -0400 +++ new/test/compiler/rtm/locking/TestRTMLockingCalculationDelay.java 2016-08-11 13:25:21.139596500 -0400 @@ -27,10 +27,10 @@ * @bug 8031320 * @summary Verify that RTMLockingCalculationDelay affect when * abort ratio calculation is started. - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management - * @build compiler.rtm.locking.TestRTMLockingCalculationDelay + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions @@ -46,7 +46,7 @@ import compiler.testlibrary.rtm.predicate.SupportedCPU; import compiler.testlibrary.rtm.predicate.SupportedVM; import jdk.test.lib.Asserts; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.cli.CommandLineOptionTest; import jdk.test.lib.cli.predicate.AndPredicate; --- old/test/compiler/rtm/locking/TestRTMLockingThreshold.java 2016-08-11 13:25:23.990215800 -0400 +++ new/test/compiler/rtm/locking/TestRTMLockingThreshold.java 2016-08-11 13:25:23.583131100 -0400 @@ -27,10 +27,10 @@ * @bug 8031320 * @summary Verify that RTMLockingThreshold affects rtm state transition * ProfileRTM => UseRTM. - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management - * @build compiler.rtm.locking.TestRTMLockingThreshold + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions @@ -48,7 +48,7 @@ import compiler.testlibrary.rtm.predicate.SupportedVM; import jdk.internal.misc.Unsafe; import jdk.test.lib.Asserts; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.Utils; import jdk.test.lib.cli.CommandLineOptionTest; import jdk.test.lib.cli.predicate.AndPredicate; --- old/test/compiler/rtm/locking/TestRTMRetryCount.java 2016-08-11 13:25:26.435907300 -0400 +++ new/test/compiler/rtm/locking/TestRTMRetryCount.java 2016-08-11 13:25:26.030163000 -0400 @@ -26,10 +26,10 @@ * @test * @bug 8031320 * @summary Verify that RTMRetryCount affects actual amount of retries. - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management - * @build compiler.rtm.locking.TestRTMRetryCount + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions @@ -46,7 +46,7 @@ import compiler.testlibrary.rtm.predicate.SupportedCPU; import compiler.testlibrary.rtm.predicate.SupportedVM; import jdk.test.lib.Asserts; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.cli.CommandLineOptionTest; import jdk.test.lib.cli.predicate.AndPredicate; --- old/test/compiler/rtm/locking/TestRTMSpinLoopCount.java 2016-08-11 13:25:28.856720600 -0400 +++ new/test/compiler/rtm/locking/TestRTMSpinLoopCount.java 2016-08-11 13:25:28.451396300 -0400 @@ -27,10 +27,10 @@ * @bug 8031320 * @summary Verify that RTMSpinLoopCount affects time spent * between locking attempts. - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management - * @build compiler.rtm.locking.TestRTMSpinLoopCount + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions @@ -47,7 +47,7 @@ import compiler.testlibrary.rtm.predicate.SupportedCPU; import compiler.testlibrary.rtm.predicate.SupportedVM; import jdk.test.lib.Asserts; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.cli.CommandLineOptionTest; import jdk.test.lib.cli.predicate.AndPredicate; --- old/test/compiler/rtm/locking/TestRTMTotalCountIncrRate.java 2016-08-11 13:25:31.297567500 -0400 +++ new/test/compiler/rtm/locking/TestRTMTotalCountIncrRate.java 2016-08-11 13:25:30.880961000 -0400 @@ -27,10 +27,10 @@ * @bug 8031320 * @summary Verify that RTMTotalCountIncrRate option affects * RTM locking statistics. - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management - * @build compiler.rtm.locking.TestRTMTotalCountIncrRate + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions @@ -48,7 +48,7 @@ import compiler.testlibrary.rtm.predicate.SupportedVM; import jdk.internal.misc.Unsafe; import jdk.test.lib.Asserts; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.Utils; import jdk.test.lib.cli.CommandLineOptionTest; import jdk.test.lib.cli.predicate.AndPredicate; --- old/test/compiler/rtm/locking/TestUseRTMAfterLockInflation.java 2016-08-11 13:25:33.726114400 -0400 +++ new/test/compiler/rtm/locking/TestUseRTMAfterLockInflation.java 2016-08-11 13:25:33.323439700 -0400 @@ -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 /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management - * @build compiler.rtm.locking.TestUseRTMAfterLockInflation + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions @@ -47,7 +47,7 @@ import compiler.testlibrary.rtm.predicate.SupportedCPU; import compiler.testlibrary.rtm.predicate.SupportedVM; import jdk.test.lib.Asserts; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.cli.CommandLineOptionTest; import jdk.test.lib.cli.predicate.AndPredicate; --- old/test/compiler/rtm/locking/TestUseRTMDeopt.java 2016-08-11 13:25:36.166516500 -0400 +++ new/test/compiler/rtm/locking/TestUseRTMDeopt.java 2016-08-11 13:25:35.759210300 -0400 @@ -27,10 +27,10 @@ * @bug 8031320 * @summary Verify that UseRTMDeopt affects uncommon trap installation in * copmpiled methods with synchronized block. - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management - * @build compiler.rtm.locking.TestUseRTMDeopt + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions @@ -46,7 +46,7 @@ import compiler.testlibrary.rtm.predicate.SupportedCPU; import compiler.testlibrary.rtm.predicate.SupportedVM; import jdk.test.lib.Asserts; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.cli.CommandLineOptionTest; import jdk.test.lib.cli.predicate.AndPredicate; --- old/test/compiler/rtm/locking/TestUseRTMForInflatedLocks.java 2016-08-11 13:25:38.612702000 -0400 +++ new/test/compiler/rtm/locking/TestUseRTMForInflatedLocks.java 2016-08-11 13:25:38.204173800 -0400 @@ -26,10 +26,10 @@ * @test * @bug 8031320 * @summary Verify that rtm locking is used for inflated locks. - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management - * @build compiler.rtm.locking.TestUseRTMForInflatedLocks + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions @@ -45,7 +45,7 @@ import compiler.testlibrary.rtm.predicate.SupportedCPU; import compiler.testlibrary.rtm.predicate.SupportedVM; import jdk.test.lib.Asserts; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.cli.CommandLineOptionTest; import jdk.test.lib.cli.predicate.AndPredicate; --- old/test/compiler/rtm/locking/TestUseRTMForStackLocks.java 2016-08-11 13:25:41.068817700 -0400 +++ new/test/compiler/rtm/locking/TestUseRTMForStackLocks.java 2016-08-11 13:25:40.638670800 -0400 @@ -26,10 +26,10 @@ * @test * @bug 8031320 * @summary Verify that rtm locking is used for stack locks. - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management - * @build compiler.rtm.locking.TestUseRTMForStackLocks + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions @@ -46,7 +46,7 @@ import compiler.testlibrary.rtm.predicate.SupportedCPU; import compiler.testlibrary.rtm.predicate.SupportedVM; import jdk.test.lib.Asserts; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.cli.CommandLineOptionTest; import jdk.test.lib.cli.predicate.AndPredicate; --- old/test/compiler/rtm/locking/TestUseRTMXendForLockBusy.java 2016-08-11 13:25:43.490321200 -0400 +++ new/test/compiler/rtm/locking/TestUseRTMXendForLockBusy.java 2016-08-11 13:25:43.087829600 -0400 @@ -27,10 +27,10 @@ * @bug 8031320 * @summary Verify that UseRTMXendForLockBusy option affects * method behaviour if lock is busy. - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management - * @build compiler.rtm.locking.TestUseRTMXendForLockBusy + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions @@ -48,7 +48,7 @@ import compiler.testlibrary.rtm.predicate.SupportedCPU; import compiler.testlibrary.rtm.predicate.SupportedVM; import jdk.test.lib.Asserts; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.cli.CommandLineOptionTest; import jdk.test.lib.cli.predicate.AndPredicate; --- old/test/compiler/rtm/method_options/TestNoRTMLockElidingOption.java 2016-08-11 13:25:45.933943500 -0400 +++ new/test/compiler/rtm/method_options/TestNoRTMLockElidingOption.java 2016-08-11 13:25:45.518430200 -0400 @@ -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 /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management - * @build compiler.rtm.method_options.TestNoRTMLockElidingOption + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions @@ -47,7 +47,7 @@ import compiler.testlibrary.rtm.predicate.SupportedCPU; import compiler.testlibrary.rtm.predicate.SupportedVM; import jdk.test.lib.Asserts; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.cli.CommandLineOptionTest; import jdk.test.lib.cli.predicate.AndPredicate; --- old/test/compiler/rtm/method_options/TestUseRTMLockElidingOption.java 2016-08-11 13:25:48.374700700 -0400 +++ new/test/compiler/rtm/method_options/TestUseRTMLockElidingOption.java 2016-08-11 13:25:47.970175300 -0400 @@ -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 /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management - * @build compiler.rtm.method_options.TestUseRTMLockElidingOption + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions @@ -48,7 +48,7 @@ import compiler.testlibrary.rtm.predicate.SupportedCPU; import compiler.testlibrary.rtm.predicate.SupportedVM; import jdk.test.lib.Asserts; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.cli.CommandLineOptionTest; import jdk.test.lib.cli.predicate.AndPredicate; --- old/test/compiler/rtm/print/TestPrintPreciseRTMLockingStatistics.java 2016-08-11 13:25:50.812724400 -0400 +++ new/test/compiler/rtm/print/TestPrintPreciseRTMLockingStatistics.java 2016-08-11 13:25:50.394726600 -0400 @@ -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 /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management - * @build compiler.rtm.print.TestPrintPreciseRTMLockingStatistics + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions @@ -50,7 +50,7 @@ import compiler.testlibrary.rtm.predicate.SupportedCPU; import compiler.testlibrary.rtm.predicate.SupportedVM; import jdk.test.lib.Asserts; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.cli.CommandLineOptionTest; import jdk.test.lib.cli.predicate.AndPredicate; --- old/test/compiler/runtime/Test8010927.java 2016-08-11 13:25:53.244205700 -0400 +++ new/test/compiler/runtime/Test8010927.java 2016-08-11 13:25:52.829206500 -0400 @@ -25,9 +25,9 @@ * @test * @bug 8010927 * @summary Kitchensink crashed with SIGSEGV, Problematic frame: v ~StubRoutines::checkcast_arraycopy - * @library /test/lib /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc - * @build compiler.runtime.Test8010927 + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+IgnoreUnrecognizedVMOptions --- old/test/compiler/stable/TestStableBoolean.java 2016-08-11 13:25:55.706184600 -0400 +++ new/test/compiler/stable/TestStableBoolean.java 2016-08-11 13:25:55.277847800 -0400 @@ -26,11 +26,10 @@ /* * @test TestStableBoolean * @summary tests on stable fields and arrays - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * @modules java.base/jdk.internal.vm.annotation * @build sun.hotspot.WhiteBox - * @build compiler.stable.TestStableBoolean * * @run main/bootclasspath/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp * -XX:CompileOnly=::get,::get1,::get2,::get3,::get4 --- old/test/compiler/stable/TestStableByte.java 2016-08-11 13:25:58.141695200 -0400 +++ new/test/compiler/stable/TestStableByte.java 2016-08-11 13:25:57.738028700 -0400 @@ -26,11 +26,10 @@ /* * @test TestStableByte * @summary tests on stable fields and arrays - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * @modules java.base/jdk.internal.vm.annotation * @build sun.hotspot.WhiteBox - * @build compiler.stable.TestStableByte * * @run main/bootclasspath/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp * -XX:CompileOnly=::get,::get1,::get2,::get3,::get4 --- old/test/compiler/stable/TestStableChar.java 2016-08-11 13:26:00.602475800 -0400 +++ new/test/compiler/stable/TestStableChar.java 2016-08-11 13:26:00.192881000 -0400 @@ -26,11 +26,10 @@ /* * @test TestStableChar * @summary tests on stable fields and arrays - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * @modules java.base/jdk.internal.vm.annotation * @build sun.hotspot.WhiteBox - * @build compiler.stable.TestStableChar * * @run main/bootclasspath/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp * -XX:CompileOnly=::get,::get1,::get2,::get3,::get4 --- old/test/compiler/stable/TestStableDouble.java 2016-08-11 13:26:03.043406100 -0400 +++ new/test/compiler/stable/TestStableDouble.java 2016-08-11 13:26:02.639159200 -0400 @@ -26,11 +26,10 @@ /* * @test TestStableDouble * @summary tests on stable fields and arrays - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * @modules java.base/jdk.internal.vm.annotation * @build sun.hotspot.WhiteBox - * @build compiler.stable.TestStableDouble * * @run main/bootclasspath/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp * -XX:CompileOnly=::get,::get1,::get2,::get3,::get4 --- old/test/compiler/stable/TestStableFloat.java 2016-08-11 13:26:05.496067800 -0400 +++ new/test/compiler/stable/TestStableFloat.java 2016-08-11 13:26:05.081323900 -0400 @@ -26,11 +26,10 @@ /* * @test TestStableFloat * @summary tests on stable fields and arrays - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * @modules java.base/jdk.internal.vm.annotation * @build sun.hotspot.WhiteBox - * @build compiler.stable.TestStableFloat * * @run main/bootclasspath/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp * -XX:CompileOnly=::get,::get1,::get2,::get3,::get4 --- old/test/compiler/stable/TestStableInt.java 2016-08-11 13:26:07.952437500 -0400 +++ new/test/compiler/stable/TestStableInt.java 2016-08-11 13:26:07.531123400 -0400 @@ -26,11 +26,10 @@ /* * @test TestStableInt * @summary tests on stable fields and arrays - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * @modules java.base/jdk.internal.vm.annotation * @build sun.hotspot.WhiteBox - * @build compiler.stable.TestStableInt * * @run main/bootclasspath/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp * -XX:CompileOnly=::get,::get1,::get2,::get3,::get4 --- old/test/compiler/stable/TestStableLong.java 2016-08-11 13:26:10.399719500 -0400 +++ new/test/compiler/stable/TestStableLong.java 2016-08-11 13:26:09.989543500 -0400 @@ -26,11 +26,10 @@ /* * @test TestStableLong * @summary tests on stable fields and arrays - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * @modules java.base/jdk.internal.vm.annotation * @build sun.hotspot.WhiteBox - * @build compiler.stable.TestStableLong * * @run main/bootclasspath/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp * -XX:CompileOnly=::get,::get1,::get2,::get3,::get4 --- old/test/compiler/stable/TestStableObject.java 2016-08-11 13:26:12.868374000 -0400 +++ new/test/compiler/stable/TestStableObject.java 2016-08-11 13:26:12.465034600 -0400 @@ -26,11 +26,10 @@ /* * @test TestStableObject * @summary tests on stable fields and arrays - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * @modules java.base/jdk.internal.vm.annotation * @build sun.hotspot.WhiteBox - * @build compiler.stable.TestStableObject * * @run main/bootclasspath/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp * -XX:CompileOnly=::get,::get1,::get2,::get3,::get4 --- old/test/compiler/stable/TestStableShort.java 2016-08-11 13:26:15.333609800 -0400 +++ new/test/compiler/stable/TestStableShort.java 2016-08-11 13:26:14.920357300 -0400 @@ -26,11 +26,10 @@ /* * @test TestStableShort * @summary tests on stable fields and arrays - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * @modules java.base/jdk.internal.vm.annotation * @build sun.hotspot.WhiteBox - * @build compiler.stable.TestStableShort * * @run main/bootclasspath/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp * -XX:CompileOnly=::get,::get1,::get2,::get3,::get4 --- old/test/compiler/stable/TestStableUByte.java 2016-08-11 13:26:17.774623600 -0400 +++ new/test/compiler/stable/TestStableUByte.java 2016-08-11 13:26:17.369332600 -0400 @@ -26,11 +26,10 @@ /* * @test TestStableUByte * @summary tests on stable fields and arrays - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * @modules java.base/jdk.internal.vm.annotation * @build sun.hotspot.WhiteBox - * @build compiler.stable.TestStableUByte * * @run main/bootclasspath/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:+AlwaysIncrementalInline * -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp --- old/test/compiler/stable/TestStableUShort.java 2016-08-11 13:26:20.216280200 -0400 +++ new/test/compiler/stable/TestStableUShort.java 2016-08-11 13:26:19.802602100 -0400 @@ -26,11 +26,10 @@ /* * @test TestStableUShort * @summary tests on stable fields and arrays - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * @modules java.base/jdk.internal.vm.annotation * @build sun.hotspot.WhiteBox - * @build compiler.stable.TestStableUShort * * @run main/bootclasspath/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:+AlwaysIncrementalInline * -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp --- old/test/compiler/startup/NumCompilerThreadsCheck.java 2016-08-11 13:26:22.639701100 -0400 +++ new/test/compiler/startup/NumCompilerThreadsCheck.java 2016-08-11 13:26:22.233274600 -0400 @@ -25,7 +25,7 @@ * @test * @bug 8034775 * @summary Ensures correct minimal number of compiler threads (provided by -XX:CICompilerCount=) - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @@ -34,9 +34,9 @@ package compiler.startup; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.Platform; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.ProcessTools; public class NumCompilerThreadsCheck { --- old/test/compiler/startup/SmallCodeCacheStartup.java 2016-08-11 13:26:25.088102400 -0400 +++ new/test/compiler/startup/SmallCodeCacheStartup.java 2016-08-11 13:26:24.680040900 -0400 @@ -27,7 +27,7 @@ * @summary Test ensures that there is no crash if there is not enough ReservedCodeCacheSize * to initialize all compiler threads. The option -Xcomp gives the VM more time to * trigger the old bug. - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @@ -37,8 +37,8 @@ package compiler.startup; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; import static jdk.test.lib.Asserts.assertTrue; --- old/test/compiler/startup/StartupOutput.java 2016-08-11 13:26:27.531226900 -0400 +++ new/test/compiler/startup/StartupOutput.java 2016-08-11 13:26:27.124560000 -0400 @@ -25,7 +25,7 @@ * @test * @bug 8026949 * @summary Test ensures correct VM output during startup - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @@ -34,8 +34,8 @@ package compiler.startup; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; public class StartupOutput { public static void main(String[] args) throws Exception { --- old/test/compiler/testlibrary/rtm/RTMTestBase.java 2016-08-11 13:26:29.970527700 -0400 +++ new/test/compiler/testlibrary/rtm/RTMTestBase.java 2016-08-11 13:26:29.564546500 -0400 @@ -24,8 +24,8 @@ package compiler.testlibrary.rtm; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; import jdk.test.lib.Utils; import jdk.test.lib.cli.CommandLineOptionTest; --- old/test/compiler/tiered/ConstantGettersTransitionsTest.java 2016-08-11 13:26:32.414482300 -0400 +++ new/test/compiler/tiered/ConstantGettersTransitionsTest.java 2016-08-11 13:26:32.002534300 -0400 @@ -24,11 +24,11 @@ /** * @test ConstantGettersTransitionsTest * @summary Test the correctness of compilation level transitions for constant getters methods - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.tiered.TransitionsTestExecutor + * @build sun.hotspot.WhiteBox * compiler.tiered.ConstantGettersTransitionsTest * @run driver ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm/timeout=240 -Xmixed -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/tiered/LevelTransitionTest.java 2016-08-11 13:26:34.845553900 -0400 +++ new/test/compiler/tiered/LevelTransitionTest.java 2016-08-11 13:26:34.443814100 -0400 @@ -24,12 +24,12 @@ /** * @test LevelTransitionTest * @summary Test the correctness of compilation level transitions for different methods - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * * @ignore 8067651 - * @build compiler.tiered.TransitionsTestExecutor compiler.tiered.LevelTransitionTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm/timeout=240 -Xmixed -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/tiered/NonTieredLevelsTest.java 2016-08-11 13:26:37.298137200 -0400 +++ new/test/compiler/tiered/NonTieredLevelsTest.java 2016-08-11 13:26:36.886724200 -0400 @@ -24,11 +24,11 @@ /** * @test NonTieredLevelsTest * @summary Verify that only one level can be used - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * @requires vm.opt.TieredStopAtLevel==null - * @build compiler.tiered.NonTieredLevelsTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:-TieredCompilation --- old/test/compiler/tiered/TieredLevelsTest.java 2016-08-11 13:26:39.744652800 -0400 +++ new/test/compiler/tiered/TieredLevelsTest.java 2016-08-11 13:26:39.338023600 -0400 @@ -24,11 +24,11 @@ /** * @test TieredLevelsTest * @summary Verify that all levels < 'TieredStopAtLevel' can be used - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build compiler.tiered.TieredLevelsTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+TieredCompilation --- old/test/compiler/tiered/TransitionsTestExecutor.java 2016-08-11 13:26:42.179593700 -0400 +++ new/test/compiler/tiered/TransitionsTestExecutor.java 2016-08-11 13:26:41.773908500 -0400 @@ -24,8 +24,8 @@ package compiler.tiered; import compiler.whitebox.CompilerWhiteBoxTest; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; import java.lang.management.ManagementFactory; import java.lang.management.RuntimeMXBean; --- old/test/compiler/types/TestMeetIncompatibleInterfaceArrays.java 2016-08-11 13:26:44.631579600 -0400 +++ new/test/compiler/types/TestMeetIncompatibleInterfaceArrays.java 2016-08-11 13:26:44.223452600 -0400 @@ -27,7 +27,7 @@ * @summary C2 can not handle returns with inccompatible interface arrays * @modules java.base/jdk.internal.org.objectweb.asm * java.base/jdk.internal.misc - * @library /testlibrary /test/lib + * @library /test/lib * * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox --- old/test/compiler/types/correctness/CorrectnessTest.java 2016-08-11 13:26:47.078984000 -0400 +++ new/test/compiler/types/correctness/CorrectnessTest.java 2016-08-11 13:26:46.668677500 -0400 @@ -26,12 +26,12 @@ * @bug 8038418 * @summary Tests correctness of type usage with type profiling and speculations * @requires vm.flavor == "server" - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * * @ignore 8066173 - * @build compiler.types.correctness.CorrectnessTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockExperimentalVMOptions --- old/test/compiler/types/correctness/OffTest.java 2016-08-11 13:26:49.497186600 -0400 +++ new/test/compiler/types/correctness/OffTest.java 2016-08-11 13:26:49.088744400 -0400 @@ -24,12 +24,12 @@ /* * @test CorrectnessTest * @bug 8038418 - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * * @ignore 8066173 - * @build compiler.types.correctness.OffTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/timeout=1200 compiler.types.correctness.OffTest @@ -38,8 +38,8 @@ package compiler.types.correctness; import compiler.types.correctness.scenarios.ProfilingType; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; import jdk.test.lib.Utils; import java.util.Random; --- old/test/compiler/uncommontrap/DeoptReallocFailure.java 2016-08-11 13:26:51.941757100 -0400 +++ new/test/compiler/uncommontrap/DeoptReallocFailure.java 2016-08-11 13:26:51.534906300 -0400 @@ -24,7 +24,7 @@ /* * @test * @bug 8146416 - * @library /test/lib /testlibrary / + * @library /test/lib / * * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox --- old/test/compiler/uncommontrap/Test8009761.java 2016-08-11 13:26:54.366804500 -0400 +++ new/test/compiler/uncommontrap/Test8009761.java 2016-08-11 13:26:53.964463000 -0400 @@ -25,10 +25,10 @@ * @test * @bug 8009761 * @summary Deoptimization on sparc doesn't set Llast_SP correctly in the interpreter frames it creates - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * - * @build compiler.uncommontrap.Test8009761 + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI --- old/test/compiler/uncommontrap/TestUnstableIfTrap.java 2016-08-11 13:26:56.805578500 -0400 +++ new/test/compiler/uncommontrap/TestUnstableIfTrap.java 2016-08-11 13:26:56.397139300 -0400 @@ -24,16 +24,14 @@ /* * @test * @bug 8030976 8059226 - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.org.objectweb.asm * java.base/jdk.internal.misc * java.compiler * java.management * jdk.jvmstat/sun.jvmstat.monitor * - * @build compiler.uncommontrap.TestUnstableIfTrap - * jdk.test.lib.* - * compiler.testlibrary.uncommontrap.Verifier + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbatch -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/unsafe/UnsafeGetConstantField.java 2016-08-11 13:26:59.248199900 -0400 +++ new/test/compiler/unsafe/UnsafeGetConstantField.java 2016-08-11 13:26:58.846952400 -0400 @@ -26,7 +26,7 @@ /* * @test * @summary tests on constant folding of unsafe get operations - * @library /testlibrary + * @library /test/lib * * @requires vm.flavor == "server" * --- old/test/compiler/unsafe/UnsafeGetStableArrayElement.java 2016-08-11 13:27:01.713554200 -0400 +++ new/test/compiler/unsafe/UnsafeGetStableArrayElement.java 2016-08-11 13:27:01.299230400 -0400 @@ -26,7 +26,7 @@ /* * @test * @summary tests on constant folding of unsafe get operations from stable arrays - * @library /testlibrary + * @library /test/lib * * @requires vm.flavor == "server" * --- old/test/compiler/unsafe/UnsafeRaw.java 2016-08-11 13:27:04.145340100 -0400 +++ new/test/compiler/unsafe/UnsafeRaw.java 2016-08-11 13:27:03.736356800 -0400 @@ -25,7 +25,7 @@ * @test * @bug 8058744 * @summary Invalid pattern-matching of address computations in raw unsafe - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run main/othervm -Xbatch compiler.unsafe.UnsafeRaw --- old/test/compiler/whitebox/AllocationCodeBlobTest.java 2016-08-11 13:27:06.595282400 -0400 +++ new/test/compiler/whitebox/AllocationCodeBlobTest.java 2016-08-11 13:27:06.185055800 -0400 @@ -26,10 +26,10 @@ * @test AllocationCodeBlobTest * @summary testing of WB::allocate/freeCodeBlob() * @bug 8059624 8064669 - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management - * @build compiler.whitebox.AllocationCodeBlobTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions @@ -45,7 +45,7 @@ package compiler.whitebox; import jdk.test.lib.Asserts; -import jdk.test.lib.InfiniteLoop; +import jdk.test.lib.apps.InfiniteLoop; import sun.hotspot.WhiteBox; import sun.hotspot.code.BlobType; --- old/test/compiler/whitebox/BlockingCompilation.java 2016-08-11 13:27:09.021872100 -0400 +++ new/test/compiler/whitebox/BlockingCompilation.java 2016-08-11 13:27:08.622574900 -0400 @@ -26,9 +26,8 @@ * @bug 8150646 8153013 * @summary Add support for blocking compiles through whitebox API * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib / + * @library /test/lib / * @build sun.hotspot.WhiteBox - * compiler.testlibrary.CompilerUtils * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm --- old/test/compiler/whitebox/ClearMethodStateTest.java 2016-08-11 13:27:11.567639600 -0400 +++ new/test/compiler/whitebox/ClearMethodStateTest.java 2016-08-11 13:27:11.137708700 -0400 @@ -25,10 +25,10 @@ * @test ClearMethodStateTest * @bug 8006683 8007288 8022832 * @summary testing of WB::clearMethodState() - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management - * @build compiler.whitebox.ClearMethodStateTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -Xmixed -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/whitebox/DeoptimizeAllTest.java 2016-08-11 13:27:14.233279300 -0400 +++ new/test/compiler/whitebox/DeoptimizeAllTest.java 2016-08-11 13:27:13.801209500 -0400 @@ -25,10 +25,10 @@ * @test DeoptimizeAllTest * @bug 8006683 8007288 8022832 * @summary testing of WB::deoptimizeAll() - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management - * @build compiler.whitebox.DeoptimizeAllTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/whitebox/DeoptimizeFramesTest.java 2016-08-11 13:27:16.786158100 -0400 +++ new/test/compiler/whitebox/DeoptimizeFramesTest.java 2016-08-11 13:27:16.351076900 -0400 @@ -25,10 +25,10 @@ * @test DeoptimizeFramesTest * @bug 8028595 * @summary testing of WB::deoptimizeFrames() - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management - * @build compiler.whitebox.DeoptimizeFramesTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/whitebox/DeoptimizeMethodTest.java 2016-08-11 13:27:19.449990900 -0400 +++ new/test/compiler/whitebox/DeoptimizeMethodTest.java 2016-08-11 13:27:19.016922400 -0400 @@ -25,10 +25,10 @@ * @test DeoptimizeMethodTest * @bug 8006683 8007288 8022832 * @summary testing of WB::deoptimizeMethod() - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management - * @build compiler.whitebox.DeoptimizeMethodTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/whitebox/DeoptimizeMultipleOSRTest.java 2016-08-11 13:27:21.953496000 -0400 +++ new/test/compiler/whitebox/DeoptimizeMultipleOSRTest.java 2016-08-11 13:27:21.516081300 -0400 @@ -26,10 +26,10 @@ * @test DeoptimizeMultipleOSRTest * @bug 8061817 * @summary testing of WB::deoptimizeMethod() - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management - * @build compiler.whitebox.DeoptimizeMultipleOSRTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI --- old/test/compiler/whitebox/EnqueueMethodForCompilationTest.java 2016-08-11 13:27:24.418539400 -0400 +++ new/test/compiler/whitebox/EnqueueMethodForCompilationTest.java 2016-08-11 13:27:23.990507100 -0400 @@ -25,10 +25,10 @@ * @test EnqueueMethodForCompilationTest * @bug 8006683 8007288 8022832 * @summary testing of WB::enqueueMethodForCompilation() - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management - * @build compiler.whitebox.EnqueueMethodForCompilationTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -Xmixed -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/whitebox/ForceNMethodSweepTest.java 2016-08-11 13:27:26.880139900 -0400 +++ new/test/compiler/whitebox/ForceNMethodSweepTest.java 2016-08-11 13:27:26.460765400 -0400 @@ -26,10 +26,10 @@ * @test * @bug 8059624 8064669 8153265 * @summary testing of WB::forceNMethodSweep - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management - * @build compiler.whitebox.ForceNMethodSweepTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/whitebox/GetCodeHeapEntriesTest.java 2016-08-11 13:27:29.322852400 -0400 +++ new/test/compiler/whitebox/GetCodeHeapEntriesTest.java 2016-08-11 13:27:28.910508400 -0400 @@ -26,10 +26,10 @@ * @test GetCodeHeapEntriesTest * @bug 8059624 * @summary testing of WB::getCodeHeapEntries() - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management - * @build compiler.whitebox.GetCodeHeapEntriesTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/whitebox/GetNMethodTest.java 2016-08-11 13:27:31.756396900 -0400 +++ new/test/compiler/whitebox/GetNMethodTest.java 2016-08-11 13:27:31.342235200 -0400 @@ -26,10 +26,10 @@ * @test GetNMethodTest * @bug 8038240 * @summary testing of WB::getNMethod() - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management - * @build compiler.whitebox.GetNMethodTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -Xmixed -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/whitebox/IsMethodCompilableTest.java 2016-08-11 13:27:34.187728900 -0400 +++ new/test/compiler/whitebox/IsMethodCompilableTest.java 2016-08-11 13:27:33.773479500 -0400 @@ -26,16 +26,13 @@ * @bug 8007270 8006683 8007288 8022832 * @summary testing of WB::isMethodCompilable() * @requires vm.flavor == "server" - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management * - * @build jdk.test.lib.* - * sun.hotspot.WhiteBox - * @build compiler.whitebox.IsMethodCompilableTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission - * jdk.test.lib.Platform * @run main/othervm/timeout=2400 -XX:-TieredCompilation -Xmixed * -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI * -XX:PerMethodRecompilationCutoff=3 -XX:-UseCounterDecay --- old/test/compiler/whitebox/LockCompilationTest.java 2016-08-11 13:27:36.620467600 -0400 +++ new/test/compiler/whitebox/LockCompilationTest.java 2016-08-11 13:27:36.195023700 -0400 @@ -25,10 +25,10 @@ * @test LockCompilationTest * @bug 8059624 8152169 * @summary testing of WB::lock/unlockCompilation() - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management - * @build compiler.whitebox.LockCompilationTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -Xmixed -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/whitebox/MakeMethodNotCompilableTest.java 2016-08-11 13:27:39.040478100 -0400 +++ new/test/compiler/whitebox/MakeMethodNotCompilableTest.java 2016-08-11 13:27:38.635110200 -0400 @@ -25,10 +25,10 @@ * @test MakeMethodNotCompilableTest * @bug 8012322 8006683 8007288 8022832 * @summary testing of WB::makeMethodNotCompilable() - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management - * @build compiler.whitebox.MakeMethodNotCompilableTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/whitebox/SetDontInlineMethodTest.java 2016-08-11 13:27:41.487644700 -0400 +++ new/test/compiler/whitebox/SetDontInlineMethodTest.java 2016-08-11 13:27:41.079998000 -0400 @@ -25,10 +25,10 @@ * @test SetDontInlineMethodTest * @bug 8006683 8007288 8022832 * @summary testing of WB::testSetDontInlineMethod() - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management - * @build compiler.whitebox.SetDontInlineMethodTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/compiler/whitebox/SetForceInlineMethodTest.java 2016-08-11 13:27:43.932378600 -0400 +++ new/test/compiler/whitebox/SetForceInlineMethodTest.java 2016-08-11 13:27:43.529457500 -0400 @@ -25,10 +25,10 @@ * @test SetForceInlineMethodTest * @bug 8006683 8007288 8022832 * @summary testing of WB::testSetForceInlineMethod() - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management - * @build compiler.whitebox.SetForceInlineMethodTest + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/gc/CondCardMark/Basic.java 2016-08-11 13:27:46.368498600 -0400 +++ new/test/gc/CondCardMark/Basic.java 2016-08-11 13:27:45.950816100 -0400 @@ -27,8 +27,6 @@ * @bug 8078438 * @summary Verify UseCondCardMark works * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib - * @build Basic * @run main/othervm -Xint Basic * @run main/othervm -Xint -XX:+UseCondCardMark Basic * @run main/othervm -XX:TieredStopAtLevel=1 Basic --- old/test/gc/TestCardTablePageCommits.java 2016-08-11 13:27:48.827192900 -0400 +++ new/test/gc/TestCardTablePageCommits.java 2016-08-11 13:27:48.415317200 -0400 @@ -22,8 +22,8 @@ */ import jdk.test.lib.JDKToolFinder; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.Platform; /* @@ -32,7 +32,7 @@ * @bug 8059066 * @summary Tests that the card table does not commit the same page twice * @requires vm.gc.Parallel - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run driver TestCardTablePageCommits --- old/test/gc/TestDisableExplicitGC.java 2016-08-11 13:27:51.294723300 -0400 +++ new/test/gc/TestDisableExplicitGC.java 2016-08-11 13:27:50.838679100 -0400 @@ -25,7 +25,7 @@ * @test TestDisableExplicitGC * @requires vm.opt.DisableExplicitGC == null * @summary Verify GC behavior with DisableExplicitGC flag. - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * @modules jdk.management/com.sun.management.internal * @run main/othervm -Xlog:gc=debug TestDisableExplicitGC --- old/test/gc/TestObjectAlignment.java 2016-08-11 13:27:53.751124700 -0400 +++ new/test/gc/TestObjectAlignment.java 2016-08-11 13:27:53.344070000 -0400 @@ -26,7 +26,7 @@ * @key gc * @bug 8021823 * @summary G1: Concurrent marking crashes with -XX:ObjectAlignmentInBytes>=32 in 64bit VMs - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run main/othervm TestObjectAlignment -Xmx20M -XX:+ExplicitGCInvokesConcurrent -XX:+IgnoreUnrecognizedVMOptions -XX:ObjectAlignmentInBytes=8 @@ -43,8 +43,8 @@ * @run main/othervm TestObjectAlignment -Xmx20M -XX:-ExplicitGCInvokesConcurrent -XX:+IgnoreUnrecognizedVMOptions -XX:ObjectAlignmentInBytes=256 */ -import jdk.test.lib.ProcessTools; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; public class TestObjectAlignment { --- old/test/gc/TestSmallHeap.java 2016-08-11 13:27:56.210554600 -0400 +++ new/test/gc/TestSmallHeap.java 2016-08-11 13:27:55.790947900 -0400 @@ -26,10 +26,10 @@ * @bug 8067438 8152239 * @requires vm.gc=="null" * @summary Verify that starting the VM with a small heap works - * @library /testlibrary /test/lib /test/lib/share/classes + * @library /test/lib * @modules java.base/jdk.internal.misc * @modules java.management/sun.management - * @build TestSmallHeap + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI TestSmallHeap */ --- old/test/gc/TestSoftReferencesBehaviorOnOOME.java 2016-08-11 13:27:58.662354000 -0400 +++ new/test/gc/TestSoftReferencesBehaviorOnOOME.java 2016-08-11 13:27:58.254451500 -0400 @@ -25,10 +25,9 @@ * @test TestSoftReferencesBehaviorOnOOME * @key gc * @summary Tests that all SoftReferences has been cleared at time of OOM. - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @build TestSoftReferencesBehaviorOnOOME * @run main/othervm -Xmx128m TestSoftReferencesBehaviorOnOOME 512 2k * @run main/othervm -Xmx128m TestSoftReferencesBehaviorOnOOME 128k 256k * @run main/othervm -Xmx128m TestSoftReferencesBehaviorOnOOME 2k 32k --- old/test/gc/TestVerifyDuringStartup.java 2016-08-11 13:28:01.112813800 -0400 +++ new/test/gc/TestVerifyDuringStartup.java 2016-08-11 13:28:00.701853800 -0400 @@ -25,14 +25,14 @@ * @key gc * @bug 8010463 8011343 8011898 * @summary Simple test run with -XX:+VerifyDuringStartup -XX:-UseTLAB to verify 8010463 - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management */ import jdk.test.lib.JDKToolFinder; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; import java.util.ArrayList; import java.util.Collections; --- old/test/gc/TestVerifySilently.java 2016-08-11 13:28:03.544381900 -0400 +++ new/test/gc/TestVerifySilently.java 2016-08-11 13:28:03.142456100 -0400 @@ -25,13 +25,13 @@ * @key gc * @bug 8032771 * @summary Test silent verification. - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management */ -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; import java.util.ArrayList; import java.util.Collections; import jdk.test.lib.Utils; --- old/test/gc/TestVerifySubSet.java 2016-08-11 13:28:05.970110300 -0400 +++ new/test/gc/TestVerifySubSet.java 2016-08-11 13:28:05.563990000 -0400 @@ -25,13 +25,13 @@ * @key gc * @bug 8072725 * @summary Test VerifySubSet option - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management */ -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; import java.util.ArrayList; import java.util.Collections; import jdk.test.lib.Utils; --- old/test/gc/arguments/TestArrayAllocatorMallocLimit.java 2016-08-11 13:28:08.401568000 -0400 +++ new/test/gc/arguments/TestArrayAllocatorMallocLimit.java 2016-08-11 13:28:07.997053800 -0400 @@ -27,15 +27,15 @@ * The test helps verifying that size_t flags can be set/read. * @bug 8054823 * @key gc - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run driver TestArrayAllocatorMallocLimit */ import jdk.test.lib.Asserts; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; import java.math.BigInteger; public class TestArrayAllocatorMallocLimit { --- old/test/gc/arguments/TestCMSHeapSizeFlags.java 2016-08-11 13:28:10.852794700 -0400 +++ new/test/gc/arguments/TestCMSHeapSizeFlags.java 2016-08-11 13:28:10.440632000 -0400 @@ -27,10 +27,10 @@ * @bug 8006088 * @requires vm.gc.ConcMarkSweep * @summary Tests argument processing for initial and maximum heap size for the CMS collector - * @library /testlibrary /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @build TestCMSHeapSizeFlags TestMaxHeapSizeTools + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm TestCMSHeapSizeFlags --- old/test/gc/arguments/TestCompressedClassFlags.java 2016-08-11 13:28:13.303619000 -0400 +++ new/test/gc/arguments/TestCompressedClassFlags.java 2016-08-11 13:28:12.887989800 -0400 @@ -21,14 +21,16 @@ * questions. */ -import jdk.test.lib.*; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.Platform; /* * @test * @bug 8015107 * @summary Tests that VM prints a warning when -XX:CompressedClassSpaceSize * is used together with -XX:-UseCompressedClassPointers - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management */ --- old/test/gc/arguments/TestDisableDefaultGC.java 2016-08-11 13:28:15.758819000 -0400 +++ new/test/gc/arguments/TestDisableDefaultGC.java 2016-08-11 13:28:15.349587700 -0400 @@ -26,15 +26,15 @@ * @summary Test that the VM complains when the default GC is disabled and no other GC is specified * @bug 8068579 * @key gc - * @library /testlibrary + * @library /test/lib * @requires vm.gc=="null" * @modules java.base/jdk.internal.misc * java.management * @run driver TestDisableDefaultGC */ -import jdk.test.lib.ProcessTools; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; public class TestDisableDefaultGC { public static void main(String[] args) throws Exception { --- old/test/gc/arguments/TestDynMaxHeapFreeRatio.java 2016-08-11 13:28:18.189083000 -0400 +++ new/test/gc/arguments/TestDynMaxHeapFreeRatio.java 2016-08-11 13:28:17.785485300 -0400 @@ -30,7 +30,7 @@ * @test TestDynMaxHeapFreeRatio * @bug 8028391 * @summary Verify that MaxHeapFreeRatio flag is manageable - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * @modules java.management * @run main TestDynMaxHeapFreeRatio --- old/test/gc/arguments/TestDynMinHeapFreeRatio.java 2016-08-11 13:28:20.634076500 -0400 +++ new/test/gc/arguments/TestDynMinHeapFreeRatio.java 2016-08-11 13:28:20.222824800 -0400 @@ -25,7 +25,7 @@ * @test TestDynMinHeapFreeRatio * @bug 8028391 * @summary Verify that MinHeapFreeRatio flag is manageable - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * @modules java.management * @run main TestDynMinHeapFreeRatio --- old/test/gc/arguments/TestG1ConcMarkStepDurationMillis.java 2016-08-11 13:28:23.083611600 -0400 +++ new/test/gc/arguments/TestG1ConcMarkStepDurationMillis.java 2016-08-11 13:28:22.669114600 -0400 @@ -26,12 +26,13 @@ * @key gc * @requires vm.gc.G1 * @summary Tests argument processing for double type flag, G1ConcMarkStepDurationMillis - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; import java.util.*; import java.util.regex.*; --- old/test/gc/arguments/TestG1ConcRefinementThreads.java 2016-08-11 13:28:25.517531200 -0400 +++ new/test/gc/arguments/TestG1ConcRefinementThreads.java 2016-08-11 13:28:25.106439900 -0400 @@ -27,12 +27,13 @@ * @bug 8047976 * @requires vm.gc.G1 * @summary Tests argument processing for G1ConcRefinementThreads - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management */ -import jdk.test.lib.*; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; import java.util.*; import java.util.regex.*; --- old/test/gc/arguments/TestG1HeapRegionSize.java 2016-08-11 13:28:27.947691800 -0400 +++ new/test/gc/arguments/TestG1HeapRegionSize.java 2016-08-11 13:28:27.542491500 -0400 @@ -29,7 +29,7 @@ * @summary Verify that the flag G1HeapRegionSize is updated properly * @modules java.base/jdk.internal.misc * @modules java.management/sun.management - * @library /testlibrary + * @library /test/lib * @run main TestG1HeapRegionSize */ @@ -39,7 +39,8 @@ import java.util.ArrayList; import java.util.Arrays; -import jdk.test.lib.*; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; public class TestG1HeapRegionSize { --- old/test/gc/arguments/TestG1HeapSizeFlags.java 2016-08-11 13:28:30.399666100 -0400 +++ new/test/gc/arguments/TestG1HeapSizeFlags.java 2016-08-11 13:28:29.985619800 -0400 @@ -27,10 +27,10 @@ * @bug 8006088 * @requires vm.gc.G1 * @summary Tests argument processing for initial and maximum heap size for the G1 collector - * @library /testlibrary /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @build TestG1HeapSizeFlags TestMaxHeapSizeTools + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm TestG1HeapSizeFlags --- old/test/gc/arguments/TestG1PercentageOptions.java 2016-08-11 13:28:32.824965000 -0400 +++ new/test/gc/arguments/TestG1PercentageOptions.java 2016-08-11 13:28:32.417163500 -0400 @@ -27,13 +27,14 @@ * @bug 8068942 * @requires vm.gc.G1 * @summary Test argument processing of various percentage options - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run driver TestG1PercentageOptions */ -import jdk.test.lib.*; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; public class TestG1PercentageOptions { --- old/test/gc/arguments/TestHeapFreeRatio.java 2016-08-11 13:28:35.241333300 -0400 +++ new/test/gc/arguments/TestHeapFreeRatio.java 2016-08-11 13:28:34.833060900 -0400 @@ -26,13 +26,14 @@ * @key gc * @bug 8025661 * @summary Test parsing of -Xminf and -Xmaxf - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run main/othervm TestHeapFreeRatio */ -import jdk.test.lib.*; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; public class TestHeapFreeRatio { --- old/test/gc/arguments/TestInitialTenuringThreshold.java 2016-08-11 13:28:37.786912600 -0400 +++ new/test/gc/arguments/TestInitialTenuringThreshold.java 2016-08-11 13:28:37.381448000 -0400 @@ -27,14 +27,15 @@ * @bug 8014765 * @requires vm.gc.Parallel * @summary Tests argument processing for initial tenuring threshold - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run main/othervm TestInitialTenuringThreshold * @author thomas.schatzl@oracle.com */ -import jdk.test.lib.*; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; public class TestInitialTenuringThreshold { --- old/test/gc/arguments/TestMaxHeapSizeTools.java 2016-08-11 13:28:40.233034300 -0400 +++ new/test/gc/arguments/TestMaxHeapSizeTools.java 2016-08-11 13:28:39.825315700 -0400 @@ -26,7 +26,8 @@ import java.util.ArrayList; import java.util.Arrays; -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; import sun.hotspot.WhiteBox; class ErgoArgsPrinter { --- old/test/gc/arguments/TestMaxMinHeapFreeRatioFlags.java 2016-08-11 13:28:42.671573400 -0400 +++ new/test/gc/arguments/TestMaxMinHeapFreeRatioFlags.java 2016-08-11 13:28:42.267159700 -0400 @@ -25,20 +25,18 @@ * @test TestMaxMinHeapFreeRatioFlags * @key gc * @summary Verify that heap size changes according to max and min heap free ratios. - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @build TestMaxMinHeapFreeRatioFlags * @run driver/timeout=240 TestMaxMinHeapFreeRatioFlags */ import java.util.LinkedList; import java.util.Arrays; import java.util.Collections; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; import jdk.test.lib.Utils; -import jdk.test.lib.HeapRegionUsageTool; import jdk.internal.misc.Unsafe; public class TestMaxMinHeapFreeRatioFlags { --- old/test/gc/arguments/TestMaxNewSize.java 2016-08-11 13:28:45.109426900 -0400 +++ new/test/gc/arguments/TestMaxNewSize.java 2016-08-11 13:28:44.683548000 -0400 @@ -27,10 +27,9 @@ * @bug 7057939 * @summary Make sure that MaxNewSize always has a useful value after argument * processing. - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @build TestMaxNewSize * @run main TestMaxNewSize -XX:+UseSerialGC * @run main TestMaxNewSize -XX:+UseParallelGC * @run main TestMaxNewSize -XX:+UseConcMarkSweepGC @@ -46,7 +45,8 @@ import java.util.ArrayList; import java.util.Arrays; -import jdk.test.lib.*; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; public class TestMaxNewSize { --- old/test/gc/arguments/TestMinAndInitialSurvivorRatioFlags.java 2016-08-11 13:28:47.546326200 -0400 +++ new/test/gc/arguments/TestMinAndInitialSurvivorRatioFlags.java 2016-08-11 13:28:47.138795500 -0400 @@ -25,22 +25,20 @@ * @test TestMinAndInitialSurvivorRatioFlags * @key gc * @summary Verify that MinSurvivorRatio and InitialSurvivorRatio flags work - * @library /testlibrary /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @build TestMinAndInitialSurvivorRatioFlags + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * @run driver TestMinAndInitialSurvivorRatioFlags */ -import jdk.test.lib.AllocationHelper; import java.lang.management.MemoryUsage; import java.util.Arrays; import java.util.Collections; import java.util.LinkedList; -import jdk.test.lib.HeapRegionUsageTool; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; import jdk.test.lib.Utils; import sun.hotspot.WhiteBox; --- old/test/gc/arguments/TestMinInitialErgonomics.java 2016-08-11 13:28:49.962058100 -0400 +++ new/test/gc/arguments/TestMinInitialErgonomics.java 2016-08-11 13:28:49.554670100 -0400 @@ -26,10 +26,10 @@ * @key gc * @bug 8006088 * @summary Test ergonomics decisions related to minimum and initial heap size. - * @library /testlibrary /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @build TestMinInitialErgonomics TestMaxHeapSizeTools + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm TestMinInitialErgonomics --- old/test/gc/arguments/TestNewRatioFlag.java 2016-08-11 13:28:52.371965100 -0400 +++ new/test/gc/arguments/TestNewRatioFlag.java 2016-08-11 13:28:51.967026200 -0400 @@ -26,10 +26,10 @@ * @key gc * @bug 8025166 * @summary Verify that heap devided among generations according to NewRatio - * @library /testlibrary /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @build TestNewRatioFlag + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * @run driver TestNewRatioFlag */ @@ -37,9 +37,8 @@ import java.util.Arrays; import java.util.Collections; import java.util.LinkedList; -import jdk.test.lib.HeapRegionUsageTool; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.Utils; import sun.hotspot.WhiteBox; --- old/test/gc/arguments/TestNewSizeFlags.java 2016-08-11 13:28:54.815397100 -0400 +++ new/test/gc/arguments/TestNewSizeFlags.java 2016-08-11 13:28:54.402911000 -0400 @@ -26,23 +26,21 @@ * @key gc * @bug 8025166 * @summary Verify that young gen size conforms values specified by NewSize, MaxNewSize and Xmn options - * @library /testlibrary /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @build TestNewSizeFlags + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * @run driver/timeout=240 TestNewSizeFlags */ -import jdk.test.lib.AllocationHelper; import java.io.IOException; import java.lang.management.MemoryUsage; import java.util.Arrays; import java.util.Collections; import java.util.LinkedList; -import jdk.test.lib.HeapRegionUsageTool; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; import jdk.test.lib.Utils; import sun.hotspot.WhiteBox; --- old/test/gc/arguments/TestNewSizeThreadIncrease.java 2016-08-11 13:28:57.235961800 -0400 +++ new/test/gc/arguments/TestNewSizeThreadIncrease.java 2016-08-11 13:28:56.818092000 -0400 @@ -26,14 +26,17 @@ * @key gc * @bug 8144527 * @summary Tests argument processing for NewSizeThreadIncrease - * @library /testlibrary + * @library /test/lib * @requires vm.gc.Serial * @modules java.base/jdk.internal.misc * java.management */ -import jdk.test.lib.*; +import jdk.test.lib.Platform; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; + // Range of NewSizeThreadIncrease is 0 ~ max_uintx. // Total of 5 threads will be created (1 GCTest thread and 4 TestThread). --- old/test/gc/arguments/TestObjectTenuringFlags.java 2016-08-11 13:28:59.657642500 -0400 +++ new/test/gc/arguments/TestObjectTenuringFlags.java 2016-08-11 13:28:59.242559000 -0400 @@ -28,14 +28,14 @@ * @requires vm.gc.Parallel * @summary Tests argument processing for NeverTenure, AlwaysTenure, * and MaxTenuringThreshold - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @build TestObjectTenuringFlags FlagsValue * @run main/othervm TestObjectTenuringFlags */ -import jdk.test.lib.*; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; import java.util.*; --- old/test/gc/arguments/TestParallelGCThreads.java 2016-08-11 13:29:02.108919200 -0400 +++ new/test/gc/arguments/TestParallelGCThreads.java 2016-08-11 13:29:01.702235700 -0400 @@ -26,13 +26,15 @@ * @key gc * @bug 8059527 8081382 * @summary Tests argument processing for ParallelGCThreads - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run driver TestParallelGCThreads */ -import jdk.test.lib.*; +import jdk.test.lib.Asserts; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; public class TestParallelGCThreads { --- old/test/gc/arguments/TestParallelHeapSizeFlags.java 2016-08-11 13:29:04.566928300 -0400 +++ new/test/gc/arguments/TestParallelHeapSizeFlags.java 2016-08-11 13:29:04.159261500 -0400 @@ -28,10 +28,10 @@ * @summary Tests argument processing for initial and maximum heap size for the * parallel collectors. * @requires vm.gc=="null" - * @library /testlibrary /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @build TestParallelHeapSizeFlags TestMaxHeapSizeTools + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm TestParallelHeapSizeFlags --- old/test/gc/arguments/TestSelectDefaultGC.java 2016-08-11 13:29:07.002154500 -0400 +++ new/test/gc/arguments/TestSelectDefaultGC.java 2016-08-11 13:29:06.598948200 -0400 @@ -26,14 +26,17 @@ * @summary Test selection of GC when no GC option is specified * @bug 8068582 * @key gc - * @library /testlibrary + * @library /test/lib * @requires vm.gc=="null" * @modules java.base/jdk.internal.misc * java.management * @run driver TestSelectDefaultGC */ -import jdk.test.lib.*; +import jdk.test.lib.Platform; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; + import java.util.regex.*; public class TestSelectDefaultGC { --- old/test/gc/arguments/TestSerialHeapSizeFlags.java 2016-08-11 13:29:09.451711000 -0400 +++ new/test/gc/arguments/TestSerialHeapSizeFlags.java 2016-08-11 13:29:09.035993300 -0400 @@ -26,10 +26,10 @@ * @key gc * @bug 8006088 * @summary Tests argument processing for initial and maximum heap size for the Serial collector - * @library /testlibrary /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @build TestSerialHeapSizeFlags TestMaxHeapSizeTools + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm TestSerialHeapSizeFlags --- old/test/gc/arguments/TestShrinkHeapInSteps.java 2016-08-11 13:29:11.901734600 -0400 +++ new/test/gc/arguments/TestShrinkHeapInSteps.java 2016-08-11 13:29:11.482878900 -0400 @@ -25,10 +25,9 @@ * @test TestShrinkHeapInSteps * @key gc * @summary Verify that -XX:-ShrinkHeapInSteps works properly. - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @build TestMaxMinHeapFreeRatioFlags TestShrinkHeapInSteps * @run driver/timeout=240 TestShrinkHeapInSteps */ --- old/test/gc/arguments/TestSurvivorAlignmentInBytesOption.java 2016-08-11 13:29:14.327652500 -0400 +++ new/test/gc/arguments/TestSurvivorAlignmentInBytesOption.java 2016-08-11 13:29:13.921823100 -0400 @@ -21,14 +21,14 @@ * questions. */ -import jdk.test.lib.ExitCode; +import jdk.test.lib.process.ExitCode; import jdk.test.lib.cli.CommandLineOptionTest; /** * @test * @bug 8031323 * @summary Verify SurvivorAlignmentInBytes option processing. - * @library /testlibrary + * @library /test/lib * @requires vm.opt.SurvivorAlignmentInBytes == null * & vm.opt.ObjectAlignmentInBytes == null * & vm.opt.UnlockExperimentalVMOptions == null --- old/test/gc/arguments/TestSurvivorRatioFlag.java 2016-08-11 13:29:16.785515700 -0400 +++ new/test/gc/arguments/TestSurvivorRatioFlag.java 2016-08-11 13:29:16.382562100 -0400 @@ -25,22 +25,20 @@ * @test TestSurvivorRatioFlag * @key gc * @summary Verify that actual survivor ratio is equal to specified SurvivorRatio value - * @library /testlibrary /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @build TestSurvivorRatioFlag + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * @run driver TestSurvivorRatioFlag */ -import jdk.test.lib.AllocationHelper; import java.lang.management.MemoryUsage; import java.util.Arrays; import java.util.Collections; import java.util.LinkedList; -import jdk.test.lib.HeapRegionUsageTool; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; import jdk.test.lib.Utils; import sun.hotspot.WhiteBox; --- old/test/gc/arguments/TestTargetSurvivorRatioFlag.java 2016-08-11 13:29:19.243290000 -0400 +++ new/test/gc/arguments/TestTargetSurvivorRatioFlag.java 2016-08-11 13:29:18.834769100 -0400 @@ -27,15 +27,14 @@ * @summary Verify that option TargetSurvivorRatio affects survivor space occupancy after minor GC. * @requires (vm.opt.ExplicitGCInvokesConcurrent == null) | (vm.opt.ExplicitGCInvokesConcurrent == false) * @requires (vm.opt.UseJVMCICompiler == null) | (vm.opt.UseJVMCICompiler == false) - * @library /testlibrary /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @build TestTargetSurvivorRatioFlag + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * @run driver TestTargetSurvivorRatioFlag */ -import jdk.test.lib.AllocationHelper; import java.lang.management.GarbageCollectorMXBean; import java.util.Arrays; import java.util.Collections; @@ -43,10 +42,9 @@ import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; -import jdk.test.lib.HeapRegionUsageTool; import jdk.internal.misc.Unsafe; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; import jdk.test.lib.Utils; import sun.hotspot.WhiteBox; --- old/test/gc/arguments/TestUnrecognizedVMOptionsHandling.java 2016-08-11 13:29:21.667564200 -0400 +++ new/test/gc/arguments/TestUnrecognizedVMOptionsHandling.java 2016-08-11 13:29:21.261208700 -0400 @@ -26,13 +26,14 @@ * @key gc * @bug 8017611 * @summary Tests handling unrecognized VM options - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run main/othervm TestUnrecognizedVMOptionsHandling */ -import jdk.test.lib.*; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; public class TestUnrecognizedVMOptionsHandling { --- old/test/gc/arguments/TestUseCompressedOopsErgo.java 2016-08-11 13:29:24.104158600 -0400 +++ new/test/gc/arguments/TestUseCompressedOopsErgo.java 2016-08-11 13:29:23.691107900 -0400 @@ -26,10 +26,10 @@ * @key gc * @bug 8010722 * @summary Tests ergonomics for UseCompressedOops. - * @library /testlibrary /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management/sun.management - * @build TestUseCompressedOopsErgo TestUseCompressedOopsErgoTools + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm TestUseCompressedOopsErgo -XX:+UseG1GC --- old/test/gc/arguments/TestUseCompressedOopsErgoTools.java 2016-08-11 13:29:26.532886300 -0400 +++ new/test/gc/arguments/TestUseCompressedOopsErgoTools.java 2016-08-11 13:29:26.126778100 -0400 @@ -29,7 +29,9 @@ import java.util.ArrayList; import java.util.Arrays; -import jdk.test.lib.*; +import jdk.test.lib.Asserts; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; import java.lang.management.ManagementFactory; import sun.hotspot.WhiteBox; --- old/test/gc/arguments/TestUseNUMAInterleaving.java 2016-08-11 13:29:28.966583500 -0400 +++ new/test/gc/arguments/TestUseNUMAInterleaving.java 2016-08-11 13:29:28.561902500 -0400 @@ -27,13 +27,13 @@ * ergonomics, on all platforms when UseNUMA feature is enabled. * @bug 8059614 * @key gc - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run driver TestUseNUMAInterleaving */ -import jdk.test.lib.ProcessTools; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; public class TestUseNUMAInterleaving { --- old/test/gc/arguments/TestVerifyBeforeAndAfterGCFlags.java 2016-08-11 13:29:31.411595400 -0400 +++ new/test/gc/arguments/TestVerifyBeforeAndAfterGCFlags.java 2016-08-11 13:29:31.006853600 -0400 @@ -30,7 +30,7 @@ output contain or doesn't contain expected patterns * @modules java.base/jdk.internal.misc * @modules java.management - * @library /testlibrary + * @library /test/lib * @run driver TestVerifyBeforeAndAfterGCFlags */ @@ -38,8 +38,8 @@ import java.util.Collections; import jdk.test.lib.Utils; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; public class TestVerifyBeforeAndAfterGCFlags { --- old/test/gc/class_unloading/TestCMSClassUnloadingEnabledHWM.java 2016-08-11 13:29:33.875619100 -0400 +++ new/test/gc/class_unloading/TestCMSClassUnloadingEnabledHWM.java 2016-08-11 13:29:33.463164700 -0400 @@ -25,18 +25,18 @@ * @test * @key gc * @bug 8049831 - * @library /testlibrary /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @build TestCMSClassUnloadingEnabledHWM + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run driver TestCMSClassUnloadingEnabledHWM * @summary Test that -XX:-CMSClassUnloadingEnabled will trigger a Full GC when more than MetaspaceSize metadata is allocated. */ -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; import java.lang.management.GarbageCollectorMXBean; import java.lang.management.ManagementFactory; import java.util.ArrayList; --- old/test/gc/class_unloading/TestG1ClassUnloadingHWM.java 2016-08-11 13:29:36.311325600 -0400 +++ new/test/gc/class_unloading/TestG1ClassUnloadingHWM.java 2016-08-11 13:29:35.899824100 -0400 @@ -25,18 +25,18 @@ * @test * @key gc * @bug 8049831 - * @library /testlibrary /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @build TestG1ClassUnloadingHWM + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run driver TestG1ClassUnloadingHWM * @summary Test that -XX:-ClassUnloadingWithConcurrentMark will trigger a Full GC when more than MetaspaceSize metadata is allocated. */ -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; import java.util.ArrayList; import java.util.Arrays; import sun.hotspot.WhiteBox; --- old/test/gc/cms/GuardShrinkWarning.java 2016-08-11 13:29:38.739912300 -0400 +++ new/test/gc/cms/GuardShrinkWarning.java 2016-08-11 13:29:38.331938400 -0400 @@ -27,14 +27,15 @@ * @bug 8012111 * @key gc * @key regression - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run main/othervm GuardShrinkWarning * @author jon.masamitsu@oracle.com */ -import jdk.test.lib.*; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; public class GuardShrinkWarning { public static void main(String args[]) throws Exception { --- old/test/gc/ergonomics/TestDynamicNumberOfGCThreads.java 2016-08-11 13:29:41.195310700 -0400 +++ new/test/gc/ergonomics/TestDynamicNumberOfGCThreads.java 2016-08-11 13:29:40.785479300 -0400 @@ -28,11 +28,11 @@ * @requires vm.gc=="null" * @key gc * @modules java.base/jdk.internal.misc - * @library /testlibrary + * @library /test/lib */ -import jdk.test.lib.ProcessTools; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; public class TestDynamicNumberOfGCThreads { public static void main(String[] args) throws Exception { --- old/test/gc/ergonomics/TestInitialGCThreadLogging.java 2016-08-11 13:29:43.640092900 -0400 +++ new/test/gc/ergonomics/TestInitialGCThreadLogging.java 2016-08-11 13:29:43.230726000 -0400 @@ -28,11 +28,11 @@ * @requires vm.gc=="null" * @key gc * @modules java.base/jdk.internal.misc - * @library /testlibrary + * @library /test/lib */ -import jdk.test.lib.ProcessTools; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; public class TestInitialGCThreadLogging { public static void main(String[] args) throws Exception { --- old/test/gc/g1/Test2GbHeap.java 2016-08-11 13:29:46.091860600 -0400 +++ new/test/gc/g1/Test2GbHeap.java 2016-08-11 13:29:45.679650400 -0400 @@ -30,15 +30,15 @@ * @requires vm.bits != "32" * @key gc * @key regression - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management */ import java.util.ArrayList; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; public class Test2GbHeap { public static void main(String[] args) throws Exception { --- old/test/gc/g1/TestEagerReclaimHumongousRegions.java 2016-08-11 13:29:48.655131100 -0400 +++ new/test/gc/g1/TestEagerReclaimHumongousRegions.java 2016-08-11 13:29:48.247607100 -0400 @@ -27,7 +27,7 @@ * @summary Test to make sure that eager reclaim of humongous objects work. We simply try to fill * up the heap with humongous objects that should be eagerly reclaimable to avoid Full GC. * @key gc - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management */ @@ -36,8 +36,8 @@ import java.util.regex.Matcher; import java.util.LinkedList; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; import jdk.test.lib.Asserts; class ReclaimRegionFast { --- old/test/gc/g1/TestEagerReclaimHumongousRegionsClearMarkBits.java 2016-08-11 13:29:51.113923700 -0400 +++ new/test/gc/g1/TestEagerReclaimHumongousRegionsClearMarkBits.java 2016-08-11 13:29:50.691903500 -0400 @@ -27,7 +27,7 @@ * @summary Test to make sure that eager reclaim of humongous objects correctly clears * mark bitmaps at reclaim. * @key gc - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management */ @@ -36,8 +36,8 @@ import java.util.LinkedList; import java.util.Random; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; // An object that has a few references to other instances to slow down marking. class ObjectWithSomeRefs { --- old/test/gc/g1/TestEagerReclaimHumongousRegionsWithRefs.java 2016-08-11 13:29:53.513680700 -0400 +++ new/test/gc/g1/TestEagerReclaimHumongousRegionsWithRefs.java 2016-08-11 13:29:53.109349100 -0400 @@ -30,7 +30,7 @@ * referencing that we know is in the old gen. After changing this reference, the object * should still be eagerly reclaimable to avoid Full GC. * @key gc - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management */ @@ -39,8 +39,8 @@ import java.util.regex.Matcher; import java.util.LinkedList; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; import static jdk.test.lib.Asserts.*; class RefHolder { --- old/test/gc/g1/TestG1TraceEagerReclaimHumongousObjects.java 2016-08-11 13:29:55.939800400 -0400 +++ new/test/gc/g1/TestG1TraceEagerReclaimHumongousObjects.java 2016-08-11 13:29:55.535503000 -0400 @@ -27,13 +27,13 @@ * @summary Ensure that the output for a G1TraceEagerReclaimHumongousObjects * includes the expected necessary messages. * @key gc - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management */ -import jdk.test.lib.ProcessTools; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; import java.util.LinkedList; public class TestG1TraceEagerReclaimHumongousObjects { --- old/test/gc/g1/TestGCLogMessages.java 2016-08-11 13:29:58.384075300 -0400 +++ new/test/gc/g1/TestGCLogMessages.java 2016-08-11 13:29:57.968192100 -0400 @@ -27,13 +27,13 @@ * @summary Ensure the output for a minor GC with G1 * includes the expected necessary messages. * @key gc - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management */ -import jdk.test.lib.ProcessTools; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; public class TestGCLogMessages { --- old/test/gc/g1/TestHumongousAllocInitialMark.java 2016-08-11 13:30:00.826762600 -0400 +++ new/test/gc/g1/TestHumongousAllocInitialMark.java 2016-08-11 13:30:00.422955400 -0400 @@ -25,12 +25,13 @@ * @test TestHumongousAllocInitialMark * @bug 7168848 * @summary G1: humongous object allocations should initiate marking cycles when necessary - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management */ -import jdk.test.lib.*; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; public class TestHumongousAllocInitialMark { // Heap sizes < 224 MB are increased to 224 MB if vm_page_size == 64K to --- old/test/gc/g1/TestHumongousAllocNearlyFullRegion.java 2016-08-11 13:30:03.255256500 -0400 +++ new/test/gc/g1/TestHumongousAllocNearlyFullRegion.java 2016-08-11 13:30:02.847397700 -0400 @@ -27,11 +27,12 @@ * @summary G1: humongous object allocations should work even when there is * not enough space in the heapRegion to fit a filler object. * @modules java.base/jdk.internal.misc - * @library /testlibrary + * @library /test/lib * @run driver TestHumongousAllocNearlyFullRegion */ -import jdk.test.lib.*; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; public class TestHumongousAllocNearlyFullRegion { // Heap sizes < 224 MB are increased to 224 MB if vm_page_size == 64K to --- old/test/gc/g1/TestHumongousCodeCacheRoots.java 2016-08-11 13:30:05.754583100 -0400 +++ new/test/gc/g1/TestHumongousCodeCacheRoots.java 2016-08-11 13:30:05.338171600 -0400 @@ -26,17 +26,18 @@ * @key regression * @key gc * @bug 8027756 - * @library /testlibrary /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @build TestHumongousCodeCacheRoots + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @summary Humongous objects may have references from the code cache * @run main TestHumongousCodeCacheRoots */ -import jdk.test.lib.*; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; import sun.hotspot.WhiteBox; import java.util.ArrayList; --- old/test/gc/g1/TestHumongousShrinkHeap.java 2016-08-11 13:30:08.179246900 -0400 +++ new/test/gc/g1/TestHumongousShrinkHeap.java 2016-08-11 13:30:07.770499300 -0400 @@ -27,7 +27,7 @@ * @requires vm.gc.G1 * @summary Verify that heap shrinks after GC in the presence of fragmentation * due to humongous objects - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * @modules java.management/sun.management * @run main/othervm -XX:-ExplicitGCInvokesConcurrent -XX:MinHeapFreeRatio=10 --- old/test/gc/g1/TestLargePageUseForAuxMemory.java 2016-08-11 13:30:10.603520600 -0400 +++ new/test/gc/g1/TestLargePageUseForAuxMemory.java 2016-08-11 13:30:10.192489600 -0400 @@ -27,10 +27,9 @@ * @bug 8058354 8079208 * @key gc * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib + * @library /test/lib * @requires vm.gc.G1 - * @build jdk.test.lib.* sun.hotspot.WhiteBox - * @build TestLargePageUseForAuxMemory + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UseG1GC -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:+IgnoreUnrecognizedVMOptions -XX:+UseLargePages TestLargePageUseForAuxMemory @@ -40,8 +39,10 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import jdk.test.lib.*; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; import jdk.test.lib.Asserts; +import jdk.test.lib.Platform; import sun.hotspot.WhiteBox; public class TestLargePageUseForAuxMemory { --- old/test/gc/g1/TestNoEagerReclaimOfHumongousRegions.java 2016-08-11 13:30:13.038357600 -0400 +++ new/test/gc/g1/TestNoEagerReclaimOfHumongousRegions.java 2016-08-11 13:30:12.630593300 -0400 @@ -29,9 +29,9 @@ * might pass even if there are problems in the code, but it will never crash unless there is a problem. * @requires vm.gc.G1 * @key gc - * @library /testlibrary /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc - * @build TestNoEagerReclaimOfHumongousRegions + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -Xlog:gc,gc+humongous=debug -XX:+UseG1GC -XX:MaxTenuringThreshold=0 -XX:G1RSetSparseRegionEntries=32 -XX:G1HeapRegionSize=1m -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI TestNoEagerReclaimOfHumongousRegions --- old/test/gc/g1/TestPLABOutput.java 2016-08-11 13:30:15.466002100 -0400 +++ new/test/gc/g1/TestPLABOutput.java 2016-08-11 13:30:15.054317900 -0400 @@ -28,7 +28,7 @@ * @requires vm.gc.G1 * @key gc * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib + * @library /test/lib * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * @run driver TestPLABOutput @@ -39,9 +39,9 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import jdk.test.lib.OutputAnalyzer; import jdk.test.lib.Platform; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; import static jdk.test.lib.Asserts.*; --- old/test/gc/g1/TestPLABSizeBounds.java 2016-08-11 13:30:17.901370200 -0400 +++ new/test/gc/g1/TestPLABSizeBounds.java 2016-08-11 13:30:17.492454200 -0400 @@ -27,16 +27,16 @@ * @summary Regression test to ensure that G1 supports PLAB sizes of half a region size. * @requires vm.gc.G1 * @key gc - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management */ import java.util.ArrayList; -import jdk.test.lib.OutputAnalyzer; import jdk.test.lib.Platform; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; public class TestPLABSizeBounds { --- old/test/gc/g1/TestPrintRegionRememberedSetInfo.java 2016-08-11 13:30:20.344753400 -0400 +++ new/test/gc/g1/TestPrintRegionRememberedSetInfo.java 2016-08-11 13:30:19.919448900 -0400 @@ -26,14 +26,15 @@ * @key gc * @bug 8014240 * @summary Test output of G1PrintRegionRememberedSetInfo - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run main TestPrintRegionRememberedSetInfo * @author thomas.schatzl@oracle.com */ -import jdk.test.lib.*; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; import java.lang.Thread; import java.util.ArrayList; import java.util.Arrays; --- old/test/gc/g1/TestRegionLivenessPrint.java 2016-08-11 13:30:22.766153500 -0400 +++ new/test/gc/g1/TestRegionLivenessPrint.java 2016-08-11 13:30:22.358062400 -0400 @@ -27,9 +27,9 @@ * @requires vm.gc.G1 * @summary Make sure that G1 does not assert when printing region liveness data on a humongous continues region. * @key gc - * @library /testlibrary /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc - * @build TestRegionLivenessPrint + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:+UseG1GC -Xmx128M -XX:G1HeapRegionSize=1m -Xlog:gc+liveness=trace TestRegionLivenessPrint --- old/test/gc/g1/TestRemsetLogging.java 2016-08-11 13:30:25.218719700 -0400 +++ new/test/gc/g1/TestRemsetLogging.java 2016-08-11 13:30:24.811625200 -0400 @@ -25,10 +25,10 @@ * @test TestRemsetLogging.java * @requires vm.gc.G1 * @bug 8013895 8129977 8145534 - * @library /testlibrary /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management/sun.management - * @build TestRemsetLoggingTools TestRemsetLogging + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @summary Verify output of -Xlog:gc+remset*=trace --- old/test/gc/g1/TestRemsetLoggingPerRegion.java 2016-08-11 13:30:27.657753700 -0400 +++ new/test/gc/g1/TestRemsetLoggingPerRegion.java 2016-08-11 13:30:27.251551300 -0400 @@ -25,10 +25,10 @@ * @test TestRemsetLoggingPerRegion.java * @requires vm.gc.G1 * @bug 8014078 8129977 8145534 - * @library /testlibrary /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management/sun.management - * @build TestRemsetLoggingTools TestRemsetLoggingPerRegion + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @summary Verify output of -Xlog:gc+remset*=trace in regards to per-region type output --- old/test/gc/g1/TestRemsetLoggingThreads.java 2016-08-11 13:30:30.096473300 -0400 +++ new/test/gc/g1/TestRemsetLoggingThreads.java 2016-08-11 13:30:29.684737000 -0400 @@ -26,7 +26,7 @@ * @requires vm.gc.G1 * @bug 8025441 8145534 * @key gc - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management/sun.management * @summary Ensure that various values of worker threads/concurrent @@ -36,8 +36,8 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import jdk.test.lib.ProcessTools; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; public class TestRemsetLoggingThreads { --- old/test/gc/g1/TestRemsetLoggingTools.java 2016-08-11 13:30:32.534005200 -0400 +++ new/test/gc/g1/TestRemsetLoggingTools.java 2016-08-11 13:30:32.114070400 -0400 @@ -29,7 +29,8 @@ import com.sun.management.VMOption; import sun.hotspot.WhiteBox; -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; import java.lang.management.ManagementFactory; import java.util.ArrayList; import java.util.Arrays; --- old/test/gc/g1/TestShrinkAuxiliaryData.java 2016-08-11 13:30:34.972144000 -0400 +++ new/test/gc/g1/TestShrinkAuxiliaryData.java 2016-08-11 13:30:34.555709000 -0400 @@ -22,9 +22,9 @@ */ import jdk.test.lib.Asserts; -import jdk.test.lib.OutputAnalyzer; import jdk.test.lib.Platform; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.Utils; import java.io.IOException; import java.lang.management.ManagementFactory; --- old/test/gc/g1/TestShrinkAuxiliaryData00.java 2016-08-11 13:30:37.431577300 -0400 +++ new/test/gc/g1/TestShrinkAuxiliaryData00.java 2016-08-11 13:30:37.019519800 -0400 @@ -28,11 +28,10 @@ * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values * @requires vm.gc.G1 * @requires vm.opt.AggressiveOpts=="false" | vm.opt.AggressiveOpts=="null" - * @library /testlibrary /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @build jdk.test.lib.* sun.hotspot.WhiteBox - * TestShrinkAuxiliaryData TestShrinkAuxiliaryData00 + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/timeout=720 TestShrinkAuxiliaryData00 --- old/test/gc/g1/TestShrinkAuxiliaryData05.java 2016-08-11 13:30:39.874121300 -0400 +++ new/test/gc/g1/TestShrinkAuxiliaryData05.java 2016-08-11 13:30:39.467728700 -0400 @@ -28,11 +28,10 @@ * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values * @requires vm.gc.G1 * @requires vm.opt.AggressiveOpts=="false" | vm.opt.AggressiveOpts=="null" - * @library /testlibrary /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @build jdk.test.lib.* sun.hotspot.WhiteBox - * TestShrinkAuxiliaryData TestShrinkAuxiliaryData05 + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/timeout=720 TestShrinkAuxiliaryData05 --- old/test/gc/g1/TestShrinkAuxiliaryData10.java 2016-08-11 13:30:42.340729200 -0400 +++ new/test/gc/g1/TestShrinkAuxiliaryData10.java 2016-08-11 13:30:41.925671500 -0400 @@ -28,11 +28,10 @@ * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values * @requires vm.gc.G1 * @requires vm.opt.AggressiveOpts=="false" | vm.opt.AggressiveOpts=="null" - * @library /testlibrary /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @build jdk.test.lib.* sun.hotspot.WhiteBox - * @build TestShrinkAuxiliaryData TestShrinkAuxiliaryData10 + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/timeout=720 TestShrinkAuxiliaryData10 --- old/test/gc/g1/TestShrinkAuxiliaryData15.java 2016-08-11 13:30:44.785350600 -0400 +++ new/test/gc/g1/TestShrinkAuxiliaryData15.java 2016-08-11 13:30:44.369747100 -0400 @@ -28,11 +28,10 @@ * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values * @requires vm.gc.G1 * @requires vm.opt.AggressiveOpts=="false" | vm.opt.AggressiveOpts=="null" - * @library /testlibrary /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @build jdk.test.lib.* sun.hotspot.WhiteBox - * @build TestShrinkAuxiliaryData TestShrinkAuxiliaryData15 + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/timeout=720 TestShrinkAuxiliaryData15 --- old/test/gc/g1/TestShrinkAuxiliaryData20.java 2016-08-11 13:30:47.215538500 -0400 +++ new/test/gc/g1/TestShrinkAuxiliaryData20.java 2016-08-11 13:30:46.804487800 -0400 @@ -28,11 +28,10 @@ * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values * @requires vm.gc.G1 * @requires vm.opt.AggressiveOpts=="false" | vm.opt.AggressiveOpts=="null" - * @library /testlibrary /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @build jdk.test.lib.* sun.hotspot.WhiteBox - * @build TestShrinkAuxiliaryData TestShrinkAuxiliaryData20 + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/timeout=720 TestShrinkAuxiliaryData20 --- old/test/gc/g1/TestShrinkAuxiliaryData25.java 2016-08-11 13:30:49.652215000 -0400 +++ new/test/gc/g1/TestShrinkAuxiliaryData25.java 2016-08-11 13:30:49.245205600 -0400 @@ -28,11 +28,10 @@ * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values * @requires vm.gc.G1 * @requires vm.opt.AggressiveOpts=="false" | vm.opt.AggressiveOpts=="null" - * @library /testlibrary /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @build jdk.test.lib.* sun.hotspot.WhiteBox - * @build TestShrinkAuxiliaryData TestShrinkAuxiliaryData25 + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/timeout=720 TestShrinkAuxiliaryData25 --- old/test/gc/g1/TestShrinkAuxiliaryData30.java 2016-08-11 13:30:52.090080100 -0400 +++ new/test/gc/g1/TestShrinkAuxiliaryData30.java 2016-08-11 13:30:51.681776900 -0400 @@ -28,11 +28,10 @@ * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values * @requires vm.gc.G1 * @requires vm.opt.AggressiveOpts=="false" | vm.opt.AggressiveOpts=="null" - * @library /testlibrary /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @build jdk.test.lib.* sun.hotspot.WhiteBox - * @build TestShrinkAuxiliaryData TestShrinkAuxiliaryData30 + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/timeout=720 TestShrinkAuxiliaryData30 --- old/test/gc/g1/TestShrinkDefragmentedHeap.java 2016-08-11 13:30:54.507357600 -0400 +++ new/test/gc/g1/TestShrinkDefragmentedHeap.java 2016-08-11 13:30:54.102989200 -0400 @@ -31,7 +31,7 @@ * "..................................H" * 3. invoke gc and check that memory returned to the system (amount of committed memory got down) * - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management/sun.management */ @@ -40,8 +40,8 @@ import java.util.ArrayList; import java.util.List; import static jdk.test.lib.Asserts.*; -import jdk.test.lib.ProcessTools; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; import com.sun.management.HotSpotDiagnosticMXBean; public class TestShrinkDefragmentedHeap { --- old/test/gc/g1/TestStringDeduplicationAgeThreshold.java 2016-08-11 13:30:56.945554200 -0400 +++ new/test/gc/g1/TestStringDeduplicationAgeThreshold.java 2016-08-11 13:30:56.538953200 -0400 @@ -26,7 +26,7 @@ * @summary Test string deduplication age threshold * @bug 8029075 * @key gc - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management */ --- old/test/gc/g1/TestStringDeduplicationFullGC.java 2016-08-11 13:30:59.373402600 -0400 +++ new/test/gc/g1/TestStringDeduplicationFullGC.java 2016-08-11 13:30:58.972177800 -0400 @@ -26,7 +26,7 @@ * @summary Test string deduplication during full GC * @bug 8029075 * @key gc - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management */ --- old/test/gc/g1/TestStringDeduplicationInterned.java 2016-08-11 13:31:01.817636900 -0400 +++ new/test/gc/g1/TestStringDeduplicationInterned.java 2016-08-11 13:31:01.406776100 -0400 @@ -26,7 +26,7 @@ * @summary Test string deduplication of interned strings * @bug 8029075 * @key gc - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management */ --- old/test/gc/g1/TestStringDeduplicationPrintOptions.java 2016-08-11 13:31:04.255264200 -0400 +++ new/test/gc/g1/TestStringDeduplicationPrintOptions.java 2016-08-11 13:31:03.849034000 -0400 @@ -26,7 +26,7 @@ * @summary Test string deduplication print options * @bug 8029075 * @key gc - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management */ --- old/test/gc/g1/TestStringDeduplicationTableRehash.java 2016-08-11 13:31:06.693185300 -0400 +++ new/test/gc/g1/TestStringDeduplicationTableRehash.java 2016-08-11 13:31:06.283931300 -0400 @@ -26,7 +26,7 @@ * @summary Test string deduplication table rehash * @bug 8029075 * @key gc - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management */ --- old/test/gc/g1/TestStringDeduplicationTableResize.java 2016-08-11 13:31:09.147001600 -0400 +++ new/test/gc/g1/TestStringDeduplicationTableResize.java 2016-08-11 13:31:08.742608400 -0400 @@ -26,7 +26,7 @@ * @summary Test string deduplication table resize * @bug 8029075 * @key gc - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management */ --- old/test/gc/g1/TestStringDeduplicationTools.java 2016-08-11 13:31:11.592408300 -0400 +++ new/test/gc/g1/TestStringDeduplicationTools.java 2016-08-11 13:31:11.187449700 -0400 @@ -29,7 +29,8 @@ import java.lang.reflect.*; import java.security.*; import java.util.*; -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; import sun.misc.*; class TestStringDeduplicationTools { --- old/test/gc/g1/TestStringDeduplicationYoungGC.java 2016-08-11 13:31:14.015356600 -0400 +++ new/test/gc/g1/TestStringDeduplicationYoungGC.java 2016-08-11 13:31:13.613174200 -0400 @@ -26,7 +26,7 @@ * @summary Test string deduplication during young GC * @bug 8029075 * @key gc - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management */ --- old/test/gc/g1/TestStringSymbolTableStats.java 2016-08-11 13:31:16.462744300 -0400 +++ new/test/gc/g1/TestStringSymbolTableStats.java 2016-08-11 13:31:16.052756400 -0400 @@ -26,13 +26,13 @@ * @bug 8027476 8027455 * @summary Ensure that the G1TraceStringSymbolTableScrubbing prints the expected message. * @key gc - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management */ -import jdk.test.lib.ProcessTools; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; public class TestStringSymbolTableStats { public static void main(String[] args) throws Exception { --- old/test/gc/g1/humongousObjects/TestHeapCounters.java 2016-08-11 13:31:18.917099200 -0400 +++ new/test/gc/g1/humongousObjects/TestHeapCounters.java 2016-08-11 13:31:18.507079200 -0400 @@ -38,12 +38,10 @@ * @test TestHeapCounters * @summary Checks that heap counters work as expected after humongous allocations/deallocations * @requires vm.gc.G1 - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * @modules java.management * @build sun.hotspot.WhiteBox - * gc.testlibrary.Helpers - * gc.g1.humongousObjects.TestHeapCounters * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * --- old/test/gc/g1/humongousObjects/TestHumongousClassLoader.java 2016-08-11 13:31:21.357358500 -0400 +++ new/test/gc/g1/humongousObjects/TestHumongousClassLoader.java 2016-08-11 13:31:20.949627500 -0400 @@ -41,15 +41,10 @@ * @requires vm.gc.G1 * @requires vm.opt.G1HeapRegionSize == "null" | vm.opt.G1HeapRegionSize == "1M" * @requires vm.opt.ExplicitGCInvokesConcurrent != true - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * @modules java.management * @build sun.hotspot.WhiteBox - * gc.testlibrary.Helpers - * gc.g1.humongousObjects.G1SampleClass - * gc.g1.humongousObjects.ClassLoaderGenerator - * gc.g1.humongousObjects.TestHumongousClassLoader - * * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * --- old/test/gc/g1/humongousObjects/TestHumongousMovement.java 2016-08-11 13:31:23.808129700 -0400 +++ new/test/gc/g1/humongousObjects/TestHumongousMovement.java 2016-08-11 13:31:23.401410200 -0400 @@ -40,12 +40,10 @@ * @test TestHumongousMovement * @summary Checks that Humongous objects are not moved during GC * @requires vm.gc.G1 - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * @modules java.management * @build sun.hotspot.WhiteBox - * gc.testlibrary.Helpers - * gc.g1.humongousObjects.TestHumongousMovement * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -XX:+UseG1GC -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. --- old/test/gc/g1/humongousObjects/TestHumongousNonArrayAllocation.java 2016-08-11 13:31:26.255207300 -0400 +++ new/test/gc/g1/humongousObjects/TestHumongousNonArrayAllocation.java 2016-08-11 13:31:25.840004500 -0400 @@ -39,14 +39,10 @@ * @summary Checks that huge class' instances (ie with huge amount of fields) are allocated successfully * @requires vm.gc.G1 * @requires vm.opt.G1HeapRegionSize == "null" | vm.opt.G1HeapRegionSize == "1M" - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * @modules java.management * @build sun.hotspot.WhiteBox - * gc.testlibrary.Helpers - * gc.g1.humongousObjects.G1SampleClass - * gc.g1.humongousObjects.TestHumongousNonArrayAllocation - * * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * --- old/test/gc/g1/humongousObjects/TestHumongousThreshold.java 2016-08-11 13:31:28.691545900 -0400 +++ new/test/gc/g1/humongousObjects/TestHumongousThreshold.java 2016-08-11 13:31:28.288158200 -0400 @@ -32,12 +32,10 @@ * @test TestHumongousThreshold * @summary Checks that objects larger than half a region are allocated as humongous * @requires vm.gc.G1 - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * @modules java.management * @build sun.hotspot.WhiteBox - * gc.testlibrary.Helpers - * gc.g1.humongousObjects.TestHumongousThreshold * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * --- old/test/gc/g1/humongousObjects/TestNoAllocationsInHRegions.java 2016-08-11 13:31:31.128053900 -0400 +++ new/test/gc/g1/humongousObjects/TestNoAllocationsInHRegions.java 2016-08-11 13:31:30.719305500 -0400 @@ -36,12 +36,9 @@ * @test TestNoAllocationsInHRegions * @summary Checks that no additional allocations are made in humongous regions * @requires vm.gc.G1 - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.management java.base/jdk.internal.misc * @build sun.hotspot.WhiteBox - * gc.testlibrary.Helpers - * gc.g1.humongousObjects.TestNoAllocationsInHRegions - * * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * --- old/test/gc/g1/humongousObjects/TestObjectCollected.java 2016-08-11 13:31:33.577654100 -0400 +++ new/test/gc/g1/humongousObjects/TestObjectCollected.java 2016-08-11 13:31:33.169304200 -0400 @@ -38,13 +38,10 @@ * @summary checks that after different type of GCs weak/soft references to humongous object behave correspondingly to * actual object behavior * @requires vm.gc.G1 - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * @modules java.management * @build sun.hotspot.WhiteBox - * gc.testlibrary.Helpers - * gc.g1.humongousObjects.TestObjectCollected - * * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * --- old/test/gc/g1/humongousObjects/objectGraphTest/TestObjectGraphAfterGC.java 2016-08-11 13:31:36.040704800 -0400 +++ new/test/gc/g1/humongousObjects/objectGraphTest/TestObjectGraphAfterGC.java 2016-08-11 13:31:35.613671600 -0400 @@ -24,7 +24,7 @@ package gc.g1.humongousObjects.objectGraphTest; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import sun.hotspot.WhiteBox; import java.io.File; @@ -50,16 +50,9 @@ * @summary Checks that objects' graph behave as expected after gc * @requires vm.gc.G1 * @requires vm.opt.ExplicitGCInvokesConcurrent != true - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.management java.base/jdk.internal.misc * @build sun.hotspot.WhiteBox - * gc.testlibrary.Helpers - * gc.g1.humongousObjects.objectGraphTest.GCTokens - * gc.g1.humongousObjects.objectGraphTest.ReferenceInfo - * gc.g1.humongousObjects.objectGraphTest.GC - * gc.g1.humongousObjects.objectGraphTest.ObjectGraph - * gc.g1.humongousObjects.objectGraphTest.TestObjectGraphAfterGC - * * @ignore 8156755 * * @run driver ClassFileInstaller sun.hotspot.WhiteBox --- old/test/gc/g1/ihop/TestIHOPErgo.java 2016-08-11 13:31:38.474153100 -0400 +++ new/test/gc/g1/ihop/TestIHOPErgo.java 2016-08-11 13:31:38.064495800 -0400 @@ -30,11 +30,9 @@ * @requires !vm.flightRecorder * @requires vm.opt.ExplicitGCInvokesConcurrent != true * @requires vm.opt.MaxGCPauseMillis == "null" - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * @modules java.management - * @build gc.g1.ihop.TestIHOPErgo - * gc.g1.ihop.lib.IhopUtils * @run driver/timeout=480 gc.g1.ihop.TestIHOPErgo */ package gc.g1.ihop; @@ -44,8 +42,8 @@ import java.util.LinkedList; import java.util.List; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; import gc.g1.ihop.lib.IhopUtils; --- old/test/gc/g1/ihop/TestIHOPStatic.java 2016-08-11 13:31:40.943710400 -0400 +++ new/test/gc/g1/ihop/TestIHOPStatic.java 2016-08-11 13:31:40.519327500 -0400 @@ -28,11 +28,9 @@ * @requires vm.gc.G1 * @requires !vm.flightRecorder * @requires vm.opt.ExplicitGCInvokesConcurrent != true - * @library /testlibrary / + * @library /test/lib / * @modules java.base/jdk.internal.misc * @modules java.management - * @build gc.g1.ihop.TestIHOPStatic - * gc.g1.ihop.lib.IhopUtils * @run driver/timeout=240 gc.g1.ihop.TestIHOPStatic */ package gc.g1.ihop; @@ -41,8 +39,8 @@ import java.util.Collections; import java.util.List; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.Utils; import gc.g1.ihop.lib.IhopUtils; --- old/test/gc/g1/ihop/lib/IhopUtils.java 2016-08-11 13:31:43.400796500 -0400 +++ new/test/gc/g1/ihop/lib/IhopUtils.java 2016-08-11 13:31:42.973868000 -0400 @@ -27,7 +27,7 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; import java.util.stream.Stream; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; /** --- old/test/gc/g1/mixedgc/TestLogging.java 2016-08-11 13:31:45.861336700 -0400 +++ new/test/gc/g1/mixedgc/TestLogging.java 2016-08-11 13:31:45.451409500 -0400 @@ -26,18 +26,18 @@ * @summary Check that a mixed GC is reflected in the gc logs * @requires vm.gc.G1 * @requires vm.opt.MaxGCPauseMillis == "null" - * @library /testlibrary /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc * @modules java.management - * @build sun.hotspot.WhiteBox gc.g1.mixedgc.TestLogging + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * @run driver gc.g1.mixedgc.TestLogging */ package gc.g1.mixedgc; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; import jdk.test.lib.Asserts; import sun.hotspot.WhiteBox; --- old/test/gc/g1/plab/TestPLABEvacuationFailure.java 2016-08-11 13:31:48.298933100 -0400 +++ new/test/gc/g1/plab/TestPLABEvacuationFailure.java 2016-08-11 13:31:47.887996200 -0400 @@ -26,11 +26,9 @@ * @bug 8148376 * @summary Checks PLAB statistics on evacuation failure * @requires vm.gc.G1 - * @library /testlibrary / + * @library /test/lib / * @modules java.base/jdk.internal.misc * @modules java.management - * @build gc.g1.plab.lib.LogParser - * gc.g1.plab.lib.AppPLABEvacuationFailure * @run main gc.g1.plab.TestPLABEvacuationFailure */ package gc.g1.plab; @@ -43,8 +41,8 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; import jdk.test.lib.Utils; import gc.g1.plab.lib.LogParser; --- old/test/gc/g1/plab/TestPLABPromotion.java 2016-08-11 13:31:50.731921200 -0400 +++ new/test/gc/g1/plab/TestPLABPromotion.java 2016-08-11 13:31:50.327090500 -0400 @@ -27,14 +27,10 @@ * @summary Test PLAB promotion * @requires vm.gc.G1 * @requires !vm.flightRecorder - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * @modules java.management - * @build ClassFileInstaller - * sun.hotspot.WhiteBox - * gc.g1.plab.lib.MemoryConsumer - * gc.g1.plab.lib.LogParser - * gc.g1.plab.lib.AppPLABPromotion + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/timeout=240 gc.g1.plab.TestPLABPromotion @@ -50,8 +46,8 @@ import gc.g1.plab.lib.PLABUtils; import gc.g1.plab.lib.PlabInfo; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; /** * Test checks PLAB promotion of different size objects. --- old/test/gc/g1/plab/TestPLABResize.java 2016-08-11 13:31:53.172224600 -0400 +++ new/test/gc/g1/plab/TestPLABResize.java 2016-08-11 13:31:52.757783900 -0400 @@ -27,15 +27,10 @@ * @summary Test for PLAB resizing * @requires vm.gc.G1 * @requires !vm.flightRecorder - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * @modules java.management - * @build ClassFileInstaller - * sun.hotspot.WhiteBox - * gc.g1.plab.lib.LogParser - * gc.g1.plab.lib.MemoryConsumer - * gc.g1.plab.lib.PLABUtils - * gc.g1.plab.lib.AppPLABResize + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main gc.g1.plab.TestPLABResize @@ -52,8 +47,8 @@ import gc.g1.plab.lib.AppPLABResize; import gc.g1.plab.lib.PlabReport; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; /** * Test for PLAB resizing. --- old/test/gc/g1/plab/lib/PLABUtils.java 2016-08-11 13:31:55.600374500 -0400 +++ new/test/gc/g1/plab/lib/PLABUtils.java 2016-08-11 13:31:55.181621900 -0400 @@ -26,7 +26,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.Utils; /** --- old/test/gc/logging/TestDeprecatedPrintFlags.java 2016-08-11 13:31:58.036837600 -0400 +++ new/test/gc/logging/TestDeprecatedPrintFlags.java 2016-08-11 13:31:57.630107900 -0400 @@ -26,12 +26,13 @@ * @bug 8145180 * @summary Verify PrintGC, PrintGCDetails and -Xloggc * @key gc - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management */ -import jdk.test.lib.*; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; import java.io.File; import java.nio.file.Files; import java.nio.file.Paths; --- old/test/gc/logging/TestGCId.java 2016-08-11 13:32:00.485602500 -0400 +++ new/test/gc/logging/TestGCId.java 2016-08-11 13:32:00.082597100 -0400 @@ -27,13 +27,13 @@ * @summary Ensure that the GCId is logged * @requires vm.gc=="null" * @key gc - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management */ -import jdk.test.lib.ProcessTools; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; public class TestGCId { public static void main(String[] args) throws Exception { --- old/test/gc/logging/TestPrintReferences.java 2016-08-11 13:32:02.936011400 -0400 +++ new/test/gc/logging/TestPrintReferences.java 2016-08-11 13:32:02.527593200 -0400 @@ -26,13 +26,13 @@ * @bug 8136991 * @summary Validate the reference processing logging * @key gc - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management */ -import jdk.test.lib.ProcessTools; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; public class TestPrintReferences { public static void main(String[] args) throws Exception { --- old/test/gc/logging/TestUnifiedLoggingSwitchStress.java 2016-08-11 13:32:05.370259900 -0400 +++ new/test/gc/logging/TestUnifiedLoggingSwitchStress.java 2016-08-11 13:32:04.960001300 -0400 @@ -44,7 +44,7 @@ * @key gc * @key stress * @requires !vm.flightRecorder - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.management java.base/jdk.internal.misc * * @run main/othervm -Xmx256M -Xms256M --- old/test/gc/metaspace/CompressedClassSpaceSizeInJmapHeap.java 2016-08-11 13:32:07.811683000 -0400 +++ new/test/gc/metaspace/CompressedClassSpaceSizeInJmapHeap.java 2016-08-11 13:32:07.390083600 -0400 @@ -25,13 +25,16 @@ * @test CompressedClassSpaceSizeInJmapHeap * @bug 8004924 * @summary Checks that jmap -heap contains the flag CompressedClassSpaceSize - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:CompressedClassSpaceSize=50m CompressedClassSpaceSizeInJmapHeap */ -import jdk.test.lib.*; +import jdk.test.lib.JDKToolLauncher; +import jdk.test.lib.Platform; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; import java.nio.file.*; import java.io.File; import java.nio.charset.Charset; --- old/test/gc/metaspace/PerfCounters.java 2016-08-11 13:32:10.240708000 -0400 +++ new/test/gc/metaspace/PerfCounters.java 2016-08-11 13:32:09.833650700 -0400 @@ -26,7 +26,7 @@ import sun.jvmstat.monitor.MonitoredHost; import sun.jvmstat.monitor.MonitoredVm; import sun.jvmstat.monitor.VmIdentifier; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.ProcessTools; /** * PerfCounters can be used to get a performance counter from the currently --- old/test/gc/metaspace/TestCapacityUntilGCWrapAround.java 2016-08-11 13:32:12.704585900 -0400 +++ new/test/gc/metaspace/TestCapacityUntilGCWrapAround.java 2016-08-11 13:32:12.296639800 -0400 @@ -25,10 +25,10 @@ * @test * @key gc * @bug 8049831 - * @library /testlibrary /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @build TestCapacityUntilGCWrapAround + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI TestCapacityUntilGCWrapAround --- old/test/gc/metaspace/TestMetaspaceCMSCancel.java 2016-08-11 13:32:15.165869900 -0400 +++ new/test/gc/metaspace/TestMetaspaceCMSCancel.java 2016-08-11 13:32:14.755998300 -0400 @@ -28,9 +28,9 @@ /* @test TestMetaspaceCMSCancel * @bug 8026752 * @summary Tests cancel of CMS concurrent cycle for Metaspace after a full GC - * @library /testlibrary /test/lib /test/lib/share/classes + * @library /test/lib * @modules java.base/jdk.internal.misc - * @build TestMetaspaceCMSCancel + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * @run main/othervm TestMetaspaceCMSCancel */ --- old/test/gc/metaspace/TestMetaspaceInitialization.java 2016-08-11 13:32:17.615035500 -0400 +++ new/test/gc/metaspace/TestMetaspaceInitialization.java 2016-08-11 13:32:17.205798600 -0400 @@ -27,7 +27,6 @@ * @bug 8024945 * @summary Tests to initialize metaspace with a very low MetaspaceSize * @modules java.base/jdk.internal.misc - * @library /testlibrary * @run main/othervm -XX:MetaspaceSize=0 TestMetaspaceInitialization */ public class TestMetaspaceInitialization { --- old/test/gc/metaspace/TestMetaspaceMemoryPool.java 2016-08-11 13:32:20.047701100 -0400 +++ new/test/gc/metaspace/TestMetaspaceMemoryPool.java 2016-08-11 13:32:19.635563600 -0400 @@ -23,14 +23,16 @@ import java.util.List; import java.lang.management.*; -import jdk.test.lib.*; +import jdk.test.lib.Platform; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; import static jdk.test.lib.Asserts.*; /* @test TestMetaspaceMemoryPool * @bug 8000754 * @summary Tests that a MemoryPoolMXBeans is created for metaspace and that a * MemoryManagerMXBean is created. - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-UseCompressedOops TestMetaspaceMemoryPool --- old/test/gc/metaspace/TestMetaspacePerfCounters.java 2016-08-11 13:32:22.483067100 -0400 +++ new/test/gc/metaspace/TestMetaspacePerfCounters.java 2016-08-11 13:32:22.075302400 -0400 @@ -24,13 +24,16 @@ import java.util.List; import java.util.ArrayList; -import jdk.test.lib.*; +import jdk.test.lib.ByteCodeLoader; +import jdk.test.lib.InMemoryJavaCompiler; +import jdk.test.lib.Platform; + import static jdk.test.lib.Asserts.*; /* @test TestMetaspacePerfCounters * @bug 8014659 * @requires vm.gc=="null" - * @library /testlibrary + * @library /test/lib * @summary Tests that performance counters for metaspace and compressed class * space exists and works. * @modules java.base/jdk.internal.misc --- old/test/gc/metaspace/TestMetaspaceSizeFlags.java 2016-08-11 13:32:24.945877500 -0400 +++ new/test/gc/metaspace/TestMetaspaceSizeFlags.java 2016-08-11 13:32:24.540955200 -0400 @@ -22,15 +22,15 @@ */ import jdk.test.lib.Asserts; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; /* * @test TestMetaspaceSizeFlags * @key gc * @bug 8024650 * @summary Test that metaspace size flags can be set correctly - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management */ --- old/test/gc/metaspace/TestPerfCountersAndMemoryPools.java 2016-08-11 13:32:27.410710900 -0400 +++ new/test/gc/metaspace/TestPerfCountersAndMemoryPools.java 2016-08-11 13:32:27.004498700 -0400 @@ -24,12 +24,12 @@ import java.util.List; import java.lang.management.*; -import jdk.test.lib.*; +import jdk.test.lib.Platform; import static jdk.test.lib.Asserts.*; /* @test TestPerfCountersAndMemoryPools * @bug 8023476 - * @library /testlibrary + * @library /test/lib * @requires vm.gc.Serial * @summary Tests that a MemoryPoolMXBeans and PerfCounters for metaspace * report the same data. --- old/test/gc/parallel/AdaptiveGCBoundary.java 2016-08-11 13:32:29.857416800 -0400 +++ new/test/gc/parallel/AdaptiveGCBoundary.java 2016-08-11 13:32:29.446184400 -0400 @@ -27,14 +27,15 @@ * @bug 8014546 * @key gc * @key regression - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run main/othervm AdaptiveGCBoundary * @author jon.masamitsu@oracle.com */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; public class AdaptiveGCBoundary { public static void main(String args[]) throws Exception { --- old/test/gc/parallel/TestDynShrinkHeap.java 2016-08-11 13:32:32.293824300 -0400 +++ new/test/gc/parallel/TestDynShrinkHeap.java 2016-08-11 13:32:31.890077400 -0400 @@ -28,7 +28,7 @@ * @summary Verify that the heap shrinks after full GC according to the current values of the Min/MaxHeapFreeRatio flags * @modules java.base/jdk.internal.misc * @modules jdk.management - * @library /testlibrary + * @library /test/lib * @run main/othervm -XX:+UseAdaptiveSizePolicyWithSystemGC -XX:+UseParallelGC -XX:MinHeapFreeRatio=0 -XX:MaxHeapFreeRatio=100 -Xmx1g -verbose:gc TestDynShrinkHeap */ import jdk.test.lib.DynamicVMOption; --- old/test/gc/parallel/TestPrintGCDetailsVerbose.java 2016-08-11 13:32:34.723245400 -0400 +++ new/test/gc/parallel/TestPrintGCDetailsVerbose.java 2016-08-11 13:32:34.316073000 -0400 @@ -28,7 +28,6 @@ * @key gc * @requires vm.gc.Parallel * @modules java.base/jdk.internal.misc - * @library /testlibrary * @run main/othervm -Xmx50m -XX:+UseParallelGC -Xlog:gc*=trace TestPrintGCDetailsVerbose */ public class TestPrintGCDetailsVerbose { --- old/test/gc/serial/HeapChangeLogging.java 2016-08-11 13:32:37.165321100 -0400 +++ new/test/gc/serial/HeapChangeLogging.java 2016-08-11 13:32:36.756919600 -0400 @@ -24,10 +24,9 @@ /* * @test HeapChangeLogging.java * @bug 8027440 - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @build HeapChangeLogging * @summary Allocate to get a promotion failure and verify that that heap change logging is present. * @run main HeapChangeLogging */ @@ -35,7 +34,8 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; public class HeapChangeLogging { public static void main(String[] args) throws Exception { --- old/test/gc/startup_warnings/TestCMS.java 2016-08-11 13:32:39.596624500 -0400 +++ new/test/gc/startup_warnings/TestCMS.java 2016-08-11 13:32:39.189179700 -0400 @@ -26,13 +26,13 @@ * @key gc * @bug 8006398 * @summary Test that CMS does not print a warning message -* @library /testlibrary +* @library /test/lib * @modules java.base/jdk.internal.misc * java.management */ -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; public class TestCMS { --- old/test/gc/startup_warnings/TestDefNewCMS.java 2016-08-11 13:32:42.034936500 -0400 +++ new/test/gc/startup_warnings/TestDefNewCMS.java 2016-08-11 13:32:41.627339400 -0400 @@ -26,13 +26,13 @@ * @key gc * @bug 8065972 * @summary Test that the unsupported DefNew+CMS combination does not start -* @library /testlibrary +* @library /test/lib * @modules java.base/jdk.internal.misc * java.management */ -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; public class TestDefNewCMS { --- old/test/gc/startup_warnings/TestG1.java 2016-08-11 13:32:44.505077200 -0400 +++ new/test/gc/startup_warnings/TestG1.java 2016-08-11 13:32:44.095133800 -0400 @@ -26,13 +26,13 @@ * @key gc * @bug 8006398 * @summary Test that the G1 collector does not print a warning message -* @library /testlibrary +* @library /test/lib * @modules java.base/jdk.internal.misc * java.management */ -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; public class TestG1 { --- old/test/gc/startup_warnings/TestParNewCMS.java 2016-08-11 13:32:46.945789800 -0400 +++ new/test/gc/startup_warnings/TestParNewCMS.java 2016-08-11 13:32:46.540178500 -0400 @@ -26,13 +26,13 @@ * @key gc * @bug 8065972 * @summary Test that specifying -XX:+UseParNewGC on the command line logs a warning message -* @library /testlibrary +* @library /test/lib * @modules java.base/jdk.internal.misc * java.management */ -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; public class TestParNewCMS { --- old/test/gc/startup_warnings/TestParNewSerialOld.java 2016-08-11 13:32:49.387326600 -0400 +++ new/test/gc/startup_warnings/TestParNewSerialOld.java 2016-08-11 13:32:48.979578200 -0400 @@ -26,13 +26,13 @@ * @key gc * @bug 8065972 * @summary Test that the unsupported ParNew+SerialOld combination does not start -* @library /testlibrary +* @library /test/lib * @modules java.base/jdk.internal.misc * java.management */ -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; public class TestParNewSerialOld { --- old/test/gc/startup_warnings/TestParallelGC.java 2016-08-11 13:32:51.832115700 -0400 +++ new/test/gc/startup_warnings/TestParallelGC.java 2016-08-11 13:32:51.423705100 -0400 @@ -26,13 +26,13 @@ * @key gc * @bug 8006398 * @summary Test that ParallelGC does not print a warning message -* @library /testlibrary +* @library /test/lib * @modules java.base/jdk.internal.misc * java.management */ -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; public class TestParallelGC { --- old/test/gc/startup_warnings/TestParallelScavengeSerialOld.java 2016-08-11 13:32:54.272735900 -0400 +++ new/test/gc/startup_warnings/TestParallelScavengeSerialOld.java 2016-08-11 13:32:53.858081100 -0400 @@ -26,13 +26,13 @@ * @key gc * @bug 8006398 * @summary Test that the ParallelScavenge+SerialOld combination does not print a warning message -* @library /testlibrary +* @library /test/lib * @modules java.base/jdk.internal.misc * java.management */ -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; public class TestParallelScavengeSerialOld { --- old/test/gc/startup_warnings/TestSerialGC.java 2016-08-11 13:32:56.709505300 -0400 +++ new/test/gc/startup_warnings/TestSerialGC.java 2016-08-11 13:32:56.299943800 -0400 @@ -26,13 +26,13 @@ * @key gc * @bug 8006398 * @summary Test that SerialGC does not print a warning message -* @library /testlibrary +* @library /test/lib * @modules java.base/jdk.internal.misc * java.management */ -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; public class TestSerialGC { --- old/test/gc/stress/TestMultiThreadStressRSet.java 2016-08-11 13:32:59.166748300 -0400 +++ new/test/gc/stress/TestMultiThreadStressRSet.java 2016-08-11 13:32:58.763433800 -0400 @@ -37,7 +37,7 @@ * * @summary Stress G1 Remembered Set using multiple threads * @modules java.base/jdk.internal.misc - * @library /test/lib /testlibrary + * @library /test/lib * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission --- old/test/gc/stress/TestStressRSetCoarsening.java 2016-08-11 13:33:01.620567300 -0400 +++ new/test/gc/stress/TestStressRSetCoarsening.java 2016-08-11 13:33:01.209131700 -0400 @@ -34,7 +34,7 @@ * * @summary Stress G1 Remembered Set by creating a lot of cross region links * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib + * @library /test/lib * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission --- old/test/gc/survivorAlignment/TestAllocationInEden.java 2016-08-11 13:33:04.109031300 -0400 +++ new/test/gc/survivorAlignment/TestAllocationInEden.java 2016-08-11 13:33:03.680949300 -0400 @@ -26,10 +26,10 @@ * @bug 8031323 * @summary Verify that object's alignment in eden space is not affected by * SurvivorAlignmentInBytes option. - * @library /testlibrary /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @build TestAllocationInEden SurvivorAlignmentTestMain AlignmentHelper + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/gc/survivorAlignment/TestPromotionFromEdenToTenured.java 2016-08-11 13:33:06.547628600 -0400 +++ new/test/gc/survivorAlignment/TestPromotionFromEdenToTenured.java 2016-08-11 13:33:06.137041500 -0400 @@ -26,11 +26,10 @@ * @bug 8031323 * @summary Verify that objects promoted from eden space to tenured space during * full GC are not aligned to SurvivorAlignmentInBytes value. - * @library /testlibrary /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @build TestPromotionFromEdenToTenured SurvivorAlignmentTestMain - * AlignmentHelper + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/gc/survivorAlignment/TestPromotionFromSurvivorToTenuredAfterFullGC.java 2016-08-11 13:33:08.981023400 -0400 +++ new/test/gc/survivorAlignment/TestPromotionFromSurvivorToTenuredAfterFullGC.java 2016-08-11 13:33:08.572498200 -0400 @@ -26,11 +26,10 @@ * @bug 8031323 * @summary Verify that objects promoted from survivor space to tenured space * during full GC are not aligned to SurvivorAlignmentInBytes value. - * @library /testlibrary /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @build TestPromotionFromSurvivorToTenuredAfterFullGC - * SurvivorAlignmentTestMain AlignmentHelper + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/gc/survivorAlignment/TestPromotionFromSurvivorToTenuredAfterMinorGC.java 2016-08-11 13:33:11.439947700 -0400 +++ new/test/gc/survivorAlignment/TestPromotionFromSurvivorToTenuredAfterMinorGC.java 2016-08-11 13:33:11.035016900 -0400 @@ -27,11 +27,10 @@ * @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 /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @build TestPromotionFromSurvivorToTenuredAfterMinorGC - * SurvivorAlignmentTestMain AlignmentHelper + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/gc/survivorAlignment/TestPromotionToSurvivor.java 2016-08-11 13:33:13.875305200 -0400 +++ new/test/gc/survivorAlignment/TestPromotionToSurvivor.java 2016-08-11 13:33:13.470518100 -0400 @@ -26,11 +26,10 @@ * @bug 8031323 * @summary Verify that objects promoted from eden space to survivor space after * minor GC are aligned to SurvivorAlignmentInBytes. - * @library /testlibrary /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @build TestPromotionToSurvivor - * SurvivorAlignmentTestMain AlignmentHelper + * @build sun.hotspot.WhiteBox * @ignore 8129886 * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission --- old/test/gc/testlibrary/Helpers.java 2016-08-11 13:33:16.340719000 -0400 +++ new/test/gc/testlibrary/Helpers.java 2016-08-11 13:33:15.918244500 -0400 @@ -25,7 +25,7 @@ package gc.testlibrary; import jdk.test.lib.JDKToolLauncher; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import sun.hotspot.WhiteBox; import java.io.File; --- old/test/gc/whitebox/TestConcMarkCycleWB.java 2016-08-11 13:33:18.819237300 -0400 +++ new/test/gc/whitebox/TestConcMarkCycleWB.java 2016-08-11 13:33:18.390821300 -0400 @@ -25,12 +25,12 @@ * @test TestConMarkCycleWB * @bug 8065579 * @requires vm.gc.G1 - * @library /testlibrary /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc * java.compiler * java.management * jdk.jvmstat/sun.jvmstat.monitor - * @build ClassFileInstaller jdk.test.lib.* sun.hotspot.WhiteBox TestConcMarkCycleWB + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:+UseG1GC TestConcMarkCycleWB --- old/test/gc/whitebox/TestWBGC.java 2016-08-11 13:33:21.354936000 -0400 +++ new/test/gc/whitebox/TestWBGC.java 2016-08-11 13:33:20.927862100 -0400 @@ -25,14 +25,16 @@ * @test TestWBGC * @bug 8055098 * @summary Test verify that WB methods isObjectInOldGen and youngGC works correctly. - * @library /testlibrary /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @build TestWBGC + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * @run driver TestWBGC */ -import jdk.test.lib.*; +import jdk.test.lib.Asserts; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; import sun.hotspot.WhiteBox; public class TestWBGC { --- old/test/native/GTestWrapper.java 2016-08-11 13:33:23.956761100 -0400 +++ new/test/native/GTestWrapper.java 2016-08-11 13:33:23.530857300 -0400 @@ -24,7 +24,7 @@ /* @test * @summary a jtreg wrapper for gtest tests - * @library /test/lib/share/classes + * @library /test/lib * @modules java.base/jdk.internal.misc * @run main/native GTestWrapper */ --- old/test/runtime/8026365/InvokeSpecialAnonTest.java 2016-08-11 13:33:26.599998100 -0400 +++ new/test/runtime/8026365/InvokeSpecialAnonTest.java 2016-08-11 13:33:26.125911600 -0400 @@ -26,7 +26,7 @@ * @bug 8026365 * @summary Test invokespecial of host class method from an anonymous class * @author Robert Field - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.org.objectweb.asm * java.base/jdk.internal.misc * @compile -XDignore.symbol.file InvokeSpecialAnonTest.java --- old/test/runtime/BadObjectClass/BootstrapRedefine.java 2016-08-11 13:33:29.155702300 -0400 +++ new/test/runtime/BadObjectClass/BootstrapRedefine.java 2016-08-11 13:33:28.739993100 -0400 @@ -25,13 +25,15 @@ * @test * @bug 6583051 * @summary Give error if java.lang.Object has been incompatibly overridden on the bootpath - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run main BootstrapRedefine */ -import jdk.test.lib.*; +import jdk.test.lib.InMemoryJavaCompiler; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; public class BootstrapRedefine { --- old/test/runtime/BoolReturn/NativeSmallIntCallsTest.java 2016-08-11 13:33:31.656017300 -0400 +++ new/test/runtime/BoolReturn/NativeSmallIntCallsTest.java 2016-08-11 13:33:31.240641700 -0400 @@ -25,7 +25,7 @@ * @bug 8149170 * @summary Test native functions return booleans as 0/1 but differently than java functions * @modules java.base/jdk.internal.misc - * @library /testlibrary + * @library /test/lib * @compile BoolConstructor.java * @run main/native NativeSmallIntCallsTest */ --- old/test/runtime/BootClassAppendProp/BootClassPathAppend.java 2016-08-11 13:33:34.172668900 -0400 +++ new/test/runtime/BootClassAppendProp/BootClassPathAppend.java 2016-08-11 13:33:33.729803700 -0400 @@ -25,11 +25,12 @@ * @test * @bug 8087154 * @summary Uninitialized system property jdk.boot.class.path.append causes SIGSEGV - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; // Test that system property jdk.boot.class.path.append is initialized. Otherwise, // -XX:+PrintCompilation does causes a SIGSEGV. --- old/test/runtime/BootClassAppendProp/BootClassPathAppendProp.java 2016-08-11 13:33:36.921657500 -0400 +++ new/test/runtime/BootClassAppendProp/BootClassPathAppendProp.java 2016-08-11 13:33:36.483592300 -0400 @@ -25,7 +25,6 @@ /* * @test - * @build BootClassPathAppendProp * @run main/othervm -Xbootclasspath/a:/usr/lib -showversion -Xbootclasspath/a:/i/dont/exist BootClassPathAppendProp * @run main/othervm -Xpatch:/not/here -Xbootclasspath/a:/i/may/exist BootClassPathAppendProp * @run main/othervm -Djdk.boot.class.path.append=newdir BootClassPathAppendProp --- old/test/runtime/CDSCompressedKPtrs/CDSCompressedKPtrs.java 2016-08-11 13:33:39.449229600 -0400 +++ new/test/runtime/CDSCompressedKPtrs/CDSCompressedKPtrs.java 2016-08-11 13:33:39.031816000 -0400 @@ -25,13 +25,15 @@ * @test * @bug 8003424 * @summary Testing UseCompressedClassPointers with CDS - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run main CDSCompressedKPtrs */ -import jdk.test.lib.*; +import jdk.test.lib.Platform; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; public class CDSCompressedKPtrs { public static void main(String[] args) throws Exception { --- old/test/runtime/CDSCompressedKPtrs/CDSCompressedKPtrsError.java 2016-08-11 13:33:41.942526900 -0400 +++ new/test/runtime/CDSCompressedKPtrs/CDSCompressedKPtrsError.java 2016-08-11 13:33:41.503948900 -0400 @@ -25,13 +25,15 @@ * @test * @bug 8003424 * @summary Test that cannot use CDS if UseCompressedClassPointers is turned off. - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run main CDSCompressedKPtrsError */ -import jdk.test.lib.*; +import jdk.test.lib.Platform; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; public class CDSCompressedKPtrsError { public static void main(String[] args) throws Exception { --- old/test/runtime/CDSCompressedKPtrs/XShareAuto.java 2016-08-11 13:33:44.403336100 -0400 +++ new/test/runtime/CDSCompressedKPtrs/XShareAuto.java 2016-08-11 13:33:43.988670500 -0400 @@ -25,13 +25,15 @@ * @test * @bug 8005933 * @summary Test that -Xshare:auto uses CDS when explicitly specified with -server. - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run main XShareAuto */ -import jdk.test.lib.*; +import jdk.test.lib.Platform; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; public class XShareAuto { public static void main(String[] args) throws Exception { --- old/test/runtime/ClassFile/JsrRewriting.java 2016-08-11 13:33:46.899406700 -0400 +++ new/test/runtime/ClassFile/JsrRewriting.java 2016-08-11 13:33:46.493223200 -0400 @@ -33,14 +33,17 @@ * @bug 7185550 * @bug 7149464 * @key cte_test - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.desktop * java.management * @run main JsrRewriting */ -import jdk.test.lib.*; +import jdk.test.lib.JDKToolFinder; +import jdk.test.lib.Platform; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; import java.io.File; public class JsrRewriting { --- old/test/runtime/ClassFile/OomWhileParsingRepeatedJsr.java 2016-08-11 13:33:49.448623900 -0400 +++ new/test/runtime/ClassFile/OomWhileParsingRepeatedJsr.java 2016-08-11 13:33:49.028974000 -0400 @@ -33,15 +33,17 @@ * @bug 7037122 * @bug 7123945 * @bug 8016029 - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.desktop * java.management * @run main OomWhileParsingRepeatedJsr */ -import jdk.test.lib.*; - +import jdk.test.lib.JDKToolFinder; +import jdk.test.lib.Platform; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; public class OomWhileParsingRepeatedJsr { --- old/test/runtime/ClassFile/UnsupportedClassFileVersion.java 2016-08-11 13:33:51.934310000 -0400 +++ new/test/runtime/ClassFile/UnsupportedClassFileVersion.java 2016-08-11 13:33:51.515785400 -0400 @@ -23,7 +23,7 @@ /* * @test - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.org.objectweb.asm * java.base/jdk.internal.misc * java.management @@ -36,7 +36,8 @@ import jdk.internal.org.objectweb.asm.ClassWriter; import jdk.internal.org.objectweb.asm.MethodVisitor; import jdk.internal.org.objectweb.asm.Opcodes; -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; public class UnsupportedClassFileVersion implements Opcodes { public static void main(String... args) throws Exception { --- old/test/runtime/ClassUnload/KeepAliveClass.java 2016-08-11 13:33:54.398862000 -0400 +++ new/test/runtime/ClassUnload/KeepAliveClass.java 2016-08-11 13:33:53.984054400 -0400 @@ -25,10 +25,9 @@ * @test KeepAliveClass * @summary This test case uses a java.lang.Class instance to keep a class alive. * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib /runtime/testlibrary + * @library /test/lib /runtime/testlibrary * @library classes - * @build KeepAliveClass test.Empty - * @build ClassUnloadCommon + * @build sun.hotspot.WhiteBox test.Empty * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -Xmn8m -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI KeepAliveClass --- old/test/runtime/ClassUnload/KeepAliveClassLoader.java 2016-08-11 13:33:56.917123100 -0400 +++ new/test/runtime/ClassUnload/KeepAliveClassLoader.java 2016-08-11 13:33:56.499308400 -0400 @@ -25,10 +25,9 @@ * @test KeepAliveClassLoader * @summary This test case uses a java.lang.ClassLoader instance to keep a class alive. * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib /runtime/testlibrary + * @library /test/lib /runtime/testlibrary * @library classes - * @build KeepAliveClassLoader test.Empty - * @build ClassUnloadCommon + * @build sun.hotspot.WhiteBox test.Empty * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -Xmn8m -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI KeepAliveClassLoader --- old/test/runtime/ClassUnload/KeepAliveObject.java 2016-08-11 13:33:59.373767800 -0400 +++ new/test/runtime/ClassUnload/KeepAliveObject.java 2016-08-11 13:33:58.967251600 -0400 @@ -25,10 +25,9 @@ * @test KeepAliveObject * @summary This test case uses a class instance to keep the class alive. * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib /runtime/testlibrary + * @library /test/lib /runtime/testlibrary * @library classes - * @build KeepAliveObject test.Empty - * @build ClassUnloadCommon + * @build sun.hotspot.WhiteBox test.Empty * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -Xmn8m -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI KeepAliveObject --- old/test/runtime/ClassUnload/KeepAliveSoftReference.java 2016-08-11 13:34:01.843416700 -0400 +++ new/test/runtime/ClassUnload/KeepAliveSoftReference.java 2016-08-11 13:34:01.436212200 -0400 @@ -25,10 +25,9 @@ * @test KeepAliveSoftReference * @summary This test case uses a java.lang.ref.SoftReference referencing a class instance to keep a class alive. * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib /runtime/testlibrary + * @library /test/lib /runtime/testlibrary * @library classes - * @build KeepAliveSoftReference test.Empty - * @build ClassUnloadCommon + * @build sun.hotspot.WhiteBox test.Empty * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -Xmn8m -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI KeepAliveSoftReference --- old/test/runtime/ClassUnload/UnloadTest.java 2016-08-11 13:34:04.313497900 -0400 +++ new/test/runtime/ClassUnload/UnloadTest.java 2016-08-11 13:34:03.901215800 -0400 @@ -24,10 +24,9 @@ /* * @test UnloadTest * @modules java.base/jdk.internal.misc - * @library /runtime/testlibrary /testlibrary /test/lib + * @library /runtime/testlibrary /test/lib * @library classes - * @build ClassUnloadCommon test.Empty - * @build UnloadTest + * @build sun.hotspot.WhiteBox test.Empty * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -Xmn8m -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI UnloadTest --- old/test/runtime/CommandLine/BooleanFlagWithInvalidValue.java 2016-08-11 13:34:06.771833300 -0400 +++ new/test/runtime/CommandLine/BooleanFlagWithInvalidValue.java 2016-08-11 13:34:06.362610100 -0400 @@ -25,12 +25,13 @@ * @test * @bug 8006298 * @summary Setting an invalid value for a bool argument should result in a useful error message - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; public class BooleanFlagWithInvalidValue { public static void main(String[] args) throws Exception { --- old/test/runtime/CommandLine/CompilerConfigFileWarning.java 2016-08-11 13:34:09.213678100 -0400 +++ new/test/runtime/CommandLine/CompilerConfigFileWarning.java 2016-08-11 13:34:08.803971600 -0400 @@ -25,13 +25,15 @@ * @test * @bug 7167142 * @summary Warn if unused .hotspot_compiler file is present - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management */ import java.io.PrintWriter; -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.Platform; public class CompilerConfigFileWarning { public static void main(String[] args) throws Exception { --- old/test/runtime/CommandLine/ConfigFileParsing.java 2016-08-11 13:34:11.675742600 -0400 +++ new/test/runtime/CommandLine/ConfigFileParsing.java 2016-08-11 13:34:11.261230900 -0400 @@ -25,13 +25,14 @@ * @test ConfigFileParsing * @bug 7158804 * @summary Improve config file parsing - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management */ import java.io.PrintWriter; -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; public class ConfigFileParsing { public static void main(String[] args) throws Exception { --- old/test/runtime/CommandLine/ConfigFileWarning.java 2016-08-11 13:34:14.138241600 -0400 +++ new/test/runtime/CommandLine/ConfigFileWarning.java 2016-08-11 13:34:13.730326300 -0400 @@ -25,13 +25,15 @@ * @test * @bug 7167142 * @summary Warn if unused .hotspot_rc file is present - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management */ import java.io.PrintWriter; -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.Platform; public class ConfigFileWarning { public static void main(String[] args) throws Exception { --- old/test/runtime/CommandLine/FlagWithInvalidValue.java 2016-08-11 13:34:16.609648700 -0400 +++ new/test/runtime/CommandLine/FlagWithInvalidValue.java 2016-08-11 13:34:16.190444800 -0400 @@ -25,12 +25,13 @@ * @test * @bug 8006298 * @summary Setting a flag to an invalid value should print a useful error message - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; public class FlagWithInvalidValue { public static void main(String[] args) throws Exception { --- old/test/runtime/CommandLine/IgnoreUnrecognizedVMOptions.java 2016-08-11 13:34:19.057343900 -0400 +++ new/test/runtime/CommandLine/IgnoreUnrecognizedVMOptions.java 2016-08-11 13:34:18.644586200 -0400 @@ -21,14 +21,16 @@ * questions. */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.Platform; /* * @test * @bug 8129855 * @summary -XX:+IgnoreUnrecognizedVMOptions should work according to the spec from JDK-8129855 * - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run main IgnoreUnrecognizedVMOptions --- old/test/runtime/CommandLine/NonBooleanFlagWithInvalidBooleanPrefix.java 2016-08-11 13:34:21.515275100 -0400 +++ new/test/runtime/CommandLine/NonBooleanFlagWithInvalidBooleanPrefix.java 2016-08-11 13:34:21.093951200 -0400 @@ -25,12 +25,13 @@ * @test * @bug 8006298 * @summary Using a bool (+/-) prefix on non-bool flag should result in a useful error message - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; public class NonBooleanFlagWithInvalidBooleanPrefix { public static void main(String[] args) throws Exception { --- old/test/runtime/CommandLine/ObsoleteFlagErrorMessage.java 2016-08-11 13:34:23.970051300 -0400 +++ new/test/runtime/CommandLine/ObsoleteFlagErrorMessage.java 2016-08-11 13:34:23.560642000 -0400 @@ -26,10 +26,11 @@ * @bug 8060449 8073989 * @summary Newly obsolete command line options should still give useful error messages when used improperly. * @modules java.base/jdk.internal.misc - * @library /testlibrary + * @library /test/lib */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; public class ObsoleteFlagErrorMessage { public static void main(String[] args) throws Exception { --- old/test/runtime/CommandLine/OptionsValidation/TestJcmdOutput.java 2016-08-11 13:34:26.441529800 -0400 +++ new/test/runtime/CommandLine/OptionsValidation/TestJcmdOutput.java 2016-08-11 13:34:26.024018700 -0400 @@ -26,7 +26,7 @@ * @summary Verify jcmd error message for out-of-range value and for * value which is not allowed by constraint. Also check that * jcmd does not print an error message to the target process output. - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * jdk.management @@ -35,8 +35,8 @@ import jdk.test.lib.Asserts; import jdk.test.lib.DynamicVMOption; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; import jdk.test.lib.dcmd.PidJcmdExecutor; public class TestJcmdOutput { --- old/test/runtime/CommandLine/OptionsValidation/TestOptionsWithRanges.java 2016-08-11 13:34:28.941490200 -0400 +++ new/test/runtime/CommandLine/OptionsValidation/TestOptionsWithRanges.java 2016-08-11 13:34:28.523936400 -0400 @@ -24,12 +24,11 @@ /* * @test * @summary Test VM Options with ranges - * @library /testlibrary /runtime/CommandLine/OptionsValidation/common + * @library /test/lib /runtime/CommandLine/OptionsValidation/common * @modules java.base/jdk.internal.misc * java.management * jdk.attach/sun.tools.attach * jdk.jvmstat/sun.jvmstat.monitor - * @build jdk.test.lib.* TestOptionsWithRanges * @run main/othervm/timeout=900 TestOptionsWithRanges */ --- old/test/runtime/CommandLine/OptionsValidation/TestOptionsWithRangesDynamic.java 2016-08-11 13:34:31.390865000 -0400 +++ new/test/runtime/CommandLine/OptionsValidation/TestOptionsWithRangesDynamic.java 2016-08-11 13:34:30.966469300 -0400 @@ -24,7 +24,7 @@ /* * @test * @summary Test writeable VM Options with ranges. - * @library /testlibrary /runtime/CommandLine/OptionsValidation/common + * @library /test/lib /runtime/CommandLine/OptionsValidation/common * @modules java.base/jdk.internal.misc * jdk.attach/sun.tools.attach * java.management --- old/test/runtime/CommandLine/OptionsValidation/common/optionsvalidation/JVMOption.java 2016-08-11 13:34:33.859719100 -0400 +++ new/test/runtime/CommandLine/OptionsValidation/common/optionsvalidation/JVMOption.java 2016-08-11 13:34:33.436978200 -0400 @@ -30,8 +30,8 @@ import java.util.List; import java.util.Set; import jdk.test.lib.DynamicVMOption; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; import jdk.test.lib.dcmd.CommandExecutor; import jdk.test.lib.dcmd.JMXExecutor; import sun.tools.attach.HotSpotVirtualMachine; --- old/test/runtime/CommandLine/OptionsValidation/common/optionsvalidation/JVMOptionsUtils.java 2016-08-11 13:34:36.324150100 -0400 +++ new/test/runtime/CommandLine/OptionsValidation/common/optionsvalidation/JVMOptionsUtils.java 2016-08-11 13:34:35.908800200 -0400 @@ -37,9 +37,9 @@ import java.util.Map; import java.util.StringTokenizer; import java.util.function.Predicate; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.Platform; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.ProcessTools; public class JVMOptionsUtils { --- old/test/runtime/CommandLine/PrintTouchedMethods.java 2016-08-11 13:34:38.821962200 -0400 +++ new/test/runtime/CommandLine/PrintTouchedMethods.java 2016-08-11 13:34:38.381880400 -0400 @@ -26,14 +26,16 @@ * @bug 8025692 * @modules java.base/jdk.internal.misc * java.management - * @library /testlibrary + * @library /test/lib * @compile TestLogTouchedMethods.java PrintTouchedMethods.java * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+LogTouchedMethods PrintTouchedMethods */ import java.io.File; import java.util.List; -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.JDKToolFinder; public class PrintTouchedMethods { --- old/test/runtime/CommandLine/TestHexArguments.java 2016-08-11 13:34:41.412246700 -0400 +++ new/test/runtime/CommandLine/TestHexArguments.java 2016-08-11 13:34:41.010069400 -0400 @@ -26,13 +26,14 @@ * @bug 8042885 * @summary Make sure there is no error using hexadecimal format in vm options * @author Yumin Qi - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management */ import java.io.File; -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; public class TestHexArguments { public static void main(String args[]) throws Exception { --- old/test/runtime/CommandLine/TestLongUnrecognizedVMOption.java 2016-08-11 13:34:43.858390700 -0400 +++ new/test/runtime/CommandLine/TestLongUnrecognizedVMOption.java 2016-08-11 13:34:43.453537300 -0400 @@ -25,14 +25,14 @@ * @test * @bug 8129786 * @summary Verify that JVM correctly processes very long unrecognized VM option - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * @modules java.management * @run main TestLongUnrecognizedVMOption */ -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; public class TestLongUnrecognizedVMOption { --- old/test/runtime/CommandLine/TestNullTerminatedFlags.java 2016-08-11 13:34:46.295529500 -0400 +++ new/test/runtime/CommandLine/TestNullTerminatedFlags.java 2016-08-11 13:34:45.875323600 -0400 @@ -21,13 +21,14 @@ * questions. */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; /* * @test TestNullTerminatedFlags * @bug 6522873 * @summary Test that the VM don't allow random junk characters at the end of valid command line flags. - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run driver TestNullTerminatedFlags --- old/test/runtime/CommandLine/TestVMOptions.java 2016-08-11 13:34:48.726794000 -0400 +++ new/test/runtime/CommandLine/TestVMOptions.java 2016-08-11 13:34:48.316325400 -0400 @@ -25,13 +25,14 @@ * @test * @bug 8060256 * @summary Test various command line options - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run main TestVMOptions */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; import java.io.File; public class TestVMOptions { --- old/test/runtime/CommandLine/TraceExceptionsTest.java 2016-08-11 13:34:51.155779200 -0400 +++ new/test/runtime/CommandLine/TraceExceptionsTest.java 2016-08-11 13:34:50.749642300 -0400 @@ -25,12 +25,13 @@ * @test * @bug 8048933 * @summary TraceExceptions output should have the exception message - useful for ClassNotFoundExceptions especially - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; public class TraceExceptionsTest { public static void main(String[] args) throws Exception { --- old/test/runtime/CommandLine/UnrecognizedVMOption.java 2016-08-11 13:34:53.653855700 -0400 +++ new/test/runtime/CommandLine/UnrecognizedVMOption.java 2016-08-11 13:34:53.243059900 -0400 @@ -25,12 +25,13 @@ * @test * @bug 8006298 * @summary Using an unrecognized VM option should print the name of the option - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; public class UnrecognizedVMOption { public static void main(String[] args) throws Exception { --- old/test/runtime/CommandLine/VMAliasOptions.java 2016-08-11 13:34:56.097102900 -0400 +++ new/test/runtime/CommandLine/VMAliasOptions.java 2016-08-11 13:34:55.692784500 -0400 @@ -21,7 +21,8 @@ * questions. */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.cli.*; /* @@ -29,7 +30,7 @@ * @bug 8061611 * @summary Test that various alias options correctly set the target options. See aliased_jvm_flags in arguments.cpp. * @modules java.base/jdk.internal.misc - * @library /testlibrary + * @library /test/lib */ public class VMAliasOptions { --- old/test/runtime/CommandLine/VMDeprecatedOptions.java 2016-08-11 13:34:58.528555900 -0400 +++ new/test/runtime/CommandLine/VMDeprecatedOptions.java 2016-08-11 13:34:58.109178800 -0400 @@ -21,7 +21,8 @@ * questions. */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.cli.*; /* @@ -29,7 +30,7 @@ * @bug 8066821 * @summary Test that various options are deprecated. See deprecated_jvm_flags in arguments.cpp. * @modules java.base/jdk.internal.misc - * @library /testlibrary + * @library /test/lib */ public class VMDeprecatedOptions { --- old/test/runtime/CommandLine/VMOptionWarning.java 2016-08-11 13:35:00.973133200 -0400 +++ new/test/runtime/CommandLine/VMOptionWarning.java 2016-08-11 13:35:00.554419500 -0400 @@ -25,12 +25,14 @@ * @test * @bug 8027314 * @summary Warn if diagnostic or experimental vm option is used and -XX:+UnlockDiagnosticVMOptions or -XX:+UnlockExperimentalVMOptions, respectively, isn't specified. Warn if develop or notproduct vm option is used with product version of VM. - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.Platform; public class VMOptionWarning { public static void main(String[] args) throws Exception { --- old/test/runtime/CommandLine/VMOptionsFile/TestVMOptionsFile.java 2016-08-11 13:35:03.413771500 -0400 +++ new/test/runtime/CommandLine/VMOptionsFile/TestVMOptionsFile.java 2016-08-11 13:35:03.006184200 -0400 @@ -25,7 +25,7 @@ * @test * @bug 8061999 8135195 8136552 * @summary Test "-XX:VMOptionsFile" VM option - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * @modules jdk.management * @run main TestVMOptionsFile @@ -52,8 +52,8 @@ import java.util.Set; import jdk.test.lib.Asserts; import jdk.test.lib.DynamicVMOption; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; public class TestVMOptionsFile { --- old/test/runtime/CompressedOops/CompressedClassPointers.java 2016-08-11 13:35:05.872462700 -0400 +++ new/test/runtime/CompressedOops/CompressedClassPointers.java 2016-08-11 13:35:05.471232800 -0400 @@ -25,12 +25,14 @@ * @test * @bug 8024927 * @summary Testing address of compressed class pointer space as best as possible. - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management */ -import jdk.test.lib.*; +import jdk.test.lib.Platform; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; public class CompressedClassPointers { --- old/test/runtime/CompressedOops/CompressedClassSpaceSize.java 2016-08-11 13:35:08.319048900 -0400 +++ new/test/runtime/CompressedOops/CompressedClassSpaceSize.java 2016-08-11 13:35:07.908720600 -0400 @@ -25,12 +25,14 @@ * @test * @bug 8022865 * @summary Tests for the -XX:CompressedClassSpaceSize command line option - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run main CompressedClassSpaceSize */ -import jdk.test.lib.*; +import jdk.test.lib.Platform; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; public class CompressedClassSpaceSize { --- old/test/runtime/CompressedOops/CompressedKlassPointerAndOops.java 2016-08-11 13:35:10.770448800 -0400 +++ new/test/runtime/CompressedOops/CompressedKlassPointerAndOops.java 2016-08-11 13:35:10.356305900 -0400 @@ -26,12 +26,14 @@ * @bug 8000968 * @key regression * @summary NPG: UseCompressedClassPointers asserts with ObjectAlignmentInBytes=32 - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management */ -import jdk.test.lib.*; +import jdk.test.lib.Platform; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; public class CompressedKlassPointerAndOops { --- old/test/runtime/CompressedOops/ObjectAlignment.java 2016-08-11 13:35:13.213663500 -0400 +++ new/test/runtime/CompressedOops/ObjectAlignment.java 2016-08-11 13:35:12.795305200 -0400 @@ -25,12 +25,15 @@ * @test * @bug 8022865 * @summary Tests for the -XX:ObjectAlignmentInBytes command line option - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run main ObjectAlignment */ -import jdk.test.lib.*; + +import jdk.test.lib.Platform; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; public class ObjectAlignment { --- old/test/runtime/CompressedOops/UseCompressedOops.java 2016-08-11 13:35:15.645286800 -0400 +++ new/test/runtime/CompressedOops/UseCompressedOops.java 2016-08-11 13:35:15.237870700 -0400 @@ -25,7 +25,7 @@ * @test * @bug 8022865 * @summary Tests for different combination of UseCompressedOops options - * @library /testlibrary + * @library /test/lib * @ignore 8079353 * @modules java.base/jdk.internal.misc * java.management @@ -33,7 +33,9 @@ */ import java.util.ArrayList; import java.util.Collections; -import jdk.test.lib.*; +import jdk.test.lib.Platform; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; public class UseCompressedOops { --- old/test/runtime/ConstantPool/BadMethodHandles.java 2016-08-11 13:35:18.105774000 -0400 +++ new/test/runtime/ConstantPool/BadMethodHandles.java 2016-08-11 13:35:17.695363100 -0400 @@ -25,7 +25,6 @@ * @test * @bug 8087223 * @summary Adding constantTag to keep method call consistent with it. - * @library /testlibrary * @modules java.base/jdk.internal.org.objectweb.asm * java.base/jdk.internal.misc * java.management --- old/test/runtime/ConstantPool/IntfMethod.java 2016-08-11 13:35:20.595043700 -0400 +++ new/test/runtime/ConstantPool/IntfMethod.java 2016-08-11 13:35:20.187830700 -0400 @@ -25,7 +25,6 @@ * @test * $bug 8087223 * @summary Adding constantTag to keep method call consistent with it. - * @library /testlibrary * @modules java.base/jdk.internal.org.objectweb.asm * java.base/jdk.internal.misc * java.management --- old/test/runtime/EnclosingMethodAttr/EnclMethodAttr.java 2016-08-11 13:35:23.036053600 -0400 +++ new/test/runtime/EnclosingMethodAttr/EnclMethodAttr.java 2016-08-11 13:35:22.618549900 -0400 @@ -24,7 +24,7 @@ /* * @test * @bug 8044738 - * @library /testlibrary + * @library /test/lib * @summary Check attribute_length of EnclosingMethod attribute * @modules java.base/jdk.internal.misc * java.management @@ -32,7 +32,8 @@ */ import java.io.File; -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; public class EnclMethodAttr { --- old/test/runtime/ErrorHandling/CreateCoredumpOnCrash.java 2016-08-11 13:35:25.467090500 -0400 +++ new/test/runtime/ErrorHandling/CreateCoredumpOnCrash.java 2016-08-11 13:35:25.052093100 -0400 @@ -23,16 +23,18 @@ /* * @test - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.compiler * java.management * jdk.jvmstat/sun.jvmstat.monitor - * @build jdk.test.lib.* * @run driver CreateCoredumpOnCrash */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.Platform; +import jdk.test.lib.Utils; import jdk.internal.misc.Unsafe; public class CreateCoredumpOnCrash { --- old/test/runtime/ErrorHandling/ErrorHandler.java 2016-08-11 13:35:27.902821800 -0400 +++ new/test/runtime/ErrorHandling/ErrorHandler.java 2016-08-11 13:35:27.490233600 -0400 @@ -28,11 +28,13 @@ * @summary Exercise HotSpot error handling code by invoking java with * -XX:ErrorHandlerTest option to cause an error report. Check the results. * @modules java.base/jdk.internal.misc - * @library /testlibrary + * @library /test/lib * @run driver ErrorHandler */ -import jdk.test.lib.*; +import jdk.test.lib.Platform; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; public class ErrorHandler { --- old/test/runtime/ErrorHandling/ProblematicFrameTest.java 2016-08-11 13:35:30.354541200 -0400 +++ new/test/runtime/ErrorHandling/ProblematicFrameTest.java 2016-08-11 13:35:29.945135900 -0400 @@ -25,19 +25,19 @@ * @test * @bug 8050167 * @summary Test that error is not occurred during printing problematic frame - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.compiler * java.management * jdk.jvmstat/sun.jvmstat.monitor - * @build jdk.test.lib.* * @run driver ProblematicFrameTest */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.Utils; import jdk.internal.misc.Unsafe; -import jdk.test.lib.Utils; public class ProblematicFrameTest { private static class Crasher { --- old/test/runtime/ErrorHandling/SafeFetchInErrorHandlingTest.java 2016-08-11 13:35:32.817946100 -0400 +++ new/test/runtime/ErrorHandling/SafeFetchInErrorHandlingTest.java 2016-08-11 13:35:32.410736500 -0400 @@ -27,16 +27,16 @@ import java.io.InputStreamReader; import java.util.regex.Pattern; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.Platform; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.ProcessTools; /* * @test * @bug 8074552 * @summary SafeFetch32 and SafeFetchN do not work in error handling * @modules java.base/jdk.internal.misc - * @library /testlibrary + * @library /test/lib * @author Thomas Stuefe (SAP) */ --- old/test/runtime/ErrorHandling/SecondaryErrorTest.java 2016-08-11 13:35:35.266625900 -0400 +++ new/test/runtime/ErrorHandling/SecondaryErrorTest.java 2016-08-11 13:35:34.859217000 -0400 @@ -26,7 +26,7 @@ * @test * @bug 8065896 * @summary Synchronous signals during error reporting may terminate or hang VM process - * @library /testlibrary + * @library /test/lib * @author Thomas Stuefe (SAP) * @modules java.base/jdk.internal.misc * java.management @@ -38,9 +38,9 @@ import java.io.InputStreamReader; import java.util.regex.Pattern; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.Platform; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.ProcessTools; public class SecondaryErrorTest { --- old/test/runtime/ErrorHandling/TestCrashOnOutOfMemoryError.java 2016-08-11 13:35:37.720342200 -0400 +++ new/test/runtime/ErrorHandling/TestCrashOnOutOfMemoryError.java 2016-08-11 13:35:37.313018000 -0400 @@ -25,14 +25,13 @@ * @test TestCrashOnOutOfMemoryError * @summary Test using -XX:+CrashOnOutOfMemoryError * @modules java.base/jdk.internal.misc - * @library /testlibrary - * @build jdk.test.lib.* + * @library /test/lib * @run driver TestCrashOnOutOfMemoryError * @bug 8138745 */ -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; --- old/test/runtime/ErrorHandling/TestExitOnOutOfMemoryError.java 2016-08-11 13:35:40.165150000 -0400 +++ new/test/runtime/ErrorHandling/TestExitOnOutOfMemoryError.java 2016-08-11 13:35:39.757371200 -0400 @@ -25,14 +25,13 @@ * @test TestExitOnOutOfMemoryError * @summary Test using -XX:ExitOnOutOfMemoryError * @modules java.base/jdk.internal.misc - * @library /testlibrary - * @build jdk.test.lib.* + * @library /test/lib * @run driver TestExitOnOutOfMemoryError * @bug 8138745 */ -import jdk.test.lib.ProcessTools; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; public class TestExitOnOutOfMemoryError { --- old/test/runtime/ErrorHandling/TestOnError.java 2016-08-11 13:35:42.600827400 -0400 +++ new/test/runtime/ErrorHandling/TestOnError.java 2016-08-11 13:35:42.194205100 -0400 @@ -25,13 +25,14 @@ * @test TestOnError * @summary Test using -XX:OnError= * @modules java.base/jdk.internal.misc - * @library /testlibrary - * @build TestOnError + * @library /test/lib * @run main TestOnError * @bug 8078470 */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.Platform; public class TestOnError { --- old/test/runtime/ErrorHandling/TestOnOutOfMemoryError.java 2016-08-11 13:35:45.053737100 -0400 +++ new/test/runtime/ErrorHandling/TestOnOutOfMemoryError.java 2016-08-11 13:35:44.647879500 -0400 @@ -25,13 +25,13 @@ * @test TestOnOutOfMemoryError * @summary Test using -XX:OnOutOfMemoryError= * @modules java.base/jdk.internal.misc - * @library /testlibrary - * @build TestOnOutOfMemoryError + * @library /test/lib * @run main TestOnOutOfMemoryError * @bug 8078470 */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; public class TestOnOutOfMemoryError { --- old/test/runtime/Final/TestPutMain.java 2016-08-11 13:35:47.493048700 -0400 +++ new/test/runtime/Final/TestPutMain.java 2016-08-11 13:35:47.085572200 -0400 @@ -26,7 +26,7 @@ * @test * @bug 8160527 * @summary The VM does not always perform checks added by 8157181 when updating final instance fields - * @library /testlibrary + * @library /test/lib * @compile TestPutField.jasm * @compile TestPutStatic.jasm * @compile TestPutMain.java --- old/test/runtime/LoadClass/LoadClassNegative.java 2016-08-11 13:35:49.936112400 -0400 +++ new/test/runtime/LoadClass/LoadClassNegative.java 2016-08-11 13:35:49.532044200 -0400 @@ -26,16 +26,16 @@ * @key regression * @bug 8020675 * @summary make sure there is no fatal error if a class is loaded from an invalid jar file which is in the bootclasspath - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @build TestForName - * @build LoadClassNegative * @run main LoadClassNegative */ import java.io.File; -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; public class LoadClassNegative { --- old/test/runtime/LocalVariableTable/TestLVT.java 2016-08-11 13:35:52.405203000 -0400 +++ new/test/runtime/LocalVariableTable/TestLVT.java 2016-08-11 13:35:51.997492600 -0400 @@ -25,14 +25,15 @@ * @test * @bug 8049632 * @summary Test ClassFileParser::copy_localvariable_table cases - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @compile -g -XDignore.symbol.file TestLVT.java * @run main TestLVT */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; import java.util.*; public class TestLVT { --- old/test/runtime/Metaspace/FragmentMetaspace.java 2016-08-11 13:35:54.837223600 -0400 +++ new/test/runtime/Metaspace/FragmentMetaspace.java 2016-08-11 13:35:54.428214700 -0400 @@ -26,7 +26,6 @@ * @library /runtime/testlibrary * @modules java.base/jdk.internal.misc * @modules java.compiler - * @build GeneratedClassLoader * @run main/othervm/timeout=200 -Xmx300m FragmentMetaspace */ --- old/test/runtime/NMT/AutoshutdownNMT.java 2016-08-11 13:35:57.270716800 -0400 +++ new/test/runtime/NMT/AutoshutdownNMT.java 2016-08-11 13:35:56.860580500 -0400 @@ -25,12 +25,13 @@ * @test * @key nmt * @summary Test for deprecated message if -XX:-AutoShutdownNMT is specified - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; public class AutoshutdownNMT { --- old/test/runtime/NMT/BaselineWithParameter.java 2016-08-11 13:35:59.688776600 -0400 +++ new/test/runtime/NMT/BaselineWithParameter.java 2016-08-11 13:35:59.280206900 -0400 @@ -26,13 +26,15 @@ * @bug 8004802 * @key nmt jcmd regression * @summary Regression test for invoking a jcmd with baseline=false, result was that the target VM crashed - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run main/othervm -XX:NativeMemoryTracking=detail BaselineWithParameter */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.JDKToolFinder; public class BaselineWithParameter { --- old/test/runtime/NMT/ChangeTrackingLevel.java 2016-08-11 13:36:02.135965800 -0400 +++ new/test/runtime/NMT/ChangeTrackingLevel.java 2016-08-11 13:36:01.727432500 -0400 @@ -27,14 +27,13 @@ * @summary Test that you can decrease NMT tracking level but not increase it. * @key nmt * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib - * @build ChangeTrackingLevel + * @library /test/lib + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail ChangeTrackingLevel */ -import jdk.test.lib.*; import sun.hotspot.WhiteBox; public class ChangeTrackingLevel { --- old/test/runtime/NMT/CommandLineDetail.java 2016-08-11 13:36:04.585255900 -0400 +++ new/test/runtime/NMT/CommandLineDetail.java 2016-08-11 13:36:04.172371300 -0400 @@ -25,12 +25,13 @@ * @test * @key nmt * @summary Running with NMT detail should not result in an error - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; public class CommandLineDetail { --- old/test/runtime/NMT/CommandLineEmptyArgument.java 2016-08-11 13:36:07.045634400 -0400 +++ new/test/runtime/NMT/CommandLineEmptyArgument.java 2016-08-11 13:36:06.638847900 -0400 @@ -25,12 +25,13 @@ * @test * @key nmt * @summary Empty argument to NMT should result in an informative error message - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; public class CommandLineEmptyArgument { --- old/test/runtime/NMT/CommandLineInvalidArgument.java 2016-08-11 13:36:09.487850400 -0400 +++ new/test/runtime/NMT/CommandLineInvalidArgument.java 2016-08-11 13:36:09.079583200 -0400 @@ -25,12 +25,13 @@ * @test * @key nmt * @summary Invalid argument to NMT should result in an informative error message - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; public class CommandLineInvalidArgument { --- old/test/runtime/NMT/CommandLineSummary.java 2016-08-11 13:36:11.922648500 -0400 +++ new/test/runtime/NMT/CommandLineSummary.java 2016-08-11 13:36:11.519827900 -0400 @@ -25,12 +25,13 @@ * @test * @key nmt * @summary Running with NMT summary should not result in an error - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; public class CommandLineSummary { --- old/test/runtime/NMT/CommandLineTurnOffNMT.java 2016-08-11 13:36:14.365406800 -0400 +++ new/test/runtime/NMT/CommandLineTurnOffNMT.java 2016-08-11 13:36:13.958762200 -0400 @@ -25,12 +25,13 @@ * @test * @key nmt * @summary Turning off NMT should not result in an error - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; public class CommandLineTurnOffNMT { --- old/test/runtime/NMT/CommitOverlappingRegions.java 2016-08-11 13:36:16.810436600 -0400 +++ new/test/runtime/NMT/CommitOverlappingRegions.java 2016-08-11 13:36:16.405570000 -0400 @@ -25,16 +25,18 @@ * @test * @summary Test commits of overlapping regions of memory. * @key nmt jcmd - * @library /testlibrary /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @build CommitOverlappingRegions + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail CommitOverlappingRegions */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.JDKToolFinder; import sun.hotspot.WhiteBox; public class CommitOverlappingRegions { --- old/test/runtime/NMT/JcmdBaselineDetail.java 2016-08-11 13:36:19.267212300 -0400 +++ new/test/runtime/NMT/JcmdBaselineDetail.java 2016-08-11 13:36:18.858181600 -0400 @@ -25,13 +25,15 @@ * @test * @key nmt jcmd * @summary Verify that jcmd correctly reports that baseline succeeds with NMT enabled with detailed tracking. - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run main/othervm -XX:NativeMemoryTracking=detail JcmdBaselineDetail */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.JDKToolFinder; public class JcmdBaselineDetail { --- old/test/runtime/NMT/JcmdDetailDiff.java 2016-08-11 13:36:21.700339700 -0400 +++ new/test/runtime/NMT/JcmdDetailDiff.java 2016-08-11 13:36:21.282901400 -0400 @@ -25,15 +25,17 @@ * @test * @summary run NMT baseline, allocate memory and verify output from detail.diff * @key nmt jcmd - * @library /testlibrary /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @build JcmdDetailDiff + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail JcmdDetailDiff */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.JDKToolFinder; import sun.hotspot.WhiteBox; --- old/test/runtime/NMT/JcmdScale.java 2016-08-11 13:36:24.167598600 -0400 +++ new/test/runtime/NMT/JcmdScale.java 2016-08-11 13:36:23.741777900 -0400 @@ -25,13 +25,15 @@ * @test * @key nmt jcmd * @summary Test the NMT scale parameter - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run main/othervm -XX:NativeMemoryTracking=summary JcmdScale */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.JDKToolFinder; public class JcmdScale { --- old/test/runtime/NMT/JcmdScaleDetail.java 2016-08-11 13:36:26.610819700 -0400 +++ new/test/runtime/NMT/JcmdScaleDetail.java 2016-08-11 13:36:26.201730000 -0400 @@ -25,13 +25,15 @@ * @test * @key nmt jcmd * @summary Test the NMT scale parameter with detail tracking level - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run main/othervm -XX:NativeMemoryTracking=detail JcmdScaleDetail */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.JDKToolFinder; public class JcmdScaleDetail { --- old/test/runtime/NMT/JcmdSummaryDiff.java 2016-08-11 13:36:29.050292900 -0400 +++ new/test/runtime/NMT/JcmdSummaryDiff.java 2016-08-11 13:36:28.645154200 -0400 @@ -25,15 +25,17 @@ * @test * @summary run NMT baseline, allocate memory and verify output from summary.diff * @key nmt jcmd - * @library /testlibrary /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @build JcmdSummaryDiff + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=summary JcmdSummaryDiff */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.JDKToolFinder; import sun.hotspot.WhiteBox; --- old/test/runtime/NMT/JcmdWithNMTDisabled.java 2016-08-11 13:36:31.498136900 -0400 +++ new/test/runtime/NMT/JcmdWithNMTDisabled.java 2016-08-11 13:36:31.087371100 -0400 @@ -25,13 +25,15 @@ * @test * @key nmt jcmd * @summary Verify that jcmd correctly reports that NMT is not enabled - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run main JcmdWithNMTDisabled 1 */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.JDKToolFinder; public class JcmdWithNMTDisabled { static ProcessBuilder pb = new ProcessBuilder(); --- old/test/runtime/NMT/MallocRoundingReportTest.java 2016-08-11 13:36:33.939076700 -0400 +++ new/test/runtime/NMT/MallocRoundingReportTest.java 2016-08-11 13:36:33.519049500 -0400 @@ -25,16 +25,18 @@ * @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 /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @build MallocRoundingReportTest + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail MallocRoundingReportTest * */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.JDKToolFinder; import sun.hotspot.WhiteBox; --- old/test/runtime/NMT/MallocSiteHashOverflow.java 2016-08-11 13:36:36.380719200 -0400 +++ new/test/runtime/NMT/MallocSiteHashOverflow.java 2016-08-11 13:36:35.960445200 -0400 @@ -27,13 +27,15 @@ * @requires sun.arch.data.model == "32" * @key nmt jcmd stress * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib - * @build MallocSiteHashOverflow + * @library /test/lib + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail MallocSiteHashOverflow */ -import jdk.test.lib.*; +import jdk.test.lib.JDKToolFinder; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; import sun.hotspot.WhiteBox; public class MallocSiteHashOverflow { --- old/test/runtime/NMT/MallocStressTest.java 2016-08-11 13:36:38.820223600 -0400 +++ new/test/runtime/NMT/MallocStressTest.java 2016-08-11 13:36:38.407728600 -0400 @@ -25,10 +25,10 @@ * @test * @summary Stress test for malloc tracking * @key nmt jcmd stress - * @library /testlibrary /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @build MallocStressTest + * @build sun.hotspot.WhiteBox * @ignore - This test is disabled since it will stress NMT and timeout during normal testing * @run main ClassFileInstaller sun.hotspot.WhiteBox * @run main/othervm/timeout=600 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail MallocStressTest @@ -38,7 +38,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; import sun.hotspot.WhiteBox; public class MallocStressTest { --- old/test/runtime/NMT/MallocTestType.java 2016-08-11 13:36:41.266823100 -0400 +++ new/test/runtime/NMT/MallocTestType.java 2016-08-11 13:36:40.860434200 -0400 @@ -25,16 +25,18 @@ * @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 /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @build MallocTestType + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail MallocTestType */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.JDKToolFinder; import sun.hotspot.WhiteBox; public class MallocTestType { --- old/test/runtime/NMT/MallocTrackingVerify.java 2016-08-11 13:36:43.677234800 -0400 +++ new/test/runtime/NMT/MallocTrackingVerify.java 2016-08-11 13:36:43.274457800 -0400 @@ -26,10 +26,10 @@ * @bug 8054836 * @summary Test to verify correctness of malloc tracking * @key nmt jcmd - * @library /testlibrary /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @build MallocTrackingVerify + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail MallocTrackingVerify * @@ -38,7 +38,9 @@ import java.util.ArrayList; import java.util.Random; -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.JDKToolFinder; import sun.hotspot.WhiteBox; --- old/test/runtime/NMT/NMTWithCDS.java 2016-08-11 13:36:46.104760700 -0400 +++ new/test/runtime/NMT/NMTWithCDS.java 2016-08-11 13:36:45.693858000 -0400 @@ -25,12 +25,13 @@ * @test * @bug 8055061 * @key nmt - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run main NMTWithCDS */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; public class NMTWithCDS { --- old/test/runtime/NMT/PrintNMTStatistics.java 2016-08-11 13:36:48.555092300 -0400 +++ new/test/runtime/NMT/PrintNMTStatistics.java 2016-08-11 13:36:48.145185700 -0400 @@ -27,10 +27,11 @@ * @bug 8005936 8058606 * @summary Verify PrintNMTStatistics on normal JVM exit for detail and summary tracking level * @modules java.base/jdk.internal.misc - * @library /testlibrary + * @library /test/lib */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; public class PrintNMTStatistics { --- old/test/runtime/NMT/PrintNMTStatisticsWithNMTDisabled.java 2016-08-11 13:36:51.008969000 -0400 +++ new/test/runtime/NMT/PrintNMTStatisticsWithNMTDisabled.java 2016-08-11 13:36:50.591655100 -0400 @@ -25,12 +25,13 @@ * @test * @key nmt * @summary Trying to enable PrintNMTStatistics should result in a warning - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; public class PrintNMTStatisticsWithNMTDisabled { --- old/test/runtime/NMT/ReleaseCommittedMemory.java 2016-08-11 13:36:53.446725800 -0400 +++ new/test/runtime/NMT/ReleaseCommittedMemory.java 2016-08-11 13:36:53.042638400 -0400 @@ -27,8 +27,8 @@ * @summary Release committed memory and make sure NMT handles it correctly * @key nmt regression * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib - * @build ReleaseCommittedMemory + * @library /test/lib + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail ReleaseCommittedMemory --- old/test/runtime/NMT/ReleaseNoCommit.java 2016-08-11 13:36:55.902664000 -0400 +++ new/test/runtime/NMT/ReleaseNoCommit.java 2016-08-11 13:36:55.496539100 -0400 @@ -25,17 +25,17 @@ * @test * @summary Release uncommitted memory and make sure NMT handles it correctly * @key nmt regression - * @library /testlibrary /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @build ReleaseNoCommit + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=summary ReleaseNoCommit */ import jdk.test.lib.JDKToolFinder; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; import sun.hotspot.WhiteBox; --- old/test/runtime/NMT/ShutdownTwice.java 2016-08-11 13:36:58.319686200 -0400 +++ new/test/runtime/NMT/ShutdownTwice.java 2016-08-11 13:36:57.916034200 -0400 @@ -25,13 +25,15 @@ * @test * @key nmt jcmd * @summary Run shutdown twice - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run main/othervm -XX:NativeMemoryTracking=detail ShutdownTwice */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.JDKToolFinder; public class ShutdownTwice { --- old/test/runtime/NMT/SummaryAfterShutdown.java 2016-08-11 13:37:00.740435300 -0400 +++ new/test/runtime/NMT/SummaryAfterShutdown.java 2016-08-11 13:37:00.323705300 -0400 @@ -25,13 +25,15 @@ * @test * @key nmt jcmd * @summary Verify that jcmd correctly reports that NMT is not enabled after a shutdown - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run main/othervm -XX:NativeMemoryTracking=detail SummaryAfterShutdown */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.JDKToolFinder; public class SummaryAfterShutdown { --- old/test/runtime/NMT/SummarySanityCheck.java 2016-08-11 13:37:03.173020100 -0400 +++ new/test/runtime/NMT/SummarySanityCheck.java 2016-08-11 13:37:02.766885700 -0400 @@ -25,16 +25,18 @@ * @test * @key nmt jcmd * @summary Sanity check the output of NMT - * @library /testlibrary /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @build SummarySanityCheck + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:NativeMemoryTracking=summary -XX:+WhiteBoxAPI SummarySanityCheck */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.JDKToolFinder; import java.util.regex.Matcher; import java.util.regex.Pattern; --- old/test/runtime/NMT/ThreadedMallocTestType.java 2016-08-11 13:37:05.611835000 -0400 +++ new/test/runtime/NMT/ThreadedMallocTestType.java 2016-08-11 13:37:05.205263600 -0400 @@ -24,16 +24,18 @@ /* * @test * @key nmt jcmd - * @library /testlibrary /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @build ThreadedMallocTestType + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail ThreadedMallocTestType */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.JDKToolFinder; import sun.hotspot.WhiteBox; public class ThreadedMallocTestType { --- old/test/runtime/NMT/ThreadedVirtualAllocTestType.java 2016-08-11 13:37:08.060707300 -0400 +++ new/test/runtime/NMT/ThreadedVirtualAllocTestType.java 2016-08-11 13:37:07.654637100 -0400 @@ -24,16 +24,18 @@ /* * @test * @key nmt jcmd - * @library /testlibrary /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @build ThreadedVirtualAllocTestType + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail ThreadedVirtualAllocTestType */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.JDKToolFinder; import sun.hotspot.WhiteBox; public class ThreadedVirtualAllocTestType { --- old/test/runtime/NMT/VirtualAllocCommitUncommitRecommit.java 2016-08-11 13:37:10.504174300 -0400 +++ new/test/runtime/NMT/VirtualAllocCommitUncommitRecommit.java 2016-08-11 13:37:10.095201300 -0400 @@ -25,16 +25,18 @@ * @test * @summary Test reserve/commit/uncommit/release of virtual memory and that we track it correctly * @key nmt jcmd - * @library /testlibrary /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @build VirtualAllocCommitUncommitRecommit + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail VirtualAllocCommitUncommitRecommit * */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.JDKToolFinder; import sun.hotspot.WhiteBox; --- old/test/runtime/NMT/VirtualAllocTestType.java 2016-08-11 13:37:12.948246900 -0400 +++ new/test/runtime/NMT/VirtualAllocTestType.java 2016-08-11 13:37:12.542120300 -0400 @@ -25,16 +25,18 @@ * @test * @summary Test Reserve/Commit/Uncommit/Release of virtual memory and that we track it correctly * @key nmt jcmd - * @library /testlibrary /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @build VirtualAllocTestType + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail VirtualAllocTestType */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.JDKToolFinder; import sun.hotspot.WhiteBox; public class VirtualAllocTestType { --- old/test/runtime/PerfMemDestroy/PerfMemDestroy.java 2016-08-11 13:37:15.378945100 -0400 +++ new/test/runtime/PerfMemDestroy/PerfMemDestroy.java 2016-08-11 13:37:14.975601500 -0400 @@ -25,7 +25,7 @@ * @test * @bug 8030955 * @summary Allow multiple calls to PerfMemory::destroy() without asserting. - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run main PerfMemDestroy @@ -33,7 +33,8 @@ import java.io.File; import java.util.Map; -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; public class PerfMemDestroy { public static void main(String args[]) throws Throwable { --- old/test/runtime/RedefineObject/TestRedefineObject.java 2016-08-11 13:37:17.800819900 -0400 +++ new/test/runtime/RedefineObject/TestRedefineObject.java 2016-08-11 13:37:17.395573000 -0400 @@ -21,7 +21,10 @@ * questions. */ import java.io.PrintWriter; -import jdk.test.lib.*; + +import jdk.test.lib.JDKToolFinder; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; /* * Test to redefine java/lang/Object and verify that it doesn't crash on vtable @@ -32,7 +35,7 @@ * @test * @bug 8005056 * @bug 8009728 - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.instrument * java.management --- old/test/runtime/RedefineTests/RedefineAnnotations.java 2016-08-11 13:37:20.246160700 -0400 +++ new/test/runtime/RedefineTests/RedefineAnnotations.java 2016-08-11 13:37:19.838691500 -0400 @@ -23,7 +23,7 @@ /* * @test - * @library /testlibrary + * @library /test/lib * @summary Test that type annotations are retained after a retransform * @modules java.base/jdk.internal.misc * @modules java.base/jdk.internal.org.objectweb.asm --- old/test/runtime/RedefineTests/RedefineFinalizer.java 2016-08-11 13:37:22.693349100 -0400 +++ new/test/runtime/RedefineTests/RedefineFinalizer.java 2016-08-11 13:37:22.279251500 -0400 @@ -25,12 +25,11 @@ * @test * @bug 6904403 * @summary Don't assert if we redefine finalize method - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * @modules java.compiler * java.instrument * jdk.jartool/sun.tools.jar - * @build RedefineClassHelper * @run main RedefineClassHelper * @run main/othervm -javaagent:redefineagent.jar RedefineFinalizer */ --- old/test/runtime/RedefineTests/RedefineRunningMethods.java 2016-08-11 13:37:25.155551700 -0400 +++ new/test/runtime/RedefineTests/RedefineRunningMethods.java 2016-08-11 13:37:24.736190000 -0400 @@ -25,12 +25,11 @@ * @test * @bug 8055008 * @summary Redefine EMCP and non-EMCP methods that are running in an infinite loop - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * @modules java.compiler * java.instrument * jdk.jartool/sun.tools.jar - * @build RedefineClassHelper * @run main RedefineClassHelper * @run main/othervm -javaagent:redefineagent.jar -XX:TraceRedefineClasses=0x600 RedefineRunningMethods */ --- old/test/runtime/RedefineTests/RedefineRunningMethodsWithBacktrace.java 2016-08-11 13:37:27.614603900 -0400 +++ new/test/runtime/RedefineTests/RedefineRunningMethodsWithBacktrace.java 2016-08-11 13:37:27.206723300 -0400 @@ -25,12 +25,11 @@ * @test * @bug 8087315 * @summary Get old method's stack trace elements after GC - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * @modules java.compiler * java.instrument * jdk.jartool/sun.tools.jar - * @build RedefineClassHelper * @run main RedefineClassHelper * @run main/othervm -javaagent:redefineagent.jar RedefineRunningMethodsWithBacktrace */ --- old/test/runtime/RedefineTests/RedefineRunningMethodsWithResolutionErrors.java 2016-08-11 13:37:30.056620200 -0400 +++ new/test/runtime/RedefineTests/RedefineRunningMethodsWithResolutionErrors.java 2016-08-11 13:37:29.648781900 -0400 @@ -25,12 +25,11 @@ * @test * @bug 8076110 * @summary Redefine running methods that have cached resolution errors - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * @modules java.base/jdk.internal.org.objectweb.asm * java.instrument * jdk.jartool/sun.tools.jar - * @build RedefineClassHelper * @run main RedefineClassHelper * @run main/othervm -javaagent:redefineagent.jar -XX:TraceRedefineClasses=0x600 RedefineRunningMethodsWithResolutionErrors */ --- old/test/runtime/ReservedStack/ReservedStackTest.java 2016-08-11 13:37:32.505746500 -0400 +++ new/test/runtime/ReservedStack/ReservedStackTest.java 2016-08-11 13:37:32.096144000 -0400 @@ -23,10 +23,9 @@ /* * @test ReservedStackTest - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * @modules java.base/jdk.internal.vm.annotation - * @build jdk.test.lib.* * @run main/othervm -Xint ReservedStackTest * @run main/othervm -XX:-Inline -XX:CompileCommand=exclude,java/util/concurrent/locks/AbstractOwnableSynchronizer.setExclusiveOwnerThread ReservedStackTest */ --- old/test/runtime/ReservedStack/ReservedStackTestCompiler.java 2016-08-11 13:37:34.939562600 -0400 +++ new/test/runtime/ReservedStack/ReservedStackTestCompiler.java 2016-08-11 13:37:34.539335600 -0400 @@ -25,10 +25,9 @@ * @test ReservedStackTestCompiler * @summary Run ReservedStackTest with dedicated compilers C1 and C2. * @requires vm.flavor == "server" - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * @modules java.base/jdk.internal.vm.annotation - * @build jdk.test.lib.* ReservedStackTest * @run main/othervm -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -XX:-Inline -XX:CompileCommand=exclude,java/util/concurrent/locks/AbstractOwnableSynchronizer.setExclusiveOwnerThread ReservedStackTest * @run main/othervm -XX:-TieredCompilation -XX:-Inline -XX:CompileCommand=exclude,java/util/concurrent/locks/AbstractOwnableSynchronizer.setExclusiveOwnerThread ReservedStackTest */ --- old/test/runtime/Safepoint/AssertSafepointCheckConsistency1.java 2016-08-11 13:37:37.380855200 -0400 +++ new/test/runtime/Safepoint/AssertSafepointCheckConsistency1.java 2016-08-11 13:37:36.972974100 -0400 @@ -25,16 +25,18 @@ * @test * @bug 8047290 * @summary Ensure that a Monitor::lock_without_safepoint_check fires an assert when it incorrectly acquires a lock which must always have safepoint checks. - * @library /testlibrary /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @build AssertSafepointCheckConsistency1 + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main AssertSafepointCheckConsistency1 */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.Platform; import sun.hotspot.WhiteBox; --- old/test/runtime/Safepoint/AssertSafepointCheckConsistency2.java 2016-08-11 13:37:39.824001400 -0400 +++ new/test/runtime/Safepoint/AssertSafepointCheckConsistency2.java 2016-08-11 13:37:39.419216900 -0400 @@ -25,16 +25,18 @@ * @test * @bug 8047290 * @summary Ensure that a Monitor::lock fires an assert when it incorrectly acquires a lock which must never have safepoint checks. - * @library /testlibrary /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @build AssertSafepointCheckConsistency2 + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main AssertSafepointCheckConsistency2 */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.Platform; import sun.hotspot.WhiteBox; --- old/test/runtime/Safepoint/AssertSafepointCheckConsistency3.java 2016-08-11 13:37:42.261454600 -0400 +++ new/test/runtime/Safepoint/AssertSafepointCheckConsistency3.java 2016-08-11 13:37:41.845057300 -0400 @@ -25,16 +25,18 @@ * @test * @bug 8047290 * @summary Ensure that Monitor::lock_without_safepoint_check does not assert when it correctly acquires a lock which must never have safepoint checks. - * @library /testlibrary /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @build AssertSafepointCheckConsistency3 + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main AssertSafepointCheckConsistency3 */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.Platform; import sun.hotspot.WhiteBox; --- old/test/runtime/Safepoint/AssertSafepointCheckConsistency4.java 2016-08-11 13:37:44.679977200 -0400 +++ new/test/runtime/Safepoint/AssertSafepointCheckConsistency4.java 2016-08-11 13:37:44.273252600 -0400 @@ -25,16 +25,18 @@ * @test * @bug 8047290 * @summary Ensure that Monitor::lock does not assert when it correctly acquires a lock which must always have safepoint checks. - * @library /testlibrary /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @build AssertSafepointCheckConsistency4 + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main AssertSafepointCheckConsistency4 */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.Platform; import sun.hotspot.WhiteBox; --- old/test/runtime/SameObject/SameObject.java 2016-08-11 13:37:47.122612300 -0400 +++ new/test/runtime/SameObject/SameObject.java 2016-08-11 13:37:46.711021000 -0400 @@ -31,7 +31,7 @@ * Fixed in JDK1.3.1_10 * Fixed in JDK1.4.1_07 * @modules java.base/jdk.internal.misc - * @library /testlibrary + * @library /test/lib * @run main/othervm/native -Xcheck:jni SameObject */ public class SameObject { --- old/test/runtime/SelectionResolution/AbstractMethodErrorTest.java 2016-08-11 13:37:49.563498600 -0400 +++ new/test/runtime/SelectionResolution/AbstractMethodErrorTest.java 2016-08-11 13:37:49.158515600 -0400 @@ -27,7 +27,6 @@ * generate AbstractMethodErrorTest * @modules java.base/jdk.internal.org.objectweb.asm * @library /runtime/SelectionResolution/classes - * @build selectionresolution.* * @run main/othervm/timeout=300 -XX:+IgnoreUnrecognizedVMOptions -XX:-VerifyDependencies AbstractMethodErrorTest */ --- old/test/runtime/SelectionResolution/IllegalAccessErrorTest.java 2016-08-11 13:37:52.047252400 -0400 +++ new/test/runtime/SelectionResolution/IllegalAccessErrorTest.java 2016-08-11 13:37:51.640044500 -0400 @@ -27,7 +27,6 @@ * generate IllegalAccessErrorTest * @modules java.base/jdk.internal.org.objectweb.asm * @library /runtime/SelectionResolution/classes - * @build selectionresolution.* * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-VerifyDependencies IllegalAccessErrorTest */ --- old/test/runtime/SelectionResolution/InvokeInterfaceICCE.java 2016-08-11 13:37:54.490611600 -0400 +++ new/test/runtime/SelectionResolution/InvokeInterfaceICCE.java 2016-08-11 13:37:54.078373200 -0400 @@ -27,7 +27,6 @@ * generate IncompatibleClassChangeError * @modules java.base/jdk.internal.org.objectweb.asm * @library /runtime/SelectionResolution/classes - * @build selectionresolution.* * @run main/othervm/timeout=500 -XX:+IgnoreUnrecognizedVMOptions -XX:-VerifyDependencies InvokeInterfaceICCE */ --- old/test/runtime/SelectionResolution/InvokeInterfaceSuccessTest.java 2016-08-11 13:37:56.931343100 -0400 +++ new/test/runtime/SelectionResolution/InvokeInterfaceSuccessTest.java 2016-08-11 13:37:56.509734800 -0400 @@ -27,7 +27,6 @@ * generate InvokeInterfaceSuccessTest * @modules java.base/jdk.internal.org.objectweb.asm * @library /runtime/SelectionResolution/classes - * @build selectionresolution.* * @run main/othervm/timeout=300 -XX:+IgnoreUnrecognizedVMOptions -XX:-VerifyDependencies InvokeInterfaceSuccessTest */ --- old/test/runtime/SelectionResolution/InvokeSpecialICCE.java 2016-08-11 13:37:59.369570900 -0400 +++ new/test/runtime/SelectionResolution/InvokeSpecialICCE.java 2016-08-11 13:37:58.960210400 -0400 @@ -27,7 +27,6 @@ * generate IncompatibleClassChangeError * @modules java.base/jdk.internal.org.objectweb.asm * @library /runtime/SelectionResolution/classes - * @build selectionresolution.* * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-VerifyDependencies InvokeSpecialICCE */ --- old/test/runtime/SelectionResolution/InvokeSpecialSuccessTest.java 2016-08-11 13:38:01.796992900 -0400 +++ new/test/runtime/SelectionResolution/InvokeSpecialSuccessTest.java 2016-08-11 13:38:01.388596500 -0400 @@ -27,7 +27,6 @@ * generate InvokeSpecialSuccessTest * @modules java.base/jdk.internal.org.objectweb.asm * @library /runtime/SelectionResolution/classes - * @build selectionresolution.* * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-VerifyDependencies InvokeSpecialSuccessTest */ --- old/test/runtime/SelectionResolution/InvokeStaticICCE.java 2016-08-11 13:38:04.230932200 -0400 +++ new/test/runtime/SelectionResolution/InvokeStaticICCE.java 2016-08-11 13:38:03.827924700 -0400 @@ -27,7 +27,6 @@ * generate IncompatibleClassChangeError * @modules java.base/jdk.internal.org.objectweb.asm * @library /runtime/SelectionResolution/classes - * @build selectionresolution.* * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-VerifyDependencies InvokeStaticICCE */ --- old/test/runtime/SelectionResolution/InvokeStaticSuccessTest.java 2016-08-11 13:38:06.656130600 -0400 +++ new/test/runtime/SelectionResolution/InvokeStaticSuccessTest.java 2016-08-11 13:38:06.243129200 -0400 @@ -27,7 +27,6 @@ * generate InvokeStaticSuccessTest * @modules java.base/jdk.internal.org.objectweb.asm * @library /runtime/SelectionResolution/classes - * @build selectionresolution.* * @run main InvokeStaticSuccessTest */ --- old/test/runtime/SelectionResolution/InvokeVirtualICCE.java 2016-08-11 13:38:09.098631000 -0400 +++ new/test/runtime/SelectionResolution/InvokeVirtualICCE.java 2016-08-11 13:38:08.679158600 -0400 @@ -27,7 +27,6 @@ * generate IncompatibleClassChangeError * @modules java.base/jdk.internal.org.objectweb.asm * @library /runtime/SelectionResolution/classes - * @build selectionresolution.* * @run main/othervm/timeout=1200 -XX:+IgnoreUnrecognizedVMOptions -XX:-VerifyDependencies InvokeVirtualICCE */ --- old/test/runtime/SelectionResolution/InvokeVirtualSuccessTest.java 2016-08-11 13:38:11.528370300 -0400 +++ new/test/runtime/SelectionResolution/InvokeVirtualSuccessTest.java 2016-08-11 13:38:11.120976400 -0400 @@ -27,7 +27,6 @@ * generate InvokeVirtualSuccessTest * @modules java.base/jdk.internal.org.objectweb.asm * @library /runtime/SelectionResolution/classes - * @build selectionresolution.* * @run main/othervm/timeout=400 -XX:+IgnoreUnrecognizedVMOptions -XX:-VerifyDependencies InvokeVirtualSuccessTest */ --- old/test/runtime/SelectionResolution/NoSuchMethodErrorTest.java 2016-08-11 13:38:13.990060600 -0400 +++ new/test/runtime/SelectionResolution/NoSuchMethodErrorTest.java 2016-08-11 13:38:13.584048100 -0400 @@ -27,7 +27,6 @@ * generate NoSuchMethodError * @modules java.base/jdk.internal.org.objectweb.asm * @library /runtime/SelectionResolution/classes - * @build selectionresolution.* * @run main NoSuchMethodErrorTest */ --- old/test/runtime/SharedArchiveFile/ArchiveDoesNotExist.java 2016-08-11 13:38:16.480122000 -0400 +++ new/test/runtime/SharedArchiveFile/ArchiveDoesNotExist.java 2016-08-11 13:38:16.045835500 -0400 @@ -27,13 +27,14 @@ * attempting to use CDS archive. JVM should exit gracefully * when sharing mode is ON, and continue w/o sharing if sharing * mode is AUTO. - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run main ArchiveDoesNotExist */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; import java.io.File; public class ArchiveDoesNotExist { --- old/test/runtime/SharedArchiveFile/BootAppendTests.java 2016-08-11 13:38:18.914683500 -0400 +++ new/test/runtime/SharedArchiveFile/BootAppendTests.java 2016-08-11 13:38:18.507325500 -0400 @@ -24,7 +24,7 @@ /** * @test * @summary Testing -Xbootclasspath/a support for CDS - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * jdk.jvmstat/sun.jvmstat.monitor @@ -32,7 +32,7 @@ * @compile javax/sound/sampled/MyClass.jasm * @compile org/omg/CORBA/Context.jasm * @compile nonjdk/myPackage/MyClass.java - * @build jdk.test.lib.* LoadClass ClassFileInstaller + * @build LoadClass * @run main/othervm BootAppendTests */ @@ -44,8 +44,8 @@ import java.nio.file.Path; import java.nio.file.Paths; -import jdk.test.lib.ProcessTools; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; public class BootAppendTests { private static final String APP_CLASS = "LoadClass"; --- old/test/runtime/SharedArchiveFile/CdsDifferentCompactStrings.java 2016-08-11 13:38:21.345306400 -0400 +++ new/test/runtime/SharedArchiveFile/CdsDifferentCompactStrings.java 2016-08-11 13:38:20.939108800 -0400 @@ -25,12 +25,13 @@ * @test CdsDifferentCompactStrings * @summary CDS (class data sharing) requires the same -XX:[+-]CompactStrings * setting between archive creation time and load time. - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; public class CdsDifferentCompactStrings { public static void main(String[] args) throws Exception { --- old/test/runtime/SharedArchiveFile/CdsDifferentObjectAlignment.java 2016-08-11 13:38:23.799754100 -0400 +++ new/test/runtime/SharedArchiveFile/CdsDifferentObjectAlignment.java 2016-08-11 13:38:23.390454000 -0400 @@ -28,13 +28,15 @@ * This is a negative test; using object alignment for loading that * is different from object alignment for creating a CDS file * should fail when loading. - * @library /testlibrary + * @library /test/lib * @bug 8025642 * @modules java.base/jdk.internal.misc * java.management */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.Platform; public class CdsDifferentObjectAlignment { public static void main(String[] args) throws Exception { --- old/test/runtime/SharedArchiveFile/CdsSameObjectAlignment.java 2016-08-11 13:38:26.261151400 -0400 +++ new/test/runtime/SharedArchiveFile/CdsSameObjectAlignment.java 2016-08-11 13:38:25.852185700 -0400 @@ -25,12 +25,14 @@ * @test CdsSameObjectAlignment * @summary Testing CDS (class data sharing) using varying object alignment. * Using same object alignment for each dump/load pair - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.Platform; public class CdsSameObjectAlignment { public static void main(String[] args) throws Exception { --- old/test/runtime/SharedArchiveFile/DefaultUseWithClient.java 2016-08-11 13:38:28.726908200 -0400 +++ new/test/runtime/SharedArchiveFile/DefaultUseWithClient.java 2016-08-11 13:38:28.306309200 -0400 @@ -24,7 +24,7 @@ /* * @test DefaultUseWithClient * @summary Test default behavior of sharing with -client - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @ignore 8154204 @@ -32,7 +32,9 @@ * @bug 8032224 */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.Platform; import java.io.File; public class DefaultUseWithClient { --- old/test/runtime/SharedArchiveFile/DumpSymbolAndStringTable.java 2016-08-11 13:38:31.185473300 -0400 +++ new/test/runtime/SharedArchiveFile/DumpSymbolAndStringTable.java 2016-08-11 13:38:30.776973800 -0400 @@ -25,13 +25,15 @@ * @test * @bug 8059510 * @summary Test jcmd VM.symboltable and VM.stringtable options - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run main/othervm -XX:+UnlockDiagnosticVMOptions DumpSymbolAndStringTable */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.JDKToolFinder; public class DumpSymbolAndStringTable { public static void main(String[] args) throws Exception { --- old/test/runtime/SharedArchiveFile/LimitSharedSizes.java 2016-08-11 13:38:33.648074100 -0400 +++ new/test/runtime/SharedArchiveFile/LimitSharedSizes.java 2016-08-11 13:38:33.226653900 -0400 @@ -23,14 +23,16 @@ /* @test LimitSharedSizes * @summary Test handling of limits on shared space size - * @library /testlibrary /runtime/CommandLine/OptionsValidation/common + * @library /test/lib /runtime/CommandLine/OptionsValidation/common * @modules java.base/jdk.internal.misc * java.management * jdk.attach/sun.tools.attach * @run main LimitSharedSizes */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.Platform; import optionsvalidation.JVMOptionsUtils; public class LimitSharedSizes { --- old/test/runtime/SharedArchiveFile/MaxMetaspaceSize.java 2016-08-11 13:38:36.115466400 -0400 +++ new/test/runtime/SharedArchiveFile/MaxMetaspaceSize.java 2016-08-11 13:38:35.692938900 -0400 @@ -25,12 +25,13 @@ * @test * @bug 8067187 * @summary Testing CDS dumping with the -XX:MaxMetaspaceSize= option - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; public class MaxMetaspaceSize { public static void main(String[] args) throws Exception { --- old/test/runtime/SharedArchiveFile/PrintSharedArchiveAndExit.java 2016-08-11 13:38:38.677551700 -0400 +++ new/test/runtime/SharedArchiveFile/PrintSharedArchiveAndExit.java 2016-08-11 13:38:38.248476600 -0400 @@ -25,12 +25,13 @@ * @test * @bug 8066670 * @summary Testing -XX:+PrintSharedArchiveAndExit option - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; public class PrintSharedArchiveAndExit { public static void main(String[] args) throws Exception { --- old/test/runtime/SharedArchiveFile/SASymbolTableTest.java 2016-08-11 13:38:41.119699300 -0400 +++ new/test/runtime/SharedArchiveFile/SASymbolTableTest.java 2016-08-11 13:38:40.716614800 -0400 @@ -27,18 +27,21 @@ * Started failing on 2016.06.24 due to 8160376 on MacOS X so quarantine * it on that platform: * @requires os.family != "mac" - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * jdk.hotspot.agent/sun.jvm.hotspot.oops * jdk.hotspot.agent/sun.jvm.hotspot.memory * jdk.hotspot.agent/sun.jvm.hotspot.runtime * jdk.hotspot.agent/sun.jvm.hotspot.tools * java.management - * @build SASymbolTableTestAgent SASymbolTableTestAttachee jdk.test.lib.* + * @build SASymbolTableTestAgent SASymbolTableTestAttachee * @run main SASymbolTableTest */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.JDKToolFinder; +import jdk.test.lib.Platform; /* * The purpose of this test is to validate that we can use SA to --- old/test/runtime/SharedArchiveFile/SharedArchiveFile.java 2016-08-11 13:38:43.574141800 -0400 +++ new/test/runtime/SharedArchiveFile/SharedArchiveFile.java 2016-08-11 13:38:43.148392100 -0400 @@ -25,12 +25,13 @@ * @test * @bug 8014138 * @summary Testing new -XX:SharedArchiveFile= option - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; public class SharedArchiveFile { public static void main(String[] args) throws Exception { --- old/test/runtime/SharedArchiveFile/SharedBaseAddress.java 2016-08-11 13:38:46.027186700 -0400 +++ new/test/runtime/SharedArchiveFile/SharedBaseAddress.java 2016-08-11 13:38:45.625070100 -0400 @@ -25,13 +25,14 @@ * @test SharedBaseAddress * @summary Test variety of values for SharedBaseAddress, making sure * VM handles normal values as well as edge values w/o a crash. - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run main SharedBaseAddress */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; public class SharedBaseAddress { --- old/test/runtime/SharedArchiveFile/SharedStrings.java 2016-08-11 13:38:48.502642700 -0400 +++ new/test/runtime/SharedArchiveFile/SharedStrings.java 2016-08-11 13:38:48.091592900 -0400 @@ -29,14 +29,15 @@ * @requires (sun.arch.data.model != "32") & (os.family != "windows") * @requires (vm.opt.UseCompressedOops == null) | (vm.opt.UseCompressedOops == true) * @requires vm.gc.G1 - * @library /testlibrary /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @build SharedStringsWb SharedStrings ClassFileInstaller sun.hotspot.WhiteBox + * @build SharedStringsWb sun.hotspot.WhiteBox * @run main ClassFileInstaller -jar whitebox.jar sun.hotspot.WhiteBox * @run main SharedStrings */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; public class SharedStrings { public static void main(String[] args) throws Exception { --- old/test/runtime/SharedArchiveFile/SharedStringsDedup.java 2016-08-11 13:38:50.937265000 -0400 +++ new/test/runtime/SharedArchiveFile/SharedStringsDedup.java 2016-08-11 13:38:50.531767100 -0400 @@ -28,13 +28,14 @@ * @requires (sun.arch.data.model != "32") & (os.family != "windows") * @requires (vm.opt.UseCompressedOops == null) | (vm.opt.UseCompressedOops == true) * @requires vm.gc.G1 - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run main SharedStringsDedup */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; import java.io.File; // The main purpose is to test the interaction between shared strings --- old/test/runtime/SharedArchiveFile/SharedStringsRunAuto.java 2016-08-11 13:38:53.387638400 -0400 +++ new/test/runtime/SharedArchiveFile/SharedStringsRunAuto.java 2016-08-11 13:38:52.979855700 -0400 @@ -28,13 +28,14 @@ * @requires (sun.arch.data.model != "32") & (os.family != "windows") * @requires (vm.opt.UseCompressedOops == null) | (vm.opt.UseCompressedOops == true) * @requires vm.gc.G1 - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run main SharedStringsRunAuto */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; import java.io.File; public class SharedStringsRunAuto { --- old/test/runtime/SharedArchiveFile/SharedSymbolTableBucketSize.java 2016-08-11 13:38:55.852685700 -0400 +++ new/test/runtime/SharedArchiveFile/SharedSymbolTableBucketSize.java 2016-08-11 13:38:55.437114700 -0400 @@ -25,12 +25,13 @@ * @test * @bug 8059510 * @summary Test SharedSymbolTableBucketSize option - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; public class SharedSymbolTableBucketSize { public static void main(String[] args) throws Exception { --- old/test/runtime/SharedArchiveFile/SpaceUtilizationCheck.java 2016-08-11 13:38:58.296788200 -0400 +++ new/test/runtime/SharedArchiveFile/SpaceUtilizationCheck.java 2016-08-11 13:38:57.888731000 -0400 @@ -24,13 +24,14 @@ /* * @test SpaceUtilizationCheck * @summary Check if the space utilization for shared spaces is adequate - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run main SpaceUtilizationCheck */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; import java.util.regex.Pattern; import java.util.regex.Matcher; --- old/test/runtime/Thread/Fibonacci.java 2016-08-11 13:39:00.749655600 -0400 +++ new/test/runtime/Thread/Fibonacci.java 2016-08-11 13:39:00.339659600 -0400 @@ -29,7 +29,7 @@ * make this test inherently unstable on Windows with 32-bit VM data model. * @requires !(os.family == "windows" & sun.arch.data.model == "32") * @modules java.base/jdk.internal.misc - * @library /testlibrary + * @library /test/lib * @run main/othervm Fibonacci 15 */ --- old/test/runtime/Thread/TestThreadDumpMonitorContention.java 2016-08-11 13:39:03.199837400 -0400 +++ new/test/runtime/Thread/TestThreadDumpMonitorContention.java 2016-08-11 13:39:02.794026000 -0400 @@ -28,7 +28,7 @@ * @summary Creates two threads contending for the same lock and checks * whether jstack reports "locked" by more than one thread. * - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run main/othervm TestThreadDumpMonitorContention @@ -43,7 +43,9 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.JDKToolFinder; public class TestThreadDumpMonitorContention { // jstack tends to be closely bound to the VM that we are running --- old/test/runtime/Thread/ThreadPriorities.java 2016-08-11 13:39:05.662072600 -0400 +++ new/test/runtime/Thread/ThreadPriorities.java 2016-08-11 13:39:05.254027300 -0400 @@ -27,7 +27,7 @@ * @summary Creates several threads with different java priorities and checks * whether jstack reports correct priorities for them. * - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run main ThreadPriorities @@ -38,7 +38,9 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.JDKToolFinder; import static jdk.test.lib.Asserts.*; public class ThreadPriorities { --- old/test/runtime/ThreadSignalMask/ThreadSignalMask.java 2016-08-11 13:39:08.114998900 -0400 +++ new/test/runtime/ThreadSignalMask/ThreadSignalMask.java 2016-08-11 13:39:07.703948200 -0400 @@ -37,7 +37,7 @@ * @summary JDK 1.3.0 alters thread signal mask * @requires (vm.simpleArch == "sparcv9") * @modules java.base/jdk.internal.misc - * @library /testlibrary + * @library /test/lib * @compile Prog.java * @run main/native ThreadSignalMask */ --- old/test/runtime/Throwable/StackTraceLogging.java 2016-08-11 13:39:10.551278500 -0400 +++ new/test/runtime/Throwable/StackTraceLogging.java 2016-08-11 13:39:10.150377900 -0400 @@ -25,18 +25,17 @@ * @test * @bug 8150778 * @summary check stacktrace logging - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @build jdk.test.lib.OutputAnalyzer jdk.test.lib.ProcessTools * @compile TestThrowable.java * @run driver StackTraceLogging */ import java.io.File; import java.util.Map; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; public class StackTraceLogging { static void analyzeOutputOn(ProcessBuilder pb) throws Exception { --- old/test/runtime/Throwable/TestThrowable.java 2016-08-11 13:39:12.998345400 -0400 +++ new/test/runtime/Throwable/TestThrowable.java 2016-08-11 13:39:12.589316000 -0400 @@ -26,7 +26,7 @@ * @bug 8150778 * @summary Test exception depths, and code to get stack traces * @modules java.base/jdk.internal.misc - * @library /testlibrary + * @library /test/lib * @run main/othervm -XX:MaxJavaStackTraceDepth=1024 TestThrowable */ --- old/test/runtime/Throwable/ThrowableIntrospectionSegfault.java 2016-08-11 13:39:15.462609100 -0400 +++ new/test/runtime/Throwable/ThrowableIntrospectionSegfault.java 2016-08-11 13:39:15.053047700 -0400 @@ -26,7 +26,6 @@ * @bug 8033735 * @summary check backtrace field introspection * @modules java.base/jdk.internal.misc - * @library /testlibrary * @run main ThrowableIntrospectionSegfault */ --- old/test/runtime/Unsafe/AllocateInstance.java 2016-08-11 13:39:17.919785500 -0400 +++ new/test/runtime/Unsafe/AllocateInstance.java 2016-08-11 13:39:17.508930700 -0400 @@ -24,13 +24,13 @@ /* * @test * @summary Verifies the behaviour of Unsafe.allocateInstance - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run main AllocateInstance */ -import jdk.test.lib.*; +import jdk.test.lib.Utils; import jdk.internal.misc.Unsafe; import static jdk.test.lib.Asserts.*; --- old/test/runtime/Unsafe/AllocateMemory.java 2016-08-11 13:39:20.379022100 -0400 +++ new/test/runtime/Unsafe/AllocateMemory.java 2016-08-11 13:39:19.951545300 -0400 @@ -25,13 +25,13 @@ * @test * @requires vm.compMode != "Xcomp" * @summary Verifies behaviour of Unsafe.allocateMemory - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:MallocMaxTestWords=100m AllocateMemory */ -import jdk.test.lib.*; +import jdk.test.lib.Utils; import jdk.internal.misc.Unsafe; import static jdk.test.lib.Asserts.*; --- old/test/runtime/Unsafe/CopyMemory.java 2016-08-11 13:39:22.813335100 -0400 +++ new/test/runtime/Unsafe/CopyMemory.java 2016-08-11 13:39:22.404754400 -0400 @@ -24,13 +24,13 @@ /* * @test * @summary Verifies behaviour of Unsafe.copyMemory - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run main CopyMemory */ -import jdk.test.lib.*; +import jdk.test.lib.Utils; import jdk.internal.misc.Unsafe; import static jdk.test.lib.Asserts.*; --- old/test/runtime/Unsafe/DefineClass.java 2016-08-11 13:39:25.249977400 -0400 +++ new/test/runtime/Unsafe/DefineClass.java 2016-08-11 13:39:24.845331500 -0400 @@ -24,7 +24,7 @@ /* * @test * @summary Verifies the behaviour of Unsafe.defineClass - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.compiler * java.management @@ -33,7 +33,8 @@ import java.security.ProtectionDomain; import java.io.InputStream; -import jdk.test.lib.*; +import jdk.test.lib.InMemoryJavaCompiler; +import jdk.test.lib.Utils; import jdk.internal.misc.Unsafe; import static jdk.test.lib.Asserts.*; --- old/test/runtime/Unsafe/FieldOffset.java 2016-08-11 13:39:27.684238700 -0400 +++ new/test/runtime/Unsafe/FieldOffset.java 2016-08-11 13:39:27.279154400 -0400 @@ -24,14 +24,14 @@ /* * @test * @summary Verifies the behaviour of Unsafe.fieldOffset - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run main FieldOffset */ import java.lang.reflect.Field; -import jdk.test.lib.*; +import jdk.test.lib.Utils; import jdk.internal.misc.Unsafe; import java.lang.reflect.*; import static jdk.test.lib.Asserts.*; --- old/test/runtime/Unsafe/GetField.java 2016-08-11 13:39:30.120732600 -0400 +++ new/test/runtime/Unsafe/GetField.java 2016-08-11 13:39:29.714990900 -0400 @@ -24,13 +24,13 @@ /* * @test * @summary Verifies behaviour of Unsafe.getField - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run main GetField */ -import jdk.test.lib.*; +import jdk.test.lib.Utils; import jdk.internal.misc.Unsafe; import java.lang.reflect.*; import static jdk.test.lib.Asserts.*; --- old/test/runtime/Unsafe/GetPutAddress.java 2016-08-11 13:39:32.571900300 -0400 +++ new/test/runtime/Unsafe/GetPutAddress.java 2016-08-11 13:39:32.153086900 -0400 @@ -24,13 +24,14 @@ /* * @test * Verify behaviour of Unsafe.get/putAddress and Unsafe.addressSize - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run main GetPutAddress */ -import jdk.test.lib.*; +import jdk.test.lib.Platform; +import jdk.test.lib.Utils; import jdk.internal.misc.Unsafe; import static jdk.test.lib.Asserts.*; --- old/test/runtime/Unsafe/GetPutBoolean.java 2016-08-11 13:39:35.038280600 -0400 +++ new/test/runtime/Unsafe/GetPutBoolean.java 2016-08-11 13:39:34.612804600 -0400 @@ -24,14 +24,14 @@ /* * @test * @summary Verify behaviour of Unsafe.get/putBoolean - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run main GetPutBoolean */ import java.lang.reflect.Field; -import jdk.test.lib.*; +import jdk.test.lib.Utils; import jdk.internal.misc.Unsafe; import static jdk.test.lib.Asserts.*; --- old/test/runtime/Unsafe/GetPutByte.java 2016-08-11 13:39:37.485649500 -0400 +++ new/test/runtime/Unsafe/GetPutByte.java 2016-08-11 13:39:37.079593900 -0400 @@ -24,14 +24,14 @@ /* * @test * @summary Verify behaviour of Unsafe.get/putByte - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run main GetPutByte */ import java.lang.reflect.Field; -import jdk.test.lib.*; +import jdk.test.lib.Utils; import jdk.internal.misc.Unsafe; import static jdk.test.lib.Asserts.*; --- old/test/runtime/Unsafe/GetPutChar.java 2016-08-11 13:39:39.947130600 -0400 +++ new/test/runtime/Unsafe/GetPutChar.java 2016-08-11 13:39:39.544379400 -0400 @@ -24,14 +24,14 @@ /* * @test * @summary Verify behaviour of Unsafe.get/putChar - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run main GetPutChar */ import java.lang.reflect.Field; -import jdk.test.lib.*; +import jdk.test.lib.Utils; import jdk.internal.misc.Unsafe; import static jdk.test.lib.Asserts.*; --- old/test/runtime/Unsafe/GetPutDouble.java 2016-08-11 13:39:42.387620500 -0400 +++ new/test/runtime/Unsafe/GetPutDouble.java 2016-08-11 13:39:41.978989700 -0400 @@ -24,14 +24,14 @@ /* * @test * @summary Verify behaviour of Unsafe.get/putDouble - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run main GetPutDouble */ import java.lang.reflect.Field; -import jdk.test.lib.*; +import jdk.test.lib.Utils; import jdk.internal.misc.Unsafe; import static jdk.test.lib.Asserts.*; --- old/test/runtime/Unsafe/GetPutFloat.java 2016-08-11 13:39:44.818606900 -0400 +++ new/test/runtime/Unsafe/GetPutFloat.java 2016-08-11 13:39:44.404429800 -0400 @@ -24,14 +24,14 @@ /* * @test * @summary Verify behaviour of Unsafe.get/putFloat - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run main GetPutFloat */ import java.lang.reflect.Field; -import jdk.test.lib.*; +import jdk.test.lib.Utils; import jdk.internal.misc.Unsafe; import static jdk.test.lib.Asserts.*; --- old/test/runtime/Unsafe/GetPutInt.java 2016-08-11 13:39:47.266066900 -0400 +++ new/test/runtime/Unsafe/GetPutInt.java 2016-08-11 13:39:46.841511700 -0400 @@ -23,14 +23,14 @@ /* * @test - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run main GetPutInt */ import java.lang.reflect.Field; -import jdk.test.lib.*; +import jdk.test.lib.Utils; import jdk.internal.misc.Unsafe; import static jdk.test.lib.Asserts.*; --- old/test/runtime/Unsafe/GetPutLong.java 2016-08-11 13:39:49.716842800 -0400 +++ new/test/runtime/Unsafe/GetPutLong.java 2016-08-11 13:39:49.308287300 -0400 @@ -24,14 +24,14 @@ /* * @test * @summary Verify behaviour of Unsafe.get/putLong - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run main GetPutLong */ import java.lang.reflect.Field; -import jdk.test.lib.*; +import jdk.test.lib.Utils; import jdk.internal.misc.Unsafe; import static jdk.test.lib.Asserts.*; --- old/test/runtime/Unsafe/GetPutObject.java 2016-08-11 13:39:52.177524600 -0400 +++ new/test/runtime/Unsafe/GetPutObject.java 2016-08-11 13:39:51.762894500 -0400 @@ -24,14 +24,14 @@ /* * @test * @summary Verify behaviour of Unsafe.get/putObject - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run main GetPutObject */ import java.lang.reflect.Field; -import jdk.test.lib.*; +import jdk.test.lib.Utils; import jdk.internal.misc.Unsafe; import static jdk.test.lib.Asserts.*; --- old/test/runtime/Unsafe/GetPutShort.java 2016-08-11 13:39:54.622941900 -0400 +++ new/test/runtime/Unsafe/GetPutShort.java 2016-08-11 13:39:54.215846900 -0400 @@ -24,14 +24,14 @@ /* * @test * @summary Verify behaviour of Unsafe.get/putShort - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run main GetPutShort */ import java.lang.reflect.Field; -import jdk.test.lib.*; +import jdk.test.lib.Utils; import jdk.internal.misc.Unsafe; import static jdk.test.lib.Asserts.*; --- old/test/runtime/Unsafe/GetUncompressedObject.java 2016-08-11 13:39:57.072288800 -0400 +++ new/test/runtime/Unsafe/GetUncompressedObject.java 2016-08-11 13:39:56.663201200 -0400 @@ -23,15 +23,14 @@ /* @test * @bug 8022853 - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc - * @build jdk.test.lib.* * @run main GetUncompressedObject */ import static jdk.test.lib.Asserts.*; -import jdk.test.lib.*; +import jdk.test.lib.Utils; import jdk.internal.misc.Unsafe; public class GetUncompressedObject { --- old/test/runtime/Unsafe/PageSize.java 2016-08-11 13:39:59.507123700 -0400 +++ new/test/runtime/Unsafe/PageSize.java 2016-08-11 13:39:59.102412700 -0400 @@ -24,14 +24,14 @@ /* * @test * @summary Make sure pageSize() returns a value that is a power of two - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run main PageSize */ import java.lang.reflect.Field; -import jdk.test.lib.*; +import jdk.test.lib.Utils; import jdk.internal.misc.Unsafe; import static jdk.test.lib.Asserts.*; --- old/test/runtime/Unsafe/PrimitiveHostClass.java 2016-08-11 13:40:01.944025100 -0400 +++ new/test/runtime/Unsafe/PrimitiveHostClass.java 2016-08-11 13:40:01.524526600 -0400 @@ -31,7 +31,6 @@ * @test PrimitiveHostClass * @bug 8140665 * @summary Throws IllegalArgumentException if host class is a primitive class. - * @library /testlibrary * @modules java.base/jdk.internal.org.objectweb.asm * java.base/jdk.internal.misc * @compile -XDignore.symbol.file PrimitiveHostClass.java --- old/test/runtime/Unsafe/RangeCheck.java 2016-08-11 13:40:04.384260500 -0400 +++ new/test/runtime/Unsafe/RangeCheck.java 2016-08-11 13:40:03.981634500 -0400 @@ -25,12 +25,16 @@ * @test * @bug 8001071 * @summary Add simple range check into VM implemenation of Unsafe access methods - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.Platform; +import jdk.test.lib.Utils; + import jdk.internal.misc.Unsafe; public class RangeCheck { --- old/test/runtime/Unsafe/Reallocate.java 2016-08-11 13:40:06.845057300 -0400 +++ new/test/runtime/Unsafe/Reallocate.java 2016-08-11 13:40:06.439969500 -0400 @@ -25,13 +25,13 @@ * @test * @requires vm.compMode != "Xcomp" * @bug 8058897 - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:MallocMaxTestWords=100m Reallocate */ -import jdk.test.lib.*; +import jdk.test.lib.Utils; import jdk.internal.misc.Unsafe; import static jdk.test.lib.Asserts.*; --- old/test/runtime/Unsafe/SetMemory.java 2016-08-11 13:40:09.288829300 -0400 +++ new/test/runtime/Unsafe/SetMemory.java 2016-08-11 13:40:08.883007600 -0400 @@ -24,13 +24,13 @@ /* * @test * @summary Verifies that setMemory works correctly - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run main SetMemory */ -import jdk.test.lib.*; +import jdk.test.lib.Utils; import jdk.internal.misc.Unsafe; import static jdk.test.lib.Asserts.*; --- old/test/runtime/Unsafe/ThrowException.java 2016-08-11 13:40:11.747997000 -0400 +++ new/test/runtime/Unsafe/ThrowException.java 2016-08-11 13:40:11.338710500 -0400 @@ -24,13 +24,13 @@ /* * @test * @summary Verify that throwException() can throw an exception - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run main ThrowException */ -import jdk.test.lib.*; +import jdk.test.lib.Utils; import jdk.internal.misc.Unsafe; import static jdk.test.lib.Asserts.*; --- old/test/runtime/XCheckJniJsig/XCheckJSig.java 2016-08-11 13:40:14.175151300 -0400 +++ new/test/runtime/XCheckJniJsig/XCheckJSig.java 2016-08-11 13:40:13.770430900 -0400 @@ -25,7 +25,7 @@ * @test * @bug 7051189 8023393 * @summary Need to suppress info message if -Xcheck:jni is used with libjsig.so - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run main XCheckJSig @@ -33,7 +33,9 @@ import java.io.File; import java.util.Map; -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.Platform; public class XCheckJSig { public static void main(String args[]) throws Throwable { --- old/test/runtime/classFileParserBug/ClassFileParserBug.java 2016-08-11 13:40:16.628376200 -0400 +++ new/test/runtime/classFileParserBug/ClassFileParserBug.java 2016-08-11 13:40:16.202127700 -0400 @@ -24,7 +24,7 @@ /* * @test * @bug 8040018 - * @library /testlibrary + * @library /test/lib * @summary Check for exception instead of assert. * @modules java.base/jdk.internal.misc * java.management @@ -32,7 +32,8 @@ */ import java.io.File; -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; public class ClassFileParserBug { public static void main(String args[]) throws Throwable { --- old/test/runtime/classFileParserBug/TestEmptyBootstrapMethodsAttr.java 2016-08-11 13:40:19.066203200 -0400 +++ new/test/runtime/classFileParserBug/TestEmptyBootstrapMethodsAttr.java 2016-08-11 13:40:18.653060200 -0400 @@ -24,7 +24,7 @@ /* * @test TestEmptyBootstrapMethodsAttr * @bug 8041918 - * @library /testlibrary + * @library /test/lib * @summary Test empty bootstrap_methods table within BootstrapMethods attribute * @modules java.base/jdk.internal.misc * java.management @@ -33,7 +33,9 @@ */ import java.io.File; -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.JDKToolFinder; public class TestEmptyBootstrapMethodsAttr { --- old/test/runtime/contended/Options.java 2016-08-11 13:40:21.525078800 -0400 +++ new/test/runtime/contended/Options.java 2016-08-11 13:40:21.102023500 -0400 @@ -21,14 +21,15 @@ * questions. */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; /* * @test * @bug 8006997 * @summary ContendedPaddingWidth should be range-checked * - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run main Options --- old/test/runtime/duplAttributes/DuplAttributesTest.java 2016-08-11 13:40:23.974720000 -0400 +++ new/test/runtime/duplAttributes/DuplAttributesTest.java 2016-08-11 13:40:23.568336300 -0400 @@ -24,7 +24,7 @@ /* * @test * @bug 8040292 - * @library /testlibrary + * @library /test/lib * @summary Throw exceptions when duplicate attributes are detected. * @modules java.base/jdk.internal.misc * java.management @@ -32,7 +32,8 @@ */ import java.io.File; -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; public class DuplAttributesTest { --- old/test/runtime/execstack/Testexecstack.java 2016-08-11 13:40:26.428316100 -0400 +++ new/test/runtime/execstack/Testexecstack.java 2016-08-11 13:40:26.021131300 -0400 @@ -28,14 +28,15 @@ * @bug 8025519 * @summary Stack guard pages lost after loading library with executable stack. * @requires (os.family == "linux") - * @library /testlibrary - * @build jdk.test.lib.* + * @library /test/lib + * @modules java.base/jdk.internal.misc * @compile Test.java * @compile TestMT.java * @run driver Testexecstack */ -import jdk.test.lib.*; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; public class Testexecstack { --- old/test/runtime/getSysPackage/GetSysPkgTest.java 2016-08-11 13:40:28.883564900 -0400 +++ new/test/runtime/getSysPackage/GetSysPkgTest.java 2016-08-11 13:40:28.475262500 -0400 @@ -26,14 +26,16 @@ * @modules java.base/jdk.internal.misc * @modules java.base/jdk.internal.loader * java.desktop - * @library /testlibrary + * @library /test/lib * @run main/othervm GetSysPkgTest */ import java.io.File; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import jdk.test.lib.*; +import jdk.test.lib.InMemoryJavaCompiler; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; // Test that JVM get_system_package() returns the module location for defined packages. public class GetSysPkgTest { --- old/test/runtime/interned/SanityTest.java 2016-08-11 13:40:31.319726400 -0400 +++ new/test/runtime/interned/SanityTest.java 2016-08-11 13:40:30.909403600 -0400 @@ -25,8 +25,8 @@ * @test SanityTest * @summary Sanity check of String.intern() & GC * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib - * @build SanityTest + * @library /test/lib + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI SanityTest --- old/test/runtime/jni/ToStringInInterfaceTest/ToStringTest.java 2016-08-11 13:40:33.761918000 -0400 +++ new/test/runtime/jni/ToStringInInterfaceTest/ToStringTest.java 2016-08-11 13:40:33.348812300 -0400 @@ -23,8 +23,7 @@ /* @test * @bug 8072588 - * @build InterfaceWithToString - * @build ImplementationOfWithToString + * @build InterfaceWithToString ImplementationOfWithToString * @run main/native ToStringTest */ public final class ToStringTest { --- old/test/runtime/libadimalloc.solaris.sparc/Testlibadimalloc.java 2016-08-11 13:40:36.193944600 -0400 +++ new/test/runtime/libadimalloc.solaris.sparc/Testlibadimalloc.java 2016-08-11 13:40:35.786086200 -0400 @@ -28,8 +28,7 @@ * @summary make sure the Solaris Sparc M7 libadimalloc.so library generates SIGSEGV's on buffer overflow * @requires (os.family == "solaris" & os.arch == "sparcv9") * @modules java.base/jdk.internal.misc - * @library /testlibrary - * @build jdk.test.lib.* + * @library /test/lib * @compile SEGVOverflow.java * @run driver Testlibadimalloc */ @@ -37,7 +36,7 @@ import java.io.*; import java.nio.file.*; import java.util.*; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.ProcessTools; public class Testlibadimalloc { --- old/test/runtime/logging/BiasedLockingTest.java 2016-08-11 13:40:38.648192100 -0400 +++ new/test/runtime/logging/BiasedLockingTest.java 2016-08-11 13:40:38.240622000 -0400 @@ -25,15 +25,14 @@ * @test * @bug 8149383 * @summary -Xlog:biasedlocking should have logging from statements in the source code - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @build jdk.test.lib.OutputAnalyzer jdk.test.lib.ProcessTools * @run driver BiasedLockingTest */ -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; public class BiasedLockingTest { static void analyzeOutputOn(ProcessBuilder pb) throws Exception { --- old/test/runtime/logging/ClassInitializationTest.java 2016-08-11 13:40:41.119056500 -0400 +++ new/test/runtime/logging/ClassInitializationTest.java 2016-08-11 13:40:40.709441100 -0400 @@ -26,15 +26,14 @@ * @test ClassInitializationTest * @bug 8142976 * @modules java.base/jdk.internal.misc - * @library /testlibrary + * @library /test/lib * @compile BadMap50.jasm - * @build jdk.test.lib.OutputAnalyzer jdk.test.lib.Platform jdk.test.lib.ProcessTools * @run driver ClassInitializationTest */ -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.Platform; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.ProcessTools; public class ClassInitializationTest { --- old/test/runtime/logging/ClassLoadUnloadTest.java 2016-08-11 13:40:43.588160000 -0400 +++ new/test/runtime/logging/ClassLoadUnloadTest.java 2016-08-11 13:40:43.172581700 -0400 @@ -26,13 +26,14 @@ * @test ClassLoadUnloadTest * @bug 8142506 * @modules java.base/jdk.internal.misc - * @library /testlibrary /runtime/testlibrary + * @library /test/lib /runtime/testlibrary * @library classes - * @build ClassUnloadCommon test.Empty jdk.test.lib.* jdk.test.lib.OutputAnalyzer jdk.test.lib.ProcessTools + * @build test.Empty * @run driver ClassLoadUnloadTest */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; import java.lang.ref.WeakReference; import java.lang.reflect.Method; import java.util.ArrayList; --- old/test/runtime/logging/ClassResolutionTest.java 2016-08-11 13:40:46.037731500 -0400 +++ new/test/runtime/logging/ClassResolutionTest.java 2016-08-11 13:40:45.631598800 -0400 @@ -26,13 +26,12 @@ * @test ClassResolutionTest * @bug 8144874 * @modules java.base/jdk.internal.misc - * @library /testlibrary - * @build jdk.test.lib.OutputAnalyzer jdk.test.lib.ProcessTools + * @library /test/lib * @run driver ClassResolutionTest */ -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; import java.lang.ref.WeakReference; import java.lang.reflect.Method; --- old/test/runtime/logging/CompressedOopsTest.java 2016-08-11 13:40:48.489641600 -0400 +++ new/test/runtime/logging/CompressedOopsTest.java 2016-08-11 13:40:48.084580400 -0400 @@ -26,16 +26,15 @@ * @bug 8149991 * @requires (sun.arch.data.model == "64") * @summary -Xlog:gc+heap+coops=info should have output from the code - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @build jdk.test.lib.OutputAnalyzer jdk.test.lib.Platform jdk.test.lib.ProcessTools * @run driver CompressedOopsTest */ -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.Platform; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.ProcessTools; public class CompressedOopsTest { static void analyzeOutputOn(ProcessBuilder pb) throws Exception { --- old/test/runtime/logging/DefaultMethodsTest.java 2016-08-11 13:40:50.922247300 -0400 +++ new/test/runtime/logging/DefaultMethodsTest.java 2016-08-11 13:40:50.516929900 -0400 @@ -25,15 +25,14 @@ * @test * @bug 8139564 * @summary defaultmethods=debug should have logging from each of the statements in the code - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @build jdk.test.lib.OutputAnalyzer jdk.test.lib.ProcessTools * @run driver DefaultMethodsTest */ -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; public class DefaultMethodsTest { public static void main(String[] args) throws Exception { --- old/test/runtime/logging/ExceptionsTest.java 2016-08-11 13:40:53.361147400 -0400 +++ new/test/runtime/logging/ExceptionsTest.java 2016-08-11 13:40:52.956158400 -0400 @@ -25,17 +25,16 @@ * @test * @bug 8141211 8147477 * @summary exceptions=info output should have an exception message for interpreter methods - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @build jdk.test.lib.OutputAnalyzer jdk.test.lib.ProcessTools * @run driver ExceptionsTest */ import java.io.File; import java.util.Map; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; public class ExceptionsTest { static void updateEnvironment(ProcessBuilder pb, String environmentVariable, String value) { --- old/test/runtime/logging/ItablesTest.java 2016-08-11 13:40:55.813921900 -0400 +++ new/test/runtime/logging/ItablesTest.java 2016-08-11 13:40:55.396752600 -0400 @@ -26,7 +26,7 @@ * @bug 8141564 * @summary itables=trace should have logging from each of the statements * in the code - * @library /testlibrary + * @library /test/lib * @compile ClassB.java * ItablesVtableTest.java * @modules java.base/jdk.internal.misc @@ -34,7 +34,9 @@ * @run driver ItablesTest */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.Platform; public class ItablesTest { public static void main(String[] args) throws Exception { --- old/test/runtime/logging/LoaderConstraintsTest.java 2016-08-11 13:40:58.265676000 -0400 +++ new/test/runtime/logging/LoaderConstraintsTest.java 2016-08-11 13:40:57.842137000 -0400 @@ -26,13 +26,12 @@ * @test LoaderConstraintsTest * @bug 8149996 * @modules java.base/jdk.internal.misc - * @library /testlibrary /runtime/testlibrary - * @library classes - * @build ClassUnloadCommon test.Empty jdk.test.lib.* jdk.test.lib.OutputAnalyzer jdk.test.lib.ProcessTools + * @library /test/lib /runtime/testlibrary classes * @run driver LoaderConstraintsTest */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; import java.lang.ref.WeakReference; import java.lang.reflect.Method; import java.util.ArrayList; --- old/test/runtime/logging/ModulesTest.java 2016-08-11 13:41:00.704303600 -0400 +++ new/test/runtime/logging/ModulesTest.java 2016-08-11 13:41:00.292602000 -0400 @@ -24,15 +24,14 @@ /* * @test * @summary modules=debug should have logging from statements in the code - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @build jdk.test.lib.OutputAnalyzer jdk.test.lib.ProcessTools * @run main ModulesTest */ -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; public class ModulesTest { public static void main(String[] args) throws Exception { --- old/test/runtime/logging/MonitorInflationTest.java 2016-08-11 13:41:03.144470500 -0400 +++ new/test/runtime/logging/MonitorInflationTest.java 2016-08-11 13:41:02.730106900 -0400 @@ -25,15 +25,14 @@ * @test * @bug 8133885 * @summary monitorinflation=debug should have logging from each of the statements in the code - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @build jdk.test.lib.OutputAnalyzer jdk.test.lib.ProcessTools * @run driver MonitorInflationTest */ -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; public class MonitorInflationTest { static void analyzeOutputOn(ProcessBuilder pb) throws Exception { --- old/test/runtime/logging/MonitorMismatchTest.java 2016-08-11 13:41:05.585431700 -0400 +++ new/test/runtime/logging/MonitorMismatchTest.java 2016-08-11 13:41:05.175116200 -0400 @@ -26,14 +26,13 @@ * @test MonitorMismatchTest * @bug 8150084 * @modules java.base/jdk.internal.misc - * @library /testlibrary + * @library /test/lib * @compile MonitorMismatchHelper.jasm - * @build jdk.test.lib.OutputAnalyzer jdk.test.lib.ProcessTools jdk.test.lib.Platform * @run driver MonitorMismatchTest */ -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; import jdk.test.lib.Platform; public class MonitorMismatchTest { --- old/test/runtime/logging/OsCpuLoggingTest.java 2016-08-11 13:41:08.040613700 -0400 +++ new/test/runtime/logging/OsCpuLoggingTest.java 2016-08-11 13:41:07.624304500 -0400 @@ -25,16 +25,17 @@ * @test * @bug 8151939 * @summary os+cpu output should contain some os,cpu information - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @build jdk.test.lib.OutputAnalyzer jdk.test.lib.ProcessTools * @run driver OsCpuLoggingTest */ import java.io.File; import java.util.Map; -import jdk.test.lib.*; +import jdk.test.lib.Platform; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; public class OsCpuLoggingTest { --- old/test/runtime/logging/ProtectionDomainVerificationTest.java 2016-08-11 13:41:10.499968300 -0400 +++ new/test/runtime/logging/ProtectionDomainVerificationTest.java 2016-08-11 13:41:10.079600700 -0400 @@ -25,14 +25,13 @@ * @test ProtectionDomainVerificationTest * @bug 8149064 * @modules java.base/jdk.internal.misc - * @library /testlibrary - * @build jdk.test.lib.OutputAnalyzer jdk.test.lib.Platform jdk.test.lib.ProcessTools + * @library /test/lib * @run driver ProtectionDomainVerificationTest */ -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.Platform; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.ProcessTools; public class ProtectionDomainVerificationTest { --- old/test/runtime/logging/RemovedDevelopFlagsTest.java 2016-08-11 13:41:12.975773400 -0400 +++ new/test/runtime/logging/RemovedDevelopFlagsTest.java 2016-08-11 13:41:12.560271700 -0400 @@ -26,11 +26,12 @@ * @test RemovedDevelopFlagsTest * @bug 8146632 * @modules java.base/jdk.internal.misc - * @library /testlibrary - * @build jdk.test.lib.OutputAnalyzer jdk.test.lib.ProcessTools + * @library /test/lib * @run driver RemovedDevelopFlagsTest */ -import jdk.test.lib.*; +import jdk.test.lib.Platform; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; public class RemovedDevelopFlagsTest { public static ProcessBuilder pb; --- old/test/runtime/logging/SafepointCleanupTest.java 2016-08-11 13:41:15.511478000 -0400 +++ new/test/runtime/logging/SafepointCleanupTest.java 2016-08-11 13:41:15.103574300 -0400 @@ -25,15 +25,14 @@ * @test * @bug 8149991 * @summary safepoint+cleanup=info should have output from the code - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @build jdk.test.lib.OutputAnalyzer jdk.test.lib.ProcessTools * @run driver SafepointCleanupTest */ -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; public class SafepointCleanupTest { static void analyzeOutputOn(ProcessBuilder pb) throws Exception { --- old/test/runtime/logging/SafepointTest.java 2016-08-11 13:41:17.977016700 -0400 +++ new/test/runtime/logging/SafepointTest.java 2016-08-11 13:41:17.563618800 -0400 @@ -25,16 +25,15 @@ * @test * @bug 8140348 * @summary safepoint=trace should have output from each log statement in the code - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @build jdk.test.lib.OutputAnalyzer jdk.test.lib.ProcessTools * @run driver SafepointTest */ import java.lang.ref.WeakReference; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; public class SafepointTest { public static void main(String[] args) throws Exception { --- old/test/runtime/logging/StartupTimeTest.java 2016-08-11 13:41:20.432914700 -0400 +++ new/test/runtime/logging/StartupTimeTest.java 2016-08-11 13:41:20.021409300 -0400 @@ -25,15 +25,14 @@ * @test * @bug 8148630 * @summary -Xlog:startuptime should produce logging from the source code - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @build jdk.test.lib.OutputAnalyzer jdk.test.lib.ProcessTools * @run driver StartupTimeTest */ -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; public class StartupTimeTest { static void analyzeOutputOn(ProcessBuilder pb) throws Exception { --- old/test/runtime/logging/ThreadLoggingTest.java 2016-08-11 13:41:22.864058100 -0400 +++ new/test/runtime/logging/ThreadLoggingTest.java 2016-08-11 13:41:22.454530400 -0400 @@ -26,18 +26,17 @@ * @test * @bug 8149036 8150619 * @summary os+thread output should contain logging calls for thread start stop attaches detaches - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @build jdk.test.lib.OutputAnalyzer jdk.test.lib.ProcessTools * @run driver ThreadLoggingTest * @author Thomas Stuefe (SAP) */ import java.io.File; import java.util.Map; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; public class ThreadLoggingTest { --- old/test/runtime/logging/VMOperationTest.java 2016-08-11 13:41:25.307993900 -0400 +++ new/test/runtime/logging/VMOperationTest.java 2016-08-11 13:41:24.888626600 -0400 @@ -25,16 +25,15 @@ * @test * @bug 8143157 * @summary vmoperation=debug should have logging output - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @build jdk.test.lib.OutputAnalyzer jdk.test.lib.ProcessTools * @run driver VMOperationTest */ import java.lang.ref.WeakReference; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; public class VMOperationTest { public static void main(String[] args) throws Exception { --- old/test/runtime/logging/VerificationTest.java 2016-08-11 13:41:27.734836800 -0400 +++ new/test/runtime/logging/VerificationTest.java 2016-08-11 13:41:27.330151500 -0400 @@ -25,15 +25,14 @@ * @test * @bug 8150083 * @summary verification=info output should have output from the code - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @build jdk.test.lib.OutputAnalyzer jdk.test.lib.ProcessTools * @run driver VerificationTest */ -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; public class VerificationTest { static void analyzeOutputOn(ProcessBuilder pb) throws Exception { --- old/test/runtime/logging/VtablesTest.java 2016-08-11 13:41:30.249810200 -0400 +++ new/test/runtime/logging/VtablesTest.java 2016-08-11 13:41:29.825919600 -0400 @@ -25,7 +25,7 @@ * @test * @bug 8141564 * @summary vtables=trace should have logging from each of the statements in the code - * @library /testlibrary + * @library /test/lib * @compile ClassB.java * p1/A.java * p2/B.jcod @@ -36,7 +36,9 @@ * @run driver VtablesTest */ -import jdk.test.lib.*; +import jdk.test.lib.Platform; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; public class VtablesTest { public static void main(String[] args) throws Exception { --- old/test/runtime/memory/LargePages/TestLargePageSizeInBytes.java 2016-08-11 13:41:32.735388900 -0400 +++ new/test/runtime/memory/LargePages/TestLargePageSizeInBytes.java 2016-08-11 13:41:32.322724500 -0400 @@ -24,15 +24,15 @@ /* @test TestLargePageSizeInBytes * @summary Tests that the flag -XX:LargePageSizeInBytes does not cause warnings on Solaris * @bug 8049536 - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run driver TestLargePageSizeInBytes */ -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.Platform; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.ProcessTools; public class TestLargePageSizeInBytes { private static long M = 1024L * 1024L; --- old/test/runtime/memory/LargePages/TestLargePagesFlags.java 2016-08-11 13:41:35.301595100 -0400 +++ new/test/runtime/memory/LargePages/TestLargePagesFlags.java 2016-08-11 13:41:34.889157400 -0400 @@ -23,15 +23,15 @@ /* @test TestLargePagesFlags * @summary Tests how large pages are choosen depending on the given large pages flag combinations. - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run main TestLargePagesFlags */ -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.Platform; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.ProcessTools; import java.util.ArrayList; public class TestLargePagesFlags { --- old/test/runtime/memory/ReadFromNoaccessArea.java 2016-08-11 13:41:37.745977800 -0400 +++ new/test/runtime/memory/ReadFromNoaccessArea.java 2016-08-11 13:41:37.333727400 -0400 @@ -24,16 +24,18 @@ /* * @test * @summary Test that touching noaccess area in class ReservedHeapSpace results in SIGSEGV/ACCESS_VIOLATION - * @library /testlibrary /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @build ReadFromNoaccessArea + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main ReadFromNoaccessArea */ -import jdk.test.lib.*; +import jdk.test.lib.Platform; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; import sun.hotspot.WhiteBox; public class ReadFromNoaccessArea { --- old/test/runtime/memory/ReadVMPageSize.java 2016-08-11 13:41:40.194423600 -0400 +++ new/test/runtime/memory/ReadVMPageSize.java 2016-08-11 13:41:39.775718500 -0400 @@ -25,13 +25,12 @@ * @test * @summary Using WhiteBox to get VM page size * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib - * @build ReadVMPageSize + * @library /test/lib + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI ReadVMPageSize */ -import jdk.test.lib.*; import sun.hotspot.WhiteBox; public class ReadVMPageSize { --- old/test/runtime/memory/ReserveMemory.java 2016-08-11 13:41:42.631872100 -0400 +++ new/test/runtime/memory/ReserveMemory.java 2016-08-11 13:41:42.220205600 -0400 @@ -28,16 +28,17 @@ * @bug 8012015 * @requires !(os.family == "aix") * @summary Make sure reserved (but uncommitted) memory is not accessible - * @library /testlibrary /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @build ReserveMemory + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main ReserveMemory */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.Platform; import sun.hotspot.WhiteBox; --- old/test/runtime/memory/RunUnitTestsConcurrently.java 2016-08-11 13:41:45.098576300 -0400 +++ new/test/runtime/memory/RunUnitTestsConcurrently.java 2016-08-11 13:41:44.685805400 -0400 @@ -24,16 +24,16 @@ /* * @test * @summary Test launches unit tests inside vm concurrently - * @library /testlibrary /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @build RunUnitTestsConcurrently + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI RunUnitTestsConcurrently 30 15000 */ -import jdk.test.lib.*; +import jdk.test.lib.Platform; import sun.hotspot.WhiteBox; public class RunUnitTestsConcurrently { --- old/test/runtime/memory/StressVirtualSpaceResize.java 2016-08-11 13:41:47.559716900 -0400 +++ new/test/runtime/memory/StressVirtualSpaceResize.java 2016-08-11 13:41:47.150633200 -0400 @@ -25,8 +25,8 @@ * @test * @summary Stress test that expands/shrinks VirtualSpace * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib - * @build StressVirtualSpaceResize + * @library /test/lib + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI StressVirtualSpaceResize --- old/test/runtime/modules/AccModuleTest.java 2016-08-11 13:41:50.001421900 -0400 +++ new/test/runtime/modules/AccModuleTest.java 2016-08-11 13:41:49.586628000 -0400 @@ -23,15 +23,12 @@ /* * @test - * @library /testlibrary * @modules java.base/jdk.internal.misc * @compile acc_module.jcod - * @build AccModuleTest * @run main AccModuleTest */ import java.io.File; -import jdk.test.lib.*; public class AccModuleTest { --- old/test/runtime/modules/AccessCheck/CheckRead.java 2016-08-11 13:41:52.464062500 -0400 +++ new/test/runtime/modules/AccessCheck/CheckRead.java 2016-08-11 13:41:52.051429300 -0400 @@ -28,11 +28,10 @@ * @summary Test that if module m1 can not read module m2, then class p1.c1 * in module m1 can not access p2.c2 in module m2. * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib + * @library /test/lib * @compile myloaders/MySameClassLoader.java * @compile p2/c2.java * @compile p1/c1.java - * @build CheckRead * @run main/othervm -Xbootclasspath/a:. CheckRead */ --- old/test/runtime/modules/AccessCheck/DiffCL_CheckRead.java 2016-08-11 13:41:54.921988100 -0400 +++ new/test/runtime/modules/AccessCheck/DiffCL_CheckRead.java 2016-08-11 13:41:54.504415500 -0400 @@ -28,11 +28,10 @@ * @summary Test that if module m1 can not read module m2, then class p1.c1 * in module m1 can not access p2.c2 in module m2. * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib + * @library /test/lib * @compile myloaders/MyDiffClassLoader.java * @compile p2/c2.java * @compile p1/c1.java - * @build DiffCL_CheckRead * @run main/othervm -Xbootclasspath/a:. DiffCL_CheckRead */ --- old/test/runtime/modules/AccessCheck/DiffCL_ExpQualOther.java 2016-08-11 13:41:57.385938800 -0400 +++ new/test/runtime/modules/AccessCheck/DiffCL_ExpQualOther.java 2016-08-11 13:41:56.976129200 -0400 @@ -29,11 +29,10 @@ * is exported specifically to module m3, then class p1.c1 in m1 can not * access p2.c2 in m2. * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib + * @library /test/lib * @compile myloaders/MyDiffClassLoader.java * @compile p2/c2.java * @compile p1/c1.java - * @build DiffCL_ExpQualOther * @run main/othervm -Xbootclasspath/a:. DiffCL_ExpQualOther */ --- old/test/runtime/modules/AccessCheck/DiffCL_ExpQualToM1.java 2016-08-11 13:41:59.838302700 -0400 +++ new/test/runtime/modules/AccessCheck/DiffCL_ExpQualToM1.java 2016-08-11 13:41:59.430061500 -0400 @@ -28,11 +28,10 @@ * @summary class p1.c1 defined in m1 tries to access p2.c2 defined in m2. * Access allowed since m1 can read m2 and package p2 is exported to m1. * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib + * @library /test/lib * @compile myloaders/MyDiffClassLoader.java * @compile p2/c2.java * @compile p1/c1.java - * @build DiffCL_ExpQualToM1 * @run main/othervm -Xbootclasspath/a:. DiffCL_ExpQualToM1 */ --- old/test/runtime/modules/AccessCheck/DiffCL_ExpUnqual.java 2016-08-11 13:42:02.293559600 -0400 +++ new/test/runtime/modules/AccessCheck/DiffCL_ExpUnqual.java 2016-08-11 13:42:01.888610400 -0400 @@ -28,11 +28,10 @@ * @summary Test that if module m1 can read module m2, and package p2 in m2 is * exported unqualifiedly, then class p1.c1 in m1 can read p2.c2 in m2. * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib + * @library /test/lib * @compile myloaders/MyDiffClassLoader.java * @compile p2/c2.java * @compile p1/c1.java - * @build DiffCL_ExpUnqual * @run main/othervm -Xbootclasspath/a:. DiffCL_ExpUnqual */ --- old/test/runtime/modules/AccessCheck/DiffCL_PkgNotExp.java 2016-08-11 13:42:04.760369400 -0400 +++ new/test/runtime/modules/AccessCheck/DiffCL_PkgNotExp.java 2016-08-11 13:42:04.346990700 -0400 @@ -28,11 +28,10 @@ * @summary Test that if module m1 can read module m2, but package p2 in m2 is not * exported, then class p1.c1 in m1 can not read p2.c2 in m2. * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib + * @library /test/lib * @compile myloaders/MyDiffClassLoader.java * @compile p2/c2.java * @compile p1/c1.java - * @build DiffCL_PkgNotExp * @run main/othervm -Xbootclasspath/a:. DiffCL_PkgNotExp */ --- old/test/runtime/modules/AccessCheck/DiffCL_Umod.java 2016-08-11 13:42:07.215105700 -0400 +++ new/test/runtime/modules/AccessCheck/DiffCL_Umod.java 2016-08-11 13:42:06.810905800 -0400 @@ -26,7 +26,7 @@ /* * @test * @summary class p1.c1 defined in m1 tries to access p2.c2 defined in unnamed module. - * @library /testlibrary /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc * @modules java.base/jdk.internal.module * @compile myloaders/MyDiffClassLoader.java @@ -34,7 +34,6 @@ * @compile p1/c1.java * @compile p1/c1ReadEdgeDiffLoader.java * @compile p1/c1Loose.java - * @build DiffCL_Umod * @run main/othervm -Xbootclasspath/a:. DiffCL_Umod */ --- old/test/runtime/modules/AccessCheck/DiffCL_UmodUpkg.java 2016-08-11 13:42:09.669453700 -0400 +++ new/test/runtime/modules/AccessCheck/DiffCL_UmodUpkg.java 2016-08-11 13:42:09.261361000 -0400 @@ -28,12 +28,11 @@ * @summary class p3.c3 defined in module m1 tries to access c4 defined in an unnamed package * and an unnamed module. * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib + * @library /test/lib * @compile myloaders/MyDiffClassLoader.java * @compile c4.java * @compile p3/c3.jcod * @compile p3/c3ReadEdgeDiffLoader.jcod - * @build DiffCL_UmodUpkg * @run main/othervm -Xbootclasspath/a:. DiffCL_UmodUpkg */ --- old/test/runtime/modules/AccessCheck/ExpQualOther.java 2016-08-11 13:42:12.126208800 -0400 +++ new/test/runtime/modules/AccessCheck/ExpQualOther.java 2016-08-11 13:42:11.710615100 -0400 @@ -29,11 +29,10 @@ * is exported specifically to module m3, then class p1.c1 in m1 can not * access p2.c2 in m2. * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib + * @library /test/lib * @compile myloaders/MySameClassLoader.java * @compile p2/c2.java * @compile p1/c1.java - * @build ExpQualOther * @run main/othervm -Xbootclasspath/a:. ExpQualOther */ --- old/test/runtime/modules/AccessCheck/ExpQualToM1.java 2016-08-11 13:42:14.564987000 -0400 +++ new/test/runtime/modules/AccessCheck/ExpQualToM1.java 2016-08-11 13:42:14.157094800 -0400 @@ -28,11 +28,10 @@ * @summary Test that if module m1 can read module m2, AND package p2 in m2 is * exported qualifiedly to m1, then class p1.c1 in m1 can read p2.c2 in m2. * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib + * @library /test/lib * @compile myloaders/MySameClassLoader.java * @compile p2/c2.java * @compile p1/c1.java - * @build ExpQualToM1 * @run main/othervm -Xbootclasspath/a:. ExpQualToM1 */ --- old/test/runtime/modules/AccessCheck/ExpUnqual.java 2016-08-11 13:42:17.028095500 -0400 +++ new/test/runtime/modules/AccessCheck/ExpUnqual.java 2016-08-11 13:42:16.622939700 -0400 @@ -28,11 +28,10 @@ * @summary Test that if module m1 can read module m2, AND package p2 in module2 is * exported unqualifiedly, then class p1.c1 in m1 can read p2.c2 in m2. * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib + * @library /test/lib * @compile myloaders/MySameClassLoader.java * @compile p2/c2.java * @compile p1/c1.java - * @build ExpUnqual * @run main/othervm -Xbootclasspath/a:. ExpUnqual */ --- old/test/runtime/modules/AccessCheck/ExportAllUnnamed.java 2016-08-11 13:42:19.491523500 -0400 +++ new/test/runtime/modules/AccessCheck/ExportAllUnnamed.java 2016-08-11 13:42:19.085086800 -0400 @@ -27,13 +27,12 @@ * @test * @summary Test if package p2 in module m2 is exported to all unnamed, * then class p1.c1 in an unnamed module can read p2.c2 in module m2. - * @library /testlibrary /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc * @modules java.base/jdk.internal.module * @compile myloaders/MySameClassLoader.java * @compile p2/c2.java * @compile p1/c1.java - * @build ExportAllUnnamed * @run main/othervm -Xbootclasspath/a:. ExportAllUnnamed */ --- old/test/runtime/modules/AccessCheck/PkgNotExp.java 2016-08-11 13:42:21.928569900 -0400 +++ new/test/runtime/modules/AccessCheck/PkgNotExp.java 2016-08-11 13:42:21.527351100 -0400 @@ -28,11 +28,10 @@ * @summary Test that if module m1 can read module m2, but package p2 in m2 is not * exported, then class p1.c1 in m1 can not read p2.c2 in m2. * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib + * @library /test/lib * @compile myloaders/MySameClassLoader.java * @compile p2/c2.java * @compile p1/c1.java - * @build PkgNotExp * @run main/othervm -Xbootclasspath/a:. PkgNotExp */ --- old/test/runtime/modules/AccessCheck/Umod.java 2016-08-11 13:42:24.381512600 -0400 +++ new/test/runtime/modules/AccessCheck/Umod.java 2016-08-11 13:42:23.969538900 -0400 @@ -26,7 +26,7 @@ /* * @test * @summary class p1.c1 defined in m1 tries to access p2.c2 defined in unnamed module. - * @library /testlibrary /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc * @modules java.base/jdk.internal.module * @compile myloaders/MySameClassLoader.java @@ -34,7 +34,6 @@ * @compile p1/c1.java * @compile p1/c1ReadEdge.java * @compile p1/c1Loose.java - * @build Umod * @run main/othervm -Xbootclasspath/a:. Umod */ --- old/test/runtime/modules/AccessCheck/UmodDiffCL_ExpQualOther.java 2016-08-11 13:42:26.819176200 -0400 +++ new/test/runtime/modules/AccessCheck/UmodDiffCL_ExpQualOther.java 2016-08-11 13:42:26.415722200 -0400 @@ -29,11 +29,10 @@ * Access is denied, since an unnamed module can read all modules but p2 in module * m2 is exported specifically to module m1, not to all modules. * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib + * @library /test/lib * @compile myloaders/MyDiffClassLoader.java * @compile p2/c2.java * @compile p1/c1.java - * @build UmodDiffCL_ExpQualOther * @run main/othervm -Xbootclasspath/a:. UmodDiffCL_ExpQualOther */ --- old/test/runtime/modules/AccessCheck/UmodDiffCL_ExpUnqual.java 2016-08-11 13:42:29.279600500 -0400 +++ new/test/runtime/modules/AccessCheck/UmodDiffCL_ExpUnqual.java 2016-08-11 13:42:28.862996100 -0400 @@ -29,11 +29,10 @@ * Access allowed, an unnamed module can read all modules and p2 in module m2 * which is exported unqualifiedly. * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib + * @library /test/lib * @compile myloaders/MyDiffClassLoader.java * @compile p2/c2.java * @compile p1/c1.java - * @build UmodDiffCL_ExpUnqual * @run main/othervm -Xbootclasspath/a:. UmodDiffCL_ExpUnqual */ --- old/test/runtime/modules/AccessCheck/UmodDiffCL_PkgNotExp.java 2016-08-11 13:42:31.748780900 -0400 +++ new/test/runtime/modules/AccessCheck/UmodDiffCL_PkgNotExp.java 2016-08-11 13:42:31.323032100 -0400 @@ -29,10 +29,9 @@ * Access is denied since even though unnamed module can read all modules, p2 * in module m2 is not exported at all. * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib + * @library /test/lib * @compile myloaders/MyDiffClassLoader.java * @compile p1/c1.java - * @build UmodDiffCL_PkgNotExp * @run main/othervm -Xbootclasspath/a:. UmodDiffCL_PkgNotExp */ --- old/test/runtime/modules/AccessCheck/UmodDiffCL_Umod.java 2016-08-11 13:42:34.202293200 -0400 +++ new/test/runtime/modules/AccessCheck/UmodDiffCL_Umod.java 2016-08-11 13:42:33.791842600 -0400 @@ -32,7 +32,6 @@ * @compile myloaders/MyDiffClassLoader.java * @compile p2/c2.java * @compile p1/c1.java - * @build UmodDiffCL_Umod * @run main/othervm -Xbootclasspath/a:. UmodDiffCL_Umod */ --- old/test/runtime/modules/AccessCheck/UmodDiffCL_UmodUpkg.java 2016-08-11 13:42:36.647642100 -0400 +++ new/test/runtime/modules/AccessCheck/UmodDiffCL_UmodUpkg.java 2016-08-11 13:42:36.236057700 -0400 @@ -31,7 +31,6 @@ * @compile myloaders/MyDiffClassLoader.java * @compile c4.java * @compile p3/c3.jcod - * @build UmodDiffCL_UmodUpkg * @run main/othervm -Xbootclasspath/a:. UmodDiffCL_UmodUpkg */ --- old/test/runtime/modules/AccessCheck/UmodUPkg.java 2016-08-11 13:42:39.093442200 -0400 +++ new/test/runtime/modules/AccessCheck/UmodUPkg.java 2016-08-11 13:42:38.688054200 -0400 @@ -27,12 +27,11 @@ * @test * @summary class p3.c3 defined in module m1 tries to access c4 defined in unnamed module. * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib + * @library /test/lib * @compile myloaders/MySameClassLoader.java * @compile c4.java * @compile p3/c3.jcod * @compile p3/c3ReadEdge.jcod - * @build UmodUPkg * @run main/othervm -Xbootclasspath/a:. UmodUPkg */ --- old/test/runtime/modules/AccessCheck/UmodUpkgDiffCL_ExpQualOther.java 2016-08-11 13:42:41.544795900 -0400 +++ new/test/runtime/modules/AccessCheck/UmodUpkgDiffCL_ExpQualOther.java 2016-08-11 13:42:41.138217200 -0400 @@ -29,11 +29,10 @@ * Access is denied, since an unnamed module can read all modules but p6 in module * m2 is exported specifically to module m1, not to all modules. * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib + * @library /test/lib * @compile myloaders/MyDiffClassLoader.java * @compile p6/c6.java * @compile c5.java - * @build UmodUpkgDiffCL_ExpQualOther * @run main/othervm -Xbootclasspath/a:. UmodUpkgDiffCL_ExpQualOther */ --- old/test/runtime/modules/AccessCheck/UmodUpkgDiffCL_NotExp.java 2016-08-11 13:42:43.995144100 -0400 +++ new/test/runtime/modules/AccessCheck/UmodUpkgDiffCL_NotExp.java 2016-08-11 13:42:43.590206900 -0400 @@ -28,11 +28,10 @@ * @summary class c5 in an unnamed module can read module m2, but package p6 in module m2 is not exported. * Access denied since even though unnamed module can read all modules, p6 in module m2 is not exported at all. * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib + * @library /test/lib * @compile myloaders/MyDiffClassLoader.java * @compile p6/c6.java * @compile c5.java - * @build UmodUpkgDiffCL_NotExp * @run main/othervm -Xbootclasspath/a:. UmodUpkgDiffCL_NotExp */ --- old/test/runtime/modules/AccessCheck/UmodUpkgDiffCL_Umod.java 2016-08-11 13:42:46.457298500 -0400 +++ new/test/runtime/modules/AccessCheck/UmodUpkgDiffCL_Umod.java 2016-08-11 13:42:46.046354700 -0400 @@ -30,7 +30,6 @@ * @compile myloaders/MyDiffClassLoader.java * @compile p6/c6.java * @compile c5.java - * @build UmodUpkgDiffCL_Umod * @run main/othervm -Xbootclasspath/a:. UmodUpkgDiffCL_Umod */ --- old/test/runtime/modules/AccessCheck/UmodUpkg_ExpQualOther.java 2016-08-11 13:42:48.922013400 -0400 +++ new/test/runtime/modules/AccessCheck/UmodUpkg_ExpQualOther.java 2016-08-11 13:42:48.500778800 -0400 @@ -28,11 +28,10 @@ * @summary Test that if class c5 in an unnamed module can read package p6 in module m2, but package p6 in module m2 is * exported qualifiedly to module m3, then class c5 in an unnamed module can not read p6.c6 in module m2. * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib + * @library /test/lib * @compile myloaders/MySameClassLoader.java * @compile p6/c6.java * @compile c5.java - * @build UmodUpkg_ExpQualOther * @run main/othervm -Xbootclasspath/a:. UmodUpkg_ExpQualOther */ --- old/test/runtime/modules/AccessCheck/UmodUpkg_NotExp.java 2016-08-11 13:42:51.384601400 -0400 +++ new/test/runtime/modules/AccessCheck/UmodUpkg_NotExp.java 2016-08-11 13:42:50.947005800 -0400 @@ -28,11 +28,10 @@ * @summary Test if package p6 in module m2 is not exported, then class c5 * in an unnamed module can not access p6.c2 in module m2. * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib + * @library /test/lib * @compile myloaders/MySameClassLoader.java * @compile p6/c6.java * @compile c5.java - * @build UmodUpkg_NotExp * @run main/othervm -Xbootclasspath/a:. UmodUpkg_NotExp */ --- old/test/runtime/modules/AccessCheck/UmodUpkg_Umod.java 2016-08-11 13:42:53.811064900 -0400 +++ new/test/runtime/modules/AccessCheck/UmodUpkg_Umod.java 2016-08-11 13:42:53.409984200 -0400 @@ -30,7 +30,6 @@ * @compile myloaders/MySameClassLoader.java * @compile p6/c6.java * @compile c5.java - * @build UmodUpkg_Umod * @run main/othervm -Xbootclasspath/a:. UmodUpkg_Umod */ --- old/test/runtime/modules/AccessCheck/Umod_ExpQualOther.java 2016-08-11 13:42:56.268662100 -0400 +++ new/test/runtime/modules/AccessCheck/Umod_ExpQualOther.java 2016-08-11 13:42:55.856363000 -0400 @@ -28,11 +28,10 @@ * @summary Test that if package p2 in module m2 is exported to module m3, * then class p1.c1 in an unnamed module can not read p2.c2 in module m2. * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib + * @library /test/lib * @compile myloaders/MySameClassLoader.java * @compile p2/c2.java * @compile p1/c1.java - * @build Umod_ExpQualOther * @run main/othervm -Xbootclasspath/a:. Umod_ExpQualOther */ --- old/test/runtime/modules/AccessCheck/Umod_ExpUnqual.java 2016-08-11 13:42:58.711928600 -0400 +++ new/test/runtime/modules/AccessCheck/Umod_ExpUnqual.java 2016-08-11 13:42:58.308826600 -0400 @@ -28,11 +28,10 @@ * @summary Test if package p2 in module m2 is exported unqualifiedly, * then class p1.c1 in an unnamed module can read p2.c2 in module m2. * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib + * @library /test/lib * @compile myloaders/MySameClassLoader.java * @compile p2/c2.java * @compile p1/c1.java - * @build Umod_ExpUnqual * @run main/othervm -Xbootclasspath/a:. Umod_ExpUnqual */ --- old/test/runtime/modules/AccessCheck/Umod_PkgNotExp.java 2016-08-11 13:43:01.156470400 -0400 +++ new/test/runtime/modules/AccessCheck/Umod_PkgNotExp.java 2016-08-11 13:43:00.738134300 -0400 @@ -28,11 +28,10 @@ * @summary Test if package p2 in module m2 is not exported, then class p1.c1 * in an unnamed module can not access p2.c2 in module m2. * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib + * @library /test/lib * @compile myloaders/MySameClassLoader.java * @compile p2/c2.java * @compile p1/c1.java - * @build Umod_PkgNotExp * @run main/othervm -Xbootclasspath/a:. Umod_PkgNotExp */ --- old/test/runtime/modules/AccessCheck/Umod_UmodUpkg.java 2016-08-11 13:43:03.610924500 -0400 +++ new/test/runtime/modules/AccessCheck/Umod_UmodUpkg.java 2016-08-11 13:43:03.184852300 -0400 @@ -31,7 +31,6 @@ * @compile myloaders/MySameClassLoader.java * @compile c4.java * @compile p3/c3.jcod - * @build Umod_UmodUpkg * @run main/othervm -Xbootclasspath/a:. Umod_UmodUpkg */ --- old/test/runtime/modules/AccessCheckAllUnnamed.java 2016-08-11 13:43:06.052410400 -0400 +++ new/test/runtime/modules/AccessCheckAllUnnamed.java 2016-08-11 13:43:05.635318900 -0400 @@ -27,7 +27,7 @@ /* * @test * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib /compiler/whitebox .. + * @library /test/lib .. * @compile p2/c2.java * @compile p1/c1.java * @build sun.hotspot.WhiteBox --- old/test/runtime/modules/AccessCheckExp.java 2016-08-11 13:43:08.505725100 -0400 +++ new/test/runtime/modules/AccessCheckExp.java 2016-08-11 13:43:08.103282600 -0400 @@ -24,7 +24,7 @@ /* * @test * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib /compiler/whitebox .. + * @library /test/lib .. * @compile p2/c2.java * @compile p1/c1.java * @build sun.hotspot.WhiteBox --- old/test/runtime/modules/AccessCheckJavaBase.java 2016-08-11 13:43:10.958347400 -0400 +++ new/test/runtime/modules/AccessCheckJavaBase.java 2016-08-11 13:43:10.548772200 -0400 @@ -24,7 +24,7 @@ /* * @test * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib /compiler/whitebox .. + * @library /test/lib .. * @compile p2/c2.java * @build sun.hotspot.WhiteBox * @compile/module=java.base java/lang/reflect/ModuleHelper.java --- old/test/runtime/modules/AccessCheckRead.java 2016-08-11 13:43:13.401589900 -0400 +++ new/test/runtime/modules/AccessCheckRead.java 2016-08-11 13:43:12.987801900 -0400 @@ -24,7 +24,7 @@ /* * @test * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib /compiler/whitebox .. + * @library /test/lib .. * @compile p2/c2.java * @compile p1/c1.java * @build sun.hotspot.WhiteBox @@ -34,7 +34,6 @@ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI AccessCheckRead */ -import jdk.test.lib.*; import java.lang.reflect.Module; import static jdk.test.lib.Asserts.*; --- old/test/runtime/modules/AccessCheckSuper.java 2016-08-11 13:43:15.855919900 -0400 +++ new/test/runtime/modules/AccessCheckSuper.java 2016-08-11 13:43:15.435652800 -0400 @@ -24,7 +24,7 @@ /* * @test * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib /compiler/whitebox .. + * @library /test/lib .. * @compile p2/c2.java * @compile p3/c3.java * @build sun.hotspot.WhiteBox --- old/test/runtime/modules/AccessCheckUnnamed.java 2016-08-11 13:43:18.308428000 -0400 +++ new/test/runtime/modules/AccessCheckUnnamed.java 2016-08-11 13:43:17.894162700 -0400 @@ -27,7 +27,7 @@ /* * @test * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib /compiler/whitebox .. + * @library /test/lib .. * @compile p2/c2.java * @compile p1/c1.java * @build sun.hotspot.WhiteBox --- old/test/runtime/modules/AccessCheckWorks.java 2016-08-11 13:43:20.767422500 -0400 +++ new/test/runtime/modules/AccessCheckWorks.java 2016-08-11 13:43:20.356537700 -0400 @@ -24,7 +24,7 @@ /* * @test * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib /compiler/whitebox .. + * @library /test/lib .. * @compile p2/c2.java * @compile p1/c1.java * @build sun.hotspot.WhiteBox --- old/test/runtime/modules/ExportTwice.java 2016-08-11 13:43:23.225074900 -0400 +++ new/test/runtime/modules/ExportTwice.java 2016-08-11 13:43:22.823004000 -0400 @@ -24,7 +24,7 @@ /* * @test * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib /compiler/whitebox .. + * @library /test/lib .. * @compile p2/c2.java * @compile p1/c1.java * @build sun.hotspot.WhiteBox --- old/test/runtime/modules/JVMAddModuleExportToAllUnnamed.java 2016-08-11 13:43:25.658788700 -0400 +++ new/test/runtime/modules/JVMAddModuleExportToAllUnnamed.java 2016-08-11 13:43:25.250131800 -0400 @@ -24,7 +24,7 @@ /* * @test * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib /compiler/whitebox .. + * @library /test/lib .. * @compile p2/c2.java * @compile p1/c1.java * @build sun.hotspot.WhiteBox --- old/test/runtime/modules/JVMAddModuleExports.java 2016-08-11 13:43:28.102317300 -0400 +++ new/test/runtime/modules/JVMAddModuleExports.java 2016-08-11 13:43:27.693726300 -0400 @@ -24,7 +24,7 @@ /* * @test * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib /compiler/whitebox .. + * @library /test/lib .. * @build sun.hotspot.WhiteBox * @compile/module=java.base java/lang/reflect/ModuleHelper.java * @run main ClassFileInstaller sun.hotspot.WhiteBox --- old/test/runtime/modules/JVMAddModuleExportsToAll.java 2016-08-11 13:43:30.537257400 -0400 +++ new/test/runtime/modules/JVMAddModuleExportsToAll.java 2016-08-11 13:43:30.130514400 -0400 @@ -27,7 +27,7 @@ /* * @test * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib /compiler/whitebox .. + * @library /test/lib .. * @compile p2/c2.java * @compile p1/c1.java * @build sun.hotspot.WhiteBox --- old/test/runtime/modules/JVMAddModulePackage.java 2016-08-11 13:43:33.002754100 -0400 +++ new/test/runtime/modules/JVMAddModulePackage.java 2016-08-11 13:43:32.590790300 -0400 @@ -24,7 +24,7 @@ /* * @test * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib /compiler/whitebox .. + * @library /test/lib .. * @build sun.hotspot.WhiteBox * @compile/module=java.base java/lang/reflect/ModuleHelper.java * @run main ClassFileInstaller sun.hotspot.WhiteBox --- old/test/runtime/modules/JVMAddReadsModule.java 2016-08-11 13:43:35.477914200 -0400 +++ new/test/runtime/modules/JVMAddReadsModule.java 2016-08-11 13:43:35.068068300 -0400 @@ -24,7 +24,7 @@ /* * @test * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib /compiler/whitebox .. + * @library /test/lib .. * @build sun.hotspot.WhiteBox * @compile/module=java.base java/lang/reflect/ModuleHelper.java * @run main ClassFileInstaller sun.hotspot.WhiteBox --- old/test/runtime/modules/JVMCanReadModule.java 2016-08-11 13:43:37.931819600 -0400 +++ new/test/runtime/modules/JVMCanReadModule.java 2016-08-11 13:43:37.527534200 -0400 @@ -24,7 +24,7 @@ /* * @test * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib /compiler/whitebox .. + * @library /test/lib .. * @build sun.hotspot.WhiteBox * @compile/module=java.base java/lang/reflect/ModuleHelper.java * @run main ClassFileInstaller sun.hotspot.WhiteBox --- old/test/runtime/modules/JVMDefineModule.java 2016-08-11 13:43:40.377267300 -0400 +++ new/test/runtime/modules/JVMDefineModule.java 2016-08-11 13:43:39.967099300 -0400 @@ -24,7 +24,7 @@ /* * @test * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib /compiler/whitebox .. + * @library /test/lib .. * @build sun.hotspot.WhiteBox * @compile/module=java.base java/lang/reflect/ModuleHelper.java * @run main ClassFileInstaller sun.hotspot.WhiteBox --- old/test/runtime/modules/JVMGetModuleByPkgName.java 2016-08-11 13:43:42.817501700 -0400 +++ new/test/runtime/modules/JVMGetModuleByPkgName.java 2016-08-11 13:43:42.411309700 -0400 @@ -24,7 +24,7 @@ /* * @test * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib /compiler/whitebox .. + * @library /test/lib .. * @compile p2/c2.java * @build sun.hotspot.WhiteBox * @compile/module=java.base java/lang/reflect/ModuleHelper.java --- old/test/runtime/modules/JVMIsExportedToModule.java 2016-08-11 13:43:45.262576500 -0400 +++ new/test/runtime/modules/JVMIsExportedToModule.java 2016-08-11 13:43:44.854446500 -0400 @@ -24,7 +24,7 @@ /* * @test * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib /compiler/whitebox .. + * @library /test/lib .. * @build sun.hotspot.WhiteBox * @compile/module=java.base java/lang/reflect/ModuleHelper.java * @run main ClassFileInstaller sun.hotspot.WhiteBox --- old/test/runtime/modules/LoadUnloadModuleStress.java 2016-08-11 13:43:47.717756400 -0400 +++ new/test/runtime/modules/LoadUnloadModuleStress.java 2016-08-11 13:43:47.314385800 -0400 @@ -25,7 +25,7 @@ * @test * @summary Ensure module information is cleaned when owning class loader unloads * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib /compiler/whitebox .. + * @library /test/lib .. * @build sun.hotspot.WhiteBox * @compile/module=java.base java/lang/reflect/ModuleHelper.java * @run main ClassFileInstaller sun.hotspot.WhiteBox --- old/test/runtime/modules/ModuleStress/ExportModuleStressTest.java 2016-08-11 13:43:50.173996900 -0400 +++ new/test/runtime/modules/ModuleStress/ExportModuleStressTest.java 2016-08-11 13:43:49.763536900 -0400 @@ -26,15 +26,15 @@ * @bug 8156871 * @summary package in the boot layer is repeatedly exported to unique module created in layers on top of the boot layer * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib + * @library /test/lib * @compile ../CompilerUtils.java - * @build ExportModuleStressTest * @run main/othervm ExportModuleStressTest */ import java.nio.file.Path; import java.nio.file.Paths; -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; public class ExportModuleStressTest { --- old/test/runtime/modules/ModuleStress/ModuleStress.java 2016-08-11 13:43:52.692986000 -0400 +++ new/test/runtime/modules/ModuleStress/ModuleStress.java 2016-08-11 13:43:52.283638800 -0400 @@ -28,16 +28,17 @@ * @bug 8159262 * @summary Test differing scenarios where a module's readability list and a package's exportability list should be walked * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib + * @library /test/lib * @compile ../AccessCheck/ModuleLibrary.java * @compile ModuleSameCLMain.java * @compile ModuleNonBuiltinCLMain.java * @compile CustomSystemClassLoader.java - * @build ModuleStress * @run main/othervm ModuleStress */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.InMemoryJavaCompiler; import java.io.File; public class ModuleStress { --- old/test/runtime/modules/ModuleStress/ModuleStressGC.java 2016-08-11 13:43:55.237823200 -0400 +++ new/test/runtime/modules/ModuleStress/ModuleStressGC.java 2016-08-11 13:43:54.828359600 -0400 @@ -26,15 +26,15 @@ * @bug 8159262 * @summary layers over the boot layer are repeatedly created, during this iteration, GCs are forced to verify correct walk of module and package lists. * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib + * @library /test/lib * @compile ../CompilerUtils.java - * @build ModuleStressGC * @run main/othervm ModuleStressGC */ import java.nio.file.Path; import java.nio.file.Paths; -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; public class ModuleStressGC { --- old/test/runtime/modules/Visibility/XbootcpNoVisibility.java 2016-08-11 13:43:57.684177100 -0400 +++ new/test/runtime/modules/Visibility/XbootcpNoVisibility.java 2016-08-11 13:43:57.280432300 -0400 @@ -25,13 +25,15 @@ * @test * @summary Ensure that a class defined within a java.base package can not * be located via -Xbootclasspath/a - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run main/othervm XbootcpNoVisibility */ -import jdk.test.lib.*; +import jdk.test.lib.InMemoryJavaCompiler; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; public class XbootcpNoVisibility { public static void main(String args[]) throws Exception { --- old/test/runtime/modules/Visibility/XbootcpVisibility.java 2016-08-11 13:44:00.129417800 -0400 +++ new/test/runtime/modules/Visibility/XbootcpVisibility.java 2016-08-11 13:43:59.720396500 -0400 @@ -26,7 +26,7 @@ * @summary Ensure that a package whose module has not been defined to the boot loader * is correctly located with -Xbootclasspath/a * @requires !(os.family == "windows") - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run main/othervm XbootcpVisibility @@ -36,7 +36,9 @@ import java.nio.file.Files; import java.nio.file.Paths; -import jdk.test.lib.*; +import jdk.test.lib.InMemoryJavaCompiler; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; public class XbootcpVisibility { --- old/test/runtime/modules/Visibility/XpatchVisibility.java 2016-08-11 13:44:02.585064300 -0400 +++ new/test/runtime/modules/Visibility/XpatchVisibility.java 2016-08-11 13:44:02.183153900 -0400 @@ -26,7 +26,7 @@ * @summary Ensure that a newly introduced java.base package placed within the -Xpatch directory * is considered part of the boot loader's visibility boundary * @requires !(os.family == "windows") - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run main/othervm XpatchVisibility @@ -36,7 +36,9 @@ import java.nio.file.Files; import java.nio.file.Paths; -import jdk.test.lib.*; +import jdk.test.lib.InMemoryJavaCompiler; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; public class XpatchVisibility { --- old/test/runtime/modules/Xpatch/BasicJarBuilder.java 2016-08-11 13:44:05.038670700 -0400 +++ new/test/runtime/modules/Xpatch/BasicJarBuilder.java 2016-08-11 13:44:04.630758000 -0400 @@ -29,8 +29,6 @@ * Output: A jar containing compiled classes, placed in a test classes folder */ -import jdk.test.lib.*; - import java.io.File; import java.util.ArrayList; import sun.tools.jar.Main; --- old/test/runtime/modules/Xpatch/Xpatch2Dirs.java 2016-08-11 13:44:07.482309700 -0400 +++ new/test/runtime/modules/Xpatch/Xpatch2Dirs.java 2016-08-11 13:44:07.073520200 -0400 @@ -25,12 +25,14 @@ * @test * @summary Make sure -Xpatch works with multiple directories. * @modules java.base/jdk.internal.misc - * @library /testlibrary + * @library /test/lib * @compile Xpatch2DirsMain.java * @run main Xpatch2Dirs */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.InMemoryJavaCompiler; import java.io.File; public class Xpatch2Dirs { --- old/test/runtime/modules/Xpatch/XpatchDupJavaBase.java 2016-08-11 13:44:09.929282500 -0400 +++ new/test/runtime/modules/Xpatch/XpatchDupJavaBase.java 2016-08-11 13:44:09.521794500 -0400 @@ -25,10 +25,11 @@ * @test * @summary VM exit initialization results if java.base is specificed more than once to Xpatch. * @modules java.base/jdk.internal.misc - * @library /testlibrary + * @library /test/lib */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; public class XpatchDupJavaBase { // The VM should exit initialization if java.base is specified --- old/test/runtime/modules/Xpatch/XpatchDupModule.java 2016-08-11 13:44:12.378901500 -0400 +++ new/test/runtime/modules/Xpatch/XpatchDupModule.java 2016-08-11 13:44:11.972803100 -0400 @@ -25,10 +25,11 @@ * @test * @summary Module system initialization exception results if a module is specificed twice to Xpatch. * @modules java.base/jdk.internal.misc - * @library /testlibrary + * @library /test/lib */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; public class XpatchDupModule { --- old/test/runtime/modules/Xpatch/XpatchJavaBase.java 2016-08-11 13:44:14.823998900 -0400 +++ new/test/runtime/modules/Xpatch/XpatchJavaBase.java 2016-08-11 13:44:14.407752500 -0400 @@ -26,12 +26,14 @@ * @bug 8130399 * @summary Make sure -Xpatch works for java.base. * @modules java.base/jdk.internal.misc - * @library /testlibrary + * @library /test/lib * @compile XpatchMain.java * @run main XpatchJavaBase */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.InMemoryJavaCompiler; public class XpatchJavaBase { --- old/test/runtime/modules/Xpatch/XpatchTest.java 2016-08-11 13:44:17.269685200 -0400 +++ new/test/runtime/modules/Xpatch/XpatchTest.java 2016-08-11 13:44:16.861743000 -0400 @@ -26,12 +26,14 @@ * @bug 8130399 * @summary Make sure -Xpatch works for modules besides java.base. * @modules java.base/jdk.internal.misc - * @library /testlibrary + * @library /test/lib * @compile XpatchMain.java * @run main XpatchTest */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.InMemoryJavaCompiler; public class XpatchTest { --- old/test/runtime/modules/Xpatch/XpatchTestJar.java 2016-08-11 13:44:19.713275000 -0400 +++ new/test/runtime/modules/Xpatch/XpatchTestJar.java 2016-08-11 13:44:19.306761700 -0400 @@ -24,15 +24,16 @@ /* * @test * @summary Make sure -Xpatch works when a jar file is specified for a module - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * jdk.jartool/sun.tools.jar - * @build BasicJarBuilder * @compile XpatchMain.java * @run main XpatchTestJar */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.InMemoryJavaCompiler; public class XpatchTestJar { private static String moduleJar; --- old/test/runtime/modules/Xpatch/XpatchTestJarDir.java 2016-08-11 13:44:22.168952300 -0400 +++ new/test/runtime/modules/Xpatch/XpatchTestJarDir.java 2016-08-11 13:44:21.761598100 -0400 @@ -24,17 +24,18 @@ /* * @test * @summary Make sure -Xpatch works when a jar file and a directory is specified for a module - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * jdk.jartool/sun.tools.jar - * @build BasicJarBuilder * @compile Xpatch2DirsMain.java * @run main XpatchTestJarDir */ import java.io.File; import java.nio.file.Files; -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.InMemoryJavaCompiler; public class XpatchTestJarDir { private static String moduleJar; --- old/test/runtime/modules/Xpatch/XpatchTraceCL.java 2016-08-11 13:44:24.632088100 -0400 +++ new/test/runtime/modules/Xpatch/XpatchTraceCL.java 2016-08-11 13:44:24.220692300 -0400 @@ -27,13 +27,15 @@ * @summary Make sure -Xlog:classload=info works properly with "modules" jimage, -Xpatch, and with -Xbootclasspath/a * @modules java.base/jdk.internal.misc - * @library /testlibrary + * @library /test/lib * @compile XpatchMain.java * @run main XpatchTraceCL */ import java.io.File; -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.InMemoryJavaCompiler; public class XpatchTraceCL { --- old/test/runtime/modules/XpatchCDS.java 2016-08-11 13:44:27.084582900 -0400 +++ new/test/runtime/modules/XpatchCDS.java 2016-08-11 13:44:26.656460300 -0400 @@ -23,13 +23,14 @@ /* * @test - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * @run main XpatchCDS */ import java.io.File; -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; public class XpatchCDS { --- old/test/runtime/os/AvailableProcessors.java 2016-08-11 13:44:29.523670800 -0400 +++ new/test/runtime/os/AvailableProcessors.java 2016-08-11 13:44:29.113821000 -0400 @@ -21,8 +21,8 @@ * questions. */ import java.io.File; -import jdk.test.lib.ProcessTools; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; import java.util.ArrayList; /* @@ -31,8 +31,7 @@ * @summary Check that availableProcessors reports the correct value when running in a cpuset on linux * @requires os.family == "linux" * @modules java.base/jdk.internal.misc - * @library /testlibrary - * @build jdk.test.lib.* + * @library /test/lib * @run driver AvailableProcessors */ public class AvailableProcessors { --- old/test/runtime/verifier/OverriderMsg.java 2016-08-11 13:44:31.965625500 -0400 +++ new/test/runtime/verifier/OverriderMsg.java 2016-08-11 13:44:31.558990300 -0400 @@ -26,12 +26,13 @@ import jdk.internal.org.objectweb.asm.ClassWriter; import jdk.internal.org.objectweb.asm.MethodVisitor; import static jdk.internal.org.objectweb.asm.Opcodes.*; -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; /* * @test OverriderMsg * @bug 8026894 - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.org.objectweb.asm * java.base/jdk.internal.misc * java.management --- old/test/runtime/verifier/TestANewArray.java 2016-08-11 13:44:34.402260500 -0400 +++ new/test/runtime/verifier/TestANewArray.java 2016-08-11 13:44:33.994791700 -0400 @@ -28,12 +28,13 @@ import jdk.internal.org.objectweb.asm.MethodVisitor; import static jdk.internal.org.objectweb.asm.Opcodes.*; -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; /* * @test * @summary Test that anewarray bytecode is valid only if it specifies 255 or fewer dimensions. - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.org.objectweb.asm * java.base/jdk.internal.misc * java.management --- old/test/runtime/verifier/TestMultiANewArray.java 2016-08-11 13:44:36.849286400 -0400 +++ new/test/runtime/verifier/TestMultiANewArray.java 2016-08-11 13:44:36.440454500 -0400 @@ -26,12 +26,13 @@ import jdk.internal.org.objectweb.asm.ClassWriter; import jdk.internal.org.objectweb.asm.MethodVisitor; import static jdk.internal.org.objectweb.asm.Opcodes.*; -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; /* * @test TestMultiANewArray * @bug 8038076 - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.org.objectweb.asm * java.base/jdk.internal.misc * java.management --- old/test/runtime/verifier/TraceClassRes.java 2016-08-11 13:44:39.317651700 -0400 +++ new/test/runtime/verifier/TraceClassRes.java 2016-08-11 13:44:38.893873200 -0400 @@ -26,10 +26,11 @@ * @bug 8076318 * @summary split verifier needs to add TraceClassResolution * @modules java.base/jdk.internal.misc - * @library /testlibrary + * @library /test/lib */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; // Test that the verifier outputs the classes it loads if -XX:+TraceClassResolution is specified" public class TraceClassRes { --- old/test/runtime/whitebox/WBStackSize.java 2016-08-11 13:44:41.779991600 -0400 +++ new/test/runtime/whitebox/WBStackSize.java 2016-08-11 13:44:41.357728800 -0400 @@ -25,8 +25,8 @@ * @test WBStackSize * @summary verify that whitebox functions getThreadFullStackSize() and getThreadRemainingStackSize are working * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib - * @build WBStackSize + * @library /test/lib + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xss512k WBStackSize --- old/test/sanity/MismatchedWhiteBox/WhiteBox.java 2016-08-11 13:44:44.230798700 -0400 +++ new/test/sanity/MismatchedWhiteBox/WhiteBox.java 2016-08-11 13:44:43.820544800 -0400 @@ -27,7 +27,7 @@ * @summary verify that whitebox can be used even if not all functions are declared in java-part * @author igor.ignatyev@oracle.com * @modules java.base/jdk.internal.misc - * @library /testlibrary + * @library /test/lib * @compile WhiteBox.java * @run main ClassFileInstaller sun.hotspot.WhiteBox * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:-CheckIntrinsics sun.hotspot.WhiteBox --- old/test/sanity/WBApi.java 2016-08-11 13:44:46.663561800 -0400 +++ new/test/sanity/WBApi.java 2016-08-11 13:44:46.259916200 -0400 @@ -25,8 +25,8 @@ * @test WBApi * @summary verify that whitebox functions can be linked and executed * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib - * @build WBApi + * @library /test/lib + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI WBApi --- old/test/serviceability/ParserTest.java 2016-08-11 13:44:49.104877900 -0400 +++ new/test/serviceability/ParserTest.java 2016-08-11 13:44:48.699237600 -0400 @@ -25,8 +25,8 @@ * @test * @summary Test that the diagnostic command arguemnt parser works * @modules java.base/jdk.internal.misc - * @library /testlibrary /test/lib - * @build ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.parser.* + * @library /test/lib + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI ParserTest --- old/test/serviceability/attach/AttachSetGetFlag.java 2016-08-11 13:44:51.548081900 -0400 +++ new/test/serviceability/attach/AttachSetGetFlag.java 2016-08-11 13:44:51.133055400 -0400 @@ -25,13 +25,12 @@ * @test * @bug 8054823 * @summary Tests the setFlag and printFlag attach command - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.compiler * java.management * jdk.attach/sun.tools.attach * jdk.jvmstat/sun.jvmstat.monitor - * @build jdk.test.lib.* AttachSetGetFlag * @run main AttachSetGetFlag */ @@ -47,7 +46,7 @@ import jdk.test.lib.Asserts; import jdk.test.lib.Platform; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.ProcessTools; import com.sun.tools.attach.VirtualMachine; public class AttachSetGetFlag { --- old/test/serviceability/attach/AttachWithStalePidFile.java 2016-08-11 13:44:54.006131200 -0400 +++ new/test/serviceability/attach/AttachWithStalePidFile.java 2016-08-11 13:44:53.587696300 -0400 @@ -28,12 +28,12 @@ * @summary Regression test for attach issue where stale pid files in /tmp lead to connection issues * @modules java.base/jdk.internal.misc * @modules jdk.attach/sun.tools.attach - * @library /testlibrary - * @build jdk.test.lib.* AttachWithStalePidFileTarget + * @library /test/lib * @run main AttachWithStalePidFile */ -import jdk.test.lib.*; +import jdk.test.lib.Platform; +import jdk.test.lib.process.ProcessTools; import com.sun.tools.attach.VirtualMachine; import sun.tools.attach.HotSpotVirtualMachine; import java.lang.reflect.Field; --- old/test/serviceability/dcmd/compiler/CodeCacheTest.java 2016-08-11 13:44:56.457185500 -0400 +++ new/test/serviceability/dcmd/compiler/CodeCacheTest.java 2016-08-11 13:44:56.049080400 -0400 @@ -24,13 +24,11 @@ /* * @test CodeCacheTest * @bug 8054889 - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.compiler * java.management * jdk.jvmstat/sun.jvmstat.monitor - * @build jdk.test.lib.* - * @build jdk.test.lib.dcmd.* * @run testng/othervm -XX:+SegmentedCodeCache CodeCacheTest * @run testng/othervm -XX:-SegmentedCodeCache CodeCacheTest * @run testng/othervm -Xint -XX:+SegmentedCodeCache CodeCacheTest @@ -40,7 +38,7 @@ import org.testng.annotations.Test; import org.testng.Assert; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.dcmd.CommandExecutor; import jdk.test.lib.dcmd.JMXExecutor; --- old/test/serviceability/dcmd/compiler/CodelistTest.java 2016-08-11 13:44:58.906476100 -0400 +++ new/test/serviceability/dcmd/compiler/CodelistTest.java 2016-08-11 13:44:58.501109900 -0400 @@ -24,15 +24,12 @@ /* * @test CodelistTest * @bug 8054889 - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.compiler * java.management * jdk.jvmstat/sun.jvmstat.monitor - * @build jdk.test.lib.* - * jdk.test.lib.dcmd.* - * sun.hotspot.WhiteBox - * compiler.testlibrary.CompilerUtils + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run testng/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:-UseCodeCacheFlushing -Xmixed CodelistTest @@ -48,7 +45,7 @@ import compiler.testlibrary.CompilerUtils; import compiler.whitebox.CompilerWhiteBoxTest; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.dcmd.CommandExecutor; import jdk.test.lib.dcmd.JMXExecutor; import org.testng.annotations.Test; --- old/test/serviceability/dcmd/compiler/CompilerDirectivesDCMDTest.java 2016-08-11 13:45:01.365281900 -0400 +++ new/test/serviceability/dcmd/compiler/CompilerDirectivesDCMDTest.java 2016-08-11 13:45:00.943762100 -0400 @@ -24,18 +24,15 @@ /* * @test CompilerDirectivesDCMDTest * @bug 8137167 - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.compiler * java.management - * @build jdk.test.lib.* - * @build jdk.test.lib.dcmd.* - * @run main ClassFileInstaller jdk.test.lib.Platform * @run testng/othervm CompilerDirectivesDCMDTest * @summary Test of diagnostic command */ -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.dcmd.CommandExecutor; import jdk.test.lib.dcmd.JMXExecutor; import jdk.test.lib.Platform; --- old/test/serviceability/dcmd/compiler/CompilerQueueTest.java 2016-08-11 13:45:03.814484800 -0400 +++ new/test/serviceability/dcmd/compiler/CompilerQueueTest.java 2016-08-11 13:45:03.407559200 -0400 @@ -24,16 +24,13 @@ /* * @test CompilerQueueTest * @bug 8054889 - * @library /testlibrary /test/lib / + * @library /test/lib / * @modules java.base/jdk.internal.misc * java.compiler * java.management * jdk.jvmstat/sun.jvmstat.monitor * @summary Test of diagnostic command Compiler.queue - * @build jdk.test.lib.* - * jdk.test.lib.dcmd.* - * sun.hotspot.WhiteBox - * compiler.testlibrary.CompilerUtils + * @build sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run testng/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -Xmixed -XX:+WhiteBoxAPI CompilerQueueTest @@ -42,7 +39,7 @@ */ import compiler.testlibrary.CompilerUtils; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.dcmd.CommandExecutor; import jdk.test.lib.dcmd.JMXExecutor; import org.testng.annotations.Test; --- old/test/serviceability/dcmd/framework/HelpTest.java 2016-08-11 13:45:06.283947600 -0400 +++ new/test/serviceability/dcmd/framework/HelpTest.java 2016-08-11 13:45:05.851316200 -0400 @@ -21,7 +21,7 @@ * questions. */ -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.dcmd.CommandExecutor; import jdk.test.lib.dcmd.PidJcmdExecutor; import jdk.test.lib.dcmd.MainClassJcmdExecutor; @@ -32,13 +32,11 @@ /* * @test * @summary Test of diagnostic command help (tests all DCMD executors) - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.compiler * java.management * jdk.jvmstat/sun.jvmstat.monitor - * @build jdk.test.lib.* - * @build jdk.test.lib.dcmd.* * @run testng/othervm -XX:+UsePerfData HelpTest */ public class HelpTest { --- old/test/serviceability/dcmd/framework/InvalidCommandTest.java 2016-08-11 13:45:08.738039000 -0400 +++ new/test/serviceability/dcmd/framework/InvalidCommandTest.java 2016-08-11 13:45:08.321560400 -0400 @@ -21,7 +21,7 @@ * questions. */ -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.dcmd.CommandExecutor; import jdk.test.lib.dcmd.PidJcmdExecutor; import jdk.test.lib.dcmd.MainClassJcmdExecutor; @@ -32,13 +32,11 @@ /* * @test * @summary Test of invalid diagnostic command (tests all DCMD executors) - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.compiler * java.management * jdk.jvmstat/sun.jvmstat.monitor - * @build jdk.test.lib.* - * @build jdk.test.lib.dcmd.* * @run testng/othervm -XX:+UsePerfData InvalidCommandTest */ public class InvalidCommandTest { --- old/test/serviceability/dcmd/framework/VMVersionTest.java 2016-08-11 13:45:11.213562600 -0400 +++ new/test/serviceability/dcmd/framework/VMVersionTest.java 2016-08-11 13:45:10.783098400 -0400 @@ -21,7 +21,7 @@ * questions. */ -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.dcmd.CommandExecutor; import jdk.test.lib.dcmd.PidJcmdExecutor; import jdk.test.lib.dcmd.MainClassJcmdExecutor; @@ -33,13 +33,11 @@ /* * @test * @summary Test of diagnostic command VM.version (tests all DCMD executors) - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.compiler * java.management * jdk.jvmstat/sun.jvmstat.monitor - * @build jdk.test.lib.* - * @build jdk.test.lib.dcmd.* * @run testng/othervm -XX:+UsePerfData VMVersionTest */ public class VMVersionTest { --- old/test/serviceability/dcmd/gc/ClassHistogramAllTest.java 2016-08-11 13:45:13.666436300 -0400 +++ new/test/serviceability/dcmd/gc/ClassHistogramAllTest.java 2016-08-11 13:45:13.262917800 -0400 @@ -24,14 +24,11 @@ /* * @test * @summary Test of diagnostic command GC.class_histogram -all=true - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.compiler * java.management * jdk.jvmstat/sun.jvmstat.monitor - * @build jdk.test.lib.* - * @build jdk.test.lib.dcmd.* - * @build ClassHistogramTest * @run testng ClassHistogramAllTest */ public class ClassHistogramAllTest extends ClassHistogramTest { --- old/test/serviceability/dcmd/gc/ClassHistogramTest.java 2016-08-11 13:45:16.122057600 -0400 +++ new/test/serviceability/dcmd/gc/ClassHistogramTest.java 2016-08-11 13:45:15.712020500 -0400 @@ -25,20 +25,18 @@ import java.util.regex.Pattern; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.dcmd.CommandExecutor; import jdk.test.lib.dcmd.JMXExecutor; /* * @test * @summary Test of diagnostic command GC.class_histogram - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.compiler * java.management * jdk.jvmstat/sun.jvmstat.monitor - * @build jdk.test.lib.* - * @build jdk.test.lib.dcmd.* * @run testng ClassHistogramTest */ public class ClassHistogramTest { --- old/test/serviceability/dcmd/gc/FinalizerInfoTest.java 2016-08-11 13:45:18.565017400 -0400 +++ new/test/serviceability/dcmd/gc/FinalizerInfoTest.java 2016-08-11 13:45:18.151270500 -0400 @@ -28,19 +28,17 @@ import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.ReentrantLock; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.dcmd.CommandExecutor; import jdk.test.lib.dcmd.PidJcmdExecutor; /* * @test * @summary - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * @modules java.xml * java.management - * @build jdk.test.lib.* - * @build jdk.test.lib.dcmd.* * @run testng FinalizerInfoTest */ public class FinalizerInfoTest { --- old/test/serviceability/dcmd/gc/HeapDumpAllTest.java 2016-08-11 13:45:21.015107700 -0400 +++ new/test/serviceability/dcmd/gc/HeapDumpAllTest.java 2016-08-11 13:45:20.604992300 -0400 @@ -24,19 +24,11 @@ /* * @test * @summary Test of diagnostic command GC.heap_dump -all=true - * @library /testlibrary - * @library /test/lib/share/classes + * @library /test/lib * @modules java.base/jdk.internal.misc * java.compiler * java.management * jdk.jvmstat/sun.jvmstat.monitor - * @build jdk.test.lib.* - * @build jdk.test.lib.dcmd.* - * @build jdk.test.lib.hprof.* - * @build jdk.test.lib.hprof.model.* - * @build jdk.test.lib.hprof.parser.* - * @build jdk.test.lib.hprof.util.* - * @build HeapDumpTest * @run testng HeapDumpAllTest */ public class HeapDumpAllTest extends HeapDumpTest { --- old/test/serviceability/dcmd/gc/HeapDumpTest.java 2016-08-11 13:45:23.457456700 -0400 +++ new/test/serviceability/dcmd/gc/HeapDumpTest.java 2016-08-11 13:45:23.051499000 -0400 @@ -33,25 +33,18 @@ import jdk.test.lib.hprof.model.Snapshot; import jdk.test.lib.JDKToolFinder; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.dcmd.CommandExecutor; import jdk.test.lib.dcmd.PidJcmdExecutor; /* * @test * @summary Test of diagnostic command GC.heap_dump - * @library /testlibrary - * @library /test/lib/share/classes + * @library /test/lib * @modules java.base/jdk.internal.misc * java.compiler * java.management * jdk.jvmstat/sun.jvmstat.monitor - * @build jdk.test.lib.* - * @build jdk.test.lib.dcmd.* - * @build jdk.test.lib.hprof.* - * @build jdk.test.lib.hprof.model.* - * @build jdk.test.lib.hprof.parser.* - * @build jdk.test.lib.hprof.util.* * @run testng HeapDumpTest */ public class HeapDumpTest { --- old/test/serviceability/dcmd/gc/HeapInfoTest.java 2016-08-11 13:45:25.928492500 -0400 +++ new/test/serviceability/dcmd/gc/HeapInfoTest.java 2016-08-11 13:45:25.524917500 -0400 @@ -28,18 +28,16 @@ import jdk.test.lib.dcmd.CommandExecutor; import jdk.test.lib.dcmd.PidJcmdExecutor; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; /* * @test * @summary Test of diagnostic command GC.heap_info - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * @modules java.xml * java.management - * @build jdk.test.lib.* - * @build jdk.test.lib.dcmd.* * @run testng HeapInfoTest */ public class HeapInfoTest { --- old/test/serviceability/dcmd/gc/RunFinalizationTest.java 2016-08-11 13:45:28.409281100 -0400 +++ new/test/serviceability/dcmd/gc/RunFinalizationTest.java 2016-08-11 13:45:27.998236000 -0400 @@ -30,16 +30,12 @@ /* * @test * @summary Test of diagnostic command GC.run_finalization - * @library /testlibrary - * @library /test/lib/share/classes + * @library /test/lib * @modules java.base/jdk.internal.misc * java.compiler * java.management * jdk.jvmstat/sun.jvmstat.monitor - * @build jdk.test.lib.* - * @build jdk.test.lib.dcmd.* - * @build jdk.test.lib.process.* - * @build RunFinalizationTest FinalizationRunner + * @build FinalizationRunner * @run main RunFinalizationTest */ public class RunFinalizationTest { --- old/test/serviceability/dcmd/gc/RunGCTest.java 2016-08-11 13:45:30.879797300 -0400 +++ new/test/serviceability/dcmd/gc/RunGCTest.java 2016-08-11 13:45:30.466203100 -0400 @@ -29,20 +29,18 @@ import java.nio.file.Path; import java.nio.file.Paths; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.dcmd.CommandExecutor; import jdk.test.lib.dcmd.JMXExecutor; /* * @test * @summary Test of diagnostic command GC.run - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.compiler * java.management * jdk.jvmstat/sun.jvmstat.monitor - * @build jdk.test.lib.* - * @build jdk.test.lib.dcmd.* * @run testng/othervm -Xlog:gc=debug:RunGC.gclog -XX:-ExplicitGCInvokesConcurrent RunGCTest */ public class RunGCTest { --- old/test/serviceability/dcmd/jvmti/DataDumpDcmdTest.java 2016-08-11 13:45:33.333064900 -0400 +++ new/test/serviceability/dcmd/jvmti/DataDumpDcmdTest.java 2016-08-11 13:45:32.924789500 -0400 @@ -21,7 +21,7 @@ * questions. */ -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.dcmd.CommandExecutor; import jdk.test.lib.dcmd.JMXExecutor; import jdk.test.lib.dcmd.PidJcmdExecutor; @@ -32,8 +32,7 @@ * @bug 8054890 * @summary Test of JVMTI.data_dump diagnostic command * @modules java.base/jdk.internal.misc - * @library /testlibrary - * @build jdk.test.lib.* + * @library /test/lib * @run testng DataDumpDcmdTest */ --- old/test/serviceability/dcmd/jvmti/LoadAgentDcmdTest.java 2016-08-11 13:45:35.783606500 -0400 +++ new/test/serviceability/dcmd/jvmti/LoadAgentDcmdTest.java 2016-08-11 13:45:35.369959600 -0400 @@ -26,7 +26,8 @@ import java.util.jar.JarEntry; import java.util.jar.JarOutputStream; import java.util.jar.Manifest; -import jdk.test.lib.*; +import jdk.test.lib.Platform; +import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.dcmd.*; import org.testng.annotations.Test; @@ -35,13 +36,13 @@ * * @test * @bug 8147388 - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.compiler * java.instrument * java.management * jdk.jvmstat/sun.jvmstat.monitor - * @build ClassFileInstaller jdk.test.lib.* SimpleJvmtiAgent + * @build SimpleJvmtiAgent * @ignore 8150318 * @run main ClassFileInstaller SimpleJvmtiAgent * @run testng LoadAgentDcmdTest @@ -59,7 +60,7 @@ "'-Dtest.jdk=/path/to/jdk'."); } - Path libpath = Paths.get(jdkPath, Platform.jdkLibPath(), Platform.sharedObjectName("instrument")); + Path libpath = Paths.get(jdkPath, jdkLibPath(), sharedObjectName("instrument")); if (!libpath.toFile().exists()) { throw new FileNotFoundException( @@ -129,6 +130,33 @@ throw new RuntimeException(e); } } + /** + * return path to library inside jdk tree + */ + public static String jdkLibPath() { + if (Platform.isWindows()) { + return "bin"; + } + if (Platform.isOSX()) { + return "lib"; + } + + return "lib/" + Platform.getOsArch(); + } + + /** + * Build name of shared object according to platform rules + */ + public static String sharedObjectName(String name) { + if (Platform.isWindows()) { + return name + ".dll"; + } + if (Platform.isOSX()) { + return "lib" + name + ".dylib"; + } + return "lib" + name + ".so"; + } +} @Test public void jmx() throws Throwable { --- old/test/serviceability/dcmd/thread/PrintConcurrentLocksTest.java 2016-08-11 13:45:38.261386200 -0400 +++ new/test/serviceability/dcmd/thread/PrintConcurrentLocksTest.java 2016-08-11 13:45:37.850901300 -0400 @@ -24,14 +24,11 @@ /* * @test * @summary Test of diagnostic command Thread.print -l=true - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.compiler * java.management * jdk.jvmstat/sun.jvmstat.monitor - * @build jdk.test.lib.* - * @build jdk.test.lib.dcmd.* - * @build PrintTest * @run testng PrintConcurrentLocksTest */ public class PrintConcurrentLocksTest extends PrintTest { --- old/test/serviceability/dcmd/thread/PrintTest.java 2016-08-11 13:45:40.708734500 -0400 +++ new/test/serviceability/dcmd/thread/PrintTest.java 2016-08-11 13:45:40.298191900 -0400 @@ -24,7 +24,7 @@ import org.testng.annotations.Test; import org.testng.Assert; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.dcmd.CommandExecutor; import jdk.test.lib.dcmd.JMXExecutor; @@ -37,13 +37,11 @@ /* * @test * @summary Test of diagnostic command Thread.print - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.compiler * java.management * jdk.jvmstat/sun.jvmstat.monitor - * @build jdk.test.lib.* - * @build jdk.test.lib.dcmd.* * @run testng PrintTest */ public class PrintTest { --- old/test/serviceability/dcmd/vm/ClassHierarchyTest.java 2016-08-11 13:45:43.160598100 -0400 +++ new/test/serviceability/dcmd/vm/ClassHierarchyTest.java 2016-08-11 13:45:42.747246400 -0400 @@ -24,20 +24,18 @@ /* * @test * @summary Test of diagnostic command VM.class_hierarchy - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.compiler * java.management * jdk.jvmstat/sun.jvmstat.monitor - * @build jdk.test.lib.* - * @build jdk.test.lib.dcmd.* * @run testng ClassHierarchyTest */ import org.testng.annotations.Test; import org.testng.Assert; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.dcmd.CommandExecutor; import jdk.test.lib.dcmd.JMXExecutor; --- old/test/serviceability/dcmd/vm/ClassLoaderStatsTest.java 2016-08-11 13:45:45.621622400 -0400 +++ new/test/serviceability/dcmd/vm/ClassLoaderStatsTest.java 2016-08-11 13:45:45.210355300 -0400 @@ -24,20 +24,18 @@ /* * @test * @summary Test of diagnostic command VM.classloader_stats - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.compiler * java.management * jdk.jvmstat/sun.jvmstat.monitor - * @build jdk.test.lib.* - * @build jdk.test.lib.dcmd.* * @run testng ClassLoaderStatsTest */ import org.testng.annotations.Test; import org.testng.Assert; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.dcmd.CommandExecutor; import jdk.test.lib.dcmd.JMXExecutor; --- old/test/serviceability/dcmd/vm/CommandLineTest.java 2016-08-11 13:45:48.101921700 -0400 +++ new/test/serviceability/dcmd/vm/CommandLineTest.java 2016-08-11 13:45:47.694223700 -0400 @@ -21,7 +21,7 @@ * questions. */ -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import org.testng.annotations.Test; import jdk.test.lib.dcmd.CommandExecutor; @@ -30,13 +30,11 @@ /* * @test * @summary Test of diagnostic command VM.command_line - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.compiler * java.management * jdk.jvmstat/sun.jvmstat.monitor - * @build jdk.test.lib.* - * @build jdk.test.lib.dcmd.* * @run testng/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:+ThereShouldNotBeAnyVMOptionNamedLikeThis CommandLineTest */ public class CommandLineTest { --- old/test/serviceability/dcmd/vm/DynLibsTest.java 2016-08-11 13:45:50.549068200 -0400 +++ new/test/serviceability/dcmd/vm/DynLibsTest.java 2016-08-11 13:45:50.141872300 -0400 @@ -1,7 +1,7 @@ import org.testng.annotations.Test; import org.testng.Assert; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.Platform; import jdk.test.lib.dcmd.CommandExecutor; import jdk.test.lib.dcmd.JMXExecutor; @@ -32,13 +32,11 @@ /* * @test * @summary Test of VM.dynlib diagnostic command via MBean - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.compiler * java.management * jdk.jvmstat/sun.jvmstat.monitor - * @build jdk.test.lib.* - * @build jdk.test.lib.dcmd.* * @run testng DynLibsTest */ --- old/test/serviceability/dcmd/vm/FlagsTest.java 2016-08-11 13:45:53.005358800 -0400 +++ new/test/serviceability/dcmd/vm/FlagsTest.java 2016-08-11 13:45:52.594148600 -0400 @@ -21,7 +21,7 @@ * questions. */ -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.dcmd.CommandExecutor; import jdk.test.lib.dcmd.JMXExecutor; import org.testng.annotations.Test; @@ -29,13 +29,11 @@ /* * @test * @summary Test of diagnostic command VM.flags - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.compiler * java.management * jdk.jvmstat/sun.jvmstat.monitor - * @build jdk.test.lib.* - * @build jdk.test.lib.dcmd.* * @run testng/othervm -Xmx129m -XX:+UnlockDiagnosticVMOptions -XX:+IgnoreUnrecognizedVMOptions -XX:+ThereShouldNotBeAnyVMOptionNamedLikeThis_Right -XX:-TieredCompilation FlagsTest */ public class FlagsTest { --- old/test/serviceability/dcmd/vm/SetVMFlagTest.java 2016-08-11 13:45:55.450758600 -0400 +++ new/test/serviceability/dcmd/vm/SetVMFlagTest.java 2016-08-11 13:45:55.046180200 -0400 @@ -21,7 +21,7 @@ * questions. */ -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.dcmd.CommandExecutor; import jdk.test.lib.dcmd.JMXExecutor; import org.testng.annotations.Test; @@ -32,9 +32,7 @@ * @bug 8054890 * @summary Test of VM.set_flag diagnostic command * @modules java.base/jdk.internal.misc - * @library /testlibrary - * @build jdk.test.lib.* - * @build jdk.test.lib.dcmd.* + * @library /test/lib * @run testng SetVMFlagTest */ --- old/test/serviceability/dcmd/vm/SystemPropertiesTest.java 2016-08-11 13:45:57.907669300 -0400 +++ new/test/serviceability/dcmd/vm/SystemPropertiesTest.java 2016-08-11 13:45:57.498414900 -0400 @@ -23,20 +23,18 @@ import org.testng.annotations.Test; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.dcmd.CommandExecutor; import jdk.test.lib.dcmd.JMXExecutor; /* * @test * @summary Test of diagnostic command VM.system_properties - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.compiler * java.management * jdk.jvmstat/sun.jvmstat.monitor - * @build jdk.test.lib.* - * @build jdk.test.lib.dcmd.* * @run testng SystemPropertiesTest */ public class SystemPropertiesTest { --- old/test/serviceability/dcmd/vm/UptimeTest.java 2016-08-11 13:46:00.360322800 -0400 +++ new/test/serviceability/dcmd/vm/UptimeTest.java 2016-08-11 13:45:59.950415300 -0400 @@ -24,7 +24,7 @@ import org.testng.annotations.Test; import org.testng.Assert; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.dcmd.CommandExecutor; import jdk.test.lib.dcmd.JMXExecutor; @@ -34,13 +34,11 @@ /* * @test * @summary Test of diagnostic command VM.uptime - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.compiler * java.management * jdk.jvmstat/sun.jvmstat.monitor - * @build jdk.test.lib.* - * @build jdk.test.lib.dcmd.* * @run testng UptimeTest */ public class UptimeTest { --- old/test/serviceability/jvmti/GetModulesInfo/JvmtiGetAllModulesTest.java 2016-08-11 13:46:02.831114400 -0400 +++ new/test/serviceability/jvmti/GetModulesInfo/JvmtiGetAllModulesTest.java 2016-08-11 13:46:02.418031700 -0400 @@ -24,7 +24,7 @@ /** * @test * @summary Verifies the JVMTI GetAllModules API - * @library /testlibrary + * @library /test/lib * @run main/othervm -agentlib:JvmtiGetAllModulesTest JvmtiGetAllModulesTest * */ --- old/test/serviceability/jvmti/GetObjectSizeClass.java 2016-08-11 13:46:05.268553900 -0400 +++ new/test/serviceability/jvmti/GetObjectSizeClass.java 2016-08-11 13:46:04.866719200 -0400 @@ -21,19 +21,22 @@ * questions. */ import java.io.PrintWriter; -import jdk.test.lib.*; +import jdk.test.lib.JDKToolFinder; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; + /* * @test * @bug 8075030 * @summary JvmtiEnv::GetObjectSize reports incorrect java.lang.Class instance size - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.compiler * java.instrument * java.management * jdk.jvmstat/sun.jvmstat.monitor - * @build ClassFileInstaller jdk.test.lib.* GetObjectSizeClassAgent + * @build GetObjectSizeClassAgent * @run main ClassFileInstaller GetObjectSizeClassAgent * @run main GetObjectSizeClass */ --- old/test/serviceability/jvmti/GetObjectSizeOverflow.java 2016-08-11 13:46:07.710012900 -0400 +++ new/test/serviceability/jvmti/GetObjectSizeOverflow.java 2016-08-11 13:46:07.297509800 -0400 @@ -21,20 +21,23 @@ * questions. */ import java.io.PrintWriter; -import jdk.test.lib.*; +import jdk.test.lib.JDKToolFinder; +import jdk.test.lib.Platform; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; /* * Test to verify GetObjectSize does not overflow on a 600M element int[] * * @test * @bug 8027230 - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.compiler * java.instrument * java.management * jdk.jvmstat/sun.jvmstat.monitor - * @build ClassFileInstaller jdk.test.lib.* GetObjectSizeOverflowAgent + * @build GetObjectSizeOverflowAgent * @run main ClassFileInstaller GetObjectSizeOverflowAgent * @run main GetObjectSizeOverflow */ --- old/test/serviceability/jvmti/TestLambdaFormRetransformation.java 2016-08-11 13:46:10.133593400 -0400 +++ new/test/serviceability/jvmti/TestLambdaFormRetransformation.java 2016-08-11 13:46:09.728364900 -0400 @@ -26,7 +26,7 @@ * @test * @bug 8008678 * @summary JSR 292: constant pool reconstitution must support pseudo strings - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.instrument * java.management @@ -46,9 +46,9 @@ import java.security.ProtectionDomain; import java.util.Arrays; -import jdk.test.lib.ExitCode; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.ExitCode; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; public class TestLambdaFormRetransformation { private static String MANIFEST = String.format("Manifest-Version: 1.0\n" + --- old/test/serviceability/jvmti/TestRedefineWithUnresolvedClass.java 2016-08-11 13:46:12.575303900 -0400 +++ new/test/serviceability/jvmti/TestRedefineWithUnresolvedClass.java 2016-08-11 13:46:12.168239300 -0400 @@ -25,22 +25,22 @@ * @test * @summary Redefine a class with an UnresolvedClass reference in the constant pool. * @bug 8035150 - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.compiler * java.instrument * java.management * jdk.jartool/sun.tools.jar * jdk.jvmstat/sun.jvmstat.monitor - * @build jdk.test.lib.* UnresolvedClassAgent + * @build UnresolvedClassAgent * @run main TestRedefineWithUnresolvedClass */ import java.io.File; import java.util.Arrays; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; public class TestRedefineWithUnresolvedClass { --- old/test/serviceability/logging/TestBasicLogOutput.java 2016-08-11 13:46:15.031196700 -0400 +++ new/test/serviceability/logging/TestBasicLogOutput.java 2016-08-11 13:46:14.619527100 -0400 @@ -25,11 +25,11 @@ * @test TestBasicLogOutput * @summary Ensure logging can be enabled and successfully prints to stdout. * @modules java.base/jdk.internal.misc - * @library /testlibrary + * @library /test/lib */ -import jdk.test.lib.ProcessTools; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; public class TestBasicLogOutput { --- old/test/serviceability/logging/TestDefaultLogOutput.java 2016-08-11 13:46:17.496253800 -0400 +++ new/test/serviceability/logging/TestDefaultLogOutput.java 2016-08-11 13:46:17.076272400 -0400 @@ -25,11 +25,11 @@ * @test TestDefaultLogOutput * @summary Ensure logging is default on stdout. * @modules java.base/jdk.internal.misc - * @library /testlibrary + * @library /test/lib */ -import jdk.test.lib.ProcessTools; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; public class TestDefaultLogOutput { --- old/test/serviceability/logging/TestLogRotation.java 2016-08-11 13:46:19.956270500 -0400 +++ new/test/serviceability/logging/TestLogRotation.java 2016-08-11 13:46:19.529891600 -0400 @@ -24,13 +24,13 @@ /* * @test TestLogRotation.java * @summary test flags for log rotation - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run main/othervm/timeout=600 TestLogRotation * */ -import jdk.test.lib.*; +import jdk.test.lib.process.ProcessTools; import java.io.File; import java.io.FilenameFilter; import java.util.ArrayList; --- old/test/serviceability/logging/TestMultipleXlogArgs.java 2016-08-11 13:46:22.390654500 -0400 +++ new/test/serviceability/logging/TestMultipleXlogArgs.java 2016-08-11 13:46:21.982665700 -0400 @@ -25,11 +25,11 @@ * @test TestMultipleXlogArgs * @summary Ensure multiple -Xlog arguments aggregate the logging options. * @modules java.base/jdk.internal.misc - * @library /testlibrary + * @library /test/lib */ -import jdk.test.lib.ProcessTools; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; public class TestMultipleXlogArgs { --- old/test/serviceability/logging/TestQuotedLogOutputs.java 2016-08-11 13:46:24.828918600 -0400 +++ new/test/serviceability/logging/TestQuotedLogOutputs.java 2016-08-11 13:46:24.419400400 -0400 @@ -25,7 +25,7 @@ * @test TestQuotedLogOutputs * @summary Ensure proper parsing of quoted output names for -Xlog arguments. * @modules java.base/jdk.internal.misc - * @library /testlibrary + * @library /test/lib */ import java.io.File; @@ -33,8 +33,8 @@ import java.nio.file.Paths; import jdk.test.lib.Asserts; -import jdk.test.lib.ProcessTools; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; public class TestQuotedLogOutputs { --- old/test/serviceability/sa/DeadlockDetectionTest.java 2016-08-11 13:46:27.262494800 -0400 +++ new/test/serviceability/sa/DeadlockDetectionTest.java 2016-08-11 13:46:26.856432300 -0400 @@ -32,19 +32,15 @@ import jdk.test.lib.Utils; import jdk.test.lib.Platform; import jdk.test.lib.JDKToolLauncher; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; /* * @test * @summary Test deadlock detection - * @library /test/lib/share/classes - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * @modules java.management - * @build jdk.test.lib.* - * @build jdk.test.lib.apps.* - * @build DeadlockDetectionTest * @run main DeadlockDetectionTest */ --- old/test/serviceability/sa/TestInstanceKlassSize.java 2016-08-11 13:46:29.703435000 -0400 +++ new/test/serviceability/sa/TestInstanceKlassSize.java 2016-08-11 13:46:29.284962900 -0400 @@ -31,8 +31,8 @@ import jdk.test.lib.JDKToolLauncher; import jdk.test.lib.Platform; -import jdk.test.lib.ProcessTools; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.Utils; import jdk.test.lib.apps.LingeredApp; import jdk.test.lib.Asserts; @@ -42,16 +42,16 @@ /* * @test - * @library /test/lib/share/classes - * @library /testlibrary - * @build jdk.test.lib.* - * @build jdk.test.lib.apps.* + * @library /test/lib * @modules java.base/jdk.internal.misc * @modules jdk.hotspot.agent * @modules jdk.hotspot.agent/sun.jvm.hotspot * @modules jdk.hotspot.agent/sun.jvm.hotspot.utilities * @modules jdk.hotspot.agent/sun.jvm.hotspot.oops - * @compile -XDignore.symbol.file=true -Xmodule:jdk.hotspot.agent TestInstanceKlassSize.java + * @compile -XDignore.symbol.file=true -Xmodule:jdk.hotspot.agent + * -XaddExports:java.base/jdk.internal.misc=jdk.hotspot.agent + * -XaddExports:java.management/java.lang.management=jdk.hotspot.agent + * TestInstanceKlassSize.java * @run main/othervm TestInstanceKlassSize */ --- old/test/serviceability/sa/TestInstanceKlassSizeForInterface.java 2016-08-11 13:46:32.161008200 -0400 +++ new/test/serviceability/sa/TestInstanceKlassSizeForInterface.java 2016-08-11 13:46:31.736689100 -0400 @@ -29,23 +29,23 @@ import jdk.test.lib.JDKToolLauncher; import jdk.test.lib.JDKToolFinder; import jdk.test.lib.Platform; -import jdk.test.lib.ProcessTools; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.Utils; import jdk.test.lib.Asserts; /* * @test - * @library /test/lib/share/classes - * @library /testlibrary - * @build jdk.test.lib.* - * @build jdk.test.lib.apps.* + * @library /test/lib * @modules java.base/jdk.internal.misc * @modules jdk.hotspot.agent * @modules jdk.hotspot.agent/sun.jvm.hotspot * @modules jdk.hotspot.agent/sun.jvm.hotspot.utilities * @modules jdk.hotspot.agent/sun.jvm.hotspot.oops - * @compile -XDignore.symbol.file=true -Xmodule:jdk.hotspot.agent TestInstanceKlassSizeForInterface.java + * @compile -XDignore.symbol.file=true -Xmodule:jdk.hotspot.agent + * -XaddExports:java.base/jdk.internal.misc=jdk.hotspot.agent + * -XaddExports:java.management/java.lang.management=jdk.hotspot.agent + * TestInstanceKlassSizeForInterface.java * @run main/othervm TestInstanceKlassSizeForInterface */ --- old/test/serviceability/sa/jmap-hashcode/Test8028623.java 2016-08-11 13:46:34.623287000 -0400 +++ new/test/serviceability/sa/jmap-hashcode/Test8028623.java 2016-08-11 13:46:34.213600700 -0400 @@ -22,9 +22,9 @@ */ import jdk.test.lib.JDKToolLauncher; -import jdk.test.lib.OutputBuffer; +import jdk.test.lib.process.OutputBuffer; import jdk.test.lib.Platform; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.ProcessTools; import java.io.File; @@ -32,12 +32,11 @@ * @test * @bug 8028623 * @summary Test hashing of extended characters in Serviceability Agent. - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.compiler * java.management * jdk.jvmstat/sun.jvmstat.monitor - * @build jdk.test.lib.* * @compile -encoding utf8 Test8028623.java * @run main/othervm -XX:+UsePerfData Test8028623 */ --- old/test/serviceability/sa/jmap-hprof/JMapHProfLargeHeapTest.java 2016-08-11 13:46:37.110736500 -0400 +++ new/test/serviceability/sa/jmap-hprof/JMapHProfLargeHeapTest.java 2016-08-11 13:46:36.713618800 -0400 @@ -32,11 +32,10 @@ import java.util.Scanner; import jdk.test.lib.Asserts; -import jdk.test.lib.JDKToolFinder; import jdk.test.lib.JDKToolLauncher; -import jdk.test.lib.OutputAnalyzer; import jdk.test.lib.Platform; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; /* * @test @@ -46,12 +45,12 @@ * Started failing on 2016.06.24 due to 8160376 on MacOS X so quarantine * it on that platform: * @requires os.family != "mac" - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.compiler * java.management/sun.management * jdk.jvmstat/sun.jvmstat.monitor - * @build jdk.test.lib.* JMapHProfLargeHeapProc + * @build JMapHProfLargeHeapProc * @run main JMapHProfLargeHeapTest */ --- old/test/serviceability/threads/TestFalseDeadLock.java 2016-08-11 13:46:39.582431800 -0400 +++ new/test/serviceability/threads/TestFalseDeadLock.java 2016-08-11 13:46:39.144850800 -0400 @@ -31,7 +31,7 @@ * @bug 8016304 * @summary Make sure no deadlock is reported for this program which has no deadlocks. * @modules java.base/jdk.internal.misc - * @library /testlibrary + * @library /test/lib * @run main/othervm TestFalseDeadLock */ --- old/test/serviceability/tmtools/jstack/DaemonThreadTest.java 2016-08-11 13:46:42.028480900 -0400 +++ new/test/serviceability/tmtools/jstack/DaemonThreadTest.java 2016-08-11 13:46:41.615931100 -0400 @@ -26,10 +26,8 @@ * @summary Create daemon and non-deamon threads. * Check the correctness of thread's status from jstack. * @modules java.base/jdk.internal.misc - * @library /test/lib/share/classes + * @library /test/lib * @library ../share - * @build common.* - * * @run main/othervm -XX:+UsePerfData DaemonThreadTest */ import common.ToolResults; --- old/test/serviceability/tmtools/jstack/JstackThreadTest.java 2016-08-11 13:46:44.495536100 -0400 +++ new/test/serviceability/tmtools/jstack/JstackThreadTest.java 2016-08-11 13:46:44.068005900 -0400 @@ -23,8 +23,8 @@ import java.util.Arrays; import jdk.test.lib.JDKToolLauncher; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; import utils.Utils; import java.util.concurrent.CountDownLatch; @@ -33,8 +33,7 @@ * @bug 8151442 * @summary jstack doesn't close quotation marks properly with threads' name greater than 1996 characters * @modules java.base/jdk.internal.misc - * @library /testlibrary - * @build jdk.test.lib.* + * @library /test/lib * @run main JstackThreadTest */ public class JstackThreadTest { --- old/test/serviceability/tmtools/jstack/SpreadLockTest.java 2016-08-11 13:46:46.945534900 -0400 +++ new/test/serviceability/tmtools/jstack/SpreadLockTest.java 2016-08-11 13:46:46.530130300 -0400 @@ -28,10 +28,8 @@ * After checking that lock info is correct invoke another method * and get the lock again. Repeat this action. * @modules java.base/jdk.internal.misc - * @library /test/lib/share/classes + * @library /test/lib * @library ../share - * @build common.* - * * @run main/othervm -XX:+UsePerfData SpreadLockTest */ import common.ToolResults; --- old/test/serviceability/tmtools/jstack/ThreadNamesTest.java 2016-08-11 13:46:49.392937600 -0400 +++ new/test/serviceability/tmtools/jstack/ThreadNamesTest.java 2016-08-11 13:46:48.988426300 -0400 @@ -25,10 +25,8 @@ * @test * @summary Checks that jstack correctly prints the thread names * @modules java.base/jdk.internal.misc - * @library /test/lib/share/classes + * @library /test/lib * @library ../share - * @build common.* - * * @run main/othervm -XX:+UsePerfData ThreadNamesTest */ import common.ToolResults; --- old/test/serviceability/tmtools/jstack/TraveledLockTest.java 2016-08-11 13:46:51.846287400 -0400 +++ new/test/serviceability/tmtools/jstack/TraveledLockTest.java 2016-08-11 13:46:51.438138100 -0400 @@ -28,10 +28,8 @@ * After checking that lock info is correct free the lock and * invoke another method. Repeat this action. * @modules java.base/jdk.internal.misc - * @library /test/lib/share/classes + * @library /test/lib * @library ../share - * @build common.* - * * @run main/othervm -XX:+UsePerfData TraveledLockTest */ import common.ToolResults; --- old/test/serviceability/tmtools/jstack/WaitNotifyThreadTest.java 2016-08-11 13:46:54.296293400 -0400 +++ new/test/serviceability/tmtools/jstack/WaitNotifyThreadTest.java 2016-08-11 13:46:53.894154600 -0400 @@ -28,10 +28,8 @@ * monitor info have to disappear from the stack. * Repeats the same scenario calling interrupt() method * @modules java.base/jdk.internal.misc - * @library /test/lib/share/classes + * @library /test/lib * @library ../share - * @build common.* - * * @run main/othervm -XX:+UsePerfData WaitNotifyThreadTest */ import common.ToolResults; --- old/test/serviceability/tmtools/jstat/GcCapacityTest.java 2016-08-11 13:46:56.755050500 -0400 +++ new/test/serviceability/tmtools/jstat/GcCapacityTest.java 2016-08-11 13:46:56.335459200 -0400 @@ -28,11 +28,9 @@ * @summary Test checks the consistency of the output * displayed with jstat -gccapacity. * @modules java.base/jdk.internal.misc - * @library /test/lib/share/classes + * @library /test/lib * @library ../share * @requires vm.opt.ExplicitGCInvokesConcurrent != true - * @build common.* - * @build utils.* * @run main/othervm -XX:+UsePerfData -Xmx128M GcCapacityTest */ public class GcCapacityTest { --- old/test/serviceability/tmtools/jstat/GcCauseTest01.java 2016-08-11 13:46:59.199974700 -0400 +++ new/test/serviceability/tmtools/jstat/GcCauseTest01.java 2016-08-11 13:46:58.785165800 -0400 @@ -29,12 +29,9 @@ * collection runs jstat. jstat should show that after garbage collection number of GC events and garbage * collection time increase. * @modules java.base/jdk.internal.misc - * @library /test/lib/share/classes + * @library /test/lib * @library ../share * @requires vm.opt.ExplicitGCInvokesConcurrent != true - * @build common.* - * @build utils.* - * * @run main/othervm -XX:+UsePerfData -Xmx128M GcCauseTest01 */ import utils.*; --- old/test/serviceability/tmtools/jstat/GcCauseTest02.java 2016-08-11 13:47:01.626238500 -0400 +++ new/test/serviceability/tmtools/jstat/GcCauseTest02.java 2016-08-11 13:47:01.217195000 -0400 @@ -28,11 +28,8 @@ * tests forces debuggee application eat ~70% of heap and runs jstat. * jstat should show that ~70% of heap (OC/OU ~= 70%). * @modules java.base/jdk.internal.misc - * @library /test/lib/share/classes + * @library /test/lib * @library ../share - * @build common.* - * @build utils.* - * * @run main/othervm -XX:+UsePerfData -Xmx128M -XX:MaxMetaspaceSize=128M GcCauseTest02 */ import utils.*; --- old/test/serviceability/tmtools/jstat/GcCauseTest03.java 2016-08-11 13:47:04.069464800 -0400 +++ new/test/serviceability/tmtools/jstat/GcCauseTest03.java 2016-08-11 13:47:03.661058500 -0400 @@ -28,11 +28,8 @@ * test forces debuggee application call System.gc(), runs jstat and checks that * cause of last garbage collection displayed by jstat (LGCC) is 'System.gc()'. * @modules java.base/jdk.internal.misc - * @library /test/lib/share/classes + * @library /test/lib * @library ../share - * @build common.* - * @build utils.* - * * @run main/othervm -XX:+UsePerfData -Xmx128M -XX:MaxMetaspaceSize=128M GcCauseTest03 */ import utils.*; --- old/test/serviceability/tmtools/jstat/GcNewTest.java 2016-08-11 13:47:06.525901600 -0400 +++ new/test/serviceability/tmtools/jstat/GcNewTest.java 2016-08-11 13:47:06.116248600 -0400 @@ -30,10 +30,8 @@ * collection runs jstat. jstat should show that after garbage collection number of GC events and garbage * collection time increase. * @modules java.base/jdk.internal.misc - * @library /test/lib/share/classes + * @library /test/lib * @library ../share - * @build common.* - * @build utils.* * @run main/othervm -XX:+UsePerfData -Xmx128M GcNewTest */ --- old/test/serviceability/tmtools/jstat/GcTest01.java 2016-08-11 13:47:08.981065300 -0400 +++ new/test/serviceability/tmtools/jstat/GcTest01.java 2016-08-11 13:47:08.582065700 -0400 @@ -32,12 +32,9 @@ * number of GC events and garbage * collection time increase. * @modules java.base/jdk.internal.misc - * @library /test/lib/share/classes + * @library /test/lib * @library ../share * @requires vm.opt.ExplicitGCInvokesConcurrent != true - * @build common.* - * @build utils.* - * * @run main/othervm -XX:+UsePerfData -Xmx128M GcTest01 */ import utils.*; --- old/test/serviceability/tmtools/jstat/GcTest02.java 2016-08-11 13:47:11.425690500 -0400 +++ new/test/serviceability/tmtools/jstat/GcTest02.java 2016-08-11 13:47:11.015422900 -0400 @@ -29,10 +29,8 @@ * tests forces debuggee application eat ~70% of heap and runs jstat. * jstat should show that ~70% of heap is utilized (OC/OU ~= 70%). * @modules java.base/jdk.internal.misc - * @library /test/lib/share/classes + * @library /test/lib * @library ../share - * @build common.* - * @build utils.* * @ignore 8155570 * @run main/othervm -XX:+UsePerfData -Xmx128M -XX:MaxMetaspaceSize=128M GcTest02 */ --- old/test/testlibrary/jittester/src/jdk/test/lib/jittester/Automatic.java 2016-08-11 13:47:13.876531800 -0400 +++ new/test/testlibrary/jittester/src/jdk/test/lib/jittester/Automatic.java 2016-08-11 13:47:13.468762400 -0400 @@ -23,7 +23,7 @@ package jdk.test.lib.jittester; -import jdk.test.lib.Pair; +import jdk.test.lib.util.Pair; import jdk.test.lib.jittester.factories.IRNodeBuilder; import jdk.test.lib.jittester.types.TypeKlass; import jdk.test.lib.jittester.utils.FixedTrees; --- old/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/AssignmentOperatorImplFactory.java 2016-08-11 13:47:16.329358500 -0400 +++ new/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/AssignmentOperatorImplFactory.java 2016-08-11 13:47:15.921793100 -0400 @@ -23,7 +23,7 @@ package jdk.test.lib.jittester.factories; -import jdk.test.lib.Pair; +import jdk.test.lib.util.Pair; import jdk.test.lib.jittester.BinaryOperator; import jdk.test.lib.jittester.IRNode; import jdk.test.lib.jittester.OperatorKind; --- old/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryArithmeticOperatorFactory.java 2016-08-11 13:47:18.784232600 -0400 +++ new/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryArithmeticOperatorFactory.java 2016-08-11 13:47:18.380932200 -0400 @@ -23,7 +23,7 @@ package jdk.test.lib.jittester.factories; -import jdk.test.lib.Pair; +import jdk.test.lib.util.Pair; import jdk.test.lib.jittester.BuiltInType; import jdk.test.lib.jittester.OperatorKind; import jdk.test.lib.jittester.ProductionFailedException; --- old/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryBitwiseOperatorFactory.java 2016-08-11 13:47:21.272196600 -0400 +++ new/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryBitwiseOperatorFactory.java 2016-08-11 13:47:20.840691000 -0400 @@ -23,7 +23,7 @@ package jdk.test.lib.jittester.factories; -import jdk.test.lib.Pair; +import jdk.test.lib.util.Pair; import jdk.test.lib.jittester.OperatorKind; import jdk.test.lib.jittester.ProductionFailedException; import jdk.test.lib.jittester.Type; --- old/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryComparisonOperatorFactory.java 2016-08-11 13:47:23.743111000 -0400 +++ new/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryComparisonOperatorFactory.java 2016-08-11 13:47:23.333303600 -0400 @@ -23,7 +23,7 @@ package jdk.test.lib.jittester.factories; -import jdk.test.lib.Pair; +import jdk.test.lib.util.Pair; import jdk.test.lib.jittester.OperatorKind; import jdk.test.lib.jittester.ProductionFailedException; import jdk.test.lib.jittester.Type; --- old/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryEqualityOperatorFactory.java 2016-08-11 13:47:26.193785500 -0400 +++ new/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryEqualityOperatorFactory.java 2016-08-11 13:47:25.781575300 -0400 @@ -23,7 +23,7 @@ package jdk.test.lib.jittester.factories; -import jdk.test.lib.Pair; +import jdk.test.lib.util.Pair; import jdk.test.lib.jittester.OperatorKind; import jdk.test.lib.jittester.ProductionFailedException; import jdk.test.lib.jittester.Type; --- old/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryLogicOperatorFactory.java 2016-08-11 13:47:28.654859900 -0400 +++ new/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryLogicOperatorFactory.java 2016-08-11 13:47:28.242888800 -0400 @@ -23,7 +23,7 @@ package jdk.test.lib.jittester.factories; -import jdk.test.lib.Pair; +import jdk.test.lib.util.Pair; import jdk.test.lib.jittester.BinaryOperator; import jdk.test.lib.jittester.IRNode; import jdk.test.lib.jittester.OperatorKind; --- old/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryOperatorFactory.java 2016-08-11 13:47:31.118315700 -0400 +++ new/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryOperatorFactory.java 2016-08-11 13:47:30.706531900 -0400 @@ -23,7 +23,7 @@ package jdk.test.lib.jittester.factories; -import jdk.test.lib.Pair; +import jdk.test.lib.util.Pair; import jdk.test.lib.jittester.BinaryOperator; import jdk.test.lib.jittester.IRNode; import jdk.test.lib.jittester.OperatorKind; --- old/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryShiftOperatorFactory.java 2016-08-11 13:47:33.563352800 -0400 +++ new/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryShiftOperatorFactory.java 2016-08-11 13:47:33.159418500 -0400 @@ -23,7 +23,7 @@ package jdk.test.lib.jittester.factories; -import jdk.test.lib.Pair; +import jdk.test.lib.util.Pair; import jdk.test.lib.jittester.OperatorKind; import jdk.test.lib.jittester.ProductionFailedException; import jdk.test.lib.jittester.Type; --- old/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryStringPlusFactory.java 2016-08-11 13:47:36.034743600 -0400 +++ new/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryStringPlusFactory.java 2016-08-11 13:47:35.624678300 -0400 @@ -23,7 +23,7 @@ package jdk.test.lib.jittester.factories; -import jdk.test.lib.Pair; +import jdk.test.lib.util.Pair; import jdk.test.lib.jittester.OperatorKind; import jdk.test.lib.jittester.ProductionFailedException; import jdk.test.lib.jittester.Type; --- old/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/CompoundArithmeticAssignmentOperatorFactory.java 2016-08-11 13:47:38.499970000 -0400 +++ new/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/CompoundArithmeticAssignmentOperatorFactory.java 2016-08-11 13:47:38.092551300 -0400 @@ -23,7 +23,7 @@ package jdk.test.lib.jittester.factories; -import jdk.test.lib.Pair; +import jdk.test.lib.util.Pair; import jdk.test.lib.jittester.BinaryOperator; import jdk.test.lib.jittester.IRNode; import jdk.test.lib.jittester.OperatorKind; --- old/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/CompoundBitwiseAssignmentOperatorFactory.java 2016-08-11 13:47:40.977124500 -0400 +++ new/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/CompoundBitwiseAssignmentOperatorFactory.java 2016-08-11 13:47:40.569547500 -0400 @@ -23,7 +23,7 @@ package jdk.test.lib.jittester.factories; -import jdk.test.lib.Pair; +import jdk.test.lib.util.Pair; import jdk.test.lib.jittester.BinaryOperator; import jdk.test.lib.jittester.IRNode; import jdk.test.lib.jittester.OperatorKind; --- old/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/CompoundShiftAssignmentOperatorFactory.java 2016-08-11 13:47:43.422178700 -0400 +++ new/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/CompoundShiftAssignmentOperatorFactory.java 2016-08-11 13:47:43.015648700 -0400 @@ -23,7 +23,7 @@ package jdk.test.lib.jittester.factories; -import jdk.test.lib.Pair; +import jdk.test.lib.util.Pair; import jdk.test.lib.jittester.BinaryOperator; import jdk.test.lib.jittester.IRNode; import jdk.test.lib.jittester.OperatorKind; --- old/test/testlibrary/jittester/src/jdk/test/lib/jittester/jtreg/JitTesterDriver.java 2016-08-11 13:47:45.881103900 -0400 +++ new/test/testlibrary/jittester/src/jdk/test/lib/jittester/jtreg/JitTesterDriver.java 2016-08-11 13:47:45.467706800 -0400 @@ -24,8 +24,8 @@ package jdk.test.lib.jittester.jtreg; import jdk.test.lib.Asserts; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; import jdk.test.lib.Utils; import java.io.IOException; import java.nio.file.Files; --- old/test/testlibrary/jittester/src/jdk/test/lib/jittester/visitors/ByteCodeVisitor.java 2016-08-11 13:47:48.337675100 -0400 +++ new/test/testlibrary/jittester/src/jdk/test/lib/jittester/visitors/ByteCodeVisitor.java 2016-08-11 13:47:47.931087800 -0400 @@ -39,7 +39,7 @@ import jdk.internal.org.objectweb.asm.Label; import jdk.internal.org.objectweb.asm.MethodVisitor; import jdk.internal.org.objectweb.asm.Opcodes; -import jdk.test.lib.Pair; +import jdk.test.lib.util.Pair; import jdk.test.lib.jittester.BinaryOperator; import jdk.test.lib.jittester.Block; import jdk.test.lib.jittester.BuiltInType; --- old/test/testlibrary_tests/AssertsTest.java 2016-08-11 13:47:50.863302800 -0400 +++ new/test/testlibrary_tests/AssertsTest.java 2016-08-11 13:47:50.456232200 -0400 @@ -26,7 +26,7 @@ /* @test * @summary Tests the different assertions in the Assert class * @modules java.base/jdk.internal.misc - * @library /testlibrary + * @library /test/lib */ public class AssertsTest { private static class Foo implements Comparable { --- old/test/testlibrary_tests/OutputAnalyzerReportingTest.java 2016-08-11 13:47:53.314642000 -0400 +++ new/test/testlibrary_tests/OutputAnalyzerReportingTest.java 2016-08-11 13:47:52.910561400 -0400 @@ -27,7 +27,7 @@ * @summary Test the OutputAnalyzer reporting functionality, * such as printing additional diagnostic info * (exit code, stdout, stderr, command line, etc.) - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management */ @@ -35,8 +35,8 @@ import java.io.ByteArrayOutputStream; import java.io.PrintStream; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; public class OutputAnalyzerReportingTest { --- old/test/testlibrary_tests/OutputAnalyzerTest.java 2016-08-11 13:47:55.770456500 -0400 +++ new/test/testlibrary_tests/OutputAnalyzerTest.java 2016-08-11 13:47:55.355136200 -0400 @@ -24,12 +24,12 @@ /* * @test * @summary Test the OutputAnalyzer utility class - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management */ -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; public class OutputAnalyzerTest { --- old/test/testlibrary_tests/RandomGeneratorTest.java 2016-08-11 13:47:58.206031700 -0400 +++ new/test/testlibrary_tests/RandomGeneratorTest.java 2016-08-11 13:47:57.799094600 -0400 @@ -24,7 +24,7 @@ /* * @test * @summary Verify correctnes of the random generator from Utility.java - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run driver RandomGeneratorTest SAME_SEED @@ -38,8 +38,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; import jdk.test.lib.Utils; /** --- old/test/testlibrary_tests/RedefineClassTest.java 2016-08-11 13:48:00.656833700 -0400 +++ new/test/testlibrary_tests/RedefineClassTest.java 2016-08-11 13:48:00.247023800 -0400 @@ -23,19 +23,17 @@ /* * @test - * @library /testlibrary + * @library /test/lib * @summary Proof of concept test for RedefineClassHelper * @modules java.base/jdk.internal.misc * @modules java.compiler * java.instrument * jdk.jartool/sun.tools.jar - * @build RedefineClassHelper * @run main RedefineClassHelper * @run main/othervm -javaagent:redefineagent.jar RedefineClassTest */ import static jdk.test.lib.Asserts.*; -import jdk.test.lib.*; /* * Proof of concept test for the test utility class RedefineClassHelper --- old/test/testlibrary_tests/SimpleClassFileLoadHookTest.java 2016-08-11 13:48:03.102404100 -0400 +++ new/test/testlibrary_tests/SimpleClassFileLoadHookTest.java 2016-08-11 13:48:02.698614000 -0400 @@ -23,7 +23,7 @@ /* * @test - * @library /testlibrary + * @library /test/lib * @requires vm.flavor != "minimal" * @run main/othervm/native -agentlib:SimpleClassFileLoadHook=Foo,XXX,YYY * SimpleClassFileLoadHookTest --- old/test/testlibrary_tests/TestMutuallyExclusivePlatformPredicates.java 2016-08-11 13:48:05.559939300 -0400 +++ new/test/testlibrary_tests/TestMutuallyExclusivePlatformPredicates.java 2016-08-11 13:48:05.153640300 -0400 @@ -38,7 +38,7 @@ * @summary Verify that for each group of mutually exclusive predicates defined * in jdk.test.lib.Platform one and only one predicate * evaluates to true. - * @library /testlibrary + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management * @run main TestMutuallyExclusivePlatformPredicates @@ -48,7 +48,7 @@ ARCH("isARM", "isPPC", "isSparc", "isX86", "isX64", "isAArch64"), BITNESS("is32bit", "is64bit"), OS("isAix", "isLinux", "isOSX", "isSolaris", "isWindows"), - VM_TYPE("isClient", "isServer", "isGraal", "isMinimal", "isZero"), + VM_TYPE("isClient", "isServer", "isGraal", "isMinimal", "isZero", "isEmbedded"), MODE("isInt", "isMixed", "isComp"), IGNORED("isDebugBuild", "shouldSAAttach", "canPtraceAttachLinux", "canAttachOSX", "isTieredSupported"); --- old/test/testlibrary_tests/TestPlatformIsTieredSupported.java 2016-08-11 13:48:08.005760800 -0400 +++ new/test/testlibrary_tests/TestPlatformIsTieredSupported.java 2016-08-11 13:48:07.593291000 -0400 @@ -28,10 +28,10 @@ /** * @test * @summary Verifies that Platform::isTieredSupported returns correct value. - * @library /testlibrary /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management - * @build TestPlatformIsTieredSupported + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions --- old/test/testlibrary_tests/ctw/ClassesDirTest.java 2016-08-11 13:48:10.470038200 -0400 +++ new/test/testlibrary_tests/ctw/ClassesDirTest.java 2016-08-11 13:48:10.045262300 -0400 @@ -24,12 +24,12 @@ /* * @test * @bug 8012447 - * @library /testlibrary /test/lib /testlibrary/ctw/src + * @library /test/lib /testlibrary/ctw/src * @modules java.base/jdk.internal.jimage * java.base/jdk.internal.misc * java.base/jdk.internal.reflect * java.management - * @build ClassFileInstaller sun.hotspot.tools.ctw.CompileTheWorld sun.hotspot.WhiteBox Foo Bar + * @build sun.hotspot.WhiteBox Foo Bar * @run main ClassFileInstaller sun.hotspot.WhiteBox Foo Bar * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main ClassesDirTest prepare --- old/test/testlibrary_tests/ctw/ClassesListTest.java 2016-08-11 13:48:12.915575700 -0400 +++ new/test/testlibrary_tests/ctw/ClassesListTest.java 2016-08-11 13:48:12.507772500 -0400 @@ -24,12 +24,12 @@ /* * @test * @bug 8012447 - * @library /testlibrary /test/lib /testlibrary/ctw/src + * @library /test/lib /testlibrary/ctw/src * @modules java.base/jdk.internal.jimage * java.base/jdk.internal.misc * java.base/jdk.internal.reflect * java.management - * @build ClassFileInstaller sun.hotspot.tools.ctw.CompileTheWorld sun.hotspot.WhiteBox Foo Bar + * @build sun.hotspot.WhiteBox Foo Bar * @run main ClassFileInstaller sun.hotspot.WhiteBox Foo Bar * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main ClassesListTest prepare --- old/test/testlibrary_tests/ctw/CtwTest.java 2016-08-11 13:48:15.375572300 -0400 +++ new/test/testlibrary_tests/ctw/CtwTest.java 2016-08-11 13:48:14.968388800 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -37,7 +37,7 @@ import java.nio.charset.Charset; import jdk.test.lib.JDKToolFinder; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; public abstract class CtwTest { protected final String[] shouldContain; --- old/test/testlibrary_tests/ctw/JarDirTest.java 2016-08-11 13:48:17.831835500 -0400 +++ new/test/testlibrary_tests/ctw/JarDirTest.java 2016-08-11 13:48:17.424084900 -0400 @@ -24,14 +24,14 @@ /* * @test * @bug 8012447 - * @library /testlibrary /test/lib /testlibrary/ctw/src + * @library /test/lib /testlibrary/ctw/src * @modules java.base/jdk.internal.jimage * java.base/jdk.internal.misc * java.base/jdk.internal.reflect * java.compiler * java.management * jdk.jvmstat/sun.jvmstat.monitor - * @build ClassFileInstaller jdk.test.lib.* sun.hotspot.tools.ctw.CompileTheWorld sun.hotspot.WhiteBox Foo Bar + * @build sun.hotspot.WhiteBox Foo Bar * @run main ClassFileInstaller sun.hotspot.WhiteBox Foo Bar * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main JarDirTest prepare @@ -45,7 +45,7 @@ import java.nio.file.Files; import java.nio.file.Paths; -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; public class JarDirTest extends CtwTest { private static final String[] SHOULD_CONTAIN --- old/test/testlibrary_tests/ctw/JarsTest.java 2016-08-11 13:48:20.265916300 -0400 +++ new/test/testlibrary_tests/ctw/JarsTest.java 2016-08-11 13:48:19.858317100 -0400 @@ -24,14 +24,14 @@ /* * @test * @bug 8012447 - * @library /testlibrary /test/lib /testlibrary/ctw/src + * @library /test/lib /testlibrary/ctw/src * @modules java.base/jdk.internal.jimage * java.base/jdk.internal.misc * java.base/jdk.internal.reflect * java.compiler * java.management * jdk.jvmstat/sun.jvmstat.monitor - * @build ClassFileInstaller jdk.test.lib.* sun.hotspot.tools.ctw.CompileTheWorld sun.hotspot.WhiteBox Foo Bar + * @build sun.hotspot.WhiteBox Foo Bar * @run main ClassFileInstaller sun.hotspot.WhiteBox Foo Bar * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main JarsTest prepare @@ -41,7 +41,7 @@ * @author igor.ignatyev@oracle.com */ -import jdk.test.lib.OutputAnalyzer; +import jdk.test.lib.process.OutputAnalyzer; public class JarsTest extends CtwTest { private static final String[] SHOULD_CONTAIN --- old/test/testlibrary_tests/whitebox/BlobSanityTest.java 2016-08-11 13:48:22.718023700 -0400 +++ new/test/testlibrary_tests/whitebox/BlobSanityTest.java 2016-08-11 13:48:22.290109800 -0400 @@ -24,10 +24,10 @@ /* * @test BlobSanityTest * @bug 8132980 - * @library /testlibrary /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc * @modules java.management/sun.management - * @build BlobSanityTest + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI BlobSanityTest --- old/test/testlibrary_tests/whitebox/vm_flags/BooleanTest.java 2016-08-11 13:48:25.192152200 -0400 +++ new/test/testlibrary_tests/whitebox/vm_flags/BooleanTest.java 2016-08-11 13:48:24.770842300 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -24,12 +24,12 @@ /* * @test BooleanTest * @bug 8028756 - * @library /testlibrary /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc * java.compiler * java.management/sun.management * jdk.jvmstat/sun.jvmstat.monitor - * @build BooleanTest ClassFileInstaller sun.hotspot.WhiteBox jdk.test.lib.* + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm/timeout=600 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI BooleanTest @@ -38,7 +38,8 @@ */ import sun.hotspot.WhiteBox; -import jdk.test.lib.*; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; import sun.management.*; import com.sun.management.*; --- old/test/testlibrary_tests/whitebox/vm_flags/DoubleTest.java 2016-08-11 13:48:27.627747400 -0400 +++ new/test/testlibrary_tests/whitebox/vm_flags/DoubleTest.java 2016-08-11 13:48:27.218863400 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -24,10 +24,10 @@ /* * @test DoubleTest * @bug 8028756 - * @library /testlibrary /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc * @modules java.management/sun.management - * @build DoubleTest + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm/timeout=600 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI DoubleTest --- old/test/testlibrary_tests/whitebox/vm_flags/IntxTest.java 2016-08-11 13:48:30.078097800 -0400 +++ new/test/testlibrary_tests/whitebox/vm_flags/IntxTest.java 2016-08-11 13:48:29.672679800 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -24,10 +24,10 @@ /* * @test IntxTest * @bug 8038756 - * @library /testlibrary /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc * @modules java.management/sun.management - * @build IntxTest + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm/timeout=600 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xint -XX:-ProfileInterpreter IntxTest --- old/test/testlibrary_tests/whitebox/vm_flags/SizeTTest.java 2016-08-11 13:48:32.516129700 -0400 +++ new/test/testlibrary_tests/whitebox/vm_flags/SizeTTest.java 2016-08-11 13:48:32.109220300 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -24,10 +24,10 @@ /* * @test SizeTTest * @bug 8054823 - * @library /testlibrary /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management/sun.management - * @build SizeTTest + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm/timeout=600 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:+UnlockExperimentalVMOptions SizeTTest --- old/test/testlibrary_tests/whitebox/vm_flags/StringTest.java 2016-08-11 13:48:34.954006700 -0400 +++ new/test/testlibrary_tests/whitebox/vm_flags/StringTest.java 2016-08-11 13:48:34.543575300 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -24,10 +24,10 @@ /* * @test StringTest * @bug 8028756 - * @library /testlibrary /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc * @modules java.management/sun.management - * @build StringTest + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm/timeout=600 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI StringTest --- old/test/testlibrary_tests/whitebox/vm_flags/Uint64Test.java 2016-08-11 13:48:37.501004200 -0400 +++ new/test/testlibrary_tests/whitebox/vm_flags/Uint64Test.java 2016-08-11 13:48:37.085969100 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -24,10 +24,10 @@ /* * @test Uint64Test * @bug 8028756 - * @library /testlibrary /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc * @modules java.management/sun.management - * @build Uint64Test + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm/timeout=600 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI Uint64Test --- old/test/testlibrary_tests/whitebox/vm_flags/UintxTest.java 2016-08-11 13:48:39.957659600 -0400 +++ new/test/testlibrary_tests/whitebox/vm_flags/UintxTest.java 2016-08-11 13:48:39.549536100 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -24,10 +24,10 @@ /* * @test UintxTest * @bug 8028756 - * @library /testlibrary /test/lib + * @library /test/lib * @modules java.base/jdk.internal.misc * java.management/sun.management - * @build UintxTest + * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission * @run main/othervm/timeout=600 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI UintxTest --- old/test/testlibrary_tests/whitebox/vm_flags/VmFlagTest.java 2016-08-11 13:48:42.461172500 -0400 +++ new/test/testlibrary_tests/whitebox/vm_flags/VmFlagTest.java 2016-08-11 13:48:42.044581900 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ import sun.hotspot.WhiteBox; import sun.management.*; import com.sun.management.*; -import jdk.test.lib.*; +import jdk.test.lib.Asserts; import java.lang.management.ManagementFactory; public final class VmFlagTest { --- old/test/testlibrary/jdk/test/lib/dtrace/DtraceResultsAnalyzer.java 2016-08-11 13:48:45.293617300 -0400 +++ /dev/null 2016-08-11 13:48:45.000000000 -0400 @@ -1,29 +0,0 @@ -/* - * Copyright (c) 2014, 2015, 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 jdk.test.lib.dtrace; - -import jdk.test.lib.OutputAnalyzer; - -public interface DtraceResultsAnalyzer { - public void analyze(OutputAnalyzer oa, String logFilePath); -} --- /dev/null 2016-08-11 13:48:45.000000000 -0400 +++ new/test/compiler/codecache/dtrace/DtraceResultsAnalyzer.java 2016-08-11 13:48:44.511822300 -0400 @@ -0,0 +1,29 @@ +/* + * Copyright (c) 2014, 2015, 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 compiler.codecache.dtrace; + +import jdk.test.lib.process.OutputAnalyzer; + +public interface DtraceResultsAnalyzer { + public void analyze(OutputAnalyzer oa, String logFilePath); +} --- old/test/testlibrary/jdk/test/lib/dtrace/DtraceRunner.java 2016-08-11 13:48:48.123094300 -0400 +++ /dev/null 2016-08-11 13:48:48.000000000 -0400 @@ -1,121 +0,0 @@ -/* - * Copyright (c) 2014, 2015, 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 jdk.test.lib.dtrace; - -import jdk.test.lib.Asserts; -import jdk.test.lib.OutputAnalyzer; -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; - -public class DtraceRunner { - - private static final String DTRACE_DEFAULT_PATH = "/usr/sbin/dtrace"; - private static final String DTRACE_PATH_PROPERTY - = "com.oracle.test.dtrace.path"; - private static final String OUTPUT_FILE_DTRACE_OPTION = "o"; - private static final String RUN_COMMAND_DTRACE_OPTION = "c"; - private static final String RUN_SCRIPT_DTRACE_OPTION = "s"; - private static final String ALLOW_ZERO_PROBE_DESCRIPTION_DTRACE_OPTION = "Z"; - private static final String DTRACE_OPTION_PREFIX = "-"; - public static final String PERMIT_DESTRUCTIVE_ACTIONS_DTRACE_OPTION = "w"; - public static final String DTRACE_OUT_LOG = "dtrace.out"; - - private final String dtraceExecutable; - - public DtraceRunner() { - dtraceExecutable = getDtracePath(); - } - - private List getLaunchCmd(String java, String javaOpts, - String execClass, String testArgs, String dtraceScript, - String dtraceAddOpts) { - Asserts.assertTrue(!java.matches("\\s"), "Current dtrace implementation" - + " can't handle whitespaces in application path"); - List result = new ArrayList<>(); - result.add(dtraceExecutable); - result.add(DTRACE_OPTION_PREFIX + System.getProperty("sun.arch.data.model")); - result.add(DTRACE_OPTION_PREFIX - + ALLOW_ZERO_PROBE_DESCRIPTION_DTRACE_OPTION - + ((dtraceAddOpts == null) ? "" : dtraceAddOpts) - + RUN_SCRIPT_DTRACE_OPTION); // run_script should be last one - result.add(dtraceScript); - result.add(DTRACE_OPTION_PREFIX + OUTPUT_FILE_DTRACE_OPTION); - result.add(DTRACE_OUT_LOG); - result.add(DTRACE_OPTION_PREFIX + RUN_COMMAND_DTRACE_OPTION); - result.add(java + " " + javaOpts + " " + execClass + " " + testArgs); - return result; - } - - private void backupLogFile(File file) { - if (file.exists()) { - file.renameTo(new File(file.getPath() + ".bak")); - } - } - - public void runDtrace(String java, String javaOpts, String execClass, - String testArgs, String dtraceScript, String dtraceAddOpts, - DtraceResultsAnalyzer analyzer) { - backupLogFile(new File(DTRACE_OUT_LOG)); - ProcessBuilder pbuilder = new ProcessBuilder( - getLaunchCmd(java, javaOpts, execClass, testArgs, - dtraceScript, dtraceAddOpts)); - OutputAnalyzer oa; - try { - oa = new OutputAnalyzer(pbuilder.start()); - } catch (IOException e) { - throw new Error("TESTBUG: Can't start process", e); - } - analyzer.analyze(oa, DTRACE_OUT_LOG); - } - - public static boolean dtraceAvailable() { - String path = getDtracePath(); - if (path == null) { - return false; - } - // now we'll launch dtrace to trace itself just to be sure it works - // and have all additional previleges set - ProcessBuilder pbuilder = new ProcessBuilder(path, path); - try { - OutputAnalyzer oa = new OutputAnalyzer(pbuilder.start()); - if (oa.getExitValue() != 0) { - return false; - } - } catch (IOException e) { - throw new Error("Couldn't launch dtrace", e); - } - return true; - } - - private static String getDtracePath() { - String propPath = System.getProperty(DTRACE_PATH_PROPERTY); - if (propPath != null && new File(propPath).exists()) { - return propPath; - } else if (new File(DTRACE_DEFAULT_PATH).exists()) { - return DTRACE_DEFAULT_PATH; - } - return null; - } -} --- /dev/null 2016-08-11 13:48:48.000000000 -0400 +++ new/test/compiler/codecache/dtrace/DtraceRunner.java 2016-08-11 13:48:47.340638600 -0400 @@ -0,0 +1,121 @@ +/* + * Copyright (c) 2014, 2015, 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 compiler.codecache.dtrace; + +import jdk.test.lib.Asserts; +import jdk.test.lib.process.OutputAnalyzer; +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + +public class DtraceRunner { + + private static final String DTRACE_DEFAULT_PATH = "/usr/sbin/dtrace"; + private static final String DTRACE_PATH_PROPERTY + = "com.oracle.test.dtrace.path"; + private static final String OUTPUT_FILE_DTRACE_OPTION = "o"; + private static final String RUN_COMMAND_DTRACE_OPTION = "c"; + private static final String RUN_SCRIPT_DTRACE_OPTION = "s"; + private static final String ALLOW_ZERO_PROBE_DESCRIPTION_DTRACE_OPTION = "Z"; + private static final String DTRACE_OPTION_PREFIX = "-"; + public static final String PERMIT_DESTRUCTIVE_ACTIONS_DTRACE_OPTION = "w"; + public static final String DTRACE_OUT_LOG = "dtrace.out"; + + private final String dtraceExecutable; + + public DtraceRunner() { + dtraceExecutable = getDtracePath(); + } + + private List getLaunchCmd(String java, String javaOpts, + String execClass, String testArgs, String dtraceScript, + String dtraceAddOpts) { + Asserts.assertTrue(!java.matches("\\s"), "Current dtrace implementation" + + " can't handle whitespaces in application path"); + List result = new ArrayList<>(); + result.add(dtraceExecutable); + result.add(DTRACE_OPTION_PREFIX + System.getProperty("sun.arch.data.model")); + result.add(DTRACE_OPTION_PREFIX + + ALLOW_ZERO_PROBE_DESCRIPTION_DTRACE_OPTION + + ((dtraceAddOpts == null) ? "" : dtraceAddOpts) + + RUN_SCRIPT_DTRACE_OPTION); // run_script should be last one + result.add(dtraceScript); + result.add(DTRACE_OPTION_PREFIX + OUTPUT_FILE_DTRACE_OPTION); + result.add(DTRACE_OUT_LOG); + result.add(DTRACE_OPTION_PREFIX + RUN_COMMAND_DTRACE_OPTION); + result.add(java + " " + javaOpts + " " + execClass + " " + testArgs); + return result; + } + + private void backupLogFile(File file) { + if (file.exists()) { + file.renameTo(new File(file.getPath() + ".bak")); + } + } + + public void runDtrace(String java, String javaOpts, String execClass, + String testArgs, String dtraceScript, String dtraceAddOpts, + DtraceResultsAnalyzer analyzer) { + backupLogFile(new File(DTRACE_OUT_LOG)); + ProcessBuilder pbuilder = new ProcessBuilder( + getLaunchCmd(java, javaOpts, execClass, testArgs, + dtraceScript, dtraceAddOpts)); + OutputAnalyzer oa; + try { + oa = new OutputAnalyzer(pbuilder.start()); + } catch (IOException e) { + throw new Error("TESTBUG: Can't start process", e); + } + analyzer.analyze(oa, DTRACE_OUT_LOG); + } + + public static boolean dtraceAvailable() { + String path = getDtracePath(); + if (path == null) { + return false; + } + // now we'll launch dtrace to trace itself just to be sure it works + // and have all additional previleges set + ProcessBuilder pbuilder = new ProcessBuilder(path, path); + try { + OutputAnalyzer oa = new OutputAnalyzer(pbuilder.start()); + if (oa.getExitValue() != 0) { + return false; + } + } catch (IOException e) { + throw new Error("Couldn't launch dtrace", e); + } + return true; + } + + private static String getDtracePath() { + String propPath = System.getProperty(DTRACE_PATH_PROPERTY); + if (propPath != null && new File(propPath).exists()) { + return propPath; + } else if (new File(DTRACE_DEFAULT_PATH).exists()) { + return DTRACE_DEFAULT_PATH; + } + return null; + } +} --- old/test/testlibrary/jdk/test/lib/AllocationHelper.java 2016-08-11 13:48:50.950252000 -0400 +++ /dev/null 2016-08-11 13:48:51.000000000 -0400 @@ -1,116 +0,0 @@ -/* -* Copyright (c) 2015, 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 jdk.test.lib; - -import java.util.LinkedList; -import java.util.concurrent.Callable; - -/** - * Helper class which allocates memory. - * - * Typical usage: - * 
- * {@code
- *           AllocationHelper allocator = new AllocationHelper(MAX_ITERATIONS, ARRAY_LENGTH, CHUNK_SIZE,
- *                   () -> (verifier()));
- *           // Allocate byte[CHUNK_SIZE] ARRAY_LENGTH times. Total allocated bytes will be CHUNK_SIZE * ARRAY_LENGTH + refs length.
- *           // Then invoke verifier and iterate MAX_ITERATIONS times.
- *           allocator.allocateMemoryAndVerify();
- * }
- *
- */ -public final class AllocationHelper { - - private final int arrayLength; - private final int maxIterations; - private final int chunkSize; - - // garbageStorage is used to store link to garbage to prevent optimization. - private static Object garbageStorage; - private byte garbage[][]; - private final Callable verifierInstance; - - /** - * Create an AllocationHelper with specified iteration count, array length, chunk size and verifier. - * - * @param maxIterations - * @param arrayLength - * @param chunkSize - * @param verifier - Callable instance which will be invoked after all allocation cycle. Can be null; - */ - public AllocationHelper(int maxIterations, int arrayLength, int chunkSize, Callable verifier) { - if ((arrayLength <= 0) || (maxIterations <= 0) || (chunkSize <= 0)) { - throw new IllegalArgumentException("maxIterations, arrayLength and chunkSize should be greater then 0."); - } - this.arrayLength = arrayLength; - this.maxIterations = maxIterations; - this.chunkSize = chunkSize; - verifierInstance = verifier; - garbage = new byte[this.arrayLength][]; - garbageStorage = garbage; - } - - private void allocateMemoryOneIteration() { - for (int j = 0; j < arrayLength; j++) { - garbage[j] = new byte[chunkSize]; - } - } - - /** - * Allocate memory and invoke Verifier during all iteration. - * - * @throws java.lang.Exception - */ - public void allocateMemoryAndVerify() throws Exception { - for (int i = 0; i < maxIterations; i++) { - allocateMemoryOneIteration(); - if (verifierInstance != null) { - verifierInstance.call(); - } - } - } - - /** - * The same as allocateMemoryAndVerify() but hides OOME - * - * @throws Exception - */ - public void allocateMemoryAndVerifyNoOOME() throws Exception { - try { - allocateMemoryAndVerify(); - } catch (OutOfMemoryError e) { - // exit on OOME - } - } - - /** - * Release link to allocated garbage to make it available for further GC - */ - public void release() { - if (garbage != null) { - garbage = null; - garbageStorage = null; - } - } -} --- /dev/null 2016-08-11 13:48:51.000000000 -0400 +++ new/test/gc/arguments/AllocationHelper.java 2016-08-11 13:48:50.163943100 -0400 @@ -0,0 +1,114 @@ +/* +* Copyright (c) 2015, 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. +*/ + +import java.util.LinkedList; +import java.util.concurrent.Callable; + +/** + * Helper class which allocates memory. + * + * Typical usage: + * 
+ * {@code
+ *           AllocationHelper allocator = new AllocationHelper(MAX_ITERATIONS, ARRAY_LENGTH, CHUNK_SIZE,
+ *                   () -> (verifier()));
+ *           // Allocate byte[CHUNK_SIZE] ARRAY_LENGTH times. Total allocated bytes will be CHUNK_SIZE * ARRAY_LENGTH + refs length.
+ *           // Then invoke verifier and iterate MAX_ITERATIONS times.
+ *           allocator.allocateMemoryAndVerify();
+ * }
+ *
+ */ +public final class AllocationHelper { + + private final int arrayLength; + private final int maxIterations; + private final int chunkSize; + + // garbageStorage is used to store link to garbage to prevent optimization. + private static Object garbageStorage; + private byte garbage[][]; + private final Callable verifierInstance; + + /** + * Create an AllocationHelper with specified iteration count, array length, chunk size and verifier. + * + * @param maxIterations + * @param arrayLength + * @param chunkSize + * @param verifier - Callable instance which will be invoked after all allocation cycle. Can be null; + */ + public AllocationHelper(int maxIterations, int arrayLength, int chunkSize, Callable verifier) { + if ((arrayLength <= 0) || (maxIterations <= 0) || (chunkSize <= 0)) { + throw new IllegalArgumentException("maxIterations, arrayLength and chunkSize should be greater then 0."); + } + this.arrayLength = arrayLength; + this.maxIterations = maxIterations; + this.chunkSize = chunkSize; + verifierInstance = verifier; + garbage = new byte[this.arrayLength][]; + garbageStorage = garbage; + } + + private void allocateMemoryOneIteration() { + for (int j = 0; j < arrayLength; j++) { + garbage[j] = new byte[chunkSize]; + } + } + + /** + * Allocate memory and invoke Verifier during all iteration. + * + * @throws java.lang.Exception + */ + public void allocateMemoryAndVerify() throws Exception { + for (int i = 0; i < maxIterations; i++) { + allocateMemoryOneIteration(); + if (verifierInstance != null) { + verifierInstance.call(); + } + } + } + + /** + * The same as allocateMemoryAndVerify() but hides OOME + * + * @throws Exception + */ + public void allocateMemoryAndVerifyNoOOME() throws Exception { + try { + allocateMemoryAndVerify(); + } catch (OutOfMemoryError e) { + // exit on OOME + } + } + + /** + * Release link to allocated garbage to make it available for further GC + */ + public void release() { + if (garbage != null) { + garbage = null; + garbageStorage = null; + } + } +} --- old/test/testlibrary/jdk/test/lib/HeapRegionUsageTool.java 2016-08-11 13:48:53.763574500 -0400 +++ /dev/null 2016-08-11 13:48:53.000000000 -0400 @@ -1,107 +0,0 @@ -/* -* Copyright (c) 2015, 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 jdk.test.lib; - -import java.lang.management.ManagementFactory; -import java.lang.management.MemoryPoolMXBean; -import java.lang.management.MemoryUsage; - -/** - * Utility class used by tests to get heap region usage. - */ -public final class HeapRegionUsageTool { - - /** - * Get MemoryUsage from MemoryPoolMXBean which name matches passed string. - * - * @param name - * @return MemoryUsage - */ - private static MemoryUsage getUsage(String name){ - for (MemoryPoolMXBean pool : ManagementFactory.getMemoryPoolMXBeans()) { - if (pool.getName().matches(name)) { - return pool.getUsage(); - } - } - return null; - } - - /** - * Get MemoryUsage of Eden space. - * - * @return MemoryUsage - */ - public static MemoryUsage getEdenUsage() { - return getUsage(".*Eden.*"); - } - - /** - * Get MemoryUsage of Survivor space. - * - * @return MemoryUsage - */ - public static MemoryUsage getSurvivorUsage() { - return getUsage(".*Survivor.*"); - } - - /** - * Get memory usage of Tenured space - * - * @return MemoryUsage - */ - public static MemoryUsage getOldUsage() { - return getUsage(".*(Old|Tenured).*"); - } - - /** - * Get heap usage. - * - * @return MemoryUsage - */ - public static MemoryUsage getHeapUsage() { - return ManagementFactory.getMemoryMXBean().getHeapMemoryUsage(); - } - - /** - * Helper function to align up. - * - * @param value - * @param alignment - * @return aligned value - */ - public static long alignUp(long value, long alignment) { - return (value + alignment - 1) & ~(alignment - 1); - } - - /** - * Helper function to align down. - * - * @param value - * @param alignment - * @return aligned value - */ - public static long alignDown(long value, long alignment) { - return value & ~(alignment - 1); - } -} --- /dev/null 2016-08-11 13:48:54.000000000 -0400 +++ new/test/gc/arguments/HeapRegionUsageTool.java 2016-08-11 13:48:52.985973500 -0400 @@ -0,0 +1,105 @@ +/* +* Copyright (c) 2015, 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. +*/ + +import java.lang.management.ManagementFactory; +import java.lang.management.MemoryPoolMXBean; +import java.lang.management.MemoryUsage; + +/** + * Utility class used by tests to get heap region usage. + */ +public final class HeapRegionUsageTool { + + /** + * Get MemoryUsage from MemoryPoolMXBean which name matches passed string. + * + * @param name + * @return MemoryUsage + */ + private static MemoryUsage getUsage(String name){ + for (MemoryPoolMXBean pool : ManagementFactory.getMemoryPoolMXBeans()) { + if (pool.getName().matches(name)) { + return pool.getUsage(); + } + } + return null; + } + + /** + * Get MemoryUsage of Eden space. + * + * @return MemoryUsage + */ + public static MemoryUsage getEdenUsage() { + return getUsage(".*Eden.*"); + } + + /** + * Get MemoryUsage of Survivor space. + * + * @return MemoryUsage + */ + public static MemoryUsage getSurvivorUsage() { + return getUsage(".*Survivor.*"); + } + + /** + * Get memory usage of Tenured space + * + * @return MemoryUsage + */ + public static MemoryUsage getOldUsage() { + return getUsage(".*(Old|Tenured).*"); + } + + /** + * Get heap usage. + * + * @return MemoryUsage + */ + public static MemoryUsage getHeapUsage() { + return ManagementFactory.getMemoryMXBean().getHeapMemoryUsage(); + } + + /** + * Helper function to align up. + * + * @param value + * @param alignment + * @return aligned value + */ + public static long alignUp(long value, long alignment) { + return (value + alignment - 1) & ~(alignment - 1); + } + + /** + * Helper function to align down. + * + * @param value + * @param alignment + * @return aligned value + */ + public static long alignDown(long value, long alignment) { + return value & ~(alignment - 1); + } +} --- old/test/testlibrary/jdk/test/lib/InputArguments.java 2016-08-11 13:48:56.591677800 -0400 +++ /dev/null 2016-08-11 13:48:56.000000000 -0400 @@ -1,76 +0,0 @@ -/* - * Copyright (c) 2013, 2015, 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 jdk.test.lib; - -import java.lang.management.RuntimeMXBean; -import java.lang.management.ManagementFactory; -import java.util.List; - -/** - * This class provides access to the input arguments to the VM. - */ -public class InputArguments { - private static final List args; - - static { - RuntimeMXBean runtimeMxBean = ManagementFactory.getRuntimeMXBean(); - args = runtimeMxBean.getInputArguments(); - } - - /** - * Returns true if {@code arg} is an input argument to the VM. - * - * This is useful for checking boolean flags such as -XX:+UseSerialGC or - * -XX:-UsePerfData. - * - * @param arg The name of the argument. - * @return {@code true} if the given argument is an input argument, - * otherwise {@code false}. - */ - public static boolean contains(String arg) { - return args.contains(arg); - } - - /** - * Returns true if {@code prefix} is the start of an input argument to the - * VM. - * - * This is useful for checking if flags describing a quantity, such as - * -XX:+MaxMetaspaceSize=100m, is set without having to know the quantity. - * To check if the flag -XX:MaxMetaspaceSize is set, use - * {@code InputArguments.containsPrefix("-XX:MaxMetaspaceSize")}. - * - * @param prefix The start of the argument. - * @return {@code true} if the given argument is the start of an input - * argument, otherwise {@code false}. - */ - public static boolean containsPrefix(String prefix) { - for (String arg : args) { - if (arg.startsWith(prefix)) { - return true; - } - } - return false; - } -} --- /dev/null 2016-08-11 13:48:56.000000000 -0400 +++ new/test/gc/metaspace/InputArguments.java 2016-08-11 13:48:55.815600200 -0400 @@ -0,0 +1,74 @@ +/* + * Copyright (c) 2013, 2015, 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. + */ + +import java.lang.management.RuntimeMXBean; +import java.lang.management.ManagementFactory; +import java.util.List; + +/** + * This class provides access to the input arguments to the VM. + */ +public class InputArguments { + private static final List args; + + static { + RuntimeMXBean runtimeMxBean = ManagementFactory.getRuntimeMXBean(); + args = runtimeMxBean.getInputArguments(); + } + + /** + * Returns true if {@code arg} is an input argument to the VM. + * + * This is useful for checking boolean flags such as -XX:+UseSerialGC or + * -XX:-UsePerfData. + * + * @param arg The name of the argument. + * @return {@code true} if the given argument is an input argument, + * otherwise {@code false}. + */ + public static boolean contains(String arg) { + return args.contains(arg); + } + + /** + * Returns true if {@code prefix} is the start of an input argument to the + * VM. + * + * This is useful for checking if flags describing a quantity, such as + * -XX:+MaxMetaspaceSize=100m, is set without having to know the quantity. + * To check if the flag -XX:MaxMetaspaceSize is set, use + * {@code InputArguments.containsPrefix("-XX:MaxMetaspaceSize")}. + * + * @param prefix The start of the argument. + * @return {@code true} if the given argument is the start of an input + * argument, otherwise {@code false}. + */ + public static boolean containsPrefix(String prefix) { + for (String arg : args) { + if (arg.startsWith(prefix)) { + return true; + } + } + return false; + } +} --- old/test/testlibrary/ClassFileInstaller.java 2016-08-11 13:48:59.038613400 -0400 +++ /dev/null 2016-08-11 13:48:59.000000000 -0400 @@ -1,257 +0,0 @@ -/* - * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * 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. - */ - -import java.io.ByteArrayInputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.FileNotFoundException; -import java.io.InputStream; -import java.io.ByteArrayInputStream; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.nio.file.StandardCopyOption; -import java.util.zip.ZipEntry; -import java.util.zip.ZipOutputStream; - -/** - * Dump a class file for a class on the class path in the current directory, or - * in the specified JAR file. This class is usually used when you build a class - * from a test library, but want to use this class in a sub-process. - * - * For example, to build the following library class: - * test/lib/sun/hotspot/WhiteBox.java - * - * You would use the following tags: - * - * @library /test/lib - * @build sun.hotspot.WhiteBox - * - * JTREG would build the class file under - * ${JTWork}/classes/test/lib/sun/hotspot/WhiteBox.class - * - * With you run your main test class using "@run main MyMainClass", JTREG would setup the - * -classpath to include "${JTWork}/classes/test/lib/", so MyMainClass would be able to - * load the WhiteBox class. - * - * However, if you run a sub process, and do not wish to use the exact same -classpath, - * You can use ClassFileInstaller to ensure that WhiteBox is available in the current - * directory of your test: - * - * @run main ClassFileInstaller sun.hotspot.WhiteBox - * - * Or, you can use the -jar option to store the class in the specified JAR file. If a relative - * path name is given, the JAR file would be relative to the current directory of - * - * @run main ClassFileInstaller -jar myjar.jar sun.hotspot.WhiteBox - */ -public class ClassFileInstaller { - /** - * You can enable debug tracing of ClassFileInstaller by running JTREG with - * jtreg -DClassFileInstaller.debug=true ... - */ - public static boolean DEBUG = Boolean.getBoolean("ClassFileInstaller.debug"); - - /** - * @param args The names of the classes to dump - * @throws Exception - */ - public static void main(String... args) throws Exception { - if (args.length > 1 && args[0].equals("-jar")) { - if (args.length < 2) { - throw new RuntimeException("Usage: ClassFileInstaller \n" + - "where possible options include:\n" + - " -jar Write to the JAR file "); - } - writeJar(args[1], null, args, 2, args.length); - } else { - if (DEBUG) { - System.out.println("ClassFileInstaller: Writing to " + System.getProperty("user.dir")); - } - for (String arg : args) { - writeClassToDisk(arg); - } - } - } - - public static class Manifest { - private InputStream in; - - private Manifest(InputStream in) { - this.in = in; - } - - static Manifest fromSourceFile(String fileName) throws Exception { - String pathName = System.getProperty("test.src") + File.separator + fileName; - return new Manifest(new FileInputStream(pathName)); - } - - // Example: - // String manifest = "Premain-Class: RedefineClassHelper\n" + - // "Can-Redefine-Classes: true\n"; - // ClassFileInstaller.writeJar("redefineagent.jar", - // ClassFileInstaller.Manifest.fromString(manifest), - // "RedefineClassHelper"); - static Manifest fromString(String manifest) throws Exception { - return new Manifest(new ByteArrayInputStream(manifest.getBytes())); - } - - public InputStream getInputStream() { - return in; - } - } - - private static void writeJar(String jarFile, Manifest manifest, String classes[], int from, int to) throws Exception { - if (DEBUG) { - System.out.println("ClassFileInstaller: Writing to " + getJarPath(jarFile)); - } - - (new File(jarFile)).delete(); - FileOutputStream fos = new FileOutputStream(jarFile); - ZipOutputStream zos = new ZipOutputStream(fos); - - // The manifest must be the first or second entry. See comments in JarInputStream - // constructor and JDK-5046178. - if (manifest != null) { - writeToDisk(zos, "META-INF/MANIFEST.MF", manifest.getInputStream()); - } - - for (int i=from; i 0) { - pathName = prependPath + "/" + pathName; - } - writeToDisk(zos, pathName, is); - } - - public static void writeClassToDisk(String className, byte[] bytecode) throws Exception { - writeClassToDisk(null, className, bytecode); - } - private static void writeClassToDisk(ZipOutputStream zos, String className, byte[] bytecode) throws Exception { - writeClassToDisk(zos, className, bytecode, ""); - } - - public static void writeClassToDisk(String className, byte[] bytecode, String prependPath) throws Exception { - writeClassToDisk(null, className, bytecode, prependPath); - } - private static void writeClassToDisk(ZipOutputStream zos, String className, byte[] bytecode, String prependPath) throws Exception { - // Convert dotted class name to a path to a class file - String pathName = className.replace('.', '/').concat(".class"); - if (prependPath.length() > 0) { - pathName = prependPath + "/" + pathName; - } - writeToDisk(zos, pathName, new ByteArrayInputStream(bytecode)); - } - - private static void writeToDisk(ZipOutputStream zos, String pathName, InputStream is) throws Exception { - if (DEBUG) { - System.out.println("ClassFileInstaller: Writing " + pathName); - } - if (zos != null) { - ZipEntry ze = new ZipEntry(pathName); - zos.putNextEntry(ze); - byte[] buf = new byte[1024]; - int len; - while ((len = is.read(buf))>0){ - zos.write(buf, 0, len); - } - } else { - // Create the class file's package directory - Path p = Paths.get(pathName); - if (pathName.contains("/")) { - Files.createDirectories(p.getParent()); - } - // Create the class file - Files.copy(is, p, StandardCopyOption.REPLACE_EXISTING); - } - is.close(); - } -} --- old/test/testlibrary/RedefineClassHelper.java 2016-08-11 13:49:00.467330000 -0400 +++ /dev/null 2016-08-11 13:49:00.000000000 -0400 @@ -1,79 +0,0 @@ -/* - * Copyright (c) 2014, 2015, 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. - */ - -import java.io.PrintWriter; -import java.lang.instrument.*; -import jdk.test.lib.*; - -/* - * Helper class to write tests that redefine classes. - * When main method is run, it will create a redefineagent.jar that can be used - * with the -javaagent option to support redefining classes in jtreg tests. - * - * See sample test in test/testlibrary_tests/RedefineClassTest.java - */ -public class RedefineClassHelper { - - public static Instrumentation instrumentation; - public static void premain(String agentArgs, Instrumentation inst) { - instrumentation = inst; - } - - /** - * Redefine a class - * - * @param clazz Class to redefine - * @param javacode String with the new java code for the class to be redefined - */ - public static void redefineClass(Class clazz, String javacode) throws Exception { - byte[] bytecode = InMemoryJavaCompiler.compile(clazz.getName(), javacode); - redefineClass(clazz, bytecode); - } - - /** - * Redefine a class - * - * @param clazz Class to redefine - * @param bytecode byte[] with the new class - */ - public static void redefineClass(Class clazz, byte[] bytecode) throws Exception { - instrumentation.redefineClasses(new ClassDefinition(clazz, bytecode)); - } - - /** - * Main method to be invoked before test to create the redefineagent.jar - */ - public static void main(String[] args) throws Exception { - ClassFileInstaller.main("RedefineClassHelper"); - - PrintWriter pw = new PrintWriter("MANIFEST.MF"); - pw.println("Premain-Class: RedefineClassHelper"); - pw.println("Can-Redefine-Classes: true"); - pw.close(); - - sun.tools.jar.Main jarTool = new sun.tools.jar.Main(System.out, System.err, "jar"); - if (!jarTool.run(new String[] { "-cmf", "MANIFEST.MF", "redefineagent.jar", "RedefineClassHelper.class" })) { - throw new Exception("jar operation failed"); - } - } -} --- old/test/testlibrary/jdk/test/lib/Asserts.java 2016-08-11 13:49:01.893905200 -0400 +++ /dev/null 2016-08-11 13:49:02.000000000 -0400 @@ -1,454 +0,0 @@ -/* - * Copyright (c) 2013, 2015, 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 jdk.test.lib; - -/** - * Asserts that can be used for verifying assumptions in tests. - * - * An assertion will throw a {@link RuntimeException} if the assertion isn't - * valid. All the asserts can be imported into a test by using a static - * import: - * - * 
- * {@code
- * import static jdk.test.lib.Asserts.*;
- * }
- *
- * Always provide a message describing the assumption if the line number of the
- * failing assertion isn't enough to understand why the assumption failed. For
- * example, if the assertion is in a loop or in a method that is called
- * multiple times, then the line number won't provide enough context to
- * understand the failure.
- *
- * @deprecated This class is deprecated. Use the one from - * {@code /test/lib/share/classes/jdk/test/lib} - */ -@Deprecated -public class Asserts { - - /** - * Shorthand for {@link #assertLessThan(T, T)}. - * - * @see #assertLessThan(T, T) - */ - public static > void assertLT(T lhs, T rhs) { - assertLessThan(lhs, rhs); - } - - /** - * Shorthand for {@link #assertLessThan(T, T, String)}. - * - * @see #assertLessThan(T, T, String) - */ - public static > void assertLT(T lhs, T rhs, String msg) { - assertLessThan(lhs, rhs, msg); - } - - /** - * Calls {@link #assertLessThan(T, T, String)} with a default message. - * - * @see #assertLessThan(T, T, String) - */ - public static > void assertLessThan(T lhs, T rhs) { - assertLessThan(lhs, rhs, null); - } - - /** - * Asserts that {@code lhs} is less than {@code rhs}. - * - * @param lhs The left hand side of the comparison. - * @param rhs The right hand side of the comparison. - * @param msg A description of the assumption. - * @throws RuntimeException if the assertion isn't valid. - */ - public static >void assertLessThan(T lhs, T rhs, String msg) { - assertTrue(compare(lhs, rhs, msg) < 0, getMessage(lhs, rhs, "<", msg)); - } - - /** - * Shorthand for {@link #assertLessThanOrEqual(T, T)}. - * - * @see #assertLessThanOrEqual(T, T) - */ - public static > void assertLTE(T lhs, T rhs) { - assertLessThanOrEqual(lhs, rhs); - } - - /** - * Shorthand for {@link #assertLessThanOrEqual(T, T, String)}. - * - * @see #assertLessThanOrEqual(T, T, String) - */ - public static > void assertLTE(T lhs, T rhs, String msg) { - assertLessThanOrEqual(lhs, rhs, msg); - } - - /** - * Calls {@link #assertLessThanOrEqual(T, T, String)} with a default message. - * - * @see #assertLessThanOrEqual(T, T, String) - */ - public static > void assertLessThanOrEqual(T lhs, T rhs) { - assertLessThanOrEqual(lhs, rhs, null); - } - - /** - * Asserts that {@code lhs} is less than or equal to {@code rhs}. - * - * @param lhs The left hand side of the comparison. - * @param rhs The right hand side of the comparison. - * @param msg A description of the assumption. - * @throws RuntimeException if the assertion isn't valid. - */ - public static > void assertLessThanOrEqual(T lhs, T rhs, String msg) { - assertTrue(compare(lhs, rhs, msg) <= 0, getMessage(lhs, rhs, "<=", msg)); - } - - /** - * Shorthand for {@link #assertEquals(T, T)}. - * - * @see #assertEquals(T, T) - */ - public static void assertEQ(Object lhs, Object rhs) { - assertEquals(lhs, rhs); - } - - /** - * Shorthand for {@link #assertEquals(T, T, String)}. - * - * @see #assertEquals(T, T, String) - */ - public static void assertEQ(Object lhs, Object rhs, String msg) { - assertEquals(lhs, rhs, msg); - } - - /** - * Calls {@link #assertEquals(T, T, String)} with a default message. - * - * @see #assertEquals(T, T, String) - */ - public static void assertEquals(Object lhs, Object rhs) { - assertEquals(lhs, rhs, null); - } - - /** - * Asserts that {@code lhs} is equal to {@code rhs}. - * - * @param lhs The left hand side of the comparison. - * @param rhs The right hand side of the comparison. - * @param msg A description of the assumption. - * @throws RuntimeException if the assertion isn't valid. - */ - public static void assertEquals(Object lhs, Object rhs, String msg) { - if (lhs == null) { - if (rhs != null) { - error(msg); - } - } else { - assertTrue(lhs.equals(rhs), getMessage(lhs, rhs, "==", msg)); - } - } - - /** - * Shorthand for {@link #assertGreaterThanOrEqual(T, T)}. - * - * @see #assertGreaterThanOrEqual(T, T) - */ - public static > void assertGTE(T lhs, T rhs) { - assertGreaterThanOrEqual(lhs, rhs); - } - - /** - * Shorthand for {@link #assertGreaterThanOrEqual(T, T, String)}. - * - * @see #assertGreaterThanOrEqual(T, T, String) - */ - public static > void assertGTE(T lhs, T rhs, String msg) { - assertGreaterThanOrEqual(lhs, rhs, msg); - } - - /** - * Calls {@link #assertGreaterThanOrEqual(T, T, String)} with a default message. - * - * @see #assertGreaterThanOrEqual(T, T, String) - */ - public static > void assertGreaterThanOrEqual(T lhs, T rhs) { - assertGreaterThanOrEqual(lhs, rhs, null); - } - - /** - * Asserts that {@code lhs} is greater than or equal to {@code rhs}. - * - * @param lhs The left hand side of the comparison. - * @param rhs The right hand side of the comparison. - * @param msg A description of the assumption. - * @throws RuntimeException if the assertion isn't valid. - */ - public static > void assertGreaterThanOrEqual(T lhs, T rhs, String msg) { - assertTrue(compare(lhs, rhs, msg) >= 0, getMessage(lhs, rhs, ">=", msg)); - } - - /** - * Shorthand for {@link #assertGreaterThan(T, T)}. - * - * @see #assertGreaterThan(T, T) - */ - public static > void assertGT(T lhs, T rhs) { - assertGreaterThan(lhs, rhs); - } - - /** - * Shorthand for {@link #assertGreaterThan(T, T, String)}. - * - * @see #assertGreaterThan(T, T, String) - */ - public static > void assertGT(T lhs, T rhs, String msg) { - assertGreaterThan(lhs, rhs, msg); - } - - /** - * Calls {@link #assertGreaterThan(T, T, String)} with a default message. - * - * @see #assertGreaterThan(T, T, String) - */ - public static > void assertGreaterThan(T lhs, T rhs) { - assertGreaterThan(lhs, rhs, null); - } - - /** - * Asserts that {@code lhs} is greater than {@code rhs}. - * - * @param lhs The left hand side of the comparison. - * @param rhs The right hand side of the comparison. - * @param msg A description of the assumption. - * @throws RuntimeException if the assertion isn't valid. - */ - public static > void assertGreaterThan(T lhs, T rhs, String msg) { - assertTrue(compare(lhs, rhs, msg) > 0, getMessage(lhs, rhs, ">", msg)); - } - - /** - * Shorthand for {@link #assertNotEquals(T, T)}. - * - * @see #assertNotEquals(T, T) - */ - public static void assertNE(Object lhs, Object rhs) { - assertNotEquals(lhs, rhs); - } - - /** - * Shorthand for {@link #assertNotEquals(T, T, String)}. - * - * @see #assertNotEquals(T, T, String) - */ - public static void assertNE(Object lhs, Object rhs, String msg) { - assertNotEquals(lhs, rhs, msg); - } - - /** - * Calls {@link #assertNotEquals(T, T, String)} with a default message. - * - * @see #assertNotEquals(T, T, String) - */ - public static void assertNotEquals(Object lhs, Object rhs) { - assertNotEquals(lhs, rhs, null); - } - - /** - * Asserts that {@code lhs} is not equal to {@code rhs}. - * - * @param lhs The left hand side of the comparison. - * @param rhs The right hand side of the comparison. - * @param msg A description of the assumption. - * @throws RuntimeException if the assertion isn't valid. - */ - public static void assertNotEquals(Object lhs, Object rhs, String msg) { - if (lhs == null) { - if (rhs == null) { - error(msg); - } - } else { - assertFalse(lhs.equals(rhs), getMessage(lhs, rhs,"!=", msg)); - } - } - - /** - * Calls {@link #assertNull(Object, String)} with a default message. - * - * @see #assertNull(Object, String) - */ - public static void assertNull(Object o) { - assertNull(o, "Expected " + format(o) + " to be null"); - } - - /** - * Asserts that {@code o} is null. - * - * @param o The reference assumed to be null. - * @param msg A description of the assumption. - * @throws RuntimeException if the assertion isn't valid. - */ - public static void assertNull(Object o, String msg) { - assertEquals(o, null, msg); - } - - /** - * Calls {@link #assertNotNull(Object, String)} with a default message. - * - * @see #assertNotNull(Object, String) - */ - public static void assertNotNull(Object o) { - assertNotNull(o, "Expected non null reference"); - } - - /** - * Asserts that {@code o} is not null. - * - * @param o The reference assumed not to be null, - * @param msg A description of the assumption. - * @throws RuntimeException if the assertion isn't valid. - */ - public static void assertNotNull(Object o, String msg) { - assertNotEquals(o, null, msg); - } - - /** - * Calls {@link #assertFalse(boolean, String)} with a default message. - * - * @see #assertFalse(boolean, String) - */ - public static void assertFalse(boolean value) { - assertFalse(value, "Expected value to be false"); - } - - /** - * Asserts that {@code value} is {@code false}. - * - * @param value The value assumed to be false. - * @param msg A description of the assumption. - * @throws RuntimeException if the assertion isn't valid. - */ - public static void assertFalse(boolean value, String msg) { - assertTrue(!value, msg); - } - - /** - * Calls {@link #assertTrue(boolean, String)} with a default message. - * - * @see #assertTrue(boolean, String) - */ - public static void assertTrue(boolean value) { - assertTrue(value, "Expected value to be true"); - } - - /** - * Asserts that {@code value} is {@code true}. - * - * @param value The value assumed to be true. - * @param msg A description of the assumption. - * @throws RuntimeException if the assertion isn't valid. - */ - public static void assertTrue(boolean value, String msg) { - if (!value) { - error(msg); - } - } - - /** - * Asserts that two strings are equal. - * - * If strings are not equals, then exception message - * will contain {@code msg} followed by list of mismatched lines. - * - * @param str1 First string to compare. - * @param str2 Second string to compare. - * @param msg A description of the assumption. - * @throws RuntimeException if strings are not equal. - */ - public static void assertStringsEqual(String str1, String str2, - String msg) { - String lineSeparator = System.getProperty("line.separator"); - String str1Lines[] = str1.split(lineSeparator); - String str2Lines[] = str2.split(lineSeparator); - - int minLength = Math.min(str1Lines.length, str2Lines.length); - String longestStringLines[] = ((str1Lines.length == minLength) ? - str2Lines : str1Lines); - - boolean stringsAreDifferent = false; - - StringBuilder messageBuilder = new StringBuilder(msg); - - messageBuilder.append("\n"); - - for (int line = 0; line < minLength; line++) { - if (!str1Lines[line].equals(str2Lines[line])) { - messageBuilder.append(String. - format("[line %d] '%s' differs " + - "from '%s'\n", - line, - str1Lines[line], - str2Lines[line])); - stringsAreDifferent = true; - } - } - - if (minLength < longestStringLines.length) { - String stringName = ((longestStringLines == str1Lines) ? - "first" : "second"); - messageBuilder.append(String.format("Only %s string contains " + - "following lines:\n", - stringName)); - stringsAreDifferent = true; - for(int line = minLength; line < longestStringLines.length; line++) { - messageBuilder.append(String. - format("[line %d] '%s'", line, - longestStringLines[line])); - } - } - - if (stringsAreDifferent) { - error(messageBuilder.toString()); - } - } - - private static > int compare(T lhs, T rhs, String msg) { - assertNotNull(lhs, msg); - assertNotNull(rhs, msg); - return lhs.compareTo(rhs); - } - - private static String format(Object o) { - return o == null? "null" : o.toString(); - } - - private static void error(String msg) { - throw new RuntimeException(msg); - } - - private static String getMessage(Object lhs, Object rhs, String op, String msg) { - return (msg == null ? "" : msg + " ") + "(assert failed: " + format(lhs) + " " + op + " " + format(rhs) + ")"; - } -} - --- old/test/testlibrary/jdk/test/lib/BuildHelper.java 2016-08-11 13:49:03.322537600 -0400 +++ /dev/null 2016-08-11 13:49:03.000000000 -0400 @@ -1,106 +0,0 @@ -/* - * Copyright (c) 2014, 2015, 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 jdk.test.lib; - -import java.io.File; -import java.io.FileReader; -import java.util.Properties; - -public class BuildHelper { - - /** - * Commercial builds should have the BUILD_TYPE set to commercial - * within the release file, found at the root of the JDK. - */ - public static boolean isCommercialBuild() throws Exception { - String buildType = getReleaseProperty("BUILD_TYPE","notFound"); - return buildType.equals("commercial"); - } - - - /** - * Return the value for property key, or defaultValue if no property not found. - * If present, double quotes are trimmed. - */ - public static String getReleaseProperty(String key, String defaultValue) throws Exception { - Properties properties = getReleaseProperties(); - String value = properties.getProperty(key, defaultValue); - return trimDoubleQuotes(value); - } - - /** - * Return the value for property key, or null if no property not found. - * If present, double quotes are trimmed. - */ - public static String getReleaseProperty(String key) throws Exception { - return getReleaseProperty(key, null); - } - - /** - * Get properties from the release file - */ - public static Properties getReleaseProperties() throws Exception { - Properties properties = new Properties(); - properties.load(new FileReader(getReleaseFile())); - return properties; - } - - /** - * Every JDK has a release file in its root. - * @return A handler to the release file. - */ - public static File getReleaseFile() throws Exception { - String jdkPath = getJDKRoot(); - File releaseFile = new File(jdkPath,"release"); - if ( ! releaseFile.canRead() ) { - throw new Exception("Release file is not readable, or it is absent: " + - releaseFile.getCanonicalPath()); - } - return releaseFile; - } - - /** - * Returns path to the JDK under test. - * This path is obtained through the test.jdk property, usually set by JTREG. - */ - public static String getJDKRoot() { - String jdkPath = System.getProperty("test.jdk"); - if (jdkPath == null) { - throw new RuntimeException("System property 'test.jdk' not set. This property is normally set by jtreg. " - + "When running test separately, set this property using '-Dtest.jdk=/path/to/jdk'."); - } - return jdkPath; - } - - /** - * Trim double quotes from the beginning and the end of the given string. - * @param original string to trim. - * @return a new trimmed string. - */ - public static String trimDoubleQuotes(String original) { - if (original == null) { return null; } - String trimmed = original.replaceAll("^\"+|\"+$", ""); - return trimmed; - } -} --- old/test/testlibrary/jdk/test/lib/ByteCodeLoader.java 2016-08-11 13:49:04.764577000 -0400 +++ /dev/null 2016-08-11 13:49:04.000000000 -0400 @@ -1,90 +0,0 @@ -/* - * Copyright (c) 2013, 2015, 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 jdk.test.lib; - -import java.security.SecureClassLoader; - -/** - * {@code ByteCodeLoader} can be used for easy loading of byte code already - * present in memory. - * - * {@code InMemoryCompiler} can be used for compiling source code in a string - * into byte code, which then can be loaded with {@code ByteCodeLoader}. - * - * @see InMemoryCompiler - */ -public class ByteCodeLoader extends SecureClassLoader { - private final String className; - private final byte[] byteCode; - private volatile Class holder; - - /** - * Creates a new {@code ByteCodeLoader} ready to load a class with the - * given name and the given byte code. - * - * @param className The name of the class - * @param byteCode The byte code of the class - */ - public ByteCodeLoader(String className, byte[] byteCode) { - this.className = className; - this.byteCode = byteCode; - } - - @Override - public Class loadClass(String name) throws ClassNotFoundException { - if (!name.equals(className)) { - return super.loadClass(name); - } - if (holder == null) { - synchronized(this) { - if (holder == null) { - holder = findClass(name); - } - } - } - return holder; - } - - @Override - protected Class findClass(String name) throws ClassNotFoundException { - if (!name.equals(className)) { - throw new ClassNotFoundException(name); - } - - return defineClass(name, byteCode, 0, byteCode.length); - } - - /** - * Utility method for creating a new {@code ByteCodeLoader} and then - * directly load the given byte code. - * - * @param className The name of the class - * @param byteCode The byte code for the class - * @throws ClassNotFoundException if the class can't be loaded - * @return A {@see Class} object representing the class - */ - public static Class load(String className, byte[] byteCode) throws ClassNotFoundException { - return new ByteCodeLoader(className, byteCode).loadClass(className); - } -} --- old/test/testlibrary/jdk/test/lib/DynamicVMOption.java 2016-08-11 13:49:06.187125000 -0400 +++ /dev/null 2016-08-11 13:49:06.000000000 -0400 @@ -1,165 +0,0 @@ -/* - * Copyright (c) 2014, 2015, 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 jdk.test.lib; - -import com.sun.management.HotSpotDiagnosticMXBean; -import java.lang.management.ManagementFactory; - -/** - * A utility class to work with VM options which could be altered during - * execution. - * - * This class is a wrapper around {@code com.sun.management.VMOption}. - * It provides more convenient interface to read/write the values. - * - */ -public class DynamicVMOption { - - private final HotSpotDiagnosticMXBean mxBean; - - /** - * VM option name, like "MinHeapFreeRatio". - */ - public final String name; - - /** - * Creates an instance of DynamicVMOption. - * - * @param name the VM option name - */ - public DynamicVMOption(String name) { - this.name = name; - mxBean = ManagementFactory.getPlatformMXBean(HotSpotDiagnosticMXBean.class); - } - - /** - * Sets a new value for the option. - * Trying to set not applicable value will cause IllegalArgumentException. - * Behavior with null is undefined, most likely NPE will be thrown. - * - * @param newValue the value to be set - * @see #getValue() - * @throws IllegalArgumentException if newValue is not applicable to the option - */ - public final void setValue(String newValue) { - mxBean.setVMOption(name, newValue); - } - - /** - * Returns the value of option. - * - * @return the current option value - * @see #setValue(java.lang.String) - */ - public final String getValue() { - return mxBean.getVMOption(name).getValue(); - } - - /** - * Returns true, if option is writable, false otherwise. - * - * @return true, if option is writable, false otherwise - */ - public final boolean isWriteable() { - return mxBean.getVMOption(name).isWriteable(); - } - - /** - * Checks if the given value is applicable for the option. - * - * This method tries to set the option to the new value. If no exception - * has been thrown the value is treated as valid. - * - * Calling this method will not change the option value. After an attempt - * to set a new value, the option will be restored to its previous value. - * - * @param value the value to verify - * @return true if option could be set to the given value - */ - public boolean isValidValue(String value) { - boolean isValid = true; - String oldValue = getValue(); - try { - setValue(value); - } catch (NullPointerException e) { - if (value == null) { - isValid = false; - } - } catch (IllegalArgumentException e) { - isValid = false; - } finally { - setValue(oldValue); - } - return isValid; - } - - /** - * Returns the value of the given VM option as String. - * - * This is a simple shortcut for {@code new DynamicVMOption(name).getValue()} - * - * @param name the name of VM option - * @return value as a string - * @see #getValue() - */ - public static String getString(String name) { - return new DynamicVMOption(name).getValue(); - } - - /** - * Returns the value of the given option as int. - * - * @param name the name of VM option - * @return value parsed as integer - * @see #getString(java.lang.String) - * - */ - public static int getInt(String name) { - return Integer.parseInt(getString(name)); - } - - /** - * Sets the VM option to a new value. - * - * This is a simple shortcut for {@code new DynamicVMOption(name).setValue(value)} - * - * @param name the name of VM option - * @param value the value to be set - * @see #setValue(java.lang.String) - */ - public static void setString(String name, String value) { - new DynamicVMOption(name).setValue(value); - } - - /** - * Sets the VM option value to a new integer value. - * - * @param name the name of VM option - * @param value the integer value to be set - * @see #setString(java.lang.String, java.lang.String) - */ - public static void setInt(String name, int value) { - new DynamicVMOption(name).setValue(Integer.toString(value)); - } - -} --- old/test/testlibrary/jdk/test/lib/ExitCode.java 2016-08-11 13:49:07.648690000 -0400 +++ /dev/null 2016-08-11 13:49:07.000000000 -0400 @@ -1,40 +0,0 @@ -/* - * Copyright (c) 2014, 2015, 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 jdk.test.lib; - -/** - * Exit code values that could be returned by the JVM. - */ -public enum ExitCode { - OK(0), - FAIL(1), - CRASH(134); - - public final int value; - - ExitCode(int value) { - this.value = value; - } -} - --- old/test/testlibrary/jdk/test/lib/FileInstaller.java 2016-08-11 13:49:09.074828100 -0400 +++ /dev/null 2016-08-11 13:49:09.000000000 -0400 @@ -1,97 +0,0 @@ -/* - * Copyright (c) 2015, 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 jdk.test.lib; - -import java.io.IOException; -import java.nio.file.FileVisitResult; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.nio.file.SimpleFileVisitor; -import java.nio.file.StandardCopyOption; -import java.nio.file.attribute.BasicFileAttributes; - -/** - * Copy a resource: file or directory recursively, using relative path(src and dst) - * which are applied to test source directory(src) and current directory(dst) - */ -public class FileInstaller { - /** - * @param args source and destination - * @throws IOException if an I/O error occurs - */ - public static void main(String[] args) throws IOException { - if (args.length != 2) { - throw new IllegalArgumentException("Unexpected number of arguments for file copy"); - } - Path src = Paths.get(Utils.TEST_SRC, args[0]).toAbsolutePath(); - Path dst = Paths.get(args[1]).toAbsolutePath(); - if (src.toFile().exists()) { - if (src.toFile().isDirectory()) { - Files.walkFileTree(src, new CopyFileVisitor(src, dst)); - } else { - Path dstDir = dst.getParent(); - if (!dstDir.toFile().exists()) { - Files.createDirectories(dstDir); - } - Files.copy(src, dst, StandardCopyOption.REPLACE_EXISTING); - } - } else { - throw new IOException("Can't find source " + src); - } - } - - private static class CopyFileVisitor extends SimpleFileVisitor { - private final Path copyFrom; - private final Path copyTo; - - public CopyFileVisitor(Path copyFrom, Path copyTo) { - this.copyFrom = copyFrom; - this.copyTo = copyTo; - } - - @Override - public FileVisitResult preVisitDirectory(Path file, - BasicFileAttributes attrs) throws IOException { - Path relativePath = file.relativize(copyFrom); - Path destination = copyTo.resolve(relativePath); - if (!destination.toFile().exists()) { - Files.createDirectories(destination); - } - return FileVisitResult.CONTINUE; - } - - @Override - public FileVisitResult visitFile(Path file, - BasicFileAttributes attrs) throws IOException { - if (!file.toFile().isFile()) { - return FileVisitResult.CONTINUE; - } - Path relativePath = copyFrom.relativize(file); - Path destination = copyTo.resolve(relativePath); - Files.copy(file, destination, StandardCopyOption.COPY_ATTRIBUTES); - return FileVisitResult.CONTINUE; - } - } -} --- old/test/testlibrary/jdk/test/lib/InMemoryJavaCompiler.java 2016-08-11 13:49:10.502903200 -0400 +++ /dev/null 2016-08-11 13:49:10.000000000 -0400 @@ -1,153 +0,0 @@ -/* - * Copyright (c) 2013, 2015, 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 jdk.test.lib; - -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.OutputStream; - -import java.net.URI; -import java.util.Arrays; - -import javax.tools.ForwardingJavaFileManager; -import javax.tools.FileObject; -import javax.tools.JavaCompiler; -import javax.tools.JavaCompiler.CompilationTask; -import javax.tools.JavaFileObject; -import javax.tools.JavaFileObject.Kind; -import javax.tools.SimpleJavaFileObject; -import javax.tools.ToolProvider; - -/** - * {@code InMemoryJavaCompiler} can be used for compiling a {@link - * CharSequence} to a {@code byte[]}. - * - * The compiler will not use the file system at all, instead using a {@link - * ByteArrayOutputStream} for storing the byte code. For the source code, any - * kind of {@link CharSequence} can be used, e.g. {@link String}, {@link - * StringBuffer} or {@link StringBuilder}. - * - * The {@code InMemoryCompiler} can easily be used together with a {@code - * ByteClassLoader} to easily compile and load source code in a {@link String}: - * - * 
- * {@code
- * import jdk.test.lib.InMemoryJavaCompiler;
- * import jdk.test.lib.ByteClassLoader;
- *
- * class Example {
- *     public static void main(String[] args) {
- *         String className = "Foo";
- *         String sourceCode = "public class " + className + " {" +
- *                             "    public void bar() {" +
- *                             "        System.out.println("Hello from bar!");" +
- *                             "    }" +
- *                             "}";
- *         byte[] byteCode = InMemoryJavaCompiler.compile(className, sourceCode);
- *         Class fooClass = ByteClassLoader.load(className, byteCode);
- *     }
- * }
- * }
- *
- */ -public class InMemoryJavaCompiler { - private static class MemoryJavaFileObject extends SimpleJavaFileObject { - private final String className; - private final CharSequence sourceCode; - private final ByteArrayOutputStream byteCode; - - public MemoryJavaFileObject(String className, CharSequence sourceCode) { - super(URI.create("string:///" + className.replace('.','/') + Kind.SOURCE.extension), Kind.SOURCE); - this.className = className; - this.sourceCode = sourceCode; - this.byteCode = new ByteArrayOutputStream(); - } - - @Override - public CharSequence getCharContent(boolean ignoreEncodingErrors) { - return sourceCode; - } - - @Override - public OutputStream openOutputStream() throws IOException { - return byteCode; - } - - public byte[] getByteCode() { - return byteCode.toByteArray(); - } - - public String getClassName() { - return className; - } - } - - private static class FileManagerWrapper extends ForwardingJavaFileManager { - private MemoryJavaFileObject file; - - public FileManagerWrapper(MemoryJavaFileObject file) { - super(getCompiler().getStandardFileManager(null, null, null)); - this.file = file; - } - - @Override - public JavaFileObject getJavaFileForOutput(Location location, String className, - Kind kind, FileObject sibling) - throws IOException { - if (!file.getClassName().equals(className)) { - throw new IOException("Expected class with name " + file.getClassName() + - ", but got " + className); - } - return file; - } - } - - /** - * Compiles the class with the given name and source code. - * - * @param className The name of the class - * @param sourceCode The source code for the class with name {@code className} - * @param options additional command line options - * @throws RuntimeException if the compilation did not succeed - * @return The resulting byte code from the compilation - */ - public static byte[] compile(String className, CharSequence sourceCode, String... options) { - MemoryJavaFileObject file = new MemoryJavaFileObject(className, sourceCode); - CompilationTask task = getCompilationTask(file, options); - - if(!task.call()) { - throw new RuntimeException("Could not compile " + className + " with source code " + sourceCode); - } - - return file.getByteCode(); - } - - private static JavaCompiler getCompiler() { - return ToolProvider.getSystemJavaCompiler(); - } - - private static CompilationTask getCompilationTask(MemoryJavaFileObject file, String... options) { - return getCompiler().getTask(null, new FileManagerWrapper(file), null, Arrays.asList(options), null, Arrays.asList(file)); - } -} --- old/test/testlibrary/jdk/test/lib/InfiniteLoop.java 2016-08-11 13:49:11.934293400 -0400 +++ /dev/null 2016-08-11 13:49:12.000000000 -0400 @@ -1,66 +0,0 @@ -/* - * Copyright (c) 2014, 2015, 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 jdk.test.lib; - -import java.util.Objects; - -/** - * Class which runs another Runnable in infinite loop with certain pauses - * between cycles. - */ -public class InfiniteLoop implements Runnable { - private final Runnable target; - private final long mills; - - - /** - * @param target a target to run in a loop - * @param mills the length of pause time in milliseconds - * @throws NullPointerException if target is null - * @throws IllegalArgumentException if the value of millis is negative - */ - public InfiniteLoop(Runnable target, long mills) { - Objects.requireNonNull(target); - if (mills < 0) { - throw new IllegalArgumentException("mills < 0"); - } - this.target = target; - this.mills = mills; - } - - @Override - public void run() { - try { - while (true) { - target.run(); - if (mills > 0) { - Thread.sleep(mills); - } - } - } catch (InterruptedException e) { - Thread.currentThread().interrupt(); - throw new Error(e); - } - } -} --- old/test/testlibrary/jdk/test/lib/JDKToolFinder.java 2016-08-11 13:49:13.357090700 -0400 +++ /dev/null 2016-08-11 13:49:13.000000000 -0400 @@ -1,111 +0,0 @@ -/* - * Copyright (c) 2013, 2015, 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 jdk.test.lib; - -import java.io.FileNotFoundException; -import java.nio.file.Path; -import java.nio.file.Paths; - -/** - * @deprecated This class is deprecated. Use the one from - * {@code /test/lib/share/classes/jdk/test/lib} - */ -@Deprecated -public final class JDKToolFinder { - - private JDKToolFinder() { - } - - /** - * Returns the full path to an executable in jdk/bin based on System - * property {@code test.jdk} or {@code compile.jdk} (both are set by the jtreg test suite) - * - * @return Full path to an executable in jdk/bin - */ - public static String getJDKTool(String tool) { - - // First try to find the executable in test.jdk - try { - return getTool(tool, "test.jdk"); - } catch (FileNotFoundException e) { - - } - - // Now see if it's available in compile.jdk - try { - return getTool(tool, "compile.jdk"); - } catch (FileNotFoundException e) { - throw new RuntimeException("Failed to find " + tool + - ", looked in test.jdk (" + System.getProperty("test.jdk") + - ") and compile.jdk (" + System.getProperty("compile.jdk") + ")"); - } - } - - /** - * Returns the full path to an executable in jdk/bin based on System - * property {@code compile.jdk} - * - * @return Full path to an executable in jdk/bin - */ - public static String getCompileJDKTool(String tool) { - try { - return getTool(tool, "compile.jdk"); - } catch (FileNotFoundException e) { - throw new RuntimeException(e); - } - } - - /** - * Returns the full path to an executable in jdk/bin based on System - * property {@code test.jdk} - * - * @return Full path to an executable in jdk/bin - */ - public static String getTestJDKTool(String tool) { - try { - return getTool(tool, "test.jdk"); - } catch (FileNotFoundException e) { - throw new RuntimeException(e); - } - } - - private static String getTool(String tool, String property) throws FileNotFoundException { - String jdkPath = System.getProperty(property); - - if (jdkPath == null) { - throw new RuntimeException( - "System property '" + property + "' not set. This property is normally set by jtreg. " - + "When running test separately, set this property using '-D" + property + "=/path/to/jdk'."); - } - - Path toolName = Paths.get("bin", tool + (Platform.isWindows() ? ".exe" : "")); - - Path jdkTool = Paths.get(jdkPath, toolName.toString()); - if (!jdkTool.toFile().exists()) { - throw new FileNotFoundException("Could not find file " + jdkTool.toAbsolutePath()); - } - - return jdkTool.toAbsolutePath().toString(); - } -} --- old/test/testlibrary/jdk/test/lib/JDKToolLauncher.java 2016-08-11 13:49:14.792690300 -0400 +++ /dev/null 2016-08-11 13:49:15.000000000 -0400 @@ -1,137 +0,0 @@ -/* - * Copyright (c) 2013, 2015, 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 jdk.test.lib; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -/** - * A utility for constructing command lines for starting JDK tool processes. - * - * The JDKToolLauncher can in particular be combined with a - * java.lang.ProcessBuilder to easily run a JDK tool. For example, the following - * code run {@code jmap -heap} against a process with GC logging turned on for - * the {@code jmap} process: - * - * 
- * {@code
- * JDKToolLauncher jmap = JDKToolLauncher.create("jmap")
- *                                       .addVMArg("-XX:+PrintGC");
- *                                       .addVMArg("-XX:+PrintGCDetails")
- *                                       .addToolArg("-heap")
- *                                       .addToolArg(pid);
- * ProcessBuilder pb = new ProcessBuilder(jmap.getCommand());
- * Process p = pb.start();
- * }
- *
- * @deprecated This class is deprecated. Use the one from - * {@code /test/lib/share/classes/jdk/test/lib} - */ -@Deprecated -public class JDKToolLauncher { - private final String executable; - private final List vmArgs = new ArrayList(); - private final List toolArgs = new ArrayList(); - - private JDKToolLauncher(String tool, boolean useCompilerJDK) { - if (useCompilerJDK) { - executable = JDKToolFinder.getJDKTool(tool); - } else { - executable = JDKToolFinder.getTestJDKTool(tool); - } - vmArgs.addAll(Arrays.asList(ProcessTools.getPlatformSpecificVMArgs())); - } - - /** - * Creates a new JDKToolLauncher for the specified tool. Using tools path - * from the compiler JDK. - * - * @param tool - * The name of the tool - * @return A new JDKToolLauncher - */ - public static JDKToolLauncher create(String tool) { - return new JDKToolLauncher(tool, true); - } - - /** - * Creates a new JDKToolLauncher for the specified tool in the Tested JDK. - * - * @param tool - * The name of the tool - * - * @return A new JDKToolLauncher - */ - public static JDKToolLauncher createUsingTestJDK(String tool) { - return new JDKToolLauncher(tool, false); - } - - /** - * Adds an argument to the JVM running the tool. - * - * The JVM arguments are passed to the underlying JVM running the tool. - * Arguments will automatically be prepended with "-J". - * - * Any platform specific arguments required for running the tool are - * automatically added. - * - * - * @param arg - * The argument to VM running the tool - * @return The JDKToolLauncher instance - */ - public JDKToolLauncher addVMArg(String arg) { - vmArgs.add(arg); - return this; - } - - /** - * Adds an argument to the tool. - * - * @param arg - * The argument to the tool - * @return The JDKToolLauncher instance - */ - public JDKToolLauncher addToolArg(String arg) { - toolArgs.add(arg); - return this; - } - - /** - * Returns the command that can be used for running the tool. - * - * @return An array whose elements are the arguments of the command. - */ - public String[] getCommand() { - List command = new ArrayList(); - command.add(executable); - // Add -J in front of all vmArgs - for (String arg : vmArgs) { - command.add("-J" + arg); - } - command.addAll(toolArgs); - return command.toArray(new String[command.size()]); - } -} --- old/test/testlibrary/jdk/test/lib/OutputAnalyzer.java 2016-08-11 13:49:16.226137700 -0400 +++ /dev/null 2016-08-11 13:49:16.000000000 -0400 @@ -1,440 +0,0 @@ -/* - * Copyright (c) 2013, 2015, 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 jdk.test.lib; - -import java.io.IOException; -import java.util.Arrays; -import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -public final class OutputAnalyzer { - - private final String stdout; - private final String stderr; - private final int exitValue; - - /** - * Create an OutputAnalyzer, a utility class for verifying output and exit - * value from a Process - * - * @param process Process to analyze - * @throws IOException If an I/O error occurs. - * - * @deprecated This class is deprecated. Use the one from - * {@code /test/lib/share/classes/jdk/test/lib/process} - */ - @Deprecated - public OutputAnalyzer(Process process) throws IOException { - OutputBuffer output = ProcessTools.getOutput(process); - exitValue = process.exitValue(); - this.stdout = output.getStdout(); - this.stderr = output.getStderr(); - } - - /** - * Create an OutputAnalyzer, a utility class for verifying output - * - * @param buf String buffer to analyze - */ - public OutputAnalyzer(String buf) { - this(buf, buf); - } - - /** - * Create an OutputAnalyzer, a utility class for verifying output - * - * @param stdout stdout buffer to analyze - * @param stderr stderr buffer to analyze - */ - public OutputAnalyzer(String stdout, String stderr) { - this.stdout = stdout; - this.stderr = stderr; - exitValue = -1; - } - - /** - * Verify that the stdout contents of output buffer is empty - * - * @throws RuntimeException - * If stdout was not empty - */ - public void stdoutShouldBeEmpty() { - if (!getStdout().isEmpty()) { - reportDiagnosticSummary(); - throw new RuntimeException("stdout was not empty"); - } - } - - /** - * Verify that the stderr contents of output buffer is empty - * - * @throws RuntimeException - * If stderr was not empty - */ - public void stderrShouldBeEmpty() { - if (!getStderr().isEmpty()) { - reportDiagnosticSummary(); - throw new RuntimeException("stderr was not empty"); - } - } - - /** - * Verify that the stdout contents of output buffer is not empty - * - * @throws RuntimeException - * If stdout was empty - */ - public void stdoutShouldNotBeEmpty() { - if (getStdout().isEmpty()) { - reportDiagnosticSummary(); - throw new RuntimeException("stdout was empty"); - } - } - - /** - * Verify that the stderr contents of output buffer is not empty - * - * @throws RuntimeException - * If stderr was empty - */ - public void stderrShouldNotBeEmpty() { - if (getStderr().isEmpty()) { - reportDiagnosticSummary(); - throw new RuntimeException("stderr was empty"); - } - } - - /** - * Verify that the stdout and stderr contents of output buffer contains the string - * - * @param expectedString String that buffer should contain - * @throws RuntimeException If the string was not found - */ - public OutputAnalyzer shouldContain(String expectedString) { - if (!stdout.contains(expectedString) && !stderr.contains(expectedString)) { - reportDiagnosticSummary(); - throw new RuntimeException("'" + expectedString + "' missing from stdout/stderr \n"); - } - return this; - } - - /** - * Verify that the stdout contents of output buffer contains the string - * - * @param expectedString String that buffer should contain - * @throws RuntimeException If the string was not found - */ - public OutputAnalyzer stdoutShouldContain(String expectedString) { - if (!stdout.contains(expectedString)) { - reportDiagnosticSummary(); - throw new RuntimeException("'" + expectedString + "' missing from stdout \n"); - } - return this; - } - - /** - * Verify that the stderr contents of output buffer contains the string - * - * @param expectedString String that buffer should contain - * @throws RuntimeException If the string was not found - */ - public OutputAnalyzer stderrShouldContain(String expectedString) { - if (!stderr.contains(expectedString)) { - reportDiagnosticSummary(); - throw new RuntimeException("'" + expectedString + "' missing from stderr \n"); - } - return this; - } - - /** - * Verify that the stdout and stderr contents of output buffer does not contain the string - * - * @param expectedString String that the buffer should not contain - * @throws RuntimeException If the string was found - */ - public OutputAnalyzer shouldNotContain(String notExpectedString) { - if (stdout.contains(notExpectedString)) { - reportDiagnosticSummary(); - throw new RuntimeException("'" + notExpectedString + "' found in stdout \n"); - } - if (stderr.contains(notExpectedString)) { - reportDiagnosticSummary(); - throw new RuntimeException("'" + notExpectedString + "' found in stderr \n"); - } - return this; - } - - /** - * Verify that the stdout contents of output buffer does not contain the string - * - * @param expectedString String that the buffer should not contain - * @throws RuntimeException If the string was found - */ - public OutputAnalyzer stdoutShouldNotContain(String notExpectedString) { - if (stdout.contains(notExpectedString)) { - reportDiagnosticSummary(); - throw new RuntimeException("'" + notExpectedString + "' found in stdout \n"); - } - return this; - } - - /** - * Verify that the stderr contents of output buffer does not contain the string - * - * @param expectedString String that the buffer should not contain - * @throws RuntimeException If the string was found - */ - public OutputAnalyzer stderrShouldNotContain(String notExpectedString) { - if (stderr.contains(notExpectedString)) { - reportDiagnosticSummary(); - throw new RuntimeException("'" + notExpectedString + "' found in stderr \n"); - } - return this; - } - - /** - * Verify that the stdout and stderr contents of output buffer matches - * the pattern - * - * @param pattern - * @throws RuntimeException If the pattern was not found - */ - public OutputAnalyzer shouldMatch(String pattern) { - Matcher stdoutMatcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stdout); - Matcher stderrMatcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stderr); - if (!stdoutMatcher.find() && !stderrMatcher.find()) { - reportDiagnosticSummary(); - throw new RuntimeException("'" + pattern - + "' missing from stdout/stderr \n"); - } - return this; - } - - /** - * Verify that the stdout contents of output buffer matches the - * pattern - * - * @param pattern - * @throws RuntimeException If the pattern was not found - */ - public OutputAnalyzer stdoutShouldMatch(String pattern) { - Matcher matcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stdout); - if (!matcher.find()) { - reportDiagnosticSummary(); - throw new RuntimeException("'" + pattern - + "' missing from stdout \n"); - } - return this; - } - - /** - * Verify that the stderr contents of output buffer matches the - * pattern - * - * @param pattern - * @throws RuntimeException If the pattern was not found - */ - public OutputAnalyzer stderrShouldMatch(String pattern) { - Matcher matcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stderr); - if (!matcher.find()) { - reportDiagnosticSummary(); - throw new RuntimeException("'" + pattern - + "' missing from stderr \n"); - } - return this; - } - - /** - * Verify that the stdout and stderr contents of output buffer does not - * match the pattern - * - * @param pattern - * @throws RuntimeException If the pattern was found - */ - public OutputAnalyzer shouldNotMatch(String pattern) { - Matcher matcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stdout); - if (matcher.find()) { - reportDiagnosticSummary(); - throw new RuntimeException("'" + pattern - + "' found in stdout: '" + matcher.group() + "' \n"); - } - matcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stderr); - if (matcher.find()) { - reportDiagnosticSummary(); - throw new RuntimeException("'" + pattern - + "' found in stderr: '" + matcher.group() + "' \n"); - } - return this; - } - - /** - * Verify that the stdout contents of output buffer does not match the - * pattern - * - * @param pattern - * @throws RuntimeException If the pattern was found - */ - public OutputAnalyzer stdoutShouldNotMatch(String pattern) { - Matcher matcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stdout); - if (matcher.find()) { - reportDiagnosticSummary(); - throw new RuntimeException("'" + pattern - + "' found in stdout \n"); - } - return this; - } - - /** - * Verify that the stderr contents of output buffer does not match the - * pattern - * - * @param pattern - * @throws RuntimeException If the pattern was found - */ - public OutputAnalyzer stderrShouldNotMatch(String pattern) { - Matcher matcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stderr); - if (matcher.find()) { - reportDiagnosticSummary(); - throw new RuntimeException("'" + pattern - + "' found in stderr \n"); - } - return this; - } - - /** - * Get the captured group of the first string matching the pattern. - * stderr is searched before stdout. - * - * @param pattern The multi-line pattern to match - * @param group The group to capture - * @return The matched string or null if no match was found - */ - public String firstMatch(String pattern, int group) { - Matcher stderrMatcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stderr); - Matcher stdoutMatcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stdout); - if (stderrMatcher.find()) { - return stderrMatcher.group(group); - } - if (stdoutMatcher.find()) { - return stdoutMatcher.group(group); - } - return null; - } - - /** - * Get the first string matching the pattern. - * stderr is searched before stdout. - * - * @param pattern The multi-line pattern to match - * @return The matched string or null if no match was found - */ - public String firstMatch(String pattern) { - return firstMatch(pattern, 0); - } - - /** - * Verify the exit value of the process - * - * @param expectedExitValue Expected exit value from process - * @throws RuntimeException If the exit value from the process did not match the expected value - */ - public OutputAnalyzer shouldHaveExitValue(int expectedExitValue) { - if (getExitValue() != expectedExitValue) { - reportDiagnosticSummary(); - throw new RuntimeException("Expected to get exit value of [" - + expectedExitValue + "]\n"); - } - return this; - } - - - /** - * Report summary that will help to diagnose the problem - * Currently includes: - * - standard input produced by the process under test - * - standard output - * - exit code - * Note: the command line is printed by the ProcessTools - */ - public void reportDiagnosticSummary() { - String msg = - " stdout: [" + stdout + "];\n" + - " stderr: [" + stderr + "]\n" + - " exitValue = " + getExitValue() + "\n"; - - System.err.println(msg); - } - - - /** - * Get the contents of the output buffer (stdout and stderr) - * - * @return Content of the output buffer - */ - public String getOutput() { - return stdout + stderr; - } - - /** - * Get the contents of the stdout buffer - * - * @return Content of the stdout buffer - */ - public String getStdout() { - return stdout; - } - - /** - * Get the contents of the stderr buffer - * - * @return Content of the stderr buffer - */ - public String getStderr() { - return stderr; - } - - /** - * Get the process exit value - * - * @return Process exit value - */ - public int getExitValue() { - return exitValue; - } - - /** - * Get the contents of the output buffer (stdout and stderr) as list of strings. - * Output will be split by newlines. - * - * @return Contents of the output buffer as list of strings - */ - public List asLines() { - return asLines(getOutput()); - } - - private List asLines(String buffer) { - return Arrays.asList(buffer.split("(\\r\\n|\\n|\\r)")); - } -} --- old/test/testlibrary/jdk/test/lib/OutputBuffer.java 2016-08-11 13:49:17.667102300 -0400 +++ /dev/null 2016-08-11 13:49:17.000000000 -0400 @@ -1,64 +0,0 @@ -/* - * Copyright (c) 2013, 2015, 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 jdk.test.lib; - -/** - * @deprecated This class is deprecated. Use the one from - * {@code /test/lib/share/classes/jdk/test/lib/process} - */ -@Deprecated -public class OutputBuffer { - private final String stdout; - private final String stderr; - - /** - * Create an OutputBuffer, a class for storing and managing stdout and stderr - * results separately - * - * @param stdout stdout result - * @param stderr stderr result - */ - public OutputBuffer(String stdout, String stderr) { - this.stdout = stdout; - this.stderr = stderr; - } - - /** - * Returns the stdout result - * - * @return stdout result - */ - public String getStdout() { - return stdout; - } - - /** - * Returns the stderr result - * - * @return stderr result - */ - public String getStderr() { - return stderr; - } -} --- old/test/testlibrary/jdk/test/lib/Pair.java 2016-08-11 13:49:19.107150700 -0400 +++ /dev/null 2016-08-11 13:49:19.000000000 -0400 @@ -1,68 +0,0 @@ -/* - * Copyright (c) 2015, 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 jdk.test.lib; - -import java.util.Objects; - -/** - * Pair - a two element tuple - * - * @param first type - * @param second type - */ -public class Pair { - public final F first; - public final S second; - - public Pair(F first, S second) { - this.first = first; - this.second = second; - } - - @Override - public String toString() { - return "(" + first + ":" + second + ")"; - } - - @Override - public boolean equals(Object other) { - if (other instanceof Pair) { - Pair otherPair = (Pair) other; - return Objects.equals(first, otherPair.first) && - Objects.equals(second, otherPair.second); - } - return false; - } - - @Override - public int hashCode() { - if (first == null) { - return (second == null) ? 0 : second.hashCode(); - } else if (second == null) { - return first.hashCode(); - } else { - return first.hashCode() * 17 + second.hashCode(); - } - } -} --- old/test/testlibrary/jdk/test/lib/Platform.java 2016-08-11 13:49:20.554922100 -0400 +++ /dev/null 2016-08-11 13:49:20.000000000 -0400 @@ -1,242 +0,0 @@ -/* - * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * 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 jdk.test.lib; - -import java.util.regex.Pattern; - -/** - * @deprecated This class is deprecated. Use the one from - * {@code /test/lib/share/classes/jdk/test/lib} - */ -@Deprecated -public class Platform { - public static final String vmName = System.getProperty("java.vm.name"); - public static final String vmInfo = System.getProperty("java.vm.info"); - private static final String osName = System.getProperty("os.name"); - private static final String dataModel = System.getProperty("sun.arch.data.model"); - private static final String vmVersion = System.getProperty("java.vm.version"); - private static final String jdkDebug = System.getProperty("jdk.debug"); - private static final String osArch = System.getProperty("os.arch"); - private static final String userName = System.getProperty("user.name"); - private static final String compiler = System.getProperty("sun.management.compiler"); - - public static boolean isClient() { - return vmName.endsWith(" Client VM"); - } - - public static boolean isServer() { - return vmName.endsWith(" Server VM"); - } - - public static boolean isGraal() { - return vmName.endsWith(" Graal VM"); - } - - public static boolean isZero() { - return vmName.endsWith(" Zero VM"); - } - - public static boolean isMinimal() { - return vmName.endsWith(" Minimal VM"); - } - - public static boolean isTieredSupported() { - return compiler.contains("Tiered Compilers"); - } - - public static boolean isInt() { - return vmInfo.contains("interpreted"); - } - - public static boolean isMixed() { - return vmInfo.contains("mixed"); - } - - public static boolean isComp() { - return vmInfo.contains("compiled"); - } - - public static boolean is32bit() { - return dataModel.equals("32"); - } - - public static boolean is64bit() { - return dataModel.equals("64"); - } - - public static boolean isAix() { - return isOs("aix"); - } - - public static boolean isLinux() { - return isOs("linux"); - } - - public static boolean isOSX() { - return isOs("mac"); - } - - public static boolean isSolaris() { - return isOs("sunos"); - } - - public static boolean isWindows() { - return isOs("win"); - } - - private static boolean isOs(String osname) { - return osName.toLowerCase().startsWith(osname.toLowerCase()); - } - - public static String getOsName() { - return osName; - } - - public static boolean isDebugBuild() { - return (jdkDebug.toLowerCase().contains("debug")); - } - - public static String getVMVersion() { - return vmVersion; - } - - // Returns true for sparc and sparcv9. - public static boolean isSparc() { - return isArch("sparc.*"); - } - - public static boolean isARM() { - return isArch("arm.*"); - } - - public static boolean isPPC() { - return isArch("ppc.*"); - } - - public static boolean isX86() { - // On Linux it's 'i386', Windows 'x86' without '_64' suffix. - return isArch("(i386)|(x86(?!_64))"); - } - - public static boolean isX64() { - // On OSX it's 'x86_64' and on other (Linux, Windows and Solaris) platforms it's 'amd64' - return isArch("(amd64)|(x86_64)"); - } - - public static boolean isAArch64() { - return isArch("aarch64"); - } - - private static boolean isArch(String archnameRE) { - return Pattern.compile(archnameRE, Pattern.CASE_INSENSITIVE) - .matcher(osArch) - .matches(); - } - - public static String getOsArch() { - return osArch; - } - - /** - * Return a boolean for whether we expect to be able to attach - * the SA to our own processes on this system. - */ - public static boolean shouldSAAttach() throws Exception { - - if (isAix()) { - return false; // SA not implemented. - } else if (isLinux()) { - return canPtraceAttachLinux(); - } else if (isOSX()) { - return canAttachOSX(); - } else { - // Other platforms expected to work: - return true; - } - } - - /** - * On Linux, first check the SELinux boolean "deny_ptrace" and return false - * as we expect to be denied if that is "1". Then expect permission to attach - * if we are root, so return true. Then return false for an expected denial - * if "ptrace_scope" is 1, and true otherwise. - */ - public static boolean canPtraceAttachLinux() throws Exception { - - // SELinux deny_ptrace: - String deny_ptrace = Utils.fileAsString("/sys/fs/selinux/booleans/deny_ptrace"); - if (deny_ptrace != null && deny_ptrace.contains("1")) { - // ptrace will be denied: - return false; - } - - if (userName.equals("root")) { - return true; - } - - // ptrace_scope: - String ptrace_scope = Utils.fileAsString("/proc/sys/kernel/yama/ptrace_scope"); - if (ptrace_scope != null && ptrace_scope.contains("1")) { - // ptrace will be denied: - return false; - } - - // Otherwise expect to be permitted: - return true; - } - - /** - * On OSX, expect permission to attach only if we are root. - */ - public static boolean canAttachOSX() throws Exception { - return userName.equals("root"); - } - - /** - * return path to library inside jdk tree - */ - public static String jdkLibPath() { - if (isWindows()) { - return "bin"; - } - if (isOSX()) { - return "lib"; - } - - return "lib/" + getOsArch(); - } - - /** - * Build name of shared object according to platform rules - */ - public static String sharedObjectName(String name) { - if (isWindows()) { - return name + ".dll"; - } - if (isOSX()) { - return "lib" + name + ".dylib"; - } - return "lib" + name + ".so"; - } -} --- old/test/testlibrary/jdk/test/lib/ProcessTools.java 2016-08-11 13:49:21.980038400 -0400 +++ /dev/null 2016-08-11 13:49:22.000000000 -0400 @@ -1,264 +0,0 @@ -/* - * Copyright (c) 2013, 2015, 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 jdk.test.lib; - -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.lang.management.ManagementFactory; -import java.lang.management.RuntimeMXBean; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -/** - * @deprecated This class is deprecated. Use the one from - * {@code /test/lib/share/classes/jdk/test/lib/process} - */ -@Deprecated -public final class ProcessTools { - - private ProcessTools() { - } - - /** - * Pumps stdout and stderr from running the process into a String. - * - * @param processBuilder ProcessBuilder to run. - * @return Output from process. - * @throws IOException If an I/O error occurs. - */ - public static OutputBuffer getOutput(ProcessBuilder processBuilder) throws IOException { - return getOutput(processBuilder.start()); - } - - /** - * Pumps stdout and stderr the running process into a String. - * - * @param process Process to pump. - * @return Output from process. - * @throws IOException If an I/O error occurs. - */ - public static OutputBuffer getOutput(Process process) throws IOException { - ByteArrayOutputStream stderrBuffer = new ByteArrayOutputStream(); - ByteArrayOutputStream stdoutBuffer = new ByteArrayOutputStream(); - StreamPumper outPumper = new StreamPumper(process.getInputStream(), stdoutBuffer); - StreamPumper errPumper = new StreamPumper(process.getErrorStream(), stderrBuffer); - Thread outPumperThread = new Thread(outPumper); - Thread errPumperThread = new Thread(errPumper); - - outPumperThread.setDaemon(true); - errPumperThread.setDaemon(true); - - outPumperThread.start(); - errPumperThread.start(); - - try { - process.waitFor(); - outPumperThread.join(); - errPumperThread.join(); - } catch (InterruptedException e) { - Thread.currentThread().interrupt(); - return null; - } - - return new OutputBuffer(stdoutBuffer.toString(), stderrBuffer.toString()); - } - - /** - * Get the process id of the current running Java process - * - * @return Process id - */ - public static long getProcessId() throws Exception { - return ProcessHandle.current().getPid(); - } - - /** - * Gets the array of strings containing input arguments passed to the VM - * - * @return arguments - */ - public static String[] getVmInputArgs() { - RuntimeMXBean runtime = ManagementFactory.getRuntimeMXBean(); - List args = runtime.getInputArguments(); - return args.toArray(new String[args.size()]); - } - - /** - * Get platform specific VM arguments (e.g. -d64 on 64bit Solaris) - * - * @return String[] with platform specific arguments, empty if there are none - */ - public static String[] getPlatformSpecificVMArgs() { - - if (Platform.is64bit() && Platform.isSolaris()) { - return new String[] { "-d64" }; - } - - return new String[] {}; - } - - /** - * Create ProcessBuilder using the java launcher from the jdk to be tested and - * with any platform specific arguments prepended - */ - public static ProcessBuilder createJavaProcessBuilder(String... command) throws Exception { - return createJavaProcessBuilder(false, command); - } - - public static ProcessBuilder createJavaProcessBuilder(boolean addTestVmAndJavaOptions, String... command) throws Exception { - String javapath = JDKToolFinder.getJDKTool("java"); - - ArrayList args = new ArrayList<>(); - args.add(javapath); - Collections.addAll(args, getPlatformSpecificVMArgs()); - - args.add("-cp"); - args.add(System.getProperty("java.class.path")); - - if (addTestVmAndJavaOptions) { - Collections.addAll(args, Utils.getTestJavaOpts()); - } - - Collections.addAll(args, command); - - // Reporting - StringBuilder cmdLine = new StringBuilder(); - for (String cmd : args) { - cmdLine.append(cmd).append(' '); - } - System.out.println("Command line: [" + cmdLine.toString() + "]"); - - return new ProcessBuilder(args.toArray(new String[args.size()])); - } - - /** - * Executes a test jvm process, waits for it to finish and returns the process output. - * The default jvm options from jtreg, test.vm.opts and test.java.opts, are added. - * The java from the test.jdk is used to execute the command. - * - * The command line will be like: - * {test.jdk}/bin/java {test.vm.opts} {test.java.opts} cmds - * - * @param cmds User specifed arguments. - * @return The output from the process. - */ - public static OutputAnalyzer executeTestJvm(String... cmds) throws Throwable { - ProcessBuilder pb = createJavaProcessBuilder(Utils.addTestJavaOpts(cmds)); - return executeProcess(pb); - } - - /** - * Executes a test jvm process, waits for it to finish and returns the process output. - * The default jvm options from the test's run command, jtreg, test.vm.opts and test.java.opts, are added. - * The java from the test.jdk is used to execute the command. - * - * The command line will be like: - * {test.jdk}/bin/java {test.fromRun.opts} {test.vm.opts} {test.java.opts} cmds - * - * @param cmds User specifed arguments. - * @return The output from the process. - */ - public static OutputAnalyzer executeTestJvmAllArgs(String... cmds) throws Throwable { - List argsList = new ArrayList<>(); - String[] testArgs = getVmInputArgs(); - Collections.addAll(argsList, testArgs); - Collections.addAll(argsList, Utils.addTestJavaOpts(cmds)); - ProcessBuilder pb = createJavaProcessBuilder(argsList.toArray(new String[argsList.size()])); - return executeProcess(pb); - } - - /** - * Executes a process, waits for it to finish and returns the process output. - * The process will have exited before this method returns. - * @param pb The ProcessBuilder to execute. - * @return The {@linkplain OutputAnalyzer} instance wrapping the process. - */ - public static OutputAnalyzer executeProcess(ProcessBuilder pb) throws Exception { - OutputAnalyzer output = null; - Process p = null; - boolean failed = false; - try { - p = pb.start(); - output = new OutputAnalyzer(p); - p.waitFor(); - - return output; - } catch (Throwable t) { - if (p != null) { - p.destroyForcibly().waitFor(); - } - - failed = true; - System.out.println("executeProcess() failed: " + t); - throw t; - } finally { - if (failed) { - System.err.println(getProcessLog(pb, output)); - } - } - } - - /** - * Executes a process, waits for it to finish and returns the process output. - * @param cmds The command line to execute. - * @return The output from the process. - */ - public static OutputAnalyzer executeProcess(String... cmds) throws Throwable { - return executeProcess(new ProcessBuilder(cmds)); - } - - /** - * Used to log command line, stdout, stderr and exit code from an executed process. - * @param pb The executed process. - * @param output The output from the process. - */ - public static String getProcessLog(ProcessBuilder pb, OutputAnalyzer output) { - String stderr = output == null ? "null" : output.getStderr(); - String stdout = output == null ? "null" : output.getStdout(); - String exitValue = output == null ? "null": Integer.toString(output.getExitValue()); - StringBuilder logMsg = new StringBuilder(); - final String nl = System.getProperty("line.separator"); - logMsg.append("--- ProcessLog ---" + nl); - logMsg.append("cmd: " + getCommandLine(pb) + nl); - logMsg.append("exitvalue: " + exitValue + nl); - logMsg.append("stderr: " + stderr + nl); - logMsg.append("stdout: " + stdout + nl); - return logMsg.toString(); - } - - /** - * @return The full command line for the ProcessBuilder. - */ - public static String getCommandLine(ProcessBuilder pb) { - if (pb == null) { - return "null"; - } - StringBuilder cmd = new StringBuilder(); - for (String s : pb.command()) { - cmd.append(s).append(" "); - } - return cmd.toString().trim(); - } -} --- old/test/testlibrary/jdk/test/lib/StreamPumper.java 2016-08-11 13:49:23.406625100 -0400 +++ /dev/null 2016-08-11 13:49:23.000000000 -0400 @@ -1,81 +0,0 @@ -/* - * Copyright (c) 2013, 2015, 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 jdk.test.lib; - -import java.io.OutputStream; -import java.io.InputStream; -import java.io.IOException; - -/** - * @deprecated This class is deprecated. Use the one from - * {@code /test/lib/share/classes/jdk/test/lib/process} - */ -@Deprecated -public final class StreamPumper implements Runnable { - - private static final int BUF_SIZE = 256; - - private final OutputStream out; - private final InputStream in; - - /** - * Create a StreamPumper that reads from in and writes to out. - * - * @param in The stream to read from. - * @param out The stream to write to. - */ - public StreamPumper(InputStream in, OutputStream out) { - this.in = in; - this.out = out; - } - - /** - * Implements Thread.run(). Continuously read from in and write - * to out until in has reached end of stream. Abort - * on interruption. Abort on IOExceptions. - */ - @Override - public void run() { - int length; - InputStream localIn = in; - OutputStream localOut = out; - byte[] buffer = new byte[BUF_SIZE]; - - try { - while (!Thread.interrupted() && (length = localIn.read(buffer)) > 0) { - localOut.write(buffer, 0, length); - } - } catch (IOException e) { - // Just abort if something like this happens. - e.printStackTrace(); - } finally { - try { - localOut.flush(); - in.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - } -} --- old/test/testlibrary/jdk/test/lib/TimeLimitedRunner.java 2016-08-11 13:49:24.833460300 -0400 +++ /dev/null 2016-08-11 13:49:25.000000000 -0400 @@ -1,86 +0,0 @@ -/* - * Copyright (c) 2014, 2015, 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 jdk.test.lib; - -import java.util.Objects; -import java.util.concurrent.Callable; - -/** - * Auxiliary class to run target w/ given timeout. - */ -public class TimeLimitedRunner implements Callable { - private final long stoptime; - private final long timeout; - private final double factor; - private final Callable target; - - /** - * @param timeout a timeout. zero means no time limitation - * @param factor a multiplier used to estimate next iteration time - * @param target a target to run - * @throws NullPointerException if target is null - * @throws IllegalArgumentException if timeout is negative or - factor isn't positive - */ - public TimeLimitedRunner(long timeout, double factor, - Callable target) { - Objects.requireNonNull(target, "target must not be null"); - if (timeout < 0) { - throw new IllegalArgumentException("timeout[" + timeout + "] < 0"); - } - if (factor <= 0d) { - throw new IllegalArgumentException("factor[" + factor + "] <= 0"); - } - this.stoptime = System.currentTimeMillis() + timeout; - this.timeout = timeout; - this.factor = factor; - this.target = target; - } - - /** - * Runs @{linkplan target} while it returns true and timeout isn't exceeded - */ - @Override - public Void call() throws Exception { - long maxDuration = 0L; - long iterStart = System.currentTimeMillis(); - if (timeout != 0 && iterStart > stoptime) { - return null; - } - while (target.call()) { - if (timeout != 0) { - long iterDuration = System.currentTimeMillis() - iterStart; - maxDuration = Math.max(maxDuration, iterDuration); - iterStart = System.currentTimeMillis(); - if (iterStart + (maxDuration * factor) > stoptime) { - System.out.println("Not enough time to continue execution. " - + "Interrupted."); - break; - } - } - } - return null; - } - -} --- old/test/testlibrary/jdk/test/lib/Triple.java 2016-08-11 13:49:26.265008300 -0400 +++ /dev/null 2016-08-11 13:49:26.000000000 -0400 @@ -1,90 +0,0 @@ -/* - * Copyright (c) 2015, 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 jdk.test.lib; - -import java.util.Objects; - -/** - * Triple - a three element tuple - * - * @param first element type - * @param second element type - * @param third element type - */ -public class Triple { - private final Pair> container; - - /** - * Constructor - * - * @param first first element of the triple - * @param second second element of the triple - * @param third third element of the triple - */ - public Triple(F first, S second, T third) { - container = new Pair<>(first, new Pair<>(second, third)); - } - - /** - * Gets first element of the triple - */ - public F getFirst() { - return container.first; - } - - /** - * Gets second element of the triple - */ - public S getSecond() { - return container.second.first; - } - - /** - * Gets third element of the triple - */ - public T getThird() { - return container.second.second; - } - - @Override - public int hashCode() { - return container.hashCode(); - } - - @Override - public boolean equals(Object obj) { - if (obj instanceof Triple) { - Triple objTriple = (Triple) obj; - return Objects.equals(container.first, objTriple.container.first) - && Objects.equals(container.second, - objTriple.container.second); - } - return false; - } - - @Override - public String toString() { - return "(" + getFirst() + " : " + getSecond() + " : " + getThird() + ")"; - } -} --- old/test/testlibrary/jdk/test/lib/Utils.java 2016-08-11 13:49:27.701477400 -0400 +++ /dev/null 2016-08-11 13:49:27.000000000 -0400 @@ -1,648 +0,0 @@ -/* - * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * 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 jdk.test.lib; - -import java.io.File; -import static jdk.test.lib.Asserts.assertTrue; -import java.io.IOException; -import java.lang.reflect.Field; -import java.net.InetAddress; -import java.net.MalformedURLException; -import java.net.ServerSocket; -import java.net.URL; -import java.net.URLClassLoader; -import java.net.UnknownHostException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.Iterator; -import java.util.Map; -import java.util.HashMap; -import java.util.List; -import java.util.Objects; -import java.util.Random; -import java.util.function.BooleanSupplier; -import java.util.concurrent.TimeUnit; -import java.util.function.Consumer; -import java.util.regex.Matcher; -import java.util.regex.Pattern; -import jdk.internal.misc.Unsafe; - -/** - * Common library for various test helper functions. - * - * @deprecated This class is deprecated. Use the one from - * {@code /test/lib/share/classes/jdk/test/lib} - */ -@Deprecated -public final class Utils { - - /** - * Returns the value of 'test.class.path' system property. - */ - public static final String TEST_CLASS_PATH = System.getProperty("test.class.path", "."); - - /** - * Returns the sequence used by operating system to separate lines. - */ - public static final String NEW_LINE = System.getProperty("line.separator"); - - /** - * Returns the value of 'test.vm.opts' system property. - */ - public static final String VM_OPTIONS = System.getProperty("test.vm.opts", "").trim(); - - /** - * Returns the value of 'test.java.opts' system property. - */ - public static final String JAVA_OPTIONS = System.getProperty("test.java.opts", "").trim(); - - /** - * Returns the value of 'test.src' system property. - */ - public static final String TEST_SRC = System.getProperty("test.src", ".").trim(); - - /* - * Returns the value of 'test.jdk' system property - */ - public static final String TEST_JDK = System.getProperty("test.jdk"); - - /** - * Returns the value of 'test.classes' system property - */ - public static final String TEST_CLASSES = System.getProperty("test.classes", "."); - - private static Unsafe unsafe = null; - - /** - * Defines property name for seed value. - */ - public static final String SEED_PROPERTY_NAME = "jdk.test.lib.random.seed"; - - /* (non-javadoc) - * Random generator with (or without) predefined seed. Depends on - * "jdk.test.lib.random.seed" property value. - */ - private static volatile Random RANDOM_GENERATOR; - - /** - * Contains the seed value used for {@link java.util.Random} creation. - */ - public static final long SEED = Long.getLong(SEED_PROPERTY_NAME, new Random().nextLong()); - /** - * Returns the value of 'test.timeout.factor' system property - * converted to {@code double}. - */ - public static final double TIMEOUT_FACTOR; - static { - String toFactor = System.getProperty("test.timeout.factor", "1.0"); - TIMEOUT_FACTOR = Double.parseDouble(toFactor); - } - - /** - * Returns the value of JTREG default test timeout in milliseconds - * converted to {@code long}. - */ - public static final long DEFAULT_TEST_TIMEOUT = TimeUnit.SECONDS.toMillis(120); - - private Utils() { - // Private constructor to prevent class instantiation - } - - /** - * Returns the list of VM options. - * - * @return List of VM options - */ - public static List getVmOptions() { - return Arrays.asList(safeSplitString(VM_OPTIONS)); - } - - /** - * Returns the list of VM options with -J prefix. - * - * @return The list of VM options with -J prefix - */ - public static List getForwardVmOptions() { - String[] opts = safeSplitString(VM_OPTIONS); - for (int i = 0; i < opts.length; i++) { - opts[i] = "-J" + opts[i]; - } - return Arrays.asList(opts); - } - - /** - * Returns the default JTReg arguments for a jvm running a test. - * This is the combination of JTReg arguments test.vm.opts and test.java.opts. - * @return An array of options, or an empty array if no options. - */ - public static String[] getTestJavaOpts() { - List opts = new ArrayList(); - Collections.addAll(opts, safeSplitString(VM_OPTIONS)); - Collections.addAll(opts, safeSplitString(JAVA_OPTIONS)); - return opts.toArray(new String[0]); - } - - /** - * Returns the default JTReg arguments for a jvm running a test without - * options that matches regular expressions in {@code filters}. - * This is the combination of JTReg arguments test.vm.opts and test.java.opts. - * @param filters Regular expressions used to filter out options. - * @return An array of options, or an empty array if no options. - */ - public static String[] getFilteredTestJavaOpts(String... filters) { - String options[] = getTestJavaOpts(); - - if (filters.length == 0) { - return options; - } - - List filteredOptions = new ArrayList(options.length); - Pattern patterns[] = new Pattern[filters.length]; - for (int i = 0; i < filters.length; i++) { - patterns[i] = Pattern.compile(filters[i]); - } - - for (String option : options) { - boolean matched = false; - for (int i = 0; i < patterns.length && !matched; i++) { - Matcher matcher = patterns[i].matcher(option); - matched = matcher.find(); - } - if (!matched) { - filteredOptions.add(option); - } - } - - return filteredOptions.toArray(new String[filteredOptions.size()]); - } - - /** - * Combines given arguments with default JTReg arguments for a jvm running a test. - * This is the combination of JTReg arguments test.vm.opts and test.java.opts - * @return The combination of JTReg test java options and user args. - */ - public static String[] addTestJavaOpts(String... userArgs) { - List opts = new ArrayList(); - Collections.addAll(opts, getTestJavaOpts()); - Collections.addAll(opts, userArgs); - return opts.toArray(new String[0]); - } - - /** - * Splits a string by white space. - * Works like String.split(), but returns an empty array - * if the string is null or empty. - */ - private static String[] safeSplitString(String s) { - if (s == null || s.trim().isEmpty()) { - return new String[] {}; - } - return s.trim().split("\\s+"); - } - - /** - * @return The full command line for the ProcessBuilder. - */ - public static String getCommandLine(ProcessBuilder pb) { - StringBuilder cmd = new StringBuilder(); - for (String s : pb.command()) { - cmd.append(s).append(" "); - } - return cmd.toString(); - } - - /** - * Returns the free port on the local host. - * The function will spin until a valid port number is found. - * - * @return The port number - * @throws InterruptedException if any thread has interrupted the current thread - * @throws IOException if an I/O error occurs when opening the socket - */ - public static int getFreePort() throws InterruptedException, IOException { - int port = -1; - - while (port <= 0) { - Thread.sleep(100); - - ServerSocket serverSocket = null; - try { - serverSocket = new ServerSocket(0); - port = serverSocket.getLocalPort(); - } finally { - serverSocket.close(); - } - } - - return port; - } - - /** - * Returns the name of the local host. - * - * @return The host name - * @throws UnknownHostException if IP address of a host could not be determined - */ - public static String getHostname() throws UnknownHostException { - InetAddress inetAddress = InetAddress.getLocalHost(); - String hostName = inetAddress.getHostName(); - - assertTrue((hostName != null && !hostName.isEmpty()), - "Cannot get hostname"); - - return hostName; - } - - /** - * Uses "jcmd -l" to search for a jvm pid. This function will wait - * forever (until jtreg timeout) for the pid to be found. - * @param key Regular expression to search for - * @return The found pid. - */ - public static int waitForJvmPid(String key) throws Throwable { - final long iterationSleepMillis = 250; - System.out.println("waitForJvmPid: Waiting for key '" + key + "'"); - System.out.flush(); - while (true) { - int pid = tryFindJvmPid(key); - if (pid >= 0) { - return pid; - } - Thread.sleep(iterationSleepMillis); - } - } - - /** - * Searches for a jvm pid in the output from "jcmd -l". - * - * Example output from jcmd is: - * 12498 sun.tools.jcmd.JCmd -l - * 12254 /tmp/jdk8/tl/jdk/JTwork/classes/com/sun/tools/attach/Application.jar - * - * @param key A regular expression to search for. - * @return The found pid, or -1 if not found. - * @throws Exception If multiple matching jvms are found. - */ - public static int tryFindJvmPid(String key) throws Throwable { - OutputAnalyzer output = null; - try { - JDKToolLauncher jcmdLauncher = JDKToolLauncher.create("jcmd"); - jcmdLauncher.addToolArg("-l"); - output = ProcessTools.executeProcess(jcmdLauncher.getCommand()); - output.shouldHaveExitValue(0); - - // Search for a line starting with numbers (pid), followed by the key. - Pattern pattern = Pattern.compile("^([0-9]+)\\s.*(" + key + ")", Pattern.MULTILINE); - Matcher matcher = pattern.matcher(output.getStdout()); - - int pid = -1; - if (matcher.find()) { - pid = Integer.parseInt(matcher.group(1)); - System.out.println("findJvmPid.pid: " + pid); - if (matcher.find()) { - throw new Exception("Found multiple JVM pids for key: " + key); - } - } - return pid; - } catch (Throwable t) { - System.out.println(String.format("Utils.findJvmPid(%s) failed: %s", key, t)); - throw t; - } - } - - /** - * Return the contents of the named file as a single String, - * or null if not found. - * @param filename name of the file to read - * @return String contents of file, or null if file not found. - * @throws IOException - * if an I/O error occurs reading from the file or a malformed or - * unmappable byte sequence is read - */ - public static String fileAsString(String filename) throws IOException { - Path filePath = Paths.get(filename); - if (!Files.exists(filePath)) return null; - return new String(Files.readAllBytes(filePath)); - } - - /** - * @return Unsafe instance. - */ - public static synchronized Unsafe getUnsafe() { - if (unsafe == null) { - try { - Field f = Unsafe.class.getDeclaredField("theUnsafe"); - f.setAccessible(true); - unsafe = (Unsafe) f.get(null); - } catch (NoSuchFieldException | IllegalAccessException e) { - throw new RuntimeException("Unable to get Unsafe instance.", e); - } - } - return unsafe; - } - private static final char[] hexArray = new char[]{'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'}; - - /** - * Returns hex view of byte array - * - * @param bytes byte array to process - * @return Space separated hexadecimal string representation of bytes - */ - - public static String toHexString(byte[] bytes) { - char[] hexView = new char[bytes.length * 3]; - int i = 0; - for (byte b : bytes) { - hexView[i++] = hexArray[(b >> 4) & 0x0F]; - hexView[i++] = hexArray[b & 0x0F]; - hexView[i++] = ' '; - } - return new String(hexView); - } - - /** - * Returns {@link java.util.Random} generator initialized with particular seed. - * The seed could be provided via system property {@link Utils#SEED_PROPERTY_NAME} - * In case no seed is provided, the method uses a random number. - * The used seed printed to stdout. - * @return {@link java.util.Random} generator with particular seed. - */ - public static Random getRandomInstance() { - if (RANDOM_GENERATOR == null) { - synchronized (Utils.class) { - if (RANDOM_GENERATOR == null) { - RANDOM_GENERATOR = new Random(SEED); - System.out.printf("For random generator using seed: %d%n", SEED); - System.out.printf("To re-run test with same seed value please add \"-D%s=%d\" to command line.%n", SEED_PROPERTY_NAME, SEED); - } - } - } - return RANDOM_GENERATOR; - } - - /** - * Returns random element of non empty collection - * - * @param a type of collection element - * @param collection collection of elements - * @return random element of collection - * @throws IllegalArgumentException if collection is empty - */ - public static T getRandomElement(Collection collection) - throws IllegalArgumentException { - if (collection.isEmpty()) { - throw new IllegalArgumentException("Empty collection"); - } - Random random = getRandomInstance(); - int elementIndex = 1 + random.nextInt(collection.size() - 1); - Iterator iterator = collection.iterator(); - while (--elementIndex != 0) { - iterator.next(); - } - return iterator.next(); - } - - /** - * Returns random element of non empty array - * - * @param a type of array element - * @param array array of elements - * @return random element of array - * @throws IllegalArgumentException if array is empty - */ - public static T getRandomElement(T[] array) - throws IllegalArgumentException { - if (array == null || array.length == 0) { - throw new IllegalArgumentException("Empty or null array"); - } - Random random = getRandomInstance(); - return array[random.nextInt(array.length)]; - } - - /** - * Wait for condition to be true - * - * @param condition, a condition to wait for - */ - public static final void waitForCondition(BooleanSupplier condition) { - waitForCondition(condition, -1L, 100L); - } - - /** - * Wait until timeout for condition to be true - * - * @param condition, a condition to wait for - * @param timeout a time in milliseconds to wait for condition to be true - * specifying -1 will wait forever - * @return condition value, to determine if wait was successful - */ - public static final boolean waitForCondition(BooleanSupplier condition, - long timeout) { - return waitForCondition(condition, timeout, 100L); - } - - /** - * Wait until timeout for condition to be true for specified time - * - * @param condition, a condition to wait for - * @param timeout a time in milliseconds to wait for condition to be true, - * specifying -1 will wait forever - * @param sleepTime a time to sleep value in milliseconds - * @return condition value, to determine if wait was successful - */ - public static final boolean waitForCondition(BooleanSupplier condition, - long timeout, long sleepTime) { - long startTime = System.currentTimeMillis(); - while (!(condition.getAsBoolean() || (timeout != -1L - && ((System.currentTimeMillis() - startTime) > timeout)))) { - try { - Thread.sleep(sleepTime); - } catch (InterruptedException e) { - Thread.currentThread().interrupt(); - throw new Error(e); - } - } - return condition.getAsBoolean(); - } - - /** - * Adjusts the provided timeout value for the TIMEOUT_FACTOR - * @param tOut the timeout value to be adjusted - * @return The timeout value adjusted for the value of "test.timeout.factor" - * system property - */ - public static long adjustTimeout(long tOut) { - return Math.round(tOut * Utils.TIMEOUT_FACTOR); - } - - /** - * Ensures a requested class is loaded - * @param aClass class to load - */ - public static void ensureClassIsLoaded(Class aClass) { - if (aClass == null) { - throw new Error("Requested null class"); - } - try { - Class.forName(aClass.getName(), /* initialize = */ true, - ClassLoader.getSystemClassLoader()); - } catch (ClassNotFoundException e) { - throw new Error("Class not found", e); - } - } - /** - * @param parent a class loader to be the parent for the returned one - * @return an UrlClassLoader with urls made of the 'test.class.path' jtreg - * property and with the given parent - */ - public static URLClassLoader getTestClassPathURLClassLoader(ClassLoader parent) { - URL[] urls = Arrays.stream(TEST_CLASS_PATH.split(File.pathSeparator)) - .map(Paths::get) - .map(Path::toUri) - .map(x -> { - try { - return x.toURL(); - } catch (MalformedURLException ex) { - throw new Error("Test issue. JTREG property" - + " 'test.class.path'" - + " is not defined correctly", ex); - } - }).toArray(URL[]::new); - return new URLClassLoader(urls, parent); - } - - /** - * Runs runnable and checks that it throws expected exception. If exceptionException is null it means - * that we expect no exception to be thrown. - * @param runnable what we run - * @param expectedException expected exception - */ - public static void runAndCheckException(Runnable runnable, Class expectedException) { - runAndCheckException(runnable, t -> { - if (t == null) { - if (expectedException != null) { - throw new AssertionError("Didn't get expected exception " + expectedException.getSimpleName()); - } - } else { - String message = "Got unexpected exception " + t.getClass().getSimpleName(); - if (expectedException == null) { - throw new AssertionError(message, t); - } else if (!expectedException.isAssignableFrom(t.getClass())) { - message += " instead of " + expectedException.getSimpleName(); - throw new AssertionError(message, t); - } - } - }); - } - - /** - * Runs runnable and makes some checks to ensure that it throws expected exception. - * @param runnable what we run - * @param checkException a consumer which checks that we got expected exception and raises a new exception otherwise - */ - public static void runAndCheckException(Runnable runnable, Consumer checkException) { - try { - runnable.run(); - checkException.accept(null); - } catch (Throwable t) { - checkException.accept(t); - } - } - - /** - * Converts to VM type signature - * - * @param type Java type to convert - * @return string representation of VM type - */ - public static String toJVMTypeSignature(Class type) { - if (type.isPrimitive()) { - if (type == boolean.class) { - return "Z"; - } else if (type == byte.class) { - return "B"; - } else if (type == char.class) { - return "C"; - } else if (type == double.class) { - return "D"; - } else if (type == float.class) { - return "F"; - } else if (type == int.class) { - return "I"; - } else if (type == long.class) { - return "J"; - } else if (type == short.class) { - return "S"; - } else if (type == void.class) { - return "V"; - } else { - throw new Error("Unsupported type: " + type); - } - } - String result = type.getName().replaceAll("\\.", "/"); - if (!type.isArray()) { - return "L" + result + ";"; - } - return result; - } - - public static Object[] getNullValues(Class... types) { - Object[] result = new Object[types.length]; - int i = 0; - for (Class type : types) { - result[i++] = NULL_VALUES.get(type); - } - return result; - } - private static Map, Object> NULL_VALUES = new HashMap<>(); - static { - NULL_VALUES.put(boolean.class, false); - NULL_VALUES.put(byte.class, (byte) 0); - NULL_VALUES.put(short.class, (short) 0); - NULL_VALUES.put(char.class, '\0'); - NULL_VALUES.put(int.class, 0); - NULL_VALUES.put(long.class, 0L); - NULL_VALUES.put(float.class, 0.0f); - NULL_VALUES.put(double.class, 0.0d); - } - - /** - * Returns mandatory property value - * @param propName is a name of property to request - * @return a String with requested property value - */ - public static String getMandatoryProperty(String propName) { - Objects.requireNonNull(propName, "Requested null property"); - String prop = System.getProperty(propName); - Objects.requireNonNull(prop, - String.format("A mandatory property '%s' isn't set", propName)); - return prop; - } -} - --- old/test/testlibrary/jdk/test/lib/cli/CPUSpecificCommandLineOptionTest.java 2016-08-11 13:49:29.154791300 -0400 +++ /dev/null 2016-08-11 13:49:29.000000000 -0400 @@ -1,65 +0,0 @@ -/* - * Copyright (c) 2014, 2015, 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 jdk.test.lib.cli; - -import jdk.test.lib.cli.predicate.CPUSpecificPredicate; - -/** - * Base class for command line options tests that - * requires specific CPU arch or specific CPU features. - */ -public abstract class CPUSpecificCommandLineOptionTest - extends CommandLineOptionTest { - /** - * Creates new CPU specific test instance that does not - * require any CPU features. - * - * @param cpuArchPattern Regular expression that should - * match os.arch. - */ - public CPUSpecificCommandLineOptionTest(String cpuArchPattern) { - this(cpuArchPattern, null, null); - } - - /** - * Creates new CPU specific test instance that does not - * require from CPU support of {@code supportedCPUFeatures} features - * and no support of {@code unsupportedCPUFeatures}. - * - * @param cpuArchPattern Regular expression that should - * match os.arch. - * @param supportedCPUFeatures Array with names of features that - * should be supported by CPU. If {@code null}, - * then no features have to be supported. - * @param unsupportedCPUFeatures Array with names of features that - * should not be supported by CPU. - * If {@code null}, then CPU may support any - * features. - */ - public CPUSpecificCommandLineOptionTest(String cpuArchPattern, - String supportedCPUFeatures[], String unsupportedCPUFeatures[]) { - super(new CPUSpecificPredicate(cpuArchPattern, supportedCPUFeatures, - unsupportedCPUFeatures)); - } -} --- old/test/testlibrary/jdk/test/lib/cli/CommandLineOptionTest.java 2016-08-11 13:49:30.586592000 -0400 +++ /dev/null 2016-08-11 13:49:30.000000000 -0400 @@ -1,520 +0,0 @@ -/* - * Copyright (c) 2014, 2015, 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 jdk.test.lib.cli; - -import java.util.List; -import java.util.ArrayList; -import java.util.Collections; -import java.util.function.BooleanSupplier; - -import jdk.test.lib.*; - -/** - * Base class for command line option tests. - */ -public abstract class CommandLineOptionTest { - public static final String UNLOCK_DIAGNOSTIC_VM_OPTIONS - = "-XX:+UnlockDiagnosticVMOptions"; - public static final String UNLOCK_EXPERIMENTAL_VM_OPTIONS - = "-XX:+UnlockExperimentalVMOptions"; - protected static final String UNRECOGNIZED_OPTION_ERROR_FORMAT - = "Unrecognized VM option '[+-]?%s(=.*)?'"; - protected static final String EXPERIMENTAL_OPTION_ERROR_FORMAT - = "VM option '%s' is experimental and must be enabled via " - + "-XX:\\+UnlockExperimentalVMOptions."; - protected static final String DIAGNOSTIC_OPTION_ERROR_FORMAT - = " VM option '%s' is diagnostic and must be enabled via " - + "-XX:\\+UnlockDiagnosticVMOptions."; - private static final String PRINT_FLAGS_FINAL_FORMAT = "%s\\s*:?=\\s*%s"; - - /** - * Verifies that JVM startup behavior matches our expectations. - * - * @param option an option that should be passed to JVM - * @param expectedMessages an array of patterns that should occur - * in JVM output. If {@code null} then - * JVM output could be empty. - * @param unexpectedMessages an array of patterns that should not - * occur in JVM output. If {@code null} then - * JVM output could be empty. - * @param exitErrorMessage message that will be shown if exit code is not - * as expected. - * @param wrongWarningMessage message that will be shown if warning - * messages are not as expected. - * @param exitCode expected exit code. - * @throws Throwable if verification fails or some other issues occur. - */ - public static void verifyJVMStartup(String option, - String expectedMessages[], String unexpectedMessages[], - String exitErrorMessage, String wrongWarningMessage, - ExitCode exitCode) throws Throwable { - CommandLineOptionTest.verifyJVMStartup(expectedMessages, - unexpectedMessages, exitErrorMessage, - wrongWarningMessage, exitCode, false, option); - } - - /** - * Verifies that JVM startup behavior matches our expectations. - * - * @param expectedMessages an array of patterns that should occur - * in JVM output. If {@code null} then - * JVM output could be empty. - * @param unexpectedMessages an array of patterns that should not - * occur in JVM output. If {@code null} then - * JVM output could be empty. - * @param exitErrorMessage message that will be shown if exit code is not - * as expected. - * @param wrongWarningMessage message that will be shown if warning - * messages are not as expected. - * @param exitCode expected exit code. - * @param addTestVMOptions if {@code true} then test VM options will be - * passed to VM. - * @param options options that should be passed to VM in addition to mode - * flag. - * @throws Throwable if verification fails or some other issues occur. - */ - public static void verifyJVMStartup(String expectedMessages[], - String unexpectedMessages[], String exitErrorMessage, - String wrongWarningMessage, ExitCode exitCode, - boolean addTestVMOptions, String... options) - throws Throwable { - List finalOptions = new ArrayList<>(); - if (addTestVMOptions) { - Collections.addAll(finalOptions, ProcessTools.getVmInputArgs()); - Collections.addAll(finalOptions, Utils.getTestJavaOpts()); - } - Collections.addAll(finalOptions, options); - finalOptions.add("-version"); - - ProcessBuilder processBuilder - = ProcessTools.createJavaProcessBuilder(finalOptions.toArray( - new String[finalOptions.size()])); - OutputAnalyzer outputAnalyzer - = new OutputAnalyzer(processBuilder.start()); - - try { - outputAnalyzer.shouldHaveExitValue(exitCode.value); - } catch (RuntimeException e) { - String errorMessage = String.format( - "JVM process should have exit value '%d'.%n%s", - exitCode.value, exitErrorMessage); - throw new AssertionError(errorMessage, e); - } - - verifyOutput(expectedMessages, unexpectedMessages, - wrongWarningMessage, outputAnalyzer); - } - - /** - * Verifies that JVM startup behavior matches our expectations. - * - * @param expectedMessages an array of patterns that should occur in JVM - * output. If {@code null} then - * JVM output could be empty. - * @param unexpectedMessages an array of patterns that should not occur - * in JVM output. If {@code null} then - * JVM output could be empty. - * @param wrongWarningMessage message that will be shown if messages are - * not as expected. - * @param outputAnalyzer OutputAnalyzer instance - * @throws AssertionError if verification fails. - */ - public static void verifyOutput(String[] expectedMessages, - String[] unexpectedMessages, String wrongWarningMessage, - OutputAnalyzer outputAnalyzer) { - if (expectedMessages != null) { - for (String expectedMessage : expectedMessages) { - try { - outputAnalyzer.shouldMatch(expectedMessage); - } catch (RuntimeException e) { - String errorMessage = String.format( - "Expected message not found: '%s'.%n%s", - expectedMessage, wrongWarningMessage); - throw new AssertionError(errorMessage, e); - } - } - } - - if (unexpectedMessages != null) { - for (String unexpectedMessage : unexpectedMessages) { - try { - outputAnalyzer.shouldNotMatch(unexpectedMessage); - } catch (RuntimeException e) { - String errorMessage = String.format( - "Unexpected message found: '%s'.%n%s", - unexpectedMessage, wrongWarningMessage); - throw new AssertionError(errorMessage, e); - } - } - } - } - - /** - * Verifies that JVM startup behavior matches our expectations when type - * of newly started VM is the same as the type of current. - * - * @param expectedMessages an array of patterns that should occur - * in JVM output. If {@code null} then - * JVM output could be empty. - * @param unexpectedMessages an array of patterns that should not - * occur in JVM output. If {@code null} then - * JVM output could be empty. - * @param exitErrorMessage Message that will be shown if exit value is not - * as expected. - * @param wrongWarningMessage message that will be shown if warning - * messages are not as expected. - * @param exitCode expected exit code. - * @param options options that should be passed to VM in addition to mode - * flag. - * @throws Throwable if verification fails or some other issues occur. - */ - public static void verifySameJVMStartup(String expectedMessages[], - String unexpectedMessages[], String exitErrorMessage, - String wrongWarningMessage, ExitCode exitCode, String... options) - throws Throwable { - List finalOptions = new ArrayList<>(); - finalOptions.add(CommandLineOptionTest.getVMTypeOption()); - Collections.addAll(finalOptions, options); - - CommandLineOptionTest.verifyJVMStartup(expectedMessages, - unexpectedMessages, exitErrorMessage, - wrongWarningMessage, exitCode, false, - finalOptions.toArray(new String[finalOptions.size()])); - } - - /** - * Verifies that value of specified JVM option is the same as - * expected value. - * This method filter out option with {@code optionName} - * name from test java options. - * - * @param optionName a name of tested option. - * @param expectedValue expected value of tested option. - * @param optionErrorString message will be shown if option value is not as - * expected. - * @param additionalVMOpts additional options that should be - * passed to JVM. - * @throws Throwable if verification fails or some other issues occur. - */ - public static void verifyOptionValue(String optionName, - String expectedValue, String optionErrorString, - String... additionalVMOpts) throws Throwable { - verifyOptionValue(optionName, expectedValue, optionErrorString, - true, additionalVMOpts); - } - - /** - * Verifies that value of specified JVM option is the same as - * expected value. - * This method filter out option with {@code optionName} - * name from test java options. - * - * @param optionName a name of tested option. - * @param expectedValue expected value of tested option. - * @param addTestVmOptions if {@code true}, then test VM options - * will be used. - * @param optionErrorString message will be shown if option value is not as - * expected. - * @param additionalVMOpts additional options that should be - * passed to JVM. - * @throws Throwable if verification fails or some other issues - * occur. - */ - public static void verifyOptionValue(String optionName, - String expectedValue, String optionErrorString, - boolean addTestVmOptions, String... additionalVMOpts) - throws Throwable { - List vmOpts = new ArrayList<>(); - - if (addTestVmOptions) { - Collections.addAll(vmOpts, - Utils.getFilteredTestJavaOpts(optionName)); - } - Collections.addAll(vmOpts, additionalVMOpts); - Collections.addAll(vmOpts, "-XX:+PrintFlagsFinal", "-version"); - - ProcessBuilder processBuilder = ProcessTools.createJavaProcessBuilder( - vmOpts.toArray(new String[vmOpts.size()])); - - OutputAnalyzer outputAnalyzer - = new OutputAnalyzer(processBuilder.start()); - - try { - outputAnalyzer.shouldHaveExitValue(0); - } catch (RuntimeException e) { - String errorMessage = String.format( - "JVM should start with option '%s' without errors.", - optionName); - throw new AssertionError(errorMessage, e); - } - verifyOptionValue(optionName, expectedValue, optionErrorString, - outputAnalyzer); - } - - /** - * Verifies that value of specified JVM option is the same as - * expected value. - * - * @param optionName a name of tested option. - * @param expectedValue expected value of tested option. - * @param optionErrorString message will be shown if option value is not - * as expected. - * @param outputAnalyzer OutputAnalyzer instance - * @throws AssertionError if verification fails - */ - public static void verifyOptionValue(String optionName, - String expectedValue, String optionErrorString, - OutputAnalyzer outputAnalyzer) { - try { - outputAnalyzer.shouldMatch(String.format( - CommandLineOptionTest.PRINT_FLAGS_FINAL_FORMAT, - optionName, expectedValue)); - } catch (RuntimeException e) { - String errorMessage = String.format( - "Option '%s' is expected to have '%s' value%n%s", - optionName, expectedValue, - optionErrorString); - throw new AssertionError(errorMessage, e); - } - } - - /** - * Start VM with given options and values. - * Generates command line option flags from - * {@code optionNames} and {@code optionValues}. - * - * @param optionNames names of options to pass in - * @param optionValues values of option - * @param additionalVMOpts additional options that should be - * passed to JVM. - * @return output from vm process - */ - public static OutputAnalyzer startVMWithOptions(String[] optionNames, - String[] optionValues, - String... additionalVMOpts) throws Throwable { - List vmOpts = new ArrayList<>(); - if (optionNames == null || optionValues == null || optionNames.length != optionValues.length) { - throw new IllegalArgumentException("optionNames and/or optionValues"); - } - - for (int i = 0; i < optionNames.length; i++) { - vmOpts.add(prepareFlag(optionNames[i], optionValues[i])); - } - Collections.addAll(vmOpts, additionalVMOpts); - Collections.addAll(vmOpts, "-version"); - - ProcessBuilder processBuilder = ProcessTools.createJavaProcessBuilder( - vmOpts.toArray(new String[vmOpts.size()])); - - return new OutputAnalyzer(processBuilder.start()); - } - - /** - * Verifies from the output that values of specified JVM options were the same as - * expected values. - * - * @param outputAnalyzer search output for expect options and values. - * @param optionNames names of tested options. - * @param expectedValues expected values of tested options. - * @throws Throwable if verification fails or some other issues occur. - */ - public static void verifyOptionValuesFromOutput(OutputAnalyzer outputAnalyzer, - String[] optionNames, - String[] expectedValues) throws Throwable { - outputAnalyzer.shouldHaveExitValue(0); - for (int i = 0; i < optionNames.length; i++) { - outputAnalyzer.shouldMatch(String.format( - CommandLineOptionTest.PRINT_FLAGS_FINAL_FORMAT, - optionNames[i], expectedValues[i])); - } - } - - /** - * Verifies that value of specified JVM options are the same as - * expected values. - * Generates command line option flags from - * {@code optionNames} and {@code expectedValues}. - * - * @param optionNames names of tested options. - * @param expectedValues expected values of tested options. - * @throws Throwable if verification fails or some other issues occur. - */ - public static void verifyOptionValues(String[] optionNames, - String[] expectedValues) throws Throwable { - OutputAnalyzer outputAnalyzer = startVMWithOptions(optionNames, expectedValues, "-XX:+PrintFlagsFinal"); - verifyOptionValuesFromOutput(outputAnalyzer, optionNames, expectedValues); - } - - /** - * Verifies that value of specified JVM when type of newly started VM - * is the same as the type of current. - * This method filter out option with {@code optionName} - * name from test java options. - * Only mode flag will be passed to VM in addition to - * {@code additionalVMOpts} - * - * @param optionName name of tested option. - * @param expectedValue expected value of tested option. - * @param optionErrorString message to show if option has another value - * @param additionalVMOpts additional options that should be - * passed to JVM. - * @throws Throwable if verification fails or some other issues occur. - */ - public static void verifyOptionValueForSameVM(String optionName, - String expectedValue, String optionErrorString, - String... additionalVMOpts) throws Throwable { - List finalOptions = new ArrayList<>(); - finalOptions.add(CommandLineOptionTest.getVMTypeOption()); - Collections.addAll(finalOptions, additionalVMOpts); - - CommandLineOptionTest.verifyOptionValue(optionName, expectedValue, - optionErrorString, false, - finalOptions.toArray(new String[finalOptions.size()])); - } - - /** - * Prepares boolean command line flag with name {@code name} according - * to it's {@code value}. - * - * @param name the name of option to be prepared - * @param value the value of option - * @return prepared command line flag - */ - public static String prepareBooleanFlag(String name, boolean value) { - return String.format("-XX:%c%s", (value ? '+' : '-'), name); - } - - /** - * Prepares numeric command line flag with name {@code name} by setting - * it's value to {@code value}. - * - * @param name the name of option to be prepared - * @param value the value of option - * @return prepared command line flag - */ - public static String prepareNumericFlag(String name, Number value) { - return String.format("-XX:%s=%s", name, value.toString()); - } - - /** - * Prepares generic command line flag with name {@code name} by setting - * it's value to {@code value}. - * - * @param name the name of option to be prepared - * @param value the value of option ("+" or "-" can be used instead of "true" or "false") - * @return prepared command line flag - */ - public static String prepareFlag(String name, String value) { - if (value.equals("+") || value.equalsIgnoreCase("true")) { - return "-XX:+" + name; - } else if (value.equals("-") || value.equalsIgnoreCase("false")) { - return "-XX:-" + name; - } else { - return "-XX:" + name + "=" + value; - } - } - - /** - * Returns message that should occur in VM output if option - * {@code optionName} if unrecognized. - * - * @param optionName the name of option for which message should be returned - * @return message saying that option {@code optionName} is unrecognized - */ - public static String getUnrecognizedOptionErrorMessage(String optionName) { - return String.format( - CommandLineOptionTest.UNRECOGNIZED_OPTION_ERROR_FORMAT, - optionName); - } - - /** - * Returns message that should occur in VM output if option - * {@code optionName} is experimental and - * -XX:+UnlockExperimentalVMOptions was not passed to VM. - * - * @param optionName the name of option for which message should be returned - * @return message saying that option {@code optionName} is experimental - */ - public static String getExperimentalOptionErrorMessage(String optionName) { - return String.format( - CommandLineOptionTest.EXPERIMENTAL_OPTION_ERROR_FORMAT, - optionName); - } - - /** - * Returns message that should occur in VM output if option - * {@code optionName} is diagnostic and -XX:+UnlockDiagnosticVMOptions - * was not passed to VM. - * - * @param optionName the name of option for which message should be returned - * @return message saying that option {@code optionName} is diganostic - */ - public static String getDiagnosticOptionErrorMessage(String optionName) { - return String.format( - CommandLineOptionTest.DIAGNOSTIC_OPTION_ERROR_FORMAT, - optionName); - } - - /** - * @return option required to start a new VM with the same type as current. - * @throws RuntimeException when VM type is unknown. - */ - private static String getVMTypeOption() { - if (Platform.isServer()) { - return "-server"; - } else if (Platform.isClient()) { - return "-client"; - } else if (Platform.isMinimal()) { - return "-minimal"; - } else if (Platform.isGraal()) { - return "-graal"; - } - throw new RuntimeException("Unknown VM mode."); - } - - private final BooleanSupplier predicate; - - /** - * Constructs new CommandLineOptionTest that will be executed only if - * predicate {@code predicate} return {@code true}. - * @param predicate a predicate responsible for test's preconditions check. - */ - public CommandLineOptionTest(BooleanSupplier predicate) { - this.predicate = predicate; - } - - /** - * Runs command line option test. - */ - public final void test() throws Throwable { - if (predicate.getAsBoolean()) { - runTestCases(); - } - } - - /** - * @throws Throwable if some issue happened during test cases execution. - */ - protected abstract void runTestCases() throws Throwable; -} --- old/test/testlibrary/jdk/test/lib/cli/predicate/AndPredicate.java 2016-08-11 13:49:32.061152900 -0400 +++ /dev/null 2016-08-11 13:49:32.000000000 -0400 @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2014, 2015, 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 jdk.test.lib.cli.predicate; - -import java.util.function.BooleanSupplier; - -public class AndPredicate implements BooleanSupplier { - private final BooleanSupplier a; - private final BooleanSupplier b; - - public AndPredicate(BooleanSupplier a, BooleanSupplier b) { - this.a = a; - this.b = b; - } - - @Override - public boolean getAsBoolean() { - return a.getAsBoolean() && b.getAsBoolean(); - } -} --- old/test/testlibrary/jdk/test/lib/cli/predicate/CPUSpecificPredicate.java 2016-08-11 13:49:33.491304900 -0400 +++ /dev/null 2016-08-11 13:49:33.000000000 -0400 @@ -1,71 +0,0 @@ -/* - * Copyright (c) 2014, 2015, 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 jdk.test.lib.cli.predicate; - -import jdk.test.lib.Platform; -import sun.hotspot.cpuinfo.CPUInfo; - -import java.util.function.BooleanSupplier; - -public class CPUSpecificPredicate implements BooleanSupplier { - private final String cpuArchPattern; - private final String supportedCPUFeatures[]; - private final String unsupportedCPUFeatures[]; - - public CPUSpecificPredicate(String cpuArchPattern, - String supportedCPUFeatures[], - String unsupportedCPUFeatures[]) { - this.cpuArchPattern = cpuArchPattern; - this.supportedCPUFeatures = supportedCPUFeatures; - this.unsupportedCPUFeatures = unsupportedCPUFeatures; - } - - @Override - public boolean getAsBoolean() { - if (!Platform.getOsArch().matches(cpuArchPattern)) { - System.out.println("CPU arch " + Platform.getOsArch() + " does not match " + cpuArchPattern); - return false; - } - - if (supportedCPUFeatures != null) { - for (String feature : supportedCPUFeatures) { - if (!CPUInfo.hasFeature(feature)) { - System.out.println("CPU does not support " + feature - + " feature"); - return false; - } - } - } - - if (unsupportedCPUFeatures != null) { - for (String feature : unsupportedCPUFeatures) { - if (CPUInfo.hasFeature(feature)) { - System.out.println("CPU support " + feature + " feature"); - return false; - } - } - } - return true; - } -} --- old/test/testlibrary/jdk/test/lib/cli/predicate/NotPredicate.java 2016-08-11 13:49:34.921534800 -0400 +++ /dev/null 2016-08-11 13:49:35.000000000 -0400 @@ -1,40 +0,0 @@ -/* - * Copyright (c) 2014, 2015, 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 jdk.test.lib.cli.predicate; - -import java.util.function.BooleanSupplier; - -public class NotPredicate implements BooleanSupplier { - private final BooleanSupplier s; - - public NotPredicate(BooleanSupplier s) { - this.s = s; - } - - @Override - public boolean getAsBoolean() { - return !s.getAsBoolean(); - } -} --- old/test/testlibrary/jdk/test/lib/cli/predicate/OrPredicate.java 2016-08-11 13:49:36.348984600 -0400 +++ /dev/null 2016-08-11 13:49:36.000000000 -0400 @@ -1,42 +0,0 @@ -/* - * Copyright (c) 2014, 2015, 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 jdk.test.lib.cli.predicate; - -import java.util.function.BooleanSupplier; - -public class OrPredicate implements BooleanSupplier { - private final BooleanSupplier a; - private final BooleanSupplier b; - - public OrPredicate(BooleanSupplier a, BooleanSupplier b) { - this.a = a; - this.b = b; - } - - @Override - public boolean getAsBoolean() { - return a.getAsBoolean() || b.getAsBoolean(); - } -} --- old/test/testlibrary/jdk/test/lib/dcmd/CommandExecutor.java 2016-08-11 13:49:37.802946400 -0400 +++ /dev/null 2016-08-11 13:49:38.000000000 -0400 @@ -1,75 +0,0 @@ -/* - * Copyright (c) 2015, 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 jdk.test.lib.dcmd; - -import jdk.test.lib.OutputAnalyzer; - -/** - * Abstract base class for Diagnostic Command executors - */ -public abstract class CommandExecutor { - - /** - * Execute a diagnostic command - * - * @param cmd The diagnostic command to execute - * @return an {@link jdk.testlibrary.OutputAnalyzer} encapsulating the output of the command - * @throws CommandExecutorException if there is an exception on the "calling side" while trying to execute the - * Diagnostic Command. Exceptions thrown on the remote side are available as textual representations in - * stderr, regardless of the specific executor used. - */ - public final OutputAnalyzer execute(String cmd) throws CommandExecutorException { - return execute(cmd, false); - } - - /** - * Execute a diagnostic command - * - * @param cmd The diagnostic command to execute - * @param silent Do not print the command output - * @return an {@link jdk.testlibrary.OutputAnalyzer} encapsulating the output of the command - * @throws CommandExecutorException if there is an exception on the "calling side" while trying to execute the - * Diagnostic Command. Exceptions thrown on the remote side are available as textual representations in - * stderr, regardless of the specific executor used. - */ - public final OutputAnalyzer execute(String cmd, boolean silent) throws CommandExecutorException { - if (!silent) { - System.out.printf("Running DCMD '%s' through '%s'%n", cmd, this.getClass().getSimpleName()); - } - - OutputAnalyzer oa = executeImpl(cmd); - - if (!silent) { - System.out.println("---------------- stdout ----------------"); - System.out.println(oa.getStdout()); - System.out.println("---------------- stderr ----------------"); - System.out.println(oa.getStderr()); - System.out.println("----------------------------------------"); - System.out.println(); - } - return oa; - } - - protected abstract OutputAnalyzer executeImpl(String cmd) throws CommandExecutorException; -} --- old/test/testlibrary/jdk/test/lib/dcmd/CommandExecutorException.java 2016-08-11 13:49:39.241092900 -0400 +++ /dev/null 2016-08-11 13:49:39.000000000 -0400 @@ -1,36 +0,0 @@ -/* - * Copyright (c) 2015, 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 jdk.test.lib.dcmd; - -/** - * CommandExecutorException encapsulates exceptions thrown (on the "calling side") from the execution of Diagnostic - * Commands - */ -public class CommandExecutorException extends RuntimeException { - private static final long serialVersionUID = -7039597746579144280L; - - public CommandExecutorException(String message, Throwable e) { - super(message, e); - } -} --- old/test/testlibrary/jdk/test/lib/dcmd/FileJcmdExecutor.java 2016-08-11 13:49:40.681901800 -0400 +++ /dev/null 2016-08-11 13:49:40.000000000 -0400 @@ -1,81 +0,0 @@ -/* - * Copyright (c) 2015, 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 jdk.test.lib.dcmd; - -import java.io.File; -import java.io.IOException; -import java.io.PrintWriter; -import java.util.Arrays; -import java.util.List; - -/** - * Executes Diagnostic Commands on the target VM (specified by pid) using the jcmd tool and its ability to read - * Diagnostic Commands from a file. - */ -public class FileJcmdExecutor extends PidJcmdExecutor { - - /** - * Instantiates a new FileJcmdExecutor targeting the current VM - */ - public FileJcmdExecutor() { - super(); - } - - /** - * Instantiates a new FileJcmdExecutor targeting the VM indicated by the given pid - * - * @param target Pid of the target VM - */ - public FileJcmdExecutor(String target) { - super(target); - } - - protected List createCommandLine(String cmd) throws CommandExecutorException { - File cmdFile = createTempFile(); - writeCommandToTemporaryFile(cmd, cmdFile); - - return Arrays.asList(jcmdBinary, Long.toString(pid), - "-f", cmdFile.getAbsolutePath()); - } - - private void writeCommandToTemporaryFile(String cmd, File cmdFile) { - try (PrintWriter pw = new PrintWriter(cmdFile)) { - pw.println(cmd); - } catch (IOException e) { - String message = "Could not write to file: " + cmdFile.getAbsolutePath(); - throw new CommandExecutorException(message, e); - } - } - - private File createTempFile() { - try { - File cmdFile = File.createTempFile("input", "jcmd"); - cmdFile.deleteOnExit(); - return cmdFile; - } catch (IOException e) { - throw new CommandExecutorException("Could not create temporary file", e); - } - } - -} --- old/test/testlibrary/jdk/test/lib/dcmd/JMXExecutor.java 2016-08-11 13:49:42.118168600 -0400 +++ /dev/null 2016-08-11 13:49:42.000000000 -0400 @@ -1,187 +0,0 @@ -/* - * Copyright (c) 2015, 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 jdk.test.lib.dcmd; - -import jdk.test.lib.OutputAnalyzer; - -import javax.management.*; -import javax.management.remote.JMXConnector; -import javax.management.remote.JMXConnectorFactory; -import javax.management.remote.JMXServiceURL; - -import java.io.IOException; -import java.io.PrintWriter; -import java.io.StringWriter; - -import java.lang.management.ManagementFactory; - -import java.util.HashMap; - -/** - * Executes Diagnostic Commands on the target VM (specified by a host/port combination or a full JMX Service URL) using - * the JMX interface. If the target is not the current VM, the JMX Remote interface must be enabled beforehand. - */ -public class JMXExecutor extends CommandExecutor { - - private final MBeanServerConnection mbs; - - /** - * Instantiates a new JMXExecutor targeting the current VM - */ - public JMXExecutor() { - super(); - mbs = ManagementFactory.getPlatformMBeanServer(); - } - - /** - * Instantiates a new JMXExecutor targeting the VM indicated by the given host/port combination or a full JMX - * Service URL - * - * @param target a host/port combination on the format "host:port" or a full JMX Service URL of the target VM - */ - public JMXExecutor(String target) { - String urlStr; - - if (target.matches("^\\w[\\w\\-]*(\\.[\\w\\-]+)*:\\d+$")) { - /* Matches "hostname:port" */ - urlStr = String.format("service:jmx:rmi:///jndi/rmi://%s/jmxrmi", target); - } else if (target.startsWith("service:")) { - urlStr = target; - } else { - throw new IllegalArgumentException("Could not recognize target string: " + target); - } - - try { - JMXServiceURL url = new JMXServiceURL(urlStr); - JMXConnector c = JMXConnectorFactory.connect(url, new HashMap<>()); - mbs = c.getMBeanServerConnection(); - } catch (IOException e) { - throw new CommandExecutorException("Could not initiate connection to target: " + target, e); - } - } - - protected OutputAnalyzer executeImpl(String cmd) throws CommandExecutorException { - String stdout = ""; - String stderr = ""; - - String[] cmdParts = cmd.split(" ", 2); - String operation = commandToMethodName(cmdParts[0]); - Object[] dcmdArgs = produceArguments(cmdParts); - String[] signature = {String[].class.getName()}; - - ObjectName beanName = getMBeanName(); - - try { - stdout = (String) mbs.invoke(beanName, operation, dcmdArgs, signature); - } - - /* Failures on the "local" side, the one invoking the command. */ - catch (ReflectionException e) { - Throwable cause = e.getCause(); - if (cause instanceof NoSuchMethodException) { - /* We want JMXExecutor to match the behavior of the other CommandExecutors */ - String message = "Unknown diagnostic command: " + operation; - stderr = exceptionTraceAsString(new IllegalArgumentException(message, e)); - } else { - rethrowExecutorException(operation, dcmdArgs, e); - } - } - - /* Failures on the "local" side, the one invoking the command. */ - catch (InstanceNotFoundException | IOException e) { - rethrowExecutorException(operation, dcmdArgs, e); - } - - /* Failures on the remote side, the one executing the invoked command. */ - catch (MBeanException e) { - stdout = exceptionTraceAsString(e); - } - - return new OutputAnalyzer(stdout, stderr); - } - - private void rethrowExecutorException(String operation, Object[] dcmdArgs, - Exception e) throws CommandExecutorException { - String message = String.format("Could not invoke: %s %s", operation, - String.join(" ", (String[]) dcmdArgs[0])); - throw new CommandExecutorException(message, e); - } - - private ObjectName getMBeanName() throws CommandExecutorException { - String MBeanName = "com.sun.management:type=DiagnosticCommand"; - - try { - return new ObjectName(MBeanName); - } catch (MalformedObjectNameException e) { - String message = "MBean not found: " + MBeanName; - throw new CommandExecutorException(message, e); - } - } - - private Object[] produceArguments(String[] cmdParts) { - Object[] dcmdArgs = {new String[0]}; /* Default: No arguments */ - - if (cmdParts.length == 2) { - dcmdArgs[0] = cmdParts[1].split(" "); - } - return dcmdArgs; - } - - /** - * Convert from diagnostic command to MBean method name - * - * Examples: - * help --> help - * VM.version --> vmVersion - * VM.command_line --> vmCommandLine - */ - private static String commandToMethodName(String cmd) { - String operation = ""; - boolean up = false; /* First letter is to be lower case */ - - /* - * If a '.' or '_' is encountered it is not copied, - * instead the next character will be converted to upper case - */ - for (char c : cmd.toCharArray()) { - if (('.' == c) || ('_' == c)) { - up = true; - } else if (up) { - operation = operation.concat(Character.toString(c).toUpperCase()); - up = false; - } else { - operation = operation.concat(Character.toString(c).toLowerCase()); - } - } - - return operation; - } - - private static String exceptionTraceAsString(Throwable cause) { - StringWriter sw = new StringWriter(); - cause.printStackTrace(new PrintWriter(sw)); - return sw.toString(); - } - -} --- old/test/testlibrary/jdk/test/lib/dcmd/JcmdExecutor.java 2016-08-11 13:49:43.544178800 -0400 +++ /dev/null 2016-08-11 13:49:43.000000000 -0400 @@ -1,58 +0,0 @@ -/* - * Copyright (c) 2015, 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 jdk.test.lib.dcmd; - -import jdk.test.lib.JDKToolFinder; -import jdk.test.lib.OutputAnalyzer; -import jdk.test.lib.ProcessTools; - -import java.util.List; - -/** - * Base class for Diagnostic Command Executors using the jcmd tool - */ -public abstract class JcmdExecutor extends CommandExecutor { - protected String jcmdBinary; - - protected abstract List createCommandLine(String cmd) throws CommandExecutorException; - - protected JcmdExecutor() { - jcmdBinary = JDKToolFinder.getJDKTool("jcmd"); - } - - protected OutputAnalyzer executeImpl(String cmd) throws CommandExecutorException { - List commandLine = createCommandLine(cmd); - - try { - System.out.printf("Executing command '%s'%n", commandLine); - OutputAnalyzer output = ProcessTools.executeProcess(new ProcessBuilder(commandLine)); - System.out.printf("Command returned with exit code %d%n", output.getExitValue()); - - return output; - } catch (Exception e) { - String message = String.format("Caught exception while executing '%s'", commandLine); - throw new CommandExecutorException(message, e); - } - } -} --- old/test/testlibrary/jdk/test/lib/dcmd/MainClassJcmdExecutor.java 2016-08-11 13:49:45.013095800 -0400 +++ /dev/null 2016-08-11 13:49:45.000000000 -0400 @@ -1,57 +0,0 @@ -/* - * Copyright (c) 2015, 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 jdk.test.lib.dcmd; - -import java.util.Arrays; -import java.util.List; - -/** - * Executes Diagnostic Commands on the target VM (specified by main class) using the jcmd tool - */ -public class MainClassJcmdExecutor extends JcmdExecutor { - private final String mainClass; - - /** - * Instantiates a new MainClassJcmdExecutor targeting the current VM - */ - public MainClassJcmdExecutor() { - super(); - mainClass = System.getProperty("sun.java.command").split(" ")[0]; - } - - /** - * Instantiates a new MainClassJcmdExecutor targeting the VM indicated by the given main class - * - * @param target Main class of the target VM - */ - public MainClassJcmdExecutor(String target) { - super(); - mainClass = target; - } - - protected List createCommandLine(String cmd) throws CommandExecutorException { - return Arrays.asList(jcmdBinary, mainClass, cmd); - } - -} --- old/test/testlibrary/jdk/test/lib/dcmd/PidJcmdExecutor.java 2016-08-11 13:49:46.446290400 -0400 +++ /dev/null 2016-08-11 13:49:46.000000000 -0400 @@ -1,63 +0,0 @@ -/* - * Copyright (c) 2015, 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 jdk.test.lib.dcmd; - -import jdk.test.lib.ProcessTools; - -import java.util.Arrays; -import java.util.List; - -/** - * Executes Diagnostic Commands on the target VM (specified by pid) using the jcmd tool - */ -public class PidJcmdExecutor extends JcmdExecutor { - protected final long pid; - - /** - * Instantiates a new PidJcmdExecutor targeting the current VM - */ - public PidJcmdExecutor() { - super(); - try { - pid = ProcessTools.getProcessId(); - } catch (Exception e) { - throw new CommandExecutorException("Could not determine own pid", e); - } - } - - /** - * Instantiates a new PidJcmdExecutor targeting the VM indicated by the given pid - * - * @param target Pid of the target VM - */ - public PidJcmdExecutor(String target) { - super(); - pid = Long.valueOf(target); - } - - protected List createCommandLine(String cmd) throws CommandExecutorException { - return Arrays.asList(jcmdBinary, Long.toString(pid), cmd); - } - -}