# HG changeset patch # User iignatyev # Date 1453743620 -10800 # Mon Jan 25 20:40:20 2016 +0300 # Node ID ee047bf1e854b6bf603ca6f299b5c201fb9d4d76 # Parent 73443d24e529f600ad0ba52025c8c0a1ca6e1dbf 8148012: get rid of slash-dot-dot in @library directives Reviewed-by: diff --git a/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityBase.java b/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityBase.java --- a/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityBase.java +++ b/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityBase.java @@ -24,7 +24,7 @@ /* * @test TestCompilerDirectivesCompatibilityBase * @bug 8137167 - * @library /testlibrary /../../test/lib + * @library /testlibrary /test/lib * @modules java.base/sun.misc * java.compiler * java.management diff --git a/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityCommandOff.java b/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityCommandOff.java --- a/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityCommandOff.java +++ b/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityCommandOff.java @@ -24,7 +24,7 @@ /* * @test TestCompilerDirectivesCompatibilityCommandOff * @bug 8137167 - * @library /testlibrary /../../test/lib + * @library /testlibrary /test/lib * @modules java.base/sun.misc * java.compiler * java.management diff --git a/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityCommandOn.java b/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityCommandOn.java --- a/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityCommandOn.java +++ b/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityCommandOn.java @@ -24,7 +24,7 @@ /* * @test TestCompilerDirectivesCompatibilityCommandOn * @bug 8137167 - * @library /testlibrary /../../test/lib + * @library /testlibrary /test/lib * @modules java.base/sun.misc * java.compiler * java.management diff --git a/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityFlag.java b/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityFlag.java --- a/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityFlag.java +++ b/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityFlag.java @@ -24,7 +24,7 @@ /* * @test TestCompilerDirectivesCompatibilityFlag * @bug 8137167 - * @library /testlibrary /../../test/lib + * @library /testlibrary /test/lib * @modules java.base/sun.misc * java.compiler * java.management diff --git a/test/compiler/compilercontrol/commandfile/CompileOnlyTest.java b/test/compiler/compilercontrol/commandfile/CompileOnlyTest.java --- a/test/compiler/compilercontrol/commandfile/CompileOnlyTest.java +++ b/test/compiler/compilercontrol/commandfile/CompileOnlyTest.java @@ -25,7 +25,7 @@ * @test * @bug 8137167 * @summary Tests CompileCommand=compileonly - * @library /testlibrary /../../test/lib /compiler/testlibrary ../share / + * @library /testlibrary /test/lib /compiler/testlibrary ../share / * @build CompileOnlyTest pool.sub.* pool.subpack.* sun.hotspot.WhiteBox * compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.* * @run main ClassFileInstaller sun.hotspot.WhiteBox diff --git a/test/compiler/compilercontrol/commandfile/ExcludeTest.java b/test/compiler/compilercontrol/commandfile/ExcludeTest.java --- a/test/compiler/compilercontrol/commandfile/ExcludeTest.java +++ b/test/compiler/compilercontrol/commandfile/ExcludeTest.java @@ -25,7 +25,7 @@ * @test * @bug 8137167 * @summary Tests CompileCommand=exclude - * @library /testlibrary /../../test/lib /compiler/testlibrary ../share / + * @library /testlibrary /test/lib /compiler/testlibrary ../share / * @build ExcludeTest pool.sub.* pool.subpack.* sun.hotspot.WhiteBox * compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.* * @run main ClassFileInstaller sun.hotspot.WhiteBox diff --git a/test/compiler/compilercontrol/commandfile/LogTest.java b/test/compiler/compilercontrol/commandfile/LogTest.java --- a/test/compiler/compilercontrol/commandfile/LogTest.java +++ b/test/compiler/compilercontrol/commandfile/LogTest.java @@ -25,7 +25,7 @@ * @test * @bug 8137167 * @summary Tests CompileCommand=log - * @library /testlibrary /../../test/lib /compiler/testlibrary ../share / + * @library /testlibrary /test/lib /compiler/testlibrary ../share / * @build LogTest pool.sub.* pool.subpack.* sun.hotspot.WhiteBox * compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.* * @run main ClassFileInstaller sun.hotspot.WhiteBox diff --git a/test/compiler/compilercontrol/commandfile/PrintTest.java b/test/compiler/compilercontrol/commandfile/PrintTest.java --- a/test/compiler/compilercontrol/commandfile/PrintTest.java +++ b/test/compiler/compilercontrol/commandfile/PrintTest.java @@ -25,7 +25,7 @@ * @test * @bug 8137167 * @summary Tests CompileCommand=print - * @library /testlibrary /../../test/lib /compiler/testlibrary ../share / + * @library /testlibrary /test/lib /compiler/testlibrary ../share / * @build PrintTest pool.sub.* pool.subpack.* sun.hotspot.WhiteBox * compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.* * @run main ClassFileInstaller sun.hotspot.WhiteBox diff --git a/test/compiler/compilercontrol/commands/CompileOnlyTest.java b/test/compiler/compilercontrol/commands/CompileOnlyTest.java --- a/test/compiler/compilercontrol/commands/CompileOnlyTest.java +++ b/test/compiler/compilercontrol/commands/CompileOnlyTest.java @@ -25,7 +25,7 @@ * @test * @bug 8137167 * @summary Tests CompileCommand=compileonly - * @library /testlibrary /../../test/lib /compiler/testlibrary ../share / + * @library /testlibrary /test/lib /compiler/testlibrary ../share / * @build CompileOnlyTest pool.sub.* pool.subpack.* sun.hotspot.WhiteBox * compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.* * @run main ClassFileInstaller sun.hotspot.WhiteBox diff --git a/test/compiler/compilercontrol/commands/ExcludeTest.java b/test/compiler/compilercontrol/commands/ExcludeTest.java --- a/test/compiler/compilercontrol/commands/ExcludeTest.java +++ b/test/compiler/compilercontrol/commands/ExcludeTest.java @@ -25,7 +25,7 @@ * @test * @bug 8137167 * @summary Tests CompileCommand=exclude - * @library /testlibrary /../../test/lib /compiler/testlibrary ../share / + * @library /testlibrary /test/lib /compiler/testlibrary ../share / * @build ExcludeTest pool.sub.* pool.subpack.* sun.hotspot.WhiteBox * compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.* * @run main ClassFileInstaller sun.hotspot.WhiteBox diff --git a/test/compiler/compilercontrol/commands/LogTest.java b/test/compiler/compilercontrol/commands/LogTest.java --- a/test/compiler/compilercontrol/commands/LogTest.java +++ b/test/compiler/compilercontrol/commands/LogTest.java @@ -25,7 +25,7 @@ * @test * @bug 8137167 * @summary Tests CompileCommand=log - * @library /testlibrary /../../test/lib /compiler/testlibrary ../share / + * @library /testlibrary /test/lib /compiler/testlibrary ../share / * @build LogTest pool.sub.* pool.subpack.* sun.hotspot.WhiteBox * compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.* * @run main ClassFileInstaller sun.hotspot.WhiteBox diff --git a/test/compiler/compilercontrol/commands/PrintTest.java b/test/compiler/compilercontrol/commands/PrintTest.java --- a/test/compiler/compilercontrol/commands/PrintTest.java +++ b/test/compiler/compilercontrol/commands/PrintTest.java @@ -25,7 +25,7 @@ * @test * @bug 8137167 * @summary Tests CompileCommand=print - * @library /testlibrary /../../test/lib /compiler/testlibrary ../share / + * @library /testlibrary /test/lib /compiler/testlibrary ../share / * @build PrintTest pool.sub.* pool.subpack.* sun.hotspot.WhiteBox * compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.* * @run main ClassFileInstaller sun.hotspot.WhiteBox diff --git a/test/compiler/compilercontrol/directives/CompileOnlyTest.java b/test/compiler/compilercontrol/directives/CompileOnlyTest.java --- a/test/compiler/compilercontrol/directives/CompileOnlyTest.java +++ b/test/compiler/compilercontrol/directives/CompileOnlyTest.java @@ -25,7 +25,7 @@ * @test * @bug 8137167 * @summary Tests directives to be able to compile only specified methods - * @library /testlibrary /../../test/lib /compiler/testlibrary ../share / + * @library /testlibrary /test/lib /compiler/testlibrary ../share / * @build CompileOnlyTest pool.sub.* pool.subpack.* sun.hotspot.WhiteBox * compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.* * @run main ClassFileInstaller sun.hotspot.WhiteBox diff --git a/test/compiler/compilercontrol/directives/ExcludeTest.java b/test/compiler/compilercontrol/directives/ExcludeTest.java --- a/test/compiler/compilercontrol/directives/ExcludeTest.java +++ b/test/compiler/compilercontrol/directives/ExcludeTest.java @@ -25,7 +25,7 @@ * @test * @bug 8137167 * @summary Tests directives to be able to exclude methods from compilation - * @library /testlibrary /../../test/lib /compiler/testlibrary ../share / + * @library /testlibrary /test/lib /compiler/testlibrary ../share / * @build ExcludeTest pool.sub.* pool.subpack.* sun.hotspot.WhiteBox * compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.* * @run main ClassFileInstaller sun.hotspot.WhiteBox diff --git a/test/compiler/compilercontrol/directives/LogTest.java b/test/compiler/compilercontrol/directives/LogTest.java --- a/test/compiler/compilercontrol/directives/LogTest.java +++ b/test/compiler/compilercontrol/directives/LogTest.java @@ -25,7 +25,7 @@ * @test * @bug 8137167 * @summary Tests directives to be able to turn on LogCompilation - * @library /testlibrary /../../test/lib /compiler/testlibrary ../share / + * @library /testlibrary /test/lib /compiler/testlibrary ../share / * @build LogTest pool.sub.* pool.subpack.* sun.hotspot.WhiteBox * compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.* * @run main ClassFileInstaller sun.hotspot.WhiteBox diff --git a/test/compiler/compilercontrol/directives/PrintTest.java b/test/compiler/compilercontrol/directives/PrintTest.java --- a/test/compiler/compilercontrol/directives/PrintTest.java +++ b/test/compiler/compilercontrol/directives/PrintTest.java @@ -25,7 +25,7 @@ * @test * @bug 8137167 * @summary Tests directives to be able to turn on print_assembly - * @library /testlibrary /../../test/lib /compiler/testlibrary ../share / + * @library /testlibrary /test/lib /compiler/testlibrary ../share / * @build PrintTest pool.sub.* pool.subpack.* sun.hotspot.WhiteBox * compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.* * @run main ClassFileInstaller sun.hotspot.WhiteBox diff --git a/test/compiler/compilercontrol/jcmd/AddAndRemoveTest.java b/test/compiler/compilercontrol/jcmd/AddAndRemoveTest.java --- a/test/compiler/compilercontrol/jcmd/AddAndRemoveTest.java +++ b/test/compiler/compilercontrol/jcmd/AddAndRemoveTest.java @@ -25,7 +25,7 @@ * @test * @bug 8137167 * @summary Tests directives to be able to add and remove directives - * @library /testlibrary /../../test/lib /compiler/testlibrary ../share / + * @library /testlibrary /test/lib /compiler/testlibrary ../share / * @build AddAndRemoveTest pool.sub.* pool.subpack.* sun.hotspot.WhiteBox * compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.* * @run main ClassFileInstaller sun.hotspot.WhiteBox diff --git a/test/compiler/compilercontrol/jcmd/AddCompileOnlyTest.java b/test/compiler/compilercontrol/jcmd/AddCompileOnlyTest.java --- a/test/compiler/compilercontrol/jcmd/AddCompileOnlyTest.java +++ b/test/compiler/compilercontrol/jcmd/AddCompileOnlyTest.java @@ -25,7 +25,7 @@ * @test * @bug 8137167 * @summary Tests jcmd to be able to add a directive to compile only specified methods - * @library /testlibrary /../../test/lib /compiler/testlibrary ../share / + * @library /testlibrary /test/lib /compiler/testlibrary ../share / * @build AddCompileOnlyTest pool.sub.* pool.subpack.* sun.hotspot.WhiteBox * compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.* * @run main ClassFileInstaller sun.hotspot.WhiteBox diff --git a/test/compiler/compilercontrol/jcmd/AddExcludeTest.java b/test/compiler/compilercontrol/jcmd/AddExcludeTest.java --- a/test/compiler/compilercontrol/jcmd/AddExcludeTest.java +++ b/test/compiler/compilercontrol/jcmd/AddExcludeTest.java @@ -25,7 +25,7 @@ * @test * @bug 8137167 * @summary Tests jcmd to be able to add a directive to exclude only specified methods - * @library /testlibrary /../../test/lib /compiler/testlibrary ../share / + * @library /testlibrary /test/lib /compiler/testlibrary ../share / * @build AddExcludeTest pool.sub.* pool.subpack.* sun.hotspot.WhiteBox * compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.* * @run main ClassFileInstaller sun.hotspot.WhiteBox diff --git a/test/compiler/compilercontrol/jcmd/AddLogTest.java b/test/compiler/compilercontrol/jcmd/AddLogTest.java --- a/test/compiler/compilercontrol/jcmd/AddLogTest.java +++ b/test/compiler/compilercontrol/jcmd/AddLogTest.java @@ -25,7 +25,7 @@ * @test * @bug 8137167 * @summary Tests jcmd to be able to add a directive to log only specified methods - * @library /testlibrary /../../test/lib /compiler/testlibrary ../share / + * @library /testlibrary /test/lib /compiler/testlibrary ../share / * @build AddLogTest pool.sub.* pool.subpack.* sun.hotspot.WhiteBox * compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.* * @run main ClassFileInstaller sun.hotspot.WhiteBox diff --git a/test/compiler/compilercontrol/jcmd/AddPrintAssemblyTest.java b/test/compiler/compilercontrol/jcmd/AddPrintAssemblyTest.java --- a/test/compiler/compilercontrol/jcmd/AddPrintAssemblyTest.java +++ b/test/compiler/compilercontrol/jcmd/AddPrintAssemblyTest.java @@ -26,7 +26,7 @@ * @bug 8137167 * @summary Tests jcmd to be able to add a directive to print assembly * only for specified methods - * @library /testlibrary /../../test/lib /compiler/testlibrary ../share / + * @library /testlibrary /test/lib /compiler/testlibrary ../share / * @build AddPrintAssemblyTest pool.sub.* pool.subpack.* sun.hotspot.WhiteBox * compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.* * @run main ClassFileInstaller sun.hotspot.WhiteBox diff --git a/test/compiler/compilercontrol/mixed/RandomCommandsTest.java b/test/compiler/compilercontrol/mixed/RandomCommandsTest.java --- a/test/compiler/compilercontrol/mixed/RandomCommandsTest.java +++ b/test/compiler/compilercontrol/mixed/RandomCommandsTest.java @@ -25,7 +25,7 @@ * @test * @bug 8137167 * @summary Randomly generates commands with random types - * @library /testlibrary /../../test/lib /compiler/testlibrary ../share / + * @library /testlibrary /test/lib /compiler/testlibrary ../share / * @build RandomCommandsTest pool.sub.* pool.subpack.* sun.hotspot.WhiteBox * compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.* * @run main ClassFileInstaller sun.hotspot.WhiteBox diff --git a/test/compiler/compilercontrol/mixed/RandomValidCommandsTest.java b/test/compiler/compilercontrol/mixed/RandomValidCommandsTest.java --- a/test/compiler/compilercontrol/mixed/RandomValidCommandsTest.java +++ b/test/compiler/compilercontrol/mixed/RandomValidCommandsTest.java @@ -25,7 +25,7 @@ * @test * @bug 8137167 * @summary Randomly generates valid commands with random types - * @library /testlibrary /../../test/lib /compiler/testlibrary ../share / + * @library /testlibrary /test/lib /compiler/testlibrary ../share / * @build RandomValidCommandsTest pool.sub.* pool.subpack.* sun.hotspot.WhiteBox * compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.* * @run main ClassFileInstaller sun.hotspot.WhiteBox diff --git a/test/compiler/cpuflags/TestAESIntrinsicsOnSupportedConfig.java b/test/compiler/cpuflags/TestAESIntrinsicsOnSupportedConfig.java --- a/test/compiler/cpuflags/TestAESIntrinsicsOnSupportedConfig.java +++ b/test/compiler/cpuflags/TestAESIntrinsicsOnSupportedConfig.java @@ -27,7 +27,7 @@ /* * @test - * @library /testlibrary /../../test/lib /compiler/whitebox + * @library /testlibrary /test/lib /compiler/whitebox * /compiler/testlibrary /compiler/codegen/7184394 * @modules java.base/sun.misc * java.management diff --git a/test/compiler/cpuflags/TestAESIntrinsicsOnUnsupportedConfig.java b/test/compiler/cpuflags/TestAESIntrinsicsOnUnsupportedConfig.java --- a/test/compiler/cpuflags/TestAESIntrinsicsOnUnsupportedConfig.java +++ b/test/compiler/cpuflags/TestAESIntrinsicsOnUnsupportedConfig.java @@ -28,7 +28,7 @@ /* * @test - * @library /testlibrary /../../test/lib /compiler/whitebox + * @library /testlibrary /test/lib /compiler/whitebox * /compiler/testlibrary /compiler/codegen/7184394 * @modules java.base/sun.misc * java.management diff --git a/test/compiler/intrinsics/IntrinsicDisabledTest.java b/test/compiler/intrinsics/IntrinsicDisabledTest.java --- a/test/compiler/intrinsics/IntrinsicDisabledTest.java +++ b/test/compiler/intrinsics/IntrinsicDisabledTest.java @@ -24,7 +24,7 @@ /* * @test * @bug 8138651 - * @library /testlibrary /../../test/lib + * @library /testlibrary /test/lib * @build IntrinsicDisabledTest * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission diff --git a/test/compiler/intrinsics/montgomerymultiply/MontgomeryMultiplyTest.java b/test/compiler/intrinsics/montgomerymultiply/MontgomeryMultiplyTest.java --- a/test/compiler/intrinsics/montgomerymultiply/MontgomeryMultiplyTest.java +++ b/test/compiler/intrinsics/montgomerymultiply/MontgomeryMultiplyTest.java @@ -42,7 +42,7 @@ * @test * @bug 8130150 8131779 8139907 * @summary Verify that the Montgomery multiply and square intrinsic works and correctly checks their arguments. - * @library /testlibrary /../../test/lib + * @library /testlibrary /test/lib * @library /testlibrary * @build MontgomeryMultiplyTest * @run main ClassFileInstaller sun.hotspot.WhiteBox diff --git a/test/compiler/intrinsics/string/TestStringIntrinsics2.java b/test/compiler/intrinsics/string/TestStringIntrinsics2.java --- a/test/compiler/intrinsics/string/TestStringIntrinsics2.java +++ b/test/compiler/intrinsics/string/TestStringIntrinsics2.java @@ -26,7 +26,7 @@ * @test * @bug 8145336 * @summary PPC64: fix string intrinsics after CompactStrings change - * @library /testlibrary /../../test/lib + * @library /testlibrary /test/lib * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission diff --git a/test/compiler/stable/TestStableMemoryBarrier.java b/test/compiler/stable/TestStableMemoryBarrier.java --- a/test/compiler/stable/TestStableMemoryBarrier.java +++ b/test/compiler/stable/TestStableMemoryBarrier.java @@ -27,7 +27,7 @@ * @test TestStableMemoryBarrier * @bug 8139758 * @summary tests memory barrier correctly inserted for stable fields - * @library /testlibrary /../../test/lib + * @library /testlibrary /test/lib * * @run main/bootclasspath -Xcomp -XX:CompileOnly=::testCompile * java.lang.invoke.TestStableMemoryBarrier diff --git a/test/compiler/types/TestMeetIncompatibleInterfaceArrays.java b/test/compiler/types/TestMeetIncompatibleInterfaceArrays.java --- a/test/compiler/types/TestMeetIncompatibleInterfaceArrays.java +++ b/test/compiler/types/TestMeetIncompatibleInterfaceArrays.java @@ -27,7 +27,7 @@ * @summary C2 can not handle returns with inccompatible interface arrays * @modules java.base/jdk.internal.org.objectweb.asm * java.base/sun.misc - * @library /testlibrary /../../test/lib + * @library /testlibrary /test/lib * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * sun.hotspot.WhiteBox$WhiteBoxPermission diff --git a/test/gc/g1/TestPLABOutput.java b/test/gc/g1/TestPLABOutput.java --- a/test/gc/g1/TestPLABOutput.java +++ b/test/gc/g1/TestPLABOutput.java @@ -27,7 +27,7 @@ * @summary Check that G1 does not report empty PLAB statistics in the first evacuation. * @requires vm.gc=="G1" | vm.gc=="null" * @key gc - * @library /testlibrary /../../test/lib + * @library /testlibrary /test/lib * @build sun.hotspot.WhiteBox * @run main ClassFileInstaller sun.hotspot.WhiteBox * @run driver TestPLABOutput