changeset 9652:f81484d852ac

8140189: [TESTBUG] Get rid of "@library /../../test/lib" in jtreg tests Summary: Use new external.lib.roots property in TEST.ROOT so /../../test/lib is not needed. Reviewed-by: mseledtsov, sla, iklam
author cjplummer
date Thu, 29 Oct 2015 12:04:04 -0700
parents 050821833f00
children 6acc55e6cf00
files test/TEST.ROOT test/compiler/arguments/TestUseBMI1InstructionsOnSupportedCPU.java test/compiler/arguments/TestUseBMI1InstructionsOnUnsupportedCPU.java test/compiler/arguments/TestUseCountLeadingZerosInstructionOnSupportedCPU.java test/compiler/arguments/TestUseCountLeadingZerosInstructionOnUnsupportedCPU.java test/compiler/arguments/TestUseCountTrailingZerosInstructionOnSupportedCPU.java test/compiler/arguments/TestUseCountTrailingZerosInstructionOnUnsupportedCPU.java test/compiler/arraycopy/TestArrayCopyNoInitDeopt.java test/compiler/c2/6589834/Test_ia32.java test/compiler/classUnloading/anonymousClass/TestAnonymousClassUnloading.java test/compiler/classUnloading/methodUnloading/TestMethodUnloading.java test/compiler/codecache/CheckSegmentedCodeCache.java test/compiler/codecache/OverflowCodeCacheTest.java test/compiler/codecache/cli/TestSegmentedCodeCacheOption.java test/compiler/codecache/cli/codeheapsize/TestCodeHeapSizeOptions.java test/compiler/codecache/cli/printcodecache/TestPrintCodeCacheOption.java test/compiler/codecache/dtrace/SegmentedCodeCacheDtraceTest.java test/compiler/codecache/jmx/BeanTypeTest.java test/compiler/codecache/jmx/CodeHeapBeanPresenceTest.java test/compiler/codecache/jmx/GetUsageTest.java test/compiler/codecache/jmx/InitialAndMaxUsageTest.java test/compiler/codecache/jmx/ManagerNamesTest.java test/compiler/codecache/jmx/MemoryPoolsPresenceTest.java test/compiler/codecache/jmx/PeakUsageTest.java test/compiler/codecache/jmx/PoolsIndependenceTest.java test/compiler/codecache/jmx/ThresholdNotificationsTest.java test/compiler/codecache/jmx/UsageThresholdExceededSeveralTimesTest.java test/compiler/codecache/jmx/UsageThresholdExceededTest.java test/compiler/codecache/jmx/UsageThresholdIncreasedTest.java test/compiler/codecache/jmx/UsageThresholdNotExceededTest.java test/compiler/codecache/stress/OverloadCompileQueueTest.java test/compiler/codecache/stress/RandomAllocationTest.java test/compiler/codecache/stress/UnexpectedDeoptimizationTest.java test/compiler/compilercontrol/matcher/MethodMatcherTest.java test/compiler/floatingpoint/TestPow2.java test/compiler/intrinsics/IntrinsicAvailableTest.java test/compiler/intrinsics/bmi/TestAndnI.java test/compiler/intrinsics/bmi/TestAndnL.java test/compiler/intrinsics/bmi/TestBlsiI.java test/compiler/intrinsics/bmi/TestBlsiL.java test/compiler/intrinsics/bmi/TestBlsmskI.java test/compiler/intrinsics/bmi/TestBlsmskL.java test/compiler/intrinsics/bmi/TestBlsrI.java test/compiler/intrinsics/bmi/TestBlsrL.java test/compiler/intrinsics/bmi/TestLzcntI.java test/compiler/intrinsics/bmi/TestLzcntL.java test/compiler/intrinsics/bmi/TestTzcntI.java test/compiler/intrinsics/bmi/TestTzcntL.java test/compiler/intrinsics/bmi/verifycode/AddnTestI.java test/compiler/intrinsics/bmi/verifycode/AddnTestL.java test/compiler/intrinsics/bmi/verifycode/BlsiTestI.java test/compiler/intrinsics/bmi/verifycode/BlsiTestL.java test/compiler/intrinsics/bmi/verifycode/BlsmskTestI.java test/compiler/intrinsics/bmi/verifycode/BlsmskTestL.java test/compiler/intrinsics/bmi/verifycode/BlsrTestI.java test/compiler/intrinsics/bmi/verifycode/BlsrTestL.java test/compiler/intrinsics/bmi/verifycode/LZcntTestI.java test/compiler/intrinsics/bmi/verifycode/LZcntTestL.java test/compiler/intrinsics/bmi/verifycode/TZcntTestI.java test/compiler/intrinsics/bmi/verifycode/TZcntTestL.java test/compiler/intrinsics/classcast/NullCheckDroppingsTest.java test/compiler/intrinsics/mathexact/sanity/AddExactIntTest.java test/compiler/intrinsics/mathexact/sanity/AddExactLongTest.java test/compiler/intrinsics/mathexact/sanity/DecrementExactIntTest.java test/compiler/intrinsics/mathexact/sanity/DecrementExactLongTest.java test/compiler/intrinsics/mathexact/sanity/IncrementExactIntTest.java test/compiler/intrinsics/mathexact/sanity/IncrementExactLongTest.java test/compiler/intrinsics/mathexact/sanity/MultiplyExactIntTest.java test/compiler/intrinsics/mathexact/sanity/MultiplyExactLongTest.java test/compiler/intrinsics/mathexact/sanity/NegateExactIntTest.java test/compiler/intrinsics/mathexact/sanity/NegateExactLongTest.java test/compiler/intrinsics/mathexact/sanity/SubtractExactIntTest.java test/compiler/intrinsics/mathexact/sanity/SubtractExactLongTest.java test/compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnSupportedCPU.java test/compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnUnsupportedCPU.java test/compiler/intrinsics/sha/cli/TestUseSHA256IntrinsicsOptionOnSupportedCPU.java test/compiler/intrinsics/sha/cli/TestUseSHA256IntrinsicsOptionOnUnsupportedCPU.java test/compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnSupportedCPU.java test/compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnUnsupportedCPU.java test/compiler/intrinsics/sha/cli/TestUseSHAOptionOnSupportedCPU.java test/compiler/intrinsics/sha/cli/TestUseSHAOptionOnUnsupportedCPU.java test/compiler/intrinsics/sha/sanity/TestSHA1Intrinsics.java test/compiler/intrinsics/sha/sanity/TestSHA1MultiBlockIntrinsics.java test/compiler/intrinsics/sha/sanity/TestSHA256Intrinsics.java test/compiler/intrinsics/sha/sanity/TestSHA256MultiBlockIntrinsics.java test/compiler/intrinsics/sha/sanity/TestSHA512Intrinsics.java test/compiler/intrinsics/sha/sanity/TestSHA512MultiBlockIntrinsics.java test/compiler/jvmci/SecurityRestrictionsTest.java test/compiler/jvmci/compilerToVM/AllocateCompileIdTest.java test/compiler/jvmci/compilerToVM/CanInlineMethodTest.java test/compiler/jvmci/compilerToVM/CollectCountersTest.java test/compiler/jvmci/compilerToVM/DebugOutputTest.java test/compiler/jvmci/compilerToVM/DisassembleCodeBlobTest.java test/compiler/jvmci/compilerToVM/DoNotInlineOrCompileTest.java test/compiler/jvmci/compilerToVM/ExecuteInstalledCodeTest.java test/compiler/jvmci/compilerToVM/FindUniqueConcreteMethodTest.java test/compiler/jvmci/compilerToVM/GetBytecodeTest.java test/compiler/jvmci/compilerToVM/GetClassInitializerTest.java test/compiler/jvmci/compilerToVM/GetConstantPoolTest.java test/compiler/jvmci/compilerToVM/GetExceptionTableTest.java test/compiler/jvmci/compilerToVM/GetImplementorTest.java test/compiler/jvmci/compilerToVM/GetLineNumberTableTest.java test/compiler/jvmci/compilerToVM/GetLocalVariableTableTest.java test/compiler/jvmci/compilerToVM/GetMaxCallTargetOffsetTest.java test/compiler/jvmci/compilerToVM/GetNextStackFrameTest.java test/compiler/jvmci/compilerToVM/GetResolvedJavaMethodAtSlotTest.java test/compiler/jvmci/compilerToVM/GetResolvedJavaMethodTest.java test/compiler/jvmci/compilerToVM/GetResolvedJavaTypeTest.java test/compiler/jvmci/compilerToVM/GetStackTraceElementTest.java test/compiler/jvmci/compilerToVM/GetSymbolTest.java test/compiler/jvmci/compilerToVM/GetVtableIndexForInterfaceTest.java test/compiler/jvmci/compilerToVM/HasCompiledCodeForOSRTest.java test/compiler/jvmci/compilerToVM/HasFinalizableSubclassTest.java test/compiler/jvmci/compilerToVM/InvalidateInstalledCodeTest.java test/compiler/jvmci/compilerToVM/IsMatureTest.java test/compiler/jvmci/compilerToVM/LookupKlassInPoolTest.java test/compiler/jvmci/compilerToVM/MaterializeVirtualObjectTest.java test/compiler/jvmci/compilerToVM/MethodIsIgnoredBySecurityStackWalkTest.java test/compiler/jvmci/compilerToVM/ReadUncompressedOopTest.java test/compiler/jvmci/compilerToVM/ReprofileTest.java test/compiler/jvmci/compilerToVM/ResolveConstantInPoolTest.java test/compiler/jvmci/compilerToVM/ResolveMethodTest.java test/compiler/jvmci/compilerToVM/ResolveTypeInPoolTest.java test/compiler/jvmci/compilerToVM/ShouldDebugNonSafepointsTest.java test/compiler/jvmci/compilerToVM/ShouldInlineMethodTest.java test/compiler/oracle/GetMethodOptionTest.java test/compiler/oracle/MethodMatcherTest.java test/compiler/rangechecks/TestExplicitRangeChecks.java test/compiler/rangechecks/TestRangeCheckSmearing.java test/compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsOptionOnSupportedConfig.java test/compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsOptionOnUnsupportedConfig.java test/compiler/rtm/cli/TestRTMAbortRatioOptionOnSupportedConfig.java test/compiler/rtm/cli/TestRTMAbortRatioOptionOnUnsupportedConfig.java test/compiler/rtm/cli/TestRTMTotalCountIncrRateOptionOnSupportedConfig.java test/compiler/rtm/cli/TestRTMTotalCountIncrRateOptionOnUnsupportedConfig.java test/compiler/rtm/cli/TestUseRTMDeoptOptionOnSupportedConfig.java test/compiler/rtm/cli/TestUseRTMDeoptOptionOnUnsupportedConfig.java test/compiler/rtm/cli/TestUseRTMForStackLocksOptionOnSupportedConfig.java test/compiler/rtm/cli/TestUseRTMForStackLocksOptionOnUnsupportedConfig.java test/compiler/rtm/cli/TestUseRTMLockingOptionOnSupportedConfig.java test/compiler/rtm/cli/TestUseRTMLockingOptionOnUnsupportedCPU.java test/compiler/rtm/cli/TestUseRTMLockingOptionOnUnsupportedVM.java test/compiler/rtm/cli/TestUseRTMLockingOptionWithBiasedLocking.java test/compiler/rtm/locking/TestRTMAbortRatio.java test/compiler/rtm/locking/TestRTMAbortThreshold.java test/compiler/rtm/locking/TestRTMAfterNonRTMDeopt.java test/compiler/rtm/locking/TestRTMDeoptOnHighAbortRatio.java test/compiler/rtm/locking/TestRTMDeoptOnLowAbortRatio.java test/compiler/rtm/locking/TestRTMLockingCalculationDelay.java test/compiler/rtm/locking/TestRTMLockingThreshold.java test/compiler/rtm/locking/TestRTMRetryCount.java test/compiler/rtm/locking/TestRTMSpinLoopCount.java test/compiler/rtm/locking/TestRTMTotalCountIncrRate.java test/compiler/rtm/locking/TestUseRTMAfterLockInflation.java test/compiler/rtm/locking/TestUseRTMDeopt.java test/compiler/rtm/locking/TestUseRTMForInflatedLocks.java test/compiler/rtm/locking/TestUseRTMForStackLocks.java test/compiler/rtm/locking/TestUseRTMXendForLockBusy.java test/compiler/rtm/method_options/TestNoRTMLockElidingOption.java test/compiler/rtm/method_options/TestUseRTMLockElidingOption.java test/compiler/rtm/print/TestPrintPreciseRTMLockingStatistics.java test/compiler/runtime/8010927/Test8010927.java test/compiler/stable/TestStableBoolean.java test/compiler/stable/TestStableByte.java test/compiler/stable/TestStableChar.java test/compiler/stable/TestStableDouble.java test/compiler/stable/TestStableFloat.java test/compiler/stable/TestStableInt.java test/compiler/stable/TestStableLong.java test/compiler/stable/TestStableObject.java test/compiler/stable/TestStableShort.java test/compiler/tiered/ConstantGettersTransitionsTest.java test/compiler/tiered/LevelTransitionTest.java test/compiler/tiered/NonTieredLevelsTest.java test/compiler/tiered/TieredLevelsTest.java test/compiler/types/correctness/CorrectnessTest.java test/compiler/types/correctness/OffTest.java test/compiler/uncommontrap/8009761/Test8009761.java test/compiler/uncommontrap/TestUnstableIfTrap.java test/compiler/unsafe/UnsafeGetConstantField.java test/compiler/whitebox/AllocationCodeBlobTest.java test/compiler/whitebox/ClearMethodStateTest.java test/compiler/whitebox/DeoptimizeAllTest.java test/compiler/whitebox/DeoptimizeFramesTest.java test/compiler/whitebox/DeoptimizeMethodTest.java test/compiler/whitebox/DeoptimizeMultipleOSRTest.java test/compiler/whitebox/EnqueueMethodForCompilationTest.java test/compiler/whitebox/ForceNMethodSweepTest.java test/compiler/whitebox/GetCodeHeapEntriesTest.java test/compiler/whitebox/GetNMethodTest.java test/compiler/whitebox/IsMethodCompilableTest.java test/compiler/whitebox/LockCompilationTest.java test/compiler/whitebox/MakeMethodNotCompilableTest.java test/compiler/whitebox/SetDontInlineMethodTest.java test/compiler/whitebox/SetForceInlineMethodTest.java test/gc/CondCardMark/Basic.java test/gc/TestSmallHeap.java test/gc/arguments/TestCMSHeapSizeFlags.java test/gc/arguments/TestG1HeapSizeFlags.java test/gc/arguments/TestMinAndInitialSurvivorRatioFlags.java test/gc/arguments/TestMinInitialErgonomics.java test/gc/arguments/TestNewRatioFlag.java test/gc/arguments/TestNewSizeFlags.java test/gc/arguments/TestParallelHeapSizeFlags.java test/gc/arguments/TestSerialHeapSizeFlags.java test/gc/arguments/TestSurvivorRatioFlag.java test/gc/arguments/TestTargetSurvivorRatioFlag.java test/gc/arguments/TestUseCompressedOopsErgo.java test/gc/class_unloading/TestCMSClassUnloadingEnabledHWM.java test/gc/class_unloading/TestG1ClassUnloadingHWM.java test/gc/g1/TestHumongousCodeCacheRoots.java test/gc/g1/TestLargePageUseForAuxMemory.java test/gc/g1/TestShrinkAuxiliaryData00.java test/gc/g1/TestShrinkAuxiliaryData05.java test/gc/g1/TestShrinkAuxiliaryData10.java test/gc/g1/TestShrinkAuxiliaryData15.java test/gc/g1/TestShrinkAuxiliaryData20.java test/gc/g1/TestShrinkAuxiliaryData25.java test/gc/g1/TestShrinkAuxiliaryData30.java test/gc/g1/humongousObjects/TestHumongousThreshold.java test/gc/g1/mixedgc/TestLogging.java test/gc/metaspace/TestCapacityUntilGCWrapAround.java test/gc/survivorAlignment/TestAllocationInEden.java test/gc/survivorAlignment/TestPromotionFromEdenToTenured.java test/gc/survivorAlignment/TestPromotionFromSurvivorToTenuredAfterFullGC.java test/gc/survivorAlignment/TestPromotionFromSurvivorToTenuredAfterMinorGC.java test/gc/survivorAlignment/TestPromotionToSurvivor.java test/gc/whitebox/TestConcMarkCycleWB.java test/gc/whitebox/TestWBGC.java test/runtime/ClassUnload/KeepAliveClass.java test/runtime/ClassUnload/KeepAliveClassLoader.java test/runtime/ClassUnload/KeepAliveObject.java test/runtime/ClassUnload/KeepAliveSoftReference.java test/runtime/ClassUnload/UnloadTest.java test/runtime/NMT/ChangeTrackingLevel.java test/runtime/NMT/JcmdDetailDiff.java test/runtime/NMT/JcmdSummaryDiff.java test/runtime/NMT/MallocRoundingReportTest.java test/runtime/NMT/MallocSiteHashOverflow.java test/runtime/NMT/MallocStressTest.java test/runtime/NMT/MallocTestType.java test/runtime/NMT/MallocTrackingVerify.java test/runtime/NMT/ReleaseCommittedMemory.java test/runtime/NMT/ReleaseNoCommit.java test/runtime/NMT/SummarySanityCheck.java test/runtime/NMT/ThreadedMallocTestType.java test/runtime/NMT/ThreadedVirtualAllocTestType.java test/runtime/NMT/VirtualAllocCommitUncommitRecommit.java test/runtime/NMT/VirtualAllocTestType.java test/runtime/Safepoint/AssertSafepointCheckConsistency1.java test/runtime/Safepoint/AssertSafepointCheckConsistency2.java test/runtime/Safepoint/AssertSafepointCheckConsistency3.java test/runtime/Safepoint/AssertSafepointCheckConsistency4.java test/runtime/SharedArchiveFile/SharedStrings.java test/runtime/interned/SanityTest.java test/runtime/memory/ReadFromNoaccessArea.java test/runtime/memory/ReadVMPageSize.java test/runtime/memory/ReserveMemory.java test/runtime/memory/RunUnitTestsConcurrently.java test/runtime/memory/StressVirtualSpaceResize.java test/runtime/whitebox/WBStackSize.java test/sanity/WBApi.java test/serviceability/ParserTest.java test/serviceability/dcmd/gc/HeapDumpAllTest.java test/serviceability/dcmd/gc/HeapDumpTest.java test/serviceability/sa/DeadlockDetectionTest.java test/serviceability/sa/TestClassLoaderStats.java test/serviceability/sa/TestStackTrace.java test/testlibrary_tests/TestPlatformIsTieredSupported.java test/testlibrary_tests/ctw/ClassesDirTest.java test/testlibrary_tests/ctw/ClassesListTest.java test/testlibrary_tests/ctw/JarDirTest.java test/testlibrary_tests/ctw/JarsTest.java test/testlibrary_tests/whitebox/BlobSanityTest.java test/testlibrary_tests/whitebox/vm_flags/BooleanTest.java test/testlibrary_tests/whitebox/vm_flags/DoubleTest.java test/testlibrary_tests/whitebox/vm_flags/IntxTest.java test/testlibrary_tests/whitebox/vm_flags/SizeTTest.java test/testlibrary_tests/whitebox/vm_flags/StringTest.java test/testlibrary_tests/whitebox/vm_flags/Uint64Test.java test/testlibrary_tests/whitebox/vm_flags/UintxTest.java
diffstat 281 files changed, 284 insertions(+), 280 deletions(-) [+]
line wrap: on
line diff
--- a/test/TEST.ROOT	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/TEST.ROOT	Thu Oct 29 12:04:04 2015 -0700
@@ -34,3 +34,7 @@
 
 # Tests using jtreg 4.1 b11 features
 requiredVersion=4.1 b11
+
+# Path to libraries in the topmost test directory. This is needed so @library
+# does not need ../../ notation to reach them
+external.lib.roots = ../../
--- a/test/compiler/arguments/TestUseBMI1InstructionsOnSupportedCPU.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/arguments/TestUseBMI1InstructionsOnSupportedCPU.java	Thu Oct 29 12:04:04 2015 -0700
@@ -26,7 +26,7 @@
  * @bug 8031321
  * @summary Verify processing of UseBMI1Instructions option on CPU with
  *          BMI1 feature support.
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build TestUseBMI1InstructionsOnSupportedCPU
--- a/test/compiler/arguments/TestUseBMI1InstructionsOnUnsupportedCPU.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/arguments/TestUseBMI1InstructionsOnUnsupportedCPU.java	Thu Oct 29 12:04:04 2015 -0700
@@ -26,7 +26,7 @@
  * @bug 8031321
  * @summary Verify processing of UseBMI1Instructions option on CPU without
  *          BMI1 feature support.
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build TestUseBMI1InstructionsOnUnsupportedCPU
--- a/test/compiler/arguments/TestUseCountLeadingZerosInstructionOnSupportedCPU.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/arguments/TestUseCountLeadingZerosInstructionOnSupportedCPU.java	Thu Oct 29 12:04:04 2015 -0700
@@ -26,7 +26,7 @@
  * @bug 8031321
  * @summary Verify processing of UseCountLeadingZerosInstruction option
  *          on CPU with LZCNT support.
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build TestUseCountLeadingZerosInstructionOnSupportedCPU
--- a/test/compiler/arguments/TestUseCountLeadingZerosInstructionOnUnsupportedCPU.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/arguments/TestUseCountLeadingZerosInstructionOnUnsupportedCPU.java	Thu Oct 29 12:04:04 2015 -0700
@@ -26,7 +26,7 @@
  * @bug 8031321
  * @summary Verify processing of UseCountLeadingZerosInstruction option
  *          on CPU without LZCNT support.
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build TestUseCountLeadingZerosInstructionOnUnsupportedCPU
--- a/test/compiler/arguments/TestUseCountTrailingZerosInstructionOnSupportedCPU.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/arguments/TestUseCountTrailingZerosInstructionOnSupportedCPU.java	Thu Oct 29 12:04:04 2015 -0700
@@ -26,7 +26,7 @@
  * @bug 8031321
  * @summary Verify processing of UseCountTrailingZerosInstruction option
  *          on CPU with TZCNT (BMI1 feature) support.
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build TestUseCountTrailingZerosInstructionOnSupportedCPU
--- a/test/compiler/arguments/TestUseCountTrailingZerosInstructionOnUnsupportedCPU.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/arguments/TestUseCountTrailingZerosInstructionOnUnsupportedCPU.java	Thu Oct 29 12:04:04 2015 -0700
@@ -26,7 +26,7 @@
  * @bug 8031321
  * @summary Verify processing of UseCountTrailingZerosInstruction option
  *          on CPU without TZCNT instruction (BMI1 feature) support.
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build TestUseCountTrailingZerosInstructionOnUnsupportedCPU
--- a/test/compiler/arraycopy/TestArrayCopyNoInitDeopt.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/arraycopy/TestArrayCopyNoInitDeopt.java	Thu Oct 29 12:04:04 2015 -0700
@@ -25,7 +25,7 @@
  * @test
  * @bug 8072016
  * @summary Infinite deoptimization/recompilation cycles in case of arraycopy with tightly coupled allocation
- * @library /testlibrary /../../test/lib /compiler/whitebox
+ * @library /testlibrary /test/lib /compiler/whitebox
  * @modules java.base/sun.misc
  *          java.management
  * @build TestArrayCopyNoInitDeopt
--- a/test/compiler/c2/6589834/Test_ia32.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/c2/6589834/Test_ia32.java	Thu Oct 29 12:04:04 2015 -0700
@@ -26,7 +26,7 @@
  * @bug 6589834
  * @summary Safepoint placed between stack pointer increment and decrement leads
  *          to interpreter's stack corruption after deoptimization.
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.compiler
  *          java.management
--- a/test/compiler/classUnloading/anonymousClass/TestAnonymousClassUnloading.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/classUnloading/anonymousClass/TestAnonymousClassUnloading.java	Thu Oct 29 12:04:04 2015 -0700
@@ -33,7 +33,7 @@
  * @test TestAnonymousClassUnloading
  * @bug 8054402
  * @summary "Tests unloading of anonymous classes."
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  * @compile TestAnonymousClassUnloading.java
  * @run main ClassFileInstaller TestAnonymousClassUnloading
--- a/test/compiler/classUnloading/methodUnloading/TestMethodUnloading.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/classUnloading/methodUnloading/TestMethodUnloading.java	Thu Oct 29 12:04:04 2015 -0700
@@ -31,7 +31,7 @@
  * @test MethodUnloadingTest
  * @bug 8029443
  * @summary "Tests the unloading of methods to to class unloading"
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @build TestMethodUnloading
  * @build WorkerClass
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/codecache/CheckSegmentedCodeCache.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/codecache/CheckSegmentedCodeCache.java	Thu Oct 29 12:04:04 2015 -0700
@@ -27,7 +27,7 @@
 /*
  * @test CheckSegmentedCodeCache
  * @bug 8015774
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @summary "Checks VM options related to the segmented code cache"
  * @modules java.base/sun.misc
  *          java.management
--- a/test/compiler/codecache/OverflowCodeCacheTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/codecache/OverflowCodeCacheTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -34,7 +34,7 @@
 /*
  * @test OverflowCodeCacheTest
  * @bug 8059550
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.management
  * @build OverflowCodeCacheTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/codecache/cli/TestSegmentedCodeCacheOption.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/codecache/cli/TestSegmentedCodeCacheOption.java	Thu Oct 29 12:04:04 2015 -0700
@@ -30,7 +30,7 @@
  * @test
  * @bug 8015774
  * @summary Verify SegmentedCodeCache option's processing
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.compiler
  *          java.management
--- a/test/compiler/codecache/cli/codeheapsize/TestCodeHeapSizeOptions.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/codecache/cli/codeheapsize/TestCodeHeapSizeOptions.java	Thu Oct 29 12:04:04 2015 -0700
@@ -31,7 +31,7 @@
  * @test
  * @bug 8015774
  * @summary Verify processing of options related to code heaps sizing.
- * @library /testlibrary .. /../../test/lib
+ * @library /testlibrary .. /test/lib
  * @modules java.base/sun.misc
  *          java.compiler
  *          java.management
--- a/test/compiler/codecache/cli/printcodecache/TestPrintCodeCacheOption.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/codecache/cli/printcodecache/TestPrintCodeCacheOption.java	Thu Oct 29 12:04:04 2015 -0700
@@ -30,7 +30,7 @@
  * @test
  * @bug 8015774
  * @summary Verify that PrintCodeCache option print correct information.
- * @library /testlibrary .. /../../test/lib
+ * @library /testlibrary .. /test/lib
  * @modules java.base/sun.misc
  *          java.compiler
  *          java.management
--- a/test/compiler/codecache/dtrace/SegmentedCodeCacheDtraceTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/codecache/dtrace/SegmentedCodeCacheDtraceTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -48,7 +48,7 @@
  * @test SegmentedCodeCacheDtraceTest
  * @bug 8015774
  * @requires os.family=="solaris"
- * @library /testlibrary / /../../test/lib
+ * @library /testlibrary / /test/lib
  * @build SegmentedCodeCacheDtraceTestWorker
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  *     sun.hotspot.WhiteBox$WhiteBoxPermission
--- a/test/compiler/codecache/jmx/BeanTypeTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/codecache/jmx/BeanTypeTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -27,7 +27,7 @@
 
 /**
  * @test BeanTypeTest
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.management
  * @build BeanTypeTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/codecache/jmx/CodeHeapBeanPresenceTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/codecache/jmx/CodeHeapBeanPresenceTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -27,7 +27,7 @@
 
 /**
  * @test CodeHeapBeanPresenceTest
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.management
  * @build CodeHeapBeanPresenceTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/codecache/jmx/GetUsageTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/codecache/jmx/GetUsageTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -29,7 +29,7 @@
 
 /*
  * @test GetUsageTest
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build GetUsageTest
--- a/test/compiler/codecache/jmx/InitialAndMaxUsageTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/codecache/jmx/InitialAndMaxUsageTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -29,7 +29,7 @@
 
 /*
  * @test InitialAndMaxUsageTest
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build InitialAndMaxUsageTest
--- a/test/compiler/codecache/jmx/ManagerNamesTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/codecache/jmx/ManagerNamesTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -27,7 +27,7 @@
 
 /**
  * @test ManagerNamesTest
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.management
  * @build ManagerNamesTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/codecache/jmx/MemoryPoolsPresenceTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/codecache/jmx/MemoryPoolsPresenceTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -32,7 +32,7 @@
 
 /**
  * @test MemoryPoolsPresenceTest
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.management
  * @build MemoryPoolsPresenceTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/codecache/jmx/PeakUsageTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/codecache/jmx/PeakUsageTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -27,7 +27,7 @@
 
 /*
  * @test PeakUsageTest
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build PeakUsageTest
--- a/test/compiler/codecache/jmx/PoolsIndependenceTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/codecache/jmx/PoolsIndependenceTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -37,7 +37,7 @@
 
 /*
  * @test PoolsIndependenceTest
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @build PoolsIndependenceTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  *     sun.hotspot.WhiteBox$WhiteBoxPermission
--- a/test/compiler/codecache/jmx/ThresholdNotificationsTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/codecache/jmx/ThresholdNotificationsTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -34,7 +34,7 @@
 
 /*
  * @test ThresholdNotificationsTest
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build ThresholdNotificationsTest
--- a/test/compiler/codecache/jmx/UsageThresholdExceededSeveralTimesTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/codecache/jmx/UsageThresholdExceededSeveralTimesTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -23,7 +23,7 @@
 
 /*
  * @test UsageThresholdExceededSeveralTimesTest
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build UsageThresholdExceededTest
--- a/test/compiler/codecache/jmx/UsageThresholdExceededTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/codecache/jmx/UsageThresholdExceededTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -27,7 +27,7 @@
 
 /*
  * @test UsageThresholdExceededTest
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build UsageThresholdExceededTest
--- a/test/compiler/codecache/jmx/UsageThresholdIncreasedTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/codecache/jmx/UsageThresholdIncreasedTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -27,7 +27,7 @@
 
 /*
  * @test UsageThresholdIncreasedTest
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build UsageThresholdIncreasedTest
--- a/test/compiler/codecache/jmx/UsageThresholdNotExceededTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/codecache/jmx/UsageThresholdNotExceededTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -27,7 +27,7 @@
 
 /*
  * @test UsageThresholdNotExceededTest
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build UsageThresholdNotExceededTest
--- a/test/compiler/codecache/stress/OverloadCompileQueueTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/codecache/stress/OverloadCompileQueueTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -29,7 +29,7 @@
 
 /*
  * @test OverloadCompileQueueTest
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @ignore 8071905
--- a/test/compiler/codecache/stress/RandomAllocationTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/codecache/stress/RandomAllocationTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -28,7 +28,7 @@
 
 /*
  * @test RandomAllocationTest
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build RandomAllocationTest
--- a/test/compiler/codecache/stress/UnexpectedDeoptimizationTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/codecache/stress/UnexpectedDeoptimizationTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -24,7 +24,7 @@
 
 /*
  * @test UnexpectedDeoptimizationTest
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build UnexpectedDeoptimizationTest
--- a/test/compiler/compilercontrol/matcher/MethodMatcherTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/compilercontrol/matcher/MethodMatcherTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -40,7 +40,7 @@
  * @test
  * @bug 8135068
  * @summary Tests CompilerCommand's method matcher
- * @library /testlibrary /../../test/lib /compiler/whitebox ../share /
+ * @library /testlibrary /test/lib /compiler/whitebox ../share /
  * @build MethodMatcherTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
--- a/test/compiler/floatingpoint/TestPow2.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/floatingpoint/TestPow2.java	Thu Oct 29 12:04:04 2015 -0700
@@ -25,7 +25,7 @@
  * @test
  * @bug 8063086
  * @summary X^2 special case for C2 yields different result than interpreter
- * @library /testlibrary /../../test/lib /compiler/whitebox
+ * @library /testlibrary /test/lib /compiler/whitebox
  * @modules java.management
  * @build TestPow2
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/intrinsics/IntrinsicAvailableTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/intrinsics/IntrinsicAvailableTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -26,7 +26,7 @@
 /*
  * @test
  * @bug 8130832
- * @library /testlibrary /../../test/lib /compiler/whitebox /compiler/testlibrary
+ * @library /testlibrary /test/lib /compiler/whitebox /compiler/testlibrary
  * @build IntrinsicAvailableTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
--- a/test/compiler/intrinsics/bmi/TestAndnI.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/intrinsics/bmi/TestAndnI.java	Thu Oct 29 12:04:04 2015 -0700
@@ -27,7 +27,7 @@
  * @bug 8031321
  * @summary Verify that results of computations are the same w/
  *          and w/o usage of ANDN instruction
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build TestAndnI BMITestRunner Expr
--- a/test/compiler/intrinsics/bmi/TestAndnL.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/intrinsics/bmi/TestAndnL.java	Thu Oct 29 12:04:04 2015 -0700
@@ -27,7 +27,7 @@
  * @bug 8031321
  * @summary Verify that results of computations are the same w/
  *          and w/o usage of ANDN instruction
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build TestAndnL BMITestRunner Expr
--- a/test/compiler/intrinsics/bmi/TestBlsiI.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/intrinsics/bmi/TestBlsiI.java	Thu Oct 29 12:04:04 2015 -0700
@@ -27,7 +27,7 @@
  * @bug 8031321
  * @summary Verify that results of computations are the same w/
  *          and w/o usage of BLSI instruction
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build TestBlsiI BMITestRunner Expr
--- a/test/compiler/intrinsics/bmi/TestBlsiL.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/intrinsics/bmi/TestBlsiL.java	Thu Oct 29 12:04:04 2015 -0700
@@ -27,7 +27,7 @@
  * @bug 8031321
  * @summary Verify that results of computations are the same w/
  *          and w/o usage of BLSI instruction
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build TestBlsiL BMITestRunner Expr
--- a/test/compiler/intrinsics/bmi/TestBlsmskI.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/intrinsics/bmi/TestBlsmskI.java	Thu Oct 29 12:04:04 2015 -0700
@@ -27,7 +27,7 @@
  * @bug 8031321
  * @summary Verify that results of computations are the same w/
  *          and w/o usage of BLSMSK instruction
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build TestBlsmskI BMITestRunner Expr
--- a/test/compiler/intrinsics/bmi/TestBlsmskL.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/intrinsics/bmi/TestBlsmskL.java	Thu Oct 29 12:04:04 2015 -0700
@@ -27,7 +27,7 @@
  * @bug 8031321
  * @summary Verify that results of computations are the same w/
  *          and w/o usage of BLSMSK instruction
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build TestBlsmskL BMITestRunner Expr
--- a/test/compiler/intrinsics/bmi/TestBlsrI.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/intrinsics/bmi/TestBlsrI.java	Thu Oct 29 12:04:04 2015 -0700
@@ -27,7 +27,7 @@
  * @bug 8031321
  * @summary Verify that results of computations are the same w/
  *          and w/o usage of BLSR instruction
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build TestBlsrI BMITestRunner Expr
--- a/test/compiler/intrinsics/bmi/TestBlsrL.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/intrinsics/bmi/TestBlsrL.java	Thu Oct 29 12:04:04 2015 -0700
@@ -27,7 +27,7 @@
  * @bug 8031321
  * @summary Verify that results of computations are the same w/
  *          and w/o usage of BLSR instruction
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build TestBlsrL BMITestRunner Expr
--- a/test/compiler/intrinsics/bmi/TestLzcntI.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/intrinsics/bmi/TestLzcntI.java	Thu Oct 29 12:04:04 2015 -0700
@@ -27,7 +27,7 @@
  * @bug 8031321
  * @summary Verify that results of computations are the same w/
  *          and w/o usage of intrinsic
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build TestLzcntI BMITestRunner Expr
--- a/test/compiler/intrinsics/bmi/TestLzcntL.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/intrinsics/bmi/TestLzcntL.java	Thu Oct 29 12:04:04 2015 -0700
@@ -27,7 +27,7 @@
  * @bug 8031321
  * @summary Verify that results of computations are the same w/
  *          and w/o usage of intrinsic
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build TestLzcntL BMITestRunner Expr
--- a/test/compiler/intrinsics/bmi/TestTzcntI.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/intrinsics/bmi/TestTzcntI.java	Thu Oct 29 12:04:04 2015 -0700
@@ -27,7 +27,7 @@
  * @bug 8031321
  * @summary Verify that results of computations are the same w/
  *          and w/o usage of intrinsic
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build TestTzcntI BMITestRunner Expr
--- a/test/compiler/intrinsics/bmi/TestTzcntL.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/intrinsics/bmi/TestTzcntL.java	Thu Oct 29 12:04:04 2015 -0700
@@ -27,7 +27,7 @@
  * @bug 8031321
  * @summary Verify that results of computations are the same w/
  *          and w/o usage of intrinsic
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build TestTzcntL BMITestRunner Expr
--- a/test/compiler/intrinsics/bmi/verifycode/AddnTestI.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/intrinsics/bmi/verifycode/AddnTestI.java	Thu Oct 29 12:04:04 2015 -0700
@@ -24,7 +24,7 @@
 /*
  * @test
  * @bug 8031321
- * @library /testlibrary /../../test/lib /compiler/whitebox ..
+ * @library /testlibrary /test/lib /compiler/whitebox ..
  * @modules java.base/sun.misc
  *          java.management
  * @build AddnTestI
--- a/test/compiler/intrinsics/bmi/verifycode/AddnTestL.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/intrinsics/bmi/verifycode/AddnTestL.java	Thu Oct 29 12:04:04 2015 -0700
@@ -24,7 +24,7 @@
 /*
  * @test
  * @bug 8031321
- * @library /testlibrary /../../test/lib /compiler/whitebox ..
+ * @library /testlibrary /test/lib /compiler/whitebox ..
  * @modules java.base/sun.misc
  *          java.management
  * @build AddnTestL
--- a/test/compiler/intrinsics/bmi/verifycode/BlsiTestI.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/intrinsics/bmi/verifycode/BlsiTestI.java	Thu Oct 29 12:04:04 2015 -0700
@@ -24,7 +24,7 @@
 /*
  * @test
  * @bug 8031321
- * @library /testlibrary /../../test/lib /compiler/whitebox ..
+ * @library /testlibrary /test/lib /compiler/whitebox ..
  * @modules java.base/sun.misc
  *          java.management
  * @build BlsiTestI
--- a/test/compiler/intrinsics/bmi/verifycode/BlsiTestL.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/intrinsics/bmi/verifycode/BlsiTestL.java	Thu Oct 29 12:04:04 2015 -0700
@@ -24,7 +24,7 @@
 /*
  * @test
  * @bug 8031321
- * @library /testlibrary /../../test/lib /compiler/whitebox ..
+ * @library /testlibrary /test/lib /compiler/whitebox ..
  * @modules java.base/sun.misc
  *          java.management
  * @build BlsiTestL
--- a/test/compiler/intrinsics/bmi/verifycode/BlsmskTestI.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/intrinsics/bmi/verifycode/BlsmskTestI.java	Thu Oct 29 12:04:04 2015 -0700
@@ -24,7 +24,7 @@
 /*
  * @test
  * @bug 8031321
- * @library /testlibrary /../../test/lib /compiler/whitebox ..
+ * @library /testlibrary /test/lib /compiler/whitebox ..
  * @modules java.base/sun.misc
  *          java.management
  * @build BlsmskTestI
--- a/test/compiler/intrinsics/bmi/verifycode/BlsmskTestL.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/intrinsics/bmi/verifycode/BlsmskTestL.java	Thu Oct 29 12:04:04 2015 -0700
@@ -24,7 +24,7 @@
 /*
  * @test
  * @bug 8031321
- * @library /testlibrary /../../test/lib /compiler/whitebox ..
+ * @library /testlibrary /test/lib /compiler/whitebox ..
  * @modules java.base/sun.misc
  *          java.management
  * @build BlsmskTestL
--- a/test/compiler/intrinsics/bmi/verifycode/BlsrTestI.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/intrinsics/bmi/verifycode/BlsrTestI.java	Thu Oct 29 12:04:04 2015 -0700
@@ -24,7 +24,7 @@
 /*
  * @test
  * @bug 8031321
- * @library /testlibrary /../../test/lib /compiler/whitebox ..
+ * @library /testlibrary /test/lib /compiler/whitebox ..
  * @modules java.base/sun.misc
  *          java.management
  * @build BlsrTestI
--- a/test/compiler/intrinsics/bmi/verifycode/BlsrTestL.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/intrinsics/bmi/verifycode/BlsrTestL.java	Thu Oct 29 12:04:04 2015 -0700
@@ -24,7 +24,7 @@
 /*
  * @test
  * @bug 8031321
- * @library /testlibrary /../../test/lib /compiler/whitebox ..
+ * @library /testlibrary /test/lib /compiler/whitebox ..
  * @modules java.base/sun.misc
  *          java.management
  * @build BlsrTestL
--- a/test/compiler/intrinsics/bmi/verifycode/LZcntTestI.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/intrinsics/bmi/verifycode/LZcntTestI.java	Thu Oct 29 12:04:04 2015 -0700
@@ -24,7 +24,7 @@
 /*
  * @test
  * @bug 8031321
- * @library /testlibrary /../../test/lib /compiler/whitebox ..
+ * @library /testlibrary /test/lib /compiler/whitebox ..
  * @modules java.base/sun.misc
  *          java.management
  * @build LZcntTestI
--- a/test/compiler/intrinsics/bmi/verifycode/LZcntTestL.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/intrinsics/bmi/verifycode/LZcntTestL.java	Thu Oct 29 12:04:04 2015 -0700
@@ -24,7 +24,7 @@
 /*
  * @test
  * @bug 8031321
- * @library /testlibrary /../../test/lib /compiler/whitebox ..
+ * @library /testlibrary /test/lib /compiler/whitebox ..
  * @modules java.base/sun.misc
  *          java.management
  * @build LZcntTestL
--- a/test/compiler/intrinsics/bmi/verifycode/TZcntTestI.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/intrinsics/bmi/verifycode/TZcntTestI.java	Thu Oct 29 12:04:04 2015 -0700
@@ -24,7 +24,7 @@
 /*
  * @test
  * @bug 8031321
- * @library /testlibrary /../../test/lib /compiler/whitebox ..
+ * @library /testlibrary /test/lib /compiler/whitebox ..
  * @modules java.base/sun.misc
  *          java.management
  * @build TZcntTestI
--- a/test/compiler/intrinsics/bmi/verifycode/TZcntTestL.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/intrinsics/bmi/verifycode/TZcntTestL.java	Thu Oct 29 12:04:04 2015 -0700
@@ -24,7 +24,7 @@
 /*
  * @test
  * @bug 8031321
- * @library /testlibrary /../../test/lib /compiler/whitebox ..
+ * @library /testlibrary /test/lib /compiler/whitebox ..
  * @modules java.base/sun.misc
  *          java.management
  * @build TZcntTestL
--- a/test/compiler/intrinsics/classcast/NullCheckDroppingsTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/intrinsics/classcast/NullCheckDroppingsTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -25,7 +25,7 @@
  * @test NullCheckDroppingsTest
  * @bug 8054492
  * @summary "Casting can result in redundant null checks in generated code"
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build ClassFileInstaller sun.hotspot.WhiteBox jdk.test.lib.*
--- a/test/compiler/intrinsics/mathexact/sanity/AddExactIntTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/intrinsics/mathexact/sanity/AddExactIntTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @library /testlibrary /../../test/lib /compiler/whitebox
+ * @library /testlibrary /test/lib /compiler/whitebox
  *          /compiler/testlibrary
  * @modules java.base/sun.misc
  *          java.management
--- a/test/compiler/intrinsics/mathexact/sanity/AddExactLongTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/intrinsics/mathexact/sanity/AddExactLongTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @library /testlibrary /../../test/lib /compiler/whitebox
+ * @library /testlibrary /test/lib /compiler/whitebox
  *          /compiler/testlibrary
  * @modules java.base/sun.misc
  *          java.management
--- a/test/compiler/intrinsics/mathexact/sanity/DecrementExactIntTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/intrinsics/mathexact/sanity/DecrementExactIntTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @library /testlibrary /../../test/lib /compiler/whitebox
+ * @library /testlibrary /test/lib /compiler/whitebox
  *          /compiler/testlibrary
  * @modules java.base/sun.misc
  *          java.management
--- a/test/compiler/intrinsics/mathexact/sanity/DecrementExactLongTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/intrinsics/mathexact/sanity/DecrementExactLongTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @library /testlibrary /../../test/lib /compiler/whitebox
+ * @library /testlibrary /test/lib /compiler/whitebox
  *          /compiler/testlibrary
  * @modules java.base/sun.misc
  *          java.management
--- a/test/compiler/intrinsics/mathexact/sanity/IncrementExactIntTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/intrinsics/mathexact/sanity/IncrementExactIntTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @library /testlibrary /../../test/lib /compiler/whitebox
+ * @library /testlibrary /test/lib /compiler/whitebox
  *          /compiler/testlibrary
  * @modules java.base/sun.misc
  *          java.management
--- a/test/compiler/intrinsics/mathexact/sanity/IncrementExactLongTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/intrinsics/mathexact/sanity/IncrementExactLongTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @library /testlibrary /../../test/lib /compiler/whitebox
+ * @library /testlibrary /test/lib /compiler/whitebox
  *          /compiler/testlibrary
  * @modules java.base/sun.misc
  *          java.management
--- a/test/compiler/intrinsics/mathexact/sanity/MultiplyExactIntTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/intrinsics/mathexact/sanity/MultiplyExactIntTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @library /testlibrary /../../test/lib /compiler/whitebox
+ * @library /testlibrary /test/lib /compiler/whitebox
  *          /compiler/testlibrary
  * @modules java.base/sun.misc
  *          java.management
--- a/test/compiler/intrinsics/mathexact/sanity/MultiplyExactLongTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/intrinsics/mathexact/sanity/MultiplyExactLongTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @library /testlibrary /../../test/lib /compiler/whitebox
+ * @library /testlibrary /test/lib /compiler/whitebox
  *          /compiler/testlibrary
  * @modules java.base/sun.misc
  *          java.management
--- a/test/compiler/intrinsics/mathexact/sanity/NegateExactIntTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/intrinsics/mathexact/sanity/NegateExactIntTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @library /testlibrary /../../test/lib /compiler/whitebox
+ * @library /testlibrary /test/lib /compiler/whitebox
  *          /compiler/testlibrary
  * @modules java.base/sun.misc
  *          java.management
--- a/test/compiler/intrinsics/mathexact/sanity/NegateExactLongTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/intrinsics/mathexact/sanity/NegateExactLongTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @library /testlibrary /../../test/lib /compiler/whitebox
+ * @library /testlibrary /test/lib /compiler/whitebox
  *          /compiler/testlibrary
  * @modules java.base/sun.misc
  *          java.management
--- a/test/compiler/intrinsics/mathexact/sanity/SubtractExactIntTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/intrinsics/mathexact/sanity/SubtractExactIntTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @library /testlibrary /../../test/lib /compiler/whitebox
+ * @library /testlibrary /test/lib /compiler/whitebox
  *          /compiler/testlibrary
  * @modules java.base/sun.misc
  *          java.management
--- a/test/compiler/intrinsics/mathexact/sanity/SubtractExactLongTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/intrinsics/mathexact/sanity/SubtractExactLongTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @library /testlibrary /../../test/lib /compiler/whitebox
+ * @library /testlibrary /test/lib /compiler/whitebox
  *          /compiler/testlibrary
  * @modules java.base/sun.misc
  *          java.management
--- a/test/compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnSupportedCPU.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnSupportedCPU.java	Thu Oct 29 12:04:04 2015 -0700
@@ -25,7 +25,7 @@
  * @test
  * @bug 8035968
  * @summary Verify UseSHA1Intrinsics option processing on supported CPU,
- * @library /testlibrary /../../test/lib /compiler/testlibrary testcases
+ * @library /testlibrary /test/lib /compiler/testlibrary testcases
  * @modules java.base/sun.misc
  *          java.management
  * @build TestUseSHA1IntrinsicsOptionOnSupportedCPU
--- a/test/compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnUnsupportedCPU.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnUnsupportedCPU.java	Thu Oct 29 12:04:04 2015 -0700
@@ -25,7 +25,7 @@
  * @test
  * @bug 8035968
  * @summary Verify UseSHA1Intrinsics option processing on unsupported CPU,
- * @library /testlibrary /../../test/lib /compiler/testlibrary testcases
+ * @library /testlibrary /test/lib /compiler/testlibrary testcases
  * @modules java.base/sun.misc
  *          java.management
  * @build TestUseSHA1IntrinsicsOptionOnUnsupportedCPU
--- a/test/compiler/intrinsics/sha/cli/TestUseSHA256IntrinsicsOptionOnSupportedCPU.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/intrinsics/sha/cli/TestUseSHA256IntrinsicsOptionOnSupportedCPU.java	Thu Oct 29 12:04:04 2015 -0700
@@ -25,7 +25,7 @@
  * @test
  * @bug 8035968
  * @summary Verify UseSHA256Intrinsics option processing on supported CPU,
- * @library /testlibrary /../../test/lib /compiler/testlibrary testcases
+ * @library /testlibrary /test/lib /compiler/testlibrary testcases
  * @modules java.base/sun.misc
  *          java.management
  * @build TestUseSHA256IntrinsicsOptionOnSupportedCPU
--- a/test/compiler/intrinsics/sha/cli/TestUseSHA256IntrinsicsOptionOnUnsupportedCPU.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/intrinsics/sha/cli/TestUseSHA256IntrinsicsOptionOnUnsupportedCPU.java	Thu Oct 29 12:04:04 2015 -0700
@@ -25,7 +25,7 @@
  * @test
  * @bug 8035968
  * @summary Verify UseSHA256Intrinsics option processing on unsupported CPU,
- * @library /testlibrary /../../test/lib /compiler/testlibrary testcases
+ * @library /testlibrary /test/lib /compiler/testlibrary testcases
  * @modules java.base/sun.misc
  *          java.management
  * @build TestUseSHA256IntrinsicsOptionOnUnsupportedCPU
--- a/test/compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnSupportedCPU.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnSupportedCPU.java	Thu Oct 29 12:04:04 2015 -0700
@@ -25,7 +25,7 @@
  * @test
  * @bug 8035968
  * @summary Verify UseSHA512Intrinsics option processing on supported CPU.
- * @library /testlibrary /../../test/lib /compiler/testlibrary testcases
+ * @library /testlibrary /test/lib /compiler/testlibrary testcases
  * @modules java.base/sun.misc
  *          java.management
  * @build TestUseSHA512IntrinsicsOptionOnSupportedCPU
--- a/test/compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnUnsupportedCPU.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnUnsupportedCPU.java	Thu Oct 29 12:04:04 2015 -0700
@@ -25,7 +25,7 @@
  * @test
  * @bug 8035968
  * @summary Verify UseSHA512Intrinsics option processing on unsupported CPU,
- * @library /testlibrary /../../test/lib /compiler/testlibrary testcases
+ * @library /testlibrary /test/lib /compiler/testlibrary testcases
  * @modules java.base/sun.misc
  *          java.management
  * @build TestUseSHA512IntrinsicsOptionOnUnsupportedCPU
--- a/test/compiler/intrinsics/sha/cli/TestUseSHAOptionOnSupportedCPU.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/intrinsics/sha/cli/TestUseSHAOptionOnSupportedCPU.java	Thu Oct 29 12:04:04 2015 -0700
@@ -25,7 +25,7 @@
  * @test
  * @bug 8035968
  * @summary Verify UseSHA option processing on supported CPU,
- * @library /testlibrary /../../test/lib /compiler/testlibrary testcases
+ * @library /testlibrary /test/lib /compiler/testlibrary testcases
  * @modules java.base/sun.misc
  *          java.management
  * @build TestUseSHAOptionOnSupportedCPU
--- a/test/compiler/intrinsics/sha/cli/TestUseSHAOptionOnUnsupportedCPU.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/intrinsics/sha/cli/TestUseSHAOptionOnUnsupportedCPU.java	Thu Oct 29 12:04:04 2015 -0700
@@ -25,7 +25,7 @@
  * @test
  * @bug 8035968
  * @summary Verify UseSHA option processing on unsupported CPU.
- * @library /testlibrary /../../test/lib /compiler/testlibrary testcases
+ * @library /testlibrary /test/lib /compiler/testlibrary testcases
  * @modules java.base/sun.misc
  *          java.management
  * @build TestUseSHAOptionOnUnsupportedCPU
--- a/test/compiler/intrinsics/sha/sanity/TestSHA1Intrinsics.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/intrinsics/sha/sanity/TestSHA1Intrinsics.java	Thu Oct 29 12:04:04 2015 -0700
@@ -25,7 +25,7 @@
  * @test
  * @bug 8035968
  * @summary Verify that SHA-1 intrinsic is actually used.
- * @library /testlibrary /../../test/lib /compiler/testlibrary ../
+ * @library /testlibrary /test/lib /compiler/testlibrary ../
  * @modules java.base/sun.misc
  *          java.management
  * @build TestSHA intrinsics.Verifier TestSHA1Intrinsics
--- a/test/compiler/intrinsics/sha/sanity/TestSHA1MultiBlockIntrinsics.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/intrinsics/sha/sanity/TestSHA1MultiBlockIntrinsics.java	Thu Oct 29 12:04:04 2015 -0700
@@ -27,7 +27,7 @@
  * @test
  * @bug 8035968
  * @summary Verify that SHA-1 multi block intrinsic is actually used.
- * @library /testlibrary /../../test/lib /compiler/testlibrary ../
+ * @library /testlibrary /test/lib /compiler/testlibrary ../
  * @modules java.base/sun.misc
  *          java.management
  * @build TestSHA intrinsics.Verifier TestSHA1MultiBlockIntrinsics
--- a/test/compiler/intrinsics/sha/sanity/TestSHA256Intrinsics.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/intrinsics/sha/sanity/TestSHA256Intrinsics.java	Thu Oct 29 12:04:04 2015 -0700
@@ -27,7 +27,7 @@
  * @test
  * @bug 8035968
  * @summary Verify that SHA-256 intrinsic is actually used.
- * @library /testlibrary /../../test/lib /compiler/testlibrary ../
+ * @library /testlibrary /test/lib /compiler/testlibrary ../
  * @modules java.base/sun.misc
  *          java.management
  * @build TestSHA intrinsics.Verifier TestSHA256Intrinsics
--- a/test/compiler/intrinsics/sha/sanity/TestSHA256MultiBlockIntrinsics.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/intrinsics/sha/sanity/TestSHA256MultiBlockIntrinsics.java	Thu Oct 29 12:04:04 2015 -0700
@@ -27,7 +27,7 @@
  * @test
  * @bug 8035968
  * @summary Verify that SHA-256 multi block intrinsic is actually used.
- * @library /testlibrary /../../test/lib /compiler/testlibrary ../
+ * @library /testlibrary /test/lib /compiler/testlibrary ../
  * @modules java.base/sun.misc
  *          java.management
  * @build TestSHA intrinsics.Verifier TestSHA256MultiBlockIntrinsics
--- a/test/compiler/intrinsics/sha/sanity/TestSHA512Intrinsics.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/intrinsics/sha/sanity/TestSHA512Intrinsics.java	Thu Oct 29 12:04:04 2015 -0700
@@ -27,7 +27,7 @@
  * @test
  * @bug 8035968
  * @summary Verify that SHA-512 intrinsic is actually used.
- * @library /testlibrary /../../test/lib /compiler/testlibrary ../
+ * @library /testlibrary /test/lib /compiler/testlibrary ../
  * @modules java.base/sun.misc
  *          java.management
  * @build TestSHA intrinsics.Verifier TestSHA512Intrinsics
--- a/test/compiler/intrinsics/sha/sanity/TestSHA512MultiBlockIntrinsics.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/intrinsics/sha/sanity/TestSHA512MultiBlockIntrinsics.java	Thu Oct 29 12:04:04 2015 -0700
@@ -27,7 +27,7 @@
  * @test
  * @bug 8035968
  * @summary Verify that SHA-512 multi block intrinsic is actually used.
- * @library /testlibrary /../../test/lib /compiler/testlibrary ../
+ * @library /testlibrary /test/lib /compiler/testlibrary ../
  * @modules java.base/sun.misc
  *          java.management
  * @build TestSHA intrinsics.Verifier TestSHA512MultiBlockIntrinsics
--- a/test/compiler/jvmci/SecurityRestrictionsTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/jvmci/SecurityRestrictionsTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -26,7 +26,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library /testlibrary /../../test/lib /
+ * @library /testlibrary /test/lib /
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
  *      compiler.jvmci.SecurityRestrictionsTest
  *      NO_SEC_MAN
--- a/test/compiler/jvmci/compilerToVM/AllocateCompileIdTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/jvmci/compilerToVM/AllocateCompileIdTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -25,7 +25,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library /testlibrary /../../test/lib /
+ * @library /testlibrary /test/lib /
  * @compile ../common/CompilerToVMHelper.java
  * @build sun.hotspot.WhiteBox
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/jvmci/compilerToVM/CanInlineMethodTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/jvmci/compilerToVM/CanInlineMethodTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -26,7 +26,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library /testlibrary /../../test/lib /
+ * @library /testlibrary /test/lib /
  * @compile ../common/CompilerToVMHelper.java
  * @build sun.hotspot.WhiteBox
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/jvmci/compilerToVM/CollectCountersTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/jvmci/compilerToVM/CollectCountersTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -25,7 +25,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library / /testlibrary /../../test/lib/
+ * @library / /testlibrary /test/lib/
  * @compile ../common/CompilerToVMHelper.java
  * @run main ClassFileInstaller
  *     jdk.vm.ci.hotspot.CompilerToVMHelper
--- a/test/compiler/jvmci/compilerToVM/DebugOutputTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/jvmci/compilerToVM/DebugOutputTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -25,7 +25,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library / /testlibrary /../../test/lib
+ * @library / /testlibrary /test/lib
  * @compile ../common/CompilerToVMHelper.java
  * @run main ClassFileInstaller
  *      jdk.vm.ci.hotspot.CompilerToVMHelper
--- a/test/compiler/jvmci/compilerToVM/DisassembleCodeBlobTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/jvmci/compilerToVM/DisassembleCodeBlobTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -26,7 +26,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library /testlibrary /../../test/lib /
+ * @library /testlibrary /test/lib /
  * @ignore 8139700
  * @compile ../common/CompilerToVMHelper.java
  * @build sun.hotspot.WhiteBox
--- a/test/compiler/jvmci/compilerToVM/DoNotInlineOrCompileTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/jvmci/compilerToVM/DoNotInlineOrCompileTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -26,7 +26,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library /testlibrary /../../test/lib /
+ * @library /testlibrary /test/lib /
  * @compile ../common/CompilerToVMHelper.java
  * @build sun.hotspot.WhiteBox
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/jvmci/compilerToVM/ExecuteInstalledCodeTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/jvmci/compilerToVM/ExecuteInstalledCodeTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -21,7 +21,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library /testlibrary /../../test/lib /
+ * @library /testlibrary /test/lib /
  * @compile ../common/CompilerToVMHelper.java
  * @build sun.hotspot.WhiteBox
  *        compiler.jvmci.compilerToVM.ExecuteInstalledCodeTest
--- a/test/compiler/jvmci/compilerToVM/FindUniqueConcreteMethodTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/jvmci/compilerToVM/FindUniqueConcreteMethodTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -25,7 +25,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library / /testlibrary /../../test/lib
+ * @library / /testlibrary /test/lib
  * @compile ../common/CompilerToVMHelper.java
  * @build compiler.jvmci.compilerToVM.FindUniqueConcreteMethodTest
  * @run main ClassFileInstaller
--- a/test/compiler/jvmci/compilerToVM/GetBytecodeTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/jvmci/compilerToVM/GetBytecodeTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -26,7 +26,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library /testlibrary /../../test/lib /
+ * @library /testlibrary /test/lib /
  * @compile ../common/CompilerToVMHelper.java
  * @run main ClassFileInstaller jdk.vm.ci.hotspot.CompilerToVMHelper
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
--- a/test/compiler/jvmci/compilerToVM/GetClassInitializerTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/jvmci/compilerToVM/GetClassInitializerTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -25,7 +25,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library / /testlibrary /../../test/lib
+ * @library / /testlibrary /test/lib
  * @compile ../common/CompilerToVMHelper.java
  * @build compiler.jvmci.compilerToVM.GetClassInitializerTest
  * @run main ClassFileInstaller jdk.vm.ci.hotspot.CompilerToVMHelper
--- a/test/compiler/jvmci/compilerToVM/GetConstantPoolTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/jvmci/compilerToVM/GetConstantPoolTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -26,7 +26,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library /testlibrary /../../test/lib /
+ * @library /testlibrary /test/lib /
  * @ignore 8139385
  * @compile ../common/CompilerToVMHelper.java
  * @build sun.hotspot.WhiteBox
--- a/test/compiler/jvmci/compilerToVM/GetExceptionTableTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/jvmci/compilerToVM/GetExceptionTableTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -26,7 +26,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library /testlibrary /../../test/lib /
+ * @library /testlibrary /test/lib /
  * @compile ../common/CompilerToVMHelper.java
  * @run main ClassFileInstaller jdk.vm.ci.hotspot.CompilerToVMHelper
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
--- a/test/compiler/jvmci/compilerToVM/GetImplementorTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/jvmci/compilerToVM/GetImplementorTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -25,7 +25,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library / /testlibrary /../../test/lib/
+ * @library / /testlibrary /test/lib/
  * @compile ../common/CompilerToVMHelper.java
  * @build compiler.jvmci.compilerToVM.GetImplementorTest
  * @run main ClassFileInstaller
--- a/test/compiler/jvmci/compilerToVM/GetLineNumberTableTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/jvmci/compilerToVM/GetLineNumberTableTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -26,7 +26,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library /testlibrary /../../test/lib /
+ * @library /testlibrary /test/lib /
  * @compile ../common/CompilerToVMHelper.java
  * @run main ClassFileInstaller jdk.vm.ci.hotspot.CompilerToVMHelper
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
--- a/test/compiler/jvmci/compilerToVM/GetLocalVariableTableTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/jvmci/compilerToVM/GetLocalVariableTableTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -26,7 +26,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library /testlibrary /../../test/lib /
+ * @library /testlibrary /test/lib /
  * @clean compiler.jvmci.compilerToVM.*
  * @compile -g DummyInterface.java
  * @compile -g DummyAbstractClass.java
--- a/test/compiler/jvmci/compilerToVM/GetMaxCallTargetOffsetTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/jvmci/compilerToVM/GetMaxCallTargetOffsetTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -25,7 +25,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library / /testlibrary /../../test/lib/
+ * @library / /testlibrary /test/lib/
  * @compile ../common/CompilerToVMHelper.java
  * @build compiler.jvmci.compilerToVM.GetMaxCallTargetOffsetTest
  * @run main ClassFileInstaller
--- a/test/compiler/jvmci/compilerToVM/GetNextStackFrameTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/jvmci/compilerToVM/GetNextStackFrameTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -25,7 +25,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library / /testlibrary /../../test/lib
+ * @library / /testlibrary /test/lib
  * @compile ../common/CompilerToVMHelper.java
  * @run main ClassFileInstaller
  *      jdk.vm.ci.hotspot.CompilerToVMHelper
--- a/test/compiler/jvmci/compilerToVM/GetResolvedJavaMethodAtSlotTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/jvmci/compilerToVM/GetResolvedJavaMethodAtSlotTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -26,7 +26,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library /testlibrary /../../test/lib /
+ * @library /testlibrary /test/lib /
  * @compile ../common/CompilerToVMHelper.java
  * @run main ClassFileInstaller jdk.vm.ci.hotspot.CompilerToVMHelper
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
--- a/test/compiler/jvmci/compilerToVM/GetResolvedJavaMethodTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/jvmci/compilerToVM/GetResolvedJavaMethodTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -25,7 +25,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library / /testlibrary /../../test/lib
+ * @library / /testlibrary /test/lib
  * @compile ../common/CompilerToVMHelper.java
  * @build compiler.jvmci.compilerToVM.GetResolvedJavaMethodTest
  * @run main ClassFileInstaller
--- a/test/compiler/jvmci/compilerToVM/GetResolvedJavaTypeTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/jvmci/compilerToVM/GetResolvedJavaTypeTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -25,7 +25,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library / /testlibrary /../../test/lib
+ * @library / /testlibrary /test/lib
  * @compile ../common/CompilerToVMHelper.java
  * @build compiler.jvmci.compilerToVM.GetResolvedJavaTypeTest
  * @run main ClassFileInstaller
--- a/test/compiler/jvmci/compilerToVM/GetStackTraceElementTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/jvmci/compilerToVM/GetStackTraceElementTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -26,7 +26,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library /testlibrary /../../test/lib /
+ * @library /testlibrary /test/lib /
  * @compile ../common/CompilerToVMHelper.java
  * @run main ClassFileInstaller jdk.vm.ci.hotspot.CompilerToVMHelper
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
--- a/test/compiler/jvmci/compilerToVM/GetSymbolTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/jvmci/compilerToVM/GetSymbolTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -25,7 +25,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library / /testlibrary /../../test/lib
+ * @library / /testlibrary /test/lib
  * @compile ../common/CompilerToVMHelper.java
  * @build compiler.jvmci.compilerToVM.GetSymbolTest
  * @run main ClassFileInstaller jdk.vm.ci.hotspot.CompilerToVMHelper
--- a/test/compiler/jvmci/compilerToVM/GetVtableIndexForInterfaceTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/jvmci/compilerToVM/GetVtableIndexForInterfaceTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -25,7 +25,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library / /testlibrary /../../test/lib
+ * @library / /testlibrary /test/lib
  * @compile ../common/CompilerToVMHelper.java
  * @build compiler.jvmci.compilerToVM.GetVtableIndexForInterfaceTest
  * @run main ClassFileInstaller
--- a/test/compiler/jvmci/compilerToVM/HasCompiledCodeForOSRTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/jvmci/compilerToVM/HasCompiledCodeForOSRTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -26,7 +26,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library /testlibrary /../../test/lib /
+ * @library /testlibrary /test/lib /
  * @compile ../common/CompilerToVMHelper.java
  * @build sun.hotspot.WhiteBox
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/jvmci/compilerToVM/HasFinalizableSubclassTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/jvmci/compilerToVM/HasFinalizableSubclassTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -25,7 +25,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library / /testlibrary /../../test/lib
+ * @library / /testlibrary /test/lib
  * @compile ../common/CompilerToVMHelper.java
  * @build compiler.jvmci.compilerToVM.HasFinalizableSubclassTest
  * @run main ClassFileInstaller jdk.vm.ci.hotspot.CompilerToVMHelper
--- a/test/compiler/jvmci/compilerToVM/InvalidateInstalledCodeTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/jvmci/compilerToVM/InvalidateInstalledCodeTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -26,7 +26,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library /testlibrary /../../test/lib /
+ * @library /testlibrary /test/lib /
  * @ignore 8139700
  * @compile ../common/CompilerToVMHelper.java
  * @build sun.hotspot.WhiteBox
--- a/test/compiler/jvmci/compilerToVM/IsMatureTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/jvmci/compilerToVM/IsMatureTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -25,7 +25,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library / /testlibrary /../../test/lib
+ * @library / /testlibrary /test/lib
  * @compile ../common/CompilerToVMHelper.java
  * @build sun.hotspot.WhiteBox IsMatureTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/jvmci/compilerToVM/LookupKlassInPoolTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/jvmci/compilerToVM/LookupKlassInPoolTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -27,7 +27,7 @@
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
  * @summary Testing compiler.jvmci.CompilerToVM.lookupKlassInPool method
- * @library /testlibrary /../../test/lib /
+ * @library /testlibrary /test/lib /
  * @compile ../common/CompilerToVMHelper.java
  * @build compiler.jvmci.common.testcases.MultipleImplementersInterface
  *        compiler.jvmci.common.testcases.MultipleImplementer2
--- a/test/compiler/jvmci/compilerToVM/MaterializeVirtualObjectTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/jvmci/compilerToVM/MaterializeVirtualObjectTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -25,7 +25,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library / /testlibrary /../../test/lib
+ * @library / /testlibrary /test/lib
  * @ignore 8139703
  * @compile ../common/CompilerToVMHelper.java
  * @build sun.hotspot.WhiteBox MaterializeVirtualObjectTest
--- a/test/compiler/jvmci/compilerToVM/MethodIsIgnoredBySecurityStackWalkTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/jvmci/compilerToVM/MethodIsIgnoredBySecurityStackWalkTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -26,7 +26,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library /testlibrary /../../test/lib /
+ * @library /testlibrary /test/lib /
  * @compile ../common/CompilerToVMHelper.java
  * @run main ClassFileInstaller jdk.vm.ci.hotspot.CompilerToVMHelper
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
--- a/test/compiler/jvmci/compilerToVM/ReadUncompressedOopTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/jvmci/compilerToVM/ReadUncompressedOopTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -25,7 +25,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library / /testlibrary /../../test/lib/
+ * @library / /testlibrary /test/lib/
  * @compile ../common/CompilerToVMHelper.java
  * @build compiler.jvmci.compilerToVM.ReadUncompressedOopTest
  * @run main ClassFileInstaller
--- a/test/compiler/jvmci/compilerToVM/ReprofileTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/jvmci/compilerToVM/ReprofileTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -26,7 +26,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library /testlibrary /../../test/lib /
+ * @library /testlibrary /test/lib /
  * @compile ../common/CompilerToVMHelper.java
  * @build sun.hotspot.WhiteBox
  * @run main ClassFileInstaller
--- a/test/compiler/jvmci/compilerToVM/ResolveConstantInPoolTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/jvmci/compilerToVM/ResolveConstantInPoolTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -26,7 +26,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library /testlibrary /../../test/lib /
+ * @library /testlibrary /test/lib /
  * @compile ../common/CompilerToVMHelper.java
  * @build compiler.jvmci.compilerToVM.ResolveConstantInPoolTest
  * @run main ClassFileInstaller jdk.vm.ci.hotspot.CompilerToVMHelper
--- a/test/compiler/jvmci/compilerToVM/ResolveMethodTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/jvmci/compilerToVM/ResolveMethodTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -25,7 +25,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library / /testlibrary /../../test/lib
+ * @library / /testlibrary /test/lib
  * @compile ../common/CompilerToVMHelper.java
  * @build compiler.jvmci.compilerToVM.ResolveMethodTest
  * @run main ClassFileInstaller
--- a/test/compiler/jvmci/compilerToVM/ResolveTypeInPoolTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/jvmci/compilerToVM/ResolveTypeInPoolTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -27,7 +27,7 @@
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
  * @summary Testing compiler.jvmci.CompilerToVM.resolveTypeInPool method
- * @library /testlibrary /../../test/lib /
+ * @library /testlibrary /test/lib /
  * @compile ../common/CompilerToVMHelper.java
  * @build compiler.jvmci.common.testcases.MultipleImplementersInterface
  *        compiler.jvmci.common.testcases.MultipleImplementer2
--- a/test/compiler/jvmci/compilerToVM/ShouldDebugNonSafepointsTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/jvmci/compilerToVM/ShouldDebugNonSafepointsTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -25,7 +25,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library / /testlibrary /../../test/lib/
+ * @library / /testlibrary /test/lib/
  * @compile ../common/CompilerToVMHelper.java
  * @build compiler.jvmci.compilerToVM.ShouldDebugNonSafepointsTest
  * @run main ClassFileInstaller
--- a/test/compiler/jvmci/compilerToVM/ShouldInlineMethodTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/jvmci/compilerToVM/ShouldInlineMethodTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -26,7 +26,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library /testlibrary /../../test/lib /
+ * @library /testlibrary /test/lib /
  * @compile ../common/CompilerToVMHelper.java
  * @build sun.hotspot.WhiteBox
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/oracle/GetMethodOptionTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/oracle/GetMethodOptionTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -30,7 +30,7 @@
 /*
  * @test
  * @bug 8074980
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @build sun.hotspot.WhiteBox jdk.test.lib.Asserts GetMethodOptionTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
--- a/test/compiler/oracle/MethodMatcherTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/oracle/MethodMatcherTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -23,7 +23,7 @@
 
 /*
  * @test MethodMatcherTest
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI MethodMatcherTest
--- a/test/compiler/rangechecks/TestExplicitRangeChecks.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/rangechecks/TestExplicitRangeChecks.java	Thu Oct 29 12:04:04 2015 -0700
@@ -25,7 +25,7 @@
  * @test
  * @bug 8073480
  * @summary explicit range checks should be recognized by C2
- * @library /testlibrary /../../test/lib /compiler/whitebox
+ * @library /testlibrary /test/lib /compiler/whitebox
  * @build  TestExplicitRangeChecks
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  * @run main ClassFileInstaller jdk.test.lib.Platform
--- a/test/compiler/rangechecks/TestRangeCheckSmearing.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/rangechecks/TestRangeCheckSmearing.java	Thu Oct 29 12:04:04 2015 -0700
@@ -25,7 +25,7 @@
  * @test
  * @bug 8066103
  * @summary C2's range check smearing allows out of bound array accesses
- * @library /testlibrary /../../test/lib /compiler/whitebox
+ * @library /testlibrary /test/lib /compiler/whitebox
  * @modules java.base/sun.misc
  *          java.management
  * @build TestRangeCheckSmearing
--- a/test/compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsOptionOnSupportedConfig.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsOptionOnSupportedConfig.java	Thu Oct 29 12:04:04 2015 -0700
@@ -27,7 +27,7 @@
  * @bug 8031320
  * @summary Verify PrintPreciseRTMLockingStatistics on CPUs with
  *          rtm support and on VM with rtm locking support,
- * @library /testlibrary /../../test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /compiler/testlibrary
  * @modules java.base/sun.misc
  *          java.management
  * @build TestPrintPreciseRTMLockingStatisticsOptionOnSupportedConfig
--- a/test/compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsOptionOnUnsupportedConfig.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsOptionOnUnsupportedConfig.java	Thu Oct 29 12:04:04 2015 -0700
@@ -27,7 +27,7 @@
  * @bug 8031320
  * @summary Verify PrintPreciseRTMLockingStatistics on CPUs without
  *          rtm support and/or unsupported VM.
- * @library /testlibrary /../../test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /compiler/testlibrary
  * @modules java.base/sun.misc
  *          java.management
  * @build TestPrintPreciseRTMLockingStatisticsOptionOnUnsupportedConfig
--- a/test/compiler/rtm/cli/TestRTMAbortRatioOptionOnSupportedConfig.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/rtm/cli/TestRTMAbortRatioOptionOnSupportedConfig.java	Thu Oct 29 12:04:04 2015 -0700
@@ -27,7 +27,7 @@
  * @bug 8031320
  * @summary Verify RTMAbortRatio option processing on CPU with rtm
  *          support and on VM with rtm locking support.
- * @library /testlibrary /../../test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /compiler/testlibrary
  * @modules java.base/sun.misc
  *          java.management
  * @build TestRTMAbortRatioOptionOnSupportedConfig
--- a/test/compiler/rtm/cli/TestRTMAbortRatioOptionOnUnsupportedConfig.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/rtm/cli/TestRTMAbortRatioOptionOnUnsupportedConfig.java	Thu Oct 29 12:04:04 2015 -0700
@@ -27,7 +27,7 @@
  * @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 /compiler/testlibrary
+ * @library /testlibrary /test/lib /compiler/testlibrary
  * @modules java.base/sun.misc
  *          java.management
  * @build TestRTMAbortRatioOptionOnUnsupportedConfig
--- a/test/compiler/rtm/cli/TestRTMTotalCountIncrRateOptionOnSupportedConfig.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/rtm/cli/TestRTMTotalCountIncrRateOptionOnSupportedConfig.java	Thu Oct 29 12:04:04 2015 -0700
@@ -27,7 +27,7 @@
  * @bug 8031320
  * @summary Verify RTMTotalCountIncrRate option processing on CPU with
  *          rtm support and on VM with rtm locking support.
- * @library /testlibrary /../../test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /compiler/testlibrary
  * @modules java.base/sun.misc
  *          java.management
  * @build TestRTMTotalCountIncrRateOptionOnSupportedConfig
--- a/test/compiler/rtm/cli/TestRTMTotalCountIncrRateOptionOnUnsupportedConfig.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/rtm/cli/TestRTMTotalCountIncrRateOptionOnUnsupportedConfig.java	Thu Oct 29 12:04:04 2015 -0700
@@ -32,7 +32,7 @@
  * @bug 8031320
  * @summary Verify RTMTotalCountIncrRate option processing on CPU without
  *          rtm support and/or on VM without rtm locking support.
- * @library /testlibrary /../../test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /compiler/testlibrary
  * @modules java.base/sun.misc
  *          java.management
  * @build TestRTMTotalCountIncrRateOptionOnUnsupportedConfig
--- a/test/compiler/rtm/cli/TestUseRTMDeoptOptionOnSupportedConfig.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/rtm/cli/TestUseRTMDeoptOptionOnSupportedConfig.java	Thu Oct 29 12:04:04 2015 -0700
@@ -27,7 +27,7 @@
  * @bug 8031320
  * @summary Verify UseRTMDeopt option processing on CPUs with rtm support
  *          when rtm locking is supported by VM.
- * @library /testlibrary /../../test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /compiler/testlibrary
  * @modules java.base/sun.misc
  *          java.management
  * @build TestUseRTMDeoptOptionOnSupportedConfig
--- a/test/compiler/rtm/cli/TestUseRTMDeoptOptionOnUnsupportedConfig.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/rtm/cli/TestUseRTMDeoptOptionOnUnsupportedConfig.java	Thu Oct 29 12:04:04 2015 -0700
@@ -27,7 +27,7 @@
  * @bug 8031320
  * @summary Verify UseRTMDeopt option processing on CPUs without rtm support
  *          or on VMs without rtm locking support.
- * @library /testlibrary /../../test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /compiler/testlibrary
  * @modules java.base/sun.misc
  *          java.management
  * @build TestUseRTMDeoptOptionOnUnsupportedConfig
--- a/test/compiler/rtm/cli/TestUseRTMForStackLocksOptionOnSupportedConfig.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/rtm/cli/TestUseRTMForStackLocksOptionOnSupportedConfig.java	Thu Oct 29 12:04:04 2015 -0700
@@ -27,7 +27,7 @@
  * @bug 8031320
  * @summary Verify UseRTMForStackLocks option processing on CPU with
  *          rtm support when VM supports rtm locking.
- * @library /testlibrary /../../test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /compiler/testlibrary
  * @modules java.base/sun.misc
  *          java.management
  * @build TestUseRTMForStackLocksOptionOnSupportedConfig
--- a/test/compiler/rtm/cli/TestUseRTMForStackLocksOptionOnUnsupportedConfig.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/rtm/cli/TestUseRTMForStackLocksOptionOnUnsupportedConfig.java	Thu Oct 29 12:04:04 2015 -0700
@@ -27,7 +27,7 @@
  * @bug 8031320
  * @summary Verify UseRTMForStackLocks option processing on CPUs without
  *          rtm support and/or on VMs without rtm locking support.
- * @library /testlibrary /../../test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /compiler/testlibrary
  * @modules java.base/sun.misc
  *          java.management
  * @build TestUseRTMForStackLocksOptionOnUnsupportedConfig
--- a/test/compiler/rtm/cli/TestUseRTMLockingOptionOnSupportedConfig.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/rtm/cli/TestUseRTMLockingOptionOnSupportedConfig.java	Thu Oct 29 12:04:04 2015 -0700
@@ -27,7 +27,7 @@
  * @bug 8031320
  * @summary Verify UseRTMLocking option processing on CPU with rtm support and
  *          on VM with rtm-locking support.
- * @library /testlibrary /../../test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /compiler/testlibrary
  * @modules java.base/sun.misc
  *          java.management
  * @build TestUseRTMLockingOptionOnSupportedConfig
--- a/test/compiler/rtm/cli/TestUseRTMLockingOptionOnUnsupportedCPU.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/rtm/cli/TestUseRTMLockingOptionOnUnsupportedCPU.java	Thu Oct 29 12:04:04 2015 -0700
@@ -27,7 +27,7 @@
  * @bug 8031320
  * @summary Verify UseRTMLocking option processing on CPU without
  *          rtm support.
- * @library /testlibrary /../../test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /compiler/testlibrary
  * @modules java.base/sun.misc
  *          java.management
  * @build TestUseRTMLockingOptionOnUnsupportedCPU
--- a/test/compiler/rtm/cli/TestUseRTMLockingOptionOnUnsupportedVM.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/rtm/cli/TestUseRTMLockingOptionOnUnsupportedVM.java	Thu Oct 29 12:04:04 2015 -0700
@@ -27,7 +27,7 @@
  * @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 /compiler/testlibrary
+ * @library /testlibrary /test/lib /compiler/testlibrary
  * @modules java.base/sun.misc
  *          java.management
  * @build TestUseRTMLockingOptionOnUnsupportedVM
--- a/test/compiler/rtm/cli/TestUseRTMLockingOptionWithBiasedLocking.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/rtm/cli/TestUseRTMLockingOptionWithBiasedLocking.java	Thu Oct 29 12:04:04 2015 -0700
@@ -27,7 +27,7 @@
  * @bug 8031320
  * @summary Verify processing of UseRTMLocking and UseBiasedLocking
  *          options combination on CPU and VM with rtm support.
- * @library /testlibrary /../../test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /compiler/testlibrary
  * @modules java.base/sun.misc
  *          java.management
  * @build TestUseRTMLockingOptionWithBiasedLocking
--- a/test/compiler/rtm/locking/TestRTMAbortRatio.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/rtm/locking/TestRTMAbortRatio.java	Thu Oct 29 12:04:04 2015 -0700
@@ -27,7 +27,7 @@
  * @bug 8031320
  * @summary Verify that RTMAbortRatio affects amount of aborts before
  *          deoptimization.
- * @library /testlibrary /../../test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /compiler/testlibrary
  * @modules java.base/sun.misc
  *          java.management
  * @build TestRTMAbortRatio
--- a/test/compiler/rtm/locking/TestRTMAbortThreshold.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/rtm/locking/TestRTMAbortThreshold.java	Thu Oct 29 12:04:04 2015 -0700
@@ -27,7 +27,7 @@
  * @bug 8031320
  * @summary Verify that RTMAbortThreshold option affects
  *          amount of aborts after which abort ratio is calculated.
- * @library /testlibrary /../../test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /compiler/testlibrary
  * @modules java.base/sun.misc
  *          java.management
  * @build TestRTMAbortThreshold
--- a/test/compiler/rtm/locking/TestRTMAfterNonRTMDeopt.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/rtm/locking/TestRTMAfterNonRTMDeopt.java	Thu Oct 29 12:04:04 2015 -0700
@@ -29,7 +29,7 @@
  *          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 /compiler/testlibrary
+ * @library /testlibrary /test/lib /compiler/testlibrary
  * @modules java.base/sun.misc
  *          java.management
  * @build TestRTMAfterNonRTMDeopt
--- a/test/compiler/rtm/locking/TestRTMDeoptOnHighAbortRatio.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/rtm/locking/TestRTMDeoptOnHighAbortRatio.java	Thu Oct 29 12:04:04 2015 -0700
@@ -27,7 +27,7 @@
  * @bug 8031320
  * @summary Verify that on high abort ratio method will be recompiled
  *          without rtm locking.
- * @library /testlibrary /../../test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /compiler/testlibrary
  * @modules java.base/sun.misc
  *          java.management
  * @build TestRTMDeoptOnHighAbortRatio
--- a/test/compiler/rtm/locking/TestRTMDeoptOnLowAbortRatio.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/rtm/locking/TestRTMDeoptOnLowAbortRatio.java	Thu Oct 29 12:04:04 2015 -0700
@@ -26,7 +26,7 @@
  * @test
  * @bug 8031320
  * @summary Verify that on low abort ratio method will be recompiled.
- * @library /testlibrary /../../test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /compiler/testlibrary
  * @modules java.base/sun.misc
  *          java.management
  * @build TestRTMDeoptOnLowAbortRatio
--- a/test/compiler/rtm/locking/TestRTMLockingCalculationDelay.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/rtm/locking/TestRTMLockingCalculationDelay.java	Thu Oct 29 12:04:04 2015 -0700
@@ -27,7 +27,7 @@
  * @bug 8031320
  * @summary Verify that RTMLockingCalculationDelay affect when
  *          abort ratio calculation is started.
- * @library /testlibrary /../../test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /compiler/testlibrary
  * @modules java.base/sun.misc
  *          java.management
  * @build TestRTMLockingCalculationDelay
--- a/test/compiler/rtm/locking/TestRTMLockingThreshold.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/rtm/locking/TestRTMLockingThreshold.java	Thu Oct 29 12:04:04 2015 -0700
@@ -27,7 +27,7 @@
  * @bug 8031320
  * @summary Verify that RTMLockingThreshold affects rtm state transition
  *          ProfileRTM => UseRTM.
- * @library /testlibrary /../../test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /compiler/testlibrary
  * @modules java.base/sun.misc
  *          java.management
  * @build TestRTMLockingThreshold
--- a/test/compiler/rtm/locking/TestRTMRetryCount.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/rtm/locking/TestRTMRetryCount.java	Thu Oct 29 12:04:04 2015 -0700
@@ -26,7 +26,7 @@
  * @test
  * @bug 8031320
  * @summary Verify that RTMRetryCount affects actual amount of retries.
- * @library /testlibrary /../../test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /compiler/testlibrary
  * @modules java.base/sun.misc
  *          java.management
  * @build TestRTMRetryCount
--- a/test/compiler/rtm/locking/TestRTMSpinLoopCount.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/rtm/locking/TestRTMSpinLoopCount.java	Thu Oct 29 12:04:04 2015 -0700
@@ -27,7 +27,7 @@
  * @bug 8031320
  * @summary Verify that RTMSpinLoopCount affects time spent
  *          between locking attempts.
- * @library /testlibrary /../../test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /compiler/testlibrary
  * @modules java.base/sun.misc
  *          java.management
  * @build TestRTMSpinLoopCount
--- a/test/compiler/rtm/locking/TestRTMTotalCountIncrRate.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/rtm/locking/TestRTMTotalCountIncrRate.java	Thu Oct 29 12:04:04 2015 -0700
@@ -27,7 +27,7 @@
  * @bug 8031320
  * @summary Verify that RTMTotalCountIncrRate option affects
  *          RTM locking statistics.
- * @library /testlibrary /../../test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /compiler/testlibrary
  * @modules java.base/sun.misc
  *          java.management
  * @build TestRTMTotalCountIncrRate
--- a/test/compiler/rtm/locking/TestUseRTMAfterLockInflation.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/rtm/locking/TestUseRTMAfterLockInflation.java	Thu Oct 29 12:04:04 2015 -0700
@@ -27,7 +27,7 @@
  * @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 /compiler/testlibrary
+ * @library /testlibrary /test/lib /compiler/testlibrary
  * @modules java.base/sun.misc
  *          java.management
  * @build TestUseRTMAfterLockInflation
--- a/test/compiler/rtm/locking/TestUseRTMDeopt.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/rtm/locking/TestUseRTMDeopt.java	Thu Oct 29 12:04:04 2015 -0700
@@ -27,7 +27,7 @@
  * @bug 8031320
  * @summary Verify that UseRTMDeopt affects uncommon trap installation in
  *          copmpiled methods with synchronized block.
- * @library /testlibrary /../../test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /compiler/testlibrary
  * @modules java.base/sun.misc
  *          java.management
  * @build TestUseRTMDeopt
--- a/test/compiler/rtm/locking/TestUseRTMForInflatedLocks.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/rtm/locking/TestUseRTMForInflatedLocks.java	Thu Oct 29 12:04:04 2015 -0700
@@ -26,7 +26,7 @@
  * @test
  * @bug 8031320
  * @summary Verify that rtm locking is used for inflated locks.
- * @library /testlibrary /../../test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /compiler/testlibrary
  * @modules java.base/sun.misc
  *          java.management
  * @build TestUseRTMForInflatedLocks
--- a/test/compiler/rtm/locking/TestUseRTMForStackLocks.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/rtm/locking/TestUseRTMForStackLocks.java	Thu Oct 29 12:04:04 2015 -0700
@@ -26,7 +26,7 @@
  * @test
  * @bug 8031320
  * @summary Verify that rtm locking is used for stack locks.
- * @library /testlibrary /../../test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /compiler/testlibrary
  * @modules java.base/sun.misc
  *          java.management
  * @build TestUseRTMForStackLocks
--- a/test/compiler/rtm/locking/TestUseRTMXendForLockBusy.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/rtm/locking/TestUseRTMXendForLockBusy.java	Thu Oct 29 12:04:04 2015 -0700
@@ -27,7 +27,7 @@
  * @bug 8031320
  * @summary Verify that UseRTMXendForLockBusy option affects
  *          method behaviour if lock is busy.
- * @library /testlibrary /../../test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /compiler/testlibrary
  * @modules java.base/sun.misc
  *          java.management
  * @build TestUseRTMXendForLockBusy
--- a/test/compiler/rtm/method_options/TestNoRTMLockElidingOption.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/rtm/method_options/TestNoRTMLockElidingOption.java	Thu Oct 29 12:04:04 2015 -0700
@@ -27,7 +27,7 @@
  * @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 /compiler/testlibrary
+ * @library /testlibrary /test/lib /compiler/testlibrary
  * @modules java.base/sun.misc
  *          java.management
  * @build TestNoRTMLockElidingOption
--- a/test/compiler/rtm/method_options/TestUseRTMLockElidingOption.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/rtm/method_options/TestUseRTMLockElidingOption.java	Thu Oct 29 12:04:04 2015 -0700
@@ -28,7 +28,7 @@
  * @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 /compiler/testlibrary
+ * @library /testlibrary /test/lib /compiler/testlibrary
  * @modules java.base/sun.misc
  *          java.management
  * @build TestUseRTMLockElidingOption
--- a/test/compiler/rtm/print/TestPrintPreciseRTMLockingStatistics.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/rtm/print/TestPrintPreciseRTMLockingStatistics.java	Thu Oct 29 12:04:04 2015 -0700
@@ -29,7 +29,7 @@
  *          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 /compiler/testlibrary
+ * @library /testlibrary /test/lib /compiler/testlibrary
  * @modules java.base/sun.misc
  *          java.management
  * @build TestPrintPreciseRTMLockingStatistics
--- a/test/compiler/runtime/8010927/Test8010927.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/runtime/8010927/Test8010927.java	Thu Oct 29 12:04:04 2015 -0700
@@ -25,7 +25,7 @@
  * @test
  * @bug 8010927
  * @summary Kitchensink crashed with SIGSEGV, Problematic frame: v ~StubRoutines::checkcast_arraycopy
- * @library /../../test/lib /testlibrary
+ * @library /test/lib /testlibrary
  * @modules java.base/sun.misc
  * @build Test8010927
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/stable/TestStableBoolean.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/stable/TestStableBoolean.java	Thu Oct 29 12:04:04 2015 -0700
@@ -26,7 +26,7 @@
 /*
  * @test TestStableBoolean
  * @summary tests on stable fields and arrays
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @build TestStableBoolean StableConfiguration sun.hotspot.WhiteBox
  * @run main ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main ClassFileInstaller
--- a/test/compiler/stable/TestStableByte.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/stable/TestStableByte.java	Thu Oct 29 12:04:04 2015 -0700
@@ -26,7 +26,7 @@
 /*
  * @test TestStableByte
  * @summary tests on stable fields and arrays
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @build TestStableByte StableConfiguration sun.hotspot.WhiteBox
  * @run main ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main ClassFileInstaller
--- a/test/compiler/stable/TestStableChar.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/stable/TestStableChar.java	Thu Oct 29 12:04:04 2015 -0700
@@ -26,7 +26,7 @@
 /*
  * @test TestStableChar
  * @summary tests on stable fields and arrays
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @build TestStableChar StableConfiguration sun.hotspot.WhiteBox
  * @run main ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main ClassFileInstaller
--- a/test/compiler/stable/TestStableDouble.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/stable/TestStableDouble.java	Thu Oct 29 12:04:04 2015 -0700
@@ -26,7 +26,7 @@
 /*
  * @test TestStableDouble
  * @summary tests on stable fields and arrays
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @build TestStableDouble StableConfiguration sun.hotspot.WhiteBox
  * @run main ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main ClassFileInstaller
--- a/test/compiler/stable/TestStableFloat.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/stable/TestStableFloat.java	Thu Oct 29 12:04:04 2015 -0700
@@ -26,7 +26,7 @@
 /*
  * @test TestStableFloat
  * @summary tests on stable fields and arrays
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @build TestStableFloat StableConfiguration sun.hotspot.WhiteBox
  * @run main ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main ClassFileInstaller
--- a/test/compiler/stable/TestStableInt.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/stable/TestStableInt.java	Thu Oct 29 12:04:04 2015 -0700
@@ -26,7 +26,7 @@
 /*
  * @test TestStableInt
  * @summary tests on stable fields and arrays
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @build TestStableInt StableConfiguration sun.hotspot.WhiteBox
  * @run main ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main ClassFileInstaller
--- a/test/compiler/stable/TestStableLong.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/stable/TestStableLong.java	Thu Oct 29 12:04:04 2015 -0700
@@ -26,7 +26,7 @@
 /*
  * @test TestStableLong
  * @summary tests on stable fields and arrays
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @build TestStableLong StableConfiguration sun.hotspot.WhiteBox
  * @run main ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main ClassFileInstaller
--- a/test/compiler/stable/TestStableObject.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/stable/TestStableObject.java	Thu Oct 29 12:04:04 2015 -0700
@@ -26,7 +26,7 @@
 /*
  * @test TestStableObject
  * @summary tests on stable fields and arrays
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @build TestStableObject StableConfiguration sun.hotspot.WhiteBox
  * @run main ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main ClassFileInstaller
--- a/test/compiler/stable/TestStableShort.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/stable/TestStableShort.java	Thu Oct 29 12:04:04 2015 -0700
@@ -26,7 +26,7 @@
 /*
  * @test TestStableShort
  * @summary tests on stable fields and arrays
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @build TestStableShort StableConfiguration sun.hotspot.WhiteBox
  * @run main ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main ClassFileInstaller
--- a/test/compiler/tiered/ConstantGettersTransitionsTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/tiered/ConstantGettersTransitionsTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -26,7 +26,7 @@
 
 /**
  * @test ConstantGettersTransitionsTest
- * @library /testlibrary /../../test/lib /compiler/whitebox
+ * @library /testlibrary /test/lib /compiler/whitebox
  * @modules java.base/sun.misc
  *          java.management
  * @build TransitionsTestExecutor ConstantGettersTransitionsTest
--- a/test/compiler/tiered/LevelTransitionTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/tiered/LevelTransitionTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -28,7 +28,7 @@
 
 /**
  * @test LevelTransitionTest
- * @library /testlibrary /../../test/lib /compiler/whitebox
+ * @library /testlibrary /test/lib /compiler/whitebox
  * @modules java.base/sun.misc
  *          java.management
  * @ignore 8067651
--- a/test/compiler/tiered/NonTieredLevelsTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/tiered/NonTieredLevelsTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -25,7 +25,7 @@
 
 /**
  * @test NonTieredLevelsTest
- * @library /testlibrary /../../test/lib /compiler/whitebox
+ * @library /testlibrary /test/lib /compiler/whitebox
  * @modules java.management
  * @build NonTieredLevelsTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/tiered/TieredLevelsTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/tiered/TieredLevelsTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -23,7 +23,7 @@
 
 /**
  * @test TieredLevelsTest
- * @library /testlibrary /../../test/lib /compiler/whitebox
+ * @library /testlibrary /test/lib /compiler/whitebox
  * @modules java.management
  * @build TieredLevelsTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/types/correctness/CorrectnessTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/types/correctness/CorrectnessTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -24,7 +24,7 @@
 /*
  * @test CorrectnessTest
  * @bug 8038418
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @ignore 8066173
--- a/test/compiler/types/correctness/OffTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/types/correctness/OffTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -24,7 +24,7 @@
 /*
  * @test CorrectnessTest
  * @bug 8038418
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @ignore 8066173
--- a/test/compiler/uncommontrap/8009761/Test8009761.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/uncommontrap/8009761/Test8009761.java	Thu Oct 29 12:04:04 2015 -0700
@@ -27,7 +27,7 @@
 /*
  * @test
  * @bug 8009761
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @summary Deoptimization on sparc doesn't set Llast_SP correctly in the interpreter frames it creates
  * @build Test8009761
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/uncommontrap/TestUnstableIfTrap.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/uncommontrap/TestUnstableIfTrap.java	Thu Oct 29 12:04:04 2015 -0700
@@ -40,7 +40,7 @@
 /*
  * @test
  * @bug 8030976 8059226
- * @library /testlibrary /compiler/testlibrary /../../test/lib
+ * @library /testlibrary /compiler/testlibrary /test/lib
  * @modules java.base/jdk.internal.org.objectweb.asm
  *          java.base/sun.misc
  *          java.compiler
--- a/test/compiler/unsafe/UnsafeGetConstantField.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/unsafe/UnsafeGetConstantField.java	Thu Oct 29 12:04:04 2015 -0700
@@ -26,7 +26,7 @@
 /*
  * @test
  * @summary tests on constant folding of unsafe get operations
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @run main/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -Xbatch -XX:-TieredCompilation
  *                   -XX:+FoldStableValues
--- a/test/compiler/whitebox/AllocationCodeBlobTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/whitebox/AllocationCodeBlobTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -34,7 +34,7 @@
 /*
  * @test AllocationCodeBlobTest
  * @bug 8059624 8064669
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.management
  * @build AllocationCodeBlobTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/whitebox/ClearMethodStateTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/whitebox/ClearMethodStateTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -26,7 +26,7 @@
 /*
  * @test ClearMethodStateTest
  * @bug 8006683 8007288 8022832
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.management
  * @build ClearMethodStateTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/whitebox/DeoptimizeAllTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/whitebox/DeoptimizeAllTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -24,7 +24,7 @@
 /*
  * @test DeoptimizeAllTest
  * @bug 8006683 8007288 8022832
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.management
  * @build DeoptimizeAllTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/whitebox/DeoptimizeFramesTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/whitebox/DeoptimizeFramesTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -24,7 +24,7 @@
 /*
  * @test DeoptimizeFramesTest
  * @bug 8028595
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.management
  * @build DeoptimizeFramesTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/whitebox/DeoptimizeMethodTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/whitebox/DeoptimizeMethodTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -24,7 +24,7 @@
 /*
  * @test DeoptimizeMethodTest
  * @bug 8006683 8007288 8022832
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.management
  * @build DeoptimizeMethodTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/whitebox/DeoptimizeMultipleOSRTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/whitebox/DeoptimizeMultipleOSRTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -28,7 +28,7 @@
 /*
  * @test DeoptimizeMultipleOSRTest
  * @bug 8061817
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.management
  * @build DeoptimizeMultipleOSRTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/whitebox/EnqueueMethodForCompilationTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/whitebox/EnqueueMethodForCompilationTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -24,7 +24,7 @@
 /*
  * @test EnqueueMethodForCompilationTest
  * @bug 8006683 8007288 8022832
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.management
  * @build EnqueueMethodForCompilationTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/whitebox/ForceNMethodSweepTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/whitebox/ForceNMethodSweepTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -34,7 +34,7 @@
 /*
  * @test
  * @bug 8059624 8064669
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.management
  * @build ForceNMethodSweepTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/whitebox/GetCodeHeapEntriesTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/whitebox/GetCodeHeapEntriesTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -33,7 +33,7 @@
 /*
  * @test GetCodeHeapEntriesTest
  * @bug 8059624
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.management
  * @build GetCodeHeapEntriesTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/whitebox/GetNMethodTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/whitebox/GetNMethodTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -29,7 +29,7 @@
 /*
  * @test GetNMethodTest
  * @bug 8038240
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.management
  * @build GetNMethodTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/whitebox/IsMethodCompilableTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/whitebox/IsMethodCompilableTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -24,7 +24,7 @@
 /*
  * @test IsMethodCompilableTest
  * @bug 8007270 8006683 8007288 8022832
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build jdk.test.lib.* sun.hotspot.WhiteBox
--- a/test/compiler/whitebox/LockCompilationTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/whitebox/LockCompilationTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -24,7 +24,7 @@
 /*
  * @test LockCompilationTest
  * @bug 8059624
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.management
  * @build LockCompilationTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/whitebox/MakeMethodNotCompilableTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/whitebox/MakeMethodNotCompilableTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -24,7 +24,7 @@
 /*
  * @test MakeMethodNotCompilableTest
  * @bug 8012322 8006683 8007288 8022832
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.management
  * @build MakeMethodNotCompilableTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/whitebox/SetDontInlineMethodTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/whitebox/SetDontInlineMethodTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -24,7 +24,7 @@
 /*
  * @test SetDontInlineMethodTest
  * @bug 8006683 8007288 8022832
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.management
  * @build SetDontInlineMethodTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/compiler/whitebox/SetForceInlineMethodTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/compiler/whitebox/SetForceInlineMethodTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -24,7 +24,7 @@
 /*
  * @test SetForceInlineMethodTest
  * @bug 8006683 8007288 8022832
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.management
  * @build SetForceInlineMethodTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/gc/CondCardMark/Basic.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/gc/CondCardMark/Basic.java	Thu Oct 29 12:04:04 2015 -0700
@@ -26,7 +26,7 @@
  * @bug 8076987
  * @bug 8078438
  * @summary Verify UseCondCardMark works
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @build Basic
  * @run main/othervm -Xint Basic
  * @run main/othervm -Xint -XX:+UseCondCardMark Basic
--- a/test/gc/TestSmallHeap.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/gc/TestSmallHeap.java	Thu Oct 29 12:04:04 2015 -0700
@@ -29,7 +29,7 @@
  * @requires vm.compMode != "Xcomp"
  * @requires vm.opt.UseCompressedOops != false
  * @summary Verify that starting the VM with a small heap works
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.management/sun.management
  * @build TestSmallHeap
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/gc/arguments/TestCMSHeapSizeFlags.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/gc/arguments/TestCMSHeapSizeFlags.java	Thu Oct 29 12:04:04 2015 -0700
@@ -26,7 +26,7 @@
  * @key gc
  * @bug 8006088
  * @summary Tests argument processing for initial and maximum heap size for the CMS collector
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build TestCMSHeapSizeFlags TestMaxHeapSizeTools
--- a/test/gc/arguments/TestG1HeapSizeFlags.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/gc/arguments/TestG1HeapSizeFlags.java	Thu Oct 29 12:04:04 2015 -0700
@@ -26,7 +26,7 @@
  * @key gc
  * @bug 8006088
  * @summary Tests argument processing for initial and maximum heap size for the G1 collector
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build TestG1HeapSizeFlags TestMaxHeapSizeTools
--- a/test/gc/arguments/TestMinAndInitialSurvivorRatioFlags.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/gc/arguments/TestMinAndInitialSurvivorRatioFlags.java	Thu Oct 29 12:04:04 2015 -0700
@@ -25,7 +25,7 @@
  * @test TestMinAndInitialSurvivorRatioFlags
  * @key gc
  * @summary Verify that MinSurvivorRatio and InitialSurvivorRatio flags work
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build TestMinAndInitialSurvivorRatioFlags
--- a/test/gc/arguments/TestMinInitialErgonomics.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/gc/arguments/TestMinInitialErgonomics.java	Thu Oct 29 12:04:04 2015 -0700
@@ -26,7 +26,7 @@
  * @key gc
  * @bug 8006088
  * @summary Test ergonomics decisions related to minimum and initial heap size.
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build TestMinInitialErgonomics TestMaxHeapSizeTools
--- a/test/gc/arguments/TestNewRatioFlag.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/gc/arguments/TestNewRatioFlag.java	Thu Oct 29 12:04:04 2015 -0700
@@ -26,7 +26,7 @@
  * @key gc
  * @bug 8025166
  * @summary Verify that heap devided among generations according to NewRatio
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build TestNewRatioFlag
--- a/test/gc/arguments/TestNewSizeFlags.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/gc/arguments/TestNewSizeFlags.java	Thu Oct 29 12:04:04 2015 -0700
@@ -26,7 +26,7 @@
  * @key gc
  * @bug 8025166
  * @summary Verify that young gen size conforms values specified by NewSize, MaxNewSize and Xmn options
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build TestNewSizeFlags
--- a/test/gc/arguments/TestParallelHeapSizeFlags.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/gc/arguments/TestParallelHeapSizeFlags.java	Thu Oct 29 12:04:04 2015 -0700
@@ -27,7 +27,7 @@
  * @bug 8006088
  * @summary Tests argument processing for initial and maximum heap size for the
  * parallel collectors.
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build TestParallelHeapSizeFlags TestMaxHeapSizeTools
--- a/test/gc/arguments/TestSerialHeapSizeFlags.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/gc/arguments/TestSerialHeapSizeFlags.java	Thu Oct 29 12:04:04 2015 -0700
@@ -26,7 +26,7 @@
  * @key gc
  * @bug 8006088
  * @summary Tests argument processing for initial and maximum heap size for the Serial collector
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build TestSerialHeapSizeFlags TestMaxHeapSizeTools
--- a/test/gc/arguments/TestSurvivorRatioFlag.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/gc/arguments/TestSurvivorRatioFlag.java	Thu Oct 29 12:04:04 2015 -0700
@@ -25,7 +25,7 @@
  * @test TestSurvivorRatioFlag
  * @key gc
  * @summary Verify that actual survivor ratio is equal to specified SurvivorRatio value
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build TestSurvivorRatioFlag
--- a/test/gc/arguments/TestTargetSurvivorRatioFlag.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/gc/arguments/TestTargetSurvivorRatioFlag.java	Thu Oct 29 12:04:04 2015 -0700
@@ -25,7 +25,7 @@
  * @test TestTargetSurvivorRatioFlag
  * @key gc
  * @summary Verify that option TargetSurvivorRatio affects survivor space occupancy after minor GC.
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build TestTargetSurvivorRatioFlag
--- a/test/gc/arguments/TestUseCompressedOopsErgo.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/gc/arguments/TestUseCompressedOopsErgo.java	Thu Oct 29 12:04:04 2015 -0700
@@ -26,7 +26,7 @@
  * @key gc
  * @bug 8010722
  * @summary Tests ergonomics for UseCompressedOops.
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management/sun.management
  * @build TestUseCompressedOopsErgo TestUseCompressedOopsErgoTools
--- a/test/gc/class_unloading/TestCMSClassUnloadingEnabledHWM.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/gc/class_unloading/TestCMSClassUnloadingEnabledHWM.java	Thu Oct 29 12:04:04 2015 -0700
@@ -25,7 +25,7 @@
  * @test
  * @key gc
  * @bug 8049831
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build TestCMSClassUnloadingEnabledHWM
--- a/test/gc/class_unloading/TestG1ClassUnloadingHWM.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/gc/class_unloading/TestG1ClassUnloadingHWM.java	Thu Oct 29 12:04:04 2015 -0700
@@ -25,7 +25,7 @@
  * @test
  * @key gc
  * @bug 8049831
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build TestG1ClassUnloadingHWM
--- a/test/gc/g1/TestHumongousCodeCacheRoots.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/gc/g1/TestHumongousCodeCacheRoots.java	Thu Oct 29 12:04:04 2015 -0700
@@ -26,7 +26,7 @@
  * @key regression
  * @key gc
  * @bug 8027756
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build TestHumongousCodeCacheRoots
--- a/test/gc/g1/TestLargePageUseForAuxMemory.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/gc/g1/TestLargePageUseForAuxMemory.java	Thu Oct 29 12:04:04 2015 -0700
@@ -26,7 +26,7 @@
  * @summary Test that auxiliary data structures are allocated using large pages if available.
  * @bug 8058354 8079208
  * @key gc
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @requires (vm.gc=="G1" | vm.gc=="null")
  * @build jdk.test.lib.* sun.hotspot.WhiteBox
  * @build TestLargePageUseForAuxMemory
--- a/test/gc/g1/TestShrinkAuxiliaryData00.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/gc/g1/TestShrinkAuxiliaryData00.java	Thu Oct 29 12:04:04 2015 -0700
@@ -27,7 +27,7 @@
  * @summary Checks that decommitment occurs for JVM with different
  * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values
  * @requires vm.gc=="G1" | vm.gc=="null"
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build jdk.test.lib.* sun.hotspot.WhiteBox
--- a/test/gc/g1/TestShrinkAuxiliaryData05.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/gc/g1/TestShrinkAuxiliaryData05.java	Thu Oct 29 12:04:04 2015 -0700
@@ -27,7 +27,7 @@
  * @summary Checks that decommitment occurs for JVM with different
  * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values
  * @requires vm.gc=="G1" | vm.gc=="null"
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build jdk.test.lib.* sun.hotspot.WhiteBox
--- a/test/gc/g1/TestShrinkAuxiliaryData10.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/gc/g1/TestShrinkAuxiliaryData10.java	Thu Oct 29 12:04:04 2015 -0700
@@ -27,7 +27,7 @@
  * @summary Checks that decommitment occurs for JVM with different
  * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values
  * @requires vm.gc=="G1" | vm.gc=="null"
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build jdk.test.lib.* sun.hotspot.WhiteBox
--- a/test/gc/g1/TestShrinkAuxiliaryData15.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/gc/g1/TestShrinkAuxiliaryData15.java	Thu Oct 29 12:04:04 2015 -0700
@@ -27,7 +27,7 @@
  * @summary Checks that decommitment occurs for JVM with different
  * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values
  * @requires vm.gc=="G1" | vm.gc=="null"
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build jdk.test.lib.* sun.hotspot.WhiteBox
--- a/test/gc/g1/TestShrinkAuxiliaryData20.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/gc/g1/TestShrinkAuxiliaryData20.java	Thu Oct 29 12:04:04 2015 -0700
@@ -27,7 +27,7 @@
  * @summary Checks that decommitment occurs for JVM with different
  * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values
  * @requires vm.gc=="G1" | vm.gc=="null"
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
   *          java.management
  * @build jdk.test.lib.* sun.hotspot.WhiteBox
--- a/test/gc/g1/TestShrinkAuxiliaryData25.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/gc/g1/TestShrinkAuxiliaryData25.java	Thu Oct 29 12:04:04 2015 -0700
@@ -27,7 +27,7 @@
  * @summary Checks that decommitment occurs for JVM with different
  * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values
  * @requires vm.gc=="G1" | vm.gc=="null"
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build jdk.test.lib.* sun.hotspot.WhiteBox
--- a/test/gc/g1/TestShrinkAuxiliaryData30.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/gc/g1/TestShrinkAuxiliaryData30.java	Thu Oct 29 12:04:04 2015 -0700
@@ -27,7 +27,7 @@
  * @summary Checks that decommitment occurs for JVM with different
  * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values
  * @requires vm.gc=="G1" | vm.gc=="null"
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build jdk.test.lib.* sun.hotspot.WhiteBox
--- a/test/gc/g1/humongousObjects/TestHumongousThreshold.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/gc/g1/humongousObjects/TestHumongousThreshold.java	Thu Oct 29 12:04:04 2015 -0700
@@ -31,7 +31,7 @@
  * @test TestHumongousThreshold
  * @summary Checks that objects larger than half a region are allocated as humongous
  * @requires vm.gc=="G1" | vm.gc=="null"
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.management
  * @build sun.hotspot.WhiteBox
  *        gc.g1.humongousObjects.Helpers
--- a/test/gc/g1/mixedgc/TestLogging.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/gc/g1/mixedgc/TestLogging.java	Thu Oct 29 12:04:04 2015 -0700
@@ -25,7 +25,7 @@
  * @test TestLogging
  * @summary Check that a mixed GC is reflected in the gc logs
  * @requires vm.gc=="G1" | vm.gc=="null"
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @ignore 8138607
  * @modules java.management
  * @build sun.hotspot.WhiteBox gc.g1.mixedgc.TestLogging
--- a/test/gc/metaspace/TestCapacityUntilGCWrapAround.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/gc/metaspace/TestCapacityUntilGCWrapAround.java	Thu Oct 29 12:04:04 2015 -0700
@@ -25,7 +25,7 @@
  * @test
  * @key gc
  * @bug 8049831
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build TestCapacityUntilGCWrapAround
--- a/test/gc/survivorAlignment/TestAllocationInEden.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/gc/survivorAlignment/TestAllocationInEden.java	Thu Oct 29 12:04:04 2015 -0700
@@ -26,7 +26,7 @@
  * @bug 8031323
  * @summary Verify that object's alignment in eden space is not affected by
  *          SurvivorAlignmentInBytes option.
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build TestAllocationInEden SurvivorAlignmentTestMain AlignmentHelper
--- a/test/gc/survivorAlignment/TestPromotionFromEdenToTenured.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/gc/survivorAlignment/TestPromotionFromEdenToTenured.java	Thu Oct 29 12:04:04 2015 -0700
@@ -26,7 +26,7 @@
  * @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 /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build TestPromotionFromEdenToTenured SurvivorAlignmentTestMain
--- a/test/gc/survivorAlignment/TestPromotionFromSurvivorToTenuredAfterFullGC.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/gc/survivorAlignment/TestPromotionFromSurvivorToTenuredAfterFullGC.java	Thu Oct 29 12:04:04 2015 -0700
@@ -26,7 +26,7 @@
  * @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 /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build TestPromotionFromSurvivorToTenuredAfterFullGC
--- a/test/gc/survivorAlignment/TestPromotionFromSurvivorToTenuredAfterMinorGC.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/gc/survivorAlignment/TestPromotionFromSurvivorToTenuredAfterMinorGC.java	Thu Oct 29 12:04:04 2015 -0700
@@ -27,7 +27,7 @@
  * @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 /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build TestPromotionFromSurvivorToTenuredAfterMinorGC
--- a/test/gc/survivorAlignment/TestPromotionToSurvivor.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/gc/survivorAlignment/TestPromotionToSurvivor.java	Thu Oct 29 12:04:04 2015 -0700
@@ -26,7 +26,7 @@
  * @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 /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build TestPromotionToSurvivor
--- a/test/gc/whitebox/TestConcMarkCycleWB.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/gc/whitebox/TestConcMarkCycleWB.java	Thu Oct 29 12:04:04 2015 -0700
@@ -25,7 +25,7 @@
  * @test TestConMarkCycleWB
  * @bug 8065579
  * @requires vm.gc=="null" | vm.gc=="G1"
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.compiler
  *          java.management
--- a/test/gc/whitebox/TestWBGC.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/gc/whitebox/TestWBGC.java	Thu Oct 29 12:04:04 2015 -0700
@@ -25,7 +25,7 @@
  * @test TestWBGC
  * @bug 8055098
  * @summary Test verify that WB methods isObjectInOldGen and youngGC works correctly.
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build TestWBGC
--- a/test/runtime/ClassUnload/KeepAliveClass.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/runtime/ClassUnload/KeepAliveClass.java	Thu Oct 29 12:04:04 2015 -0700
@@ -24,7 +24,7 @@
 /*
  * @test KeepAliveClass
  * @summary This test case uses a java.lang.Class instance to keep a class alive.
- * @library /testlibrary /../../test/lib /runtime/testlibrary
+ * @library /testlibrary /test/lib /runtime/testlibrary
  * @library classes
  * @build KeepAliveClass test.Empty
  * @build ClassUnloadCommon
--- a/test/runtime/ClassUnload/KeepAliveClassLoader.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/runtime/ClassUnload/KeepAliveClassLoader.java	Thu Oct 29 12:04:04 2015 -0700
@@ -24,7 +24,7 @@
 /*
  * @test KeepAliveClassLoader
  * @summary This test case uses a java.lang.ClassLoader instance to keep a class alive.
- * @library /testlibrary /../../test/lib /runtime/testlibrary
+ * @library /testlibrary /test/lib /runtime/testlibrary
  * @library classes
  * @build KeepAliveClassLoader test.Empty
  * @build ClassUnloadCommon
--- a/test/runtime/ClassUnload/KeepAliveObject.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/runtime/ClassUnload/KeepAliveObject.java	Thu Oct 29 12:04:04 2015 -0700
@@ -24,7 +24,7 @@
 /*
  * @test KeepAliveObject
  * @summary This test case uses a class instance to keep the class alive.
- * @library /testlibrary /../../test/lib /runtime/testlibrary
+ * @library /testlibrary /test/lib /runtime/testlibrary
  * @library classes
  * @build KeepAliveObject test.Empty
  * @build ClassUnloadCommon
--- a/test/runtime/ClassUnload/KeepAliveSoftReference.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/runtime/ClassUnload/KeepAliveSoftReference.java	Thu Oct 29 12:04:04 2015 -0700
@@ -24,7 +24,7 @@
 /*
  * @test KeepAliveSoftReference
  * @summary This test case uses a java.lang.ref.SoftReference referencing a class instance to keep a class alive.
- * @library /testlibrary /../../test/lib /runtime/testlibrary
+ * @library /testlibrary /test/lib /runtime/testlibrary
  * @library classes
  * @build KeepAliveSoftReference test.Empty
  * @build ClassUnloadCommon
--- a/test/runtime/ClassUnload/UnloadTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/runtime/ClassUnload/UnloadTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -23,7 +23,7 @@
 
 /*
  * @test UnloadTest
- * @library /runtime/testlibrary /testlibrary /../../test/lib
+ * @library /runtime/testlibrary /testlibrary /test/lib
  * @library classes
  * @build ClassUnloadCommon test.Empty
  * @build UnloadTest
--- a/test/runtime/NMT/ChangeTrackingLevel.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/runtime/NMT/ChangeTrackingLevel.java	Thu Oct 29 12:04:04 2015 -0700
@@ -26,7 +26,7 @@
  * @bug 8059100
  * @summary Test that you can decrease NMT tracking level but not increase it.
  * @key nmt
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @build ChangeTrackingLevel
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
--- a/test/runtime/NMT/JcmdDetailDiff.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/runtime/NMT/JcmdDetailDiff.java	Thu Oct 29 12:04:04 2015 -0700
@@ -25,7 +25,7 @@
  * @test
  * @summary run NMT baseline, allocate memory and verify output from detail.diff
  * @key nmt jcmd
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build JcmdDetailDiff
--- a/test/runtime/NMT/JcmdSummaryDiff.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/runtime/NMT/JcmdSummaryDiff.java	Thu Oct 29 12:04:04 2015 -0700
@@ -25,7 +25,7 @@
  * @test
  * @summary run NMT baseline, allocate memory and verify output from summary.diff
  * @key nmt jcmd
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build JcmdSummaryDiff
--- a/test/runtime/NMT/MallocRoundingReportTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/runtime/NMT/MallocRoundingReportTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -25,7 +25,7 @@
  * @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 /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build MallocRoundingReportTest
--- a/test/runtime/NMT/MallocSiteHashOverflow.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/runtime/NMT/MallocSiteHashOverflow.java	Thu Oct 29 12:04:04 2015 -0700
@@ -26,7 +26,7 @@
  * @summary Test corner case that overflows malloc site hashtable bucket
  * @requires sun.arch.data.model == "32"
  * @key nmt jcmd stress
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @build MallocSiteHashOverflow
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail MallocSiteHashOverflow
--- a/test/runtime/NMT/MallocStressTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/runtime/NMT/MallocStressTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -25,7 +25,7 @@
  * @test
  * @summary Stress test for malloc tracking
  * @key nmt jcmd stress
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build MallocStressTest
--- a/test/runtime/NMT/MallocTestType.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/runtime/NMT/MallocTestType.java	Thu Oct 29 12:04:04 2015 -0700
@@ -25,7 +25,7 @@
  * @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 /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build MallocTestType
--- a/test/runtime/NMT/MallocTrackingVerify.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/runtime/NMT/MallocTrackingVerify.java	Thu Oct 29 12:04:04 2015 -0700
@@ -26,7 +26,7 @@
  * @bug 8054836
  * @summary Test to verify correctness of malloc tracking
  * @key nmt jcmd
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build MallocTrackingVerify
--- a/test/runtime/NMT/ReleaseCommittedMemory.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/runtime/NMT/ReleaseCommittedMemory.java	Thu Oct 29 12:04:04 2015 -0700
@@ -26,7 +26,7 @@
  * @bug 8013120
  * @summary Release committed memory and make sure NMT handles it correctly
  * @key nmt regression
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @build ReleaseCommittedMemory
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
--- a/test/runtime/NMT/ReleaseNoCommit.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/runtime/NMT/ReleaseNoCommit.java	Thu Oct 29 12:04:04 2015 -0700
@@ -25,7 +25,7 @@
  * @test
  * @summary Release uncommitted memory and make sure NMT handles it correctly
  * @key nmt regression
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build ReleaseNoCommit
--- a/test/runtime/NMT/SummarySanityCheck.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/runtime/NMT/SummarySanityCheck.java	Thu Oct 29 12:04:04 2015 -0700
@@ -25,7 +25,7 @@
  * @test
  * @key nmt jcmd
  * @summary Sanity check the output of NMT
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build SummarySanityCheck
--- a/test/runtime/NMT/ThreadedMallocTestType.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/runtime/NMT/ThreadedMallocTestType.java	Thu Oct 29 12:04:04 2015 -0700
@@ -24,7 +24,7 @@
 /*
  * @test
  * @key nmt jcmd
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build ThreadedMallocTestType
--- a/test/runtime/NMT/ThreadedVirtualAllocTestType.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/runtime/NMT/ThreadedVirtualAllocTestType.java	Thu Oct 29 12:04:04 2015 -0700
@@ -24,7 +24,7 @@
 /*
  * @test
  * @key nmt jcmd
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build ThreadedVirtualAllocTestType
--- a/test/runtime/NMT/VirtualAllocCommitUncommitRecommit.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/runtime/NMT/VirtualAllocCommitUncommitRecommit.java	Thu Oct 29 12:04:04 2015 -0700
@@ -25,7 +25,7 @@
  * @test
  * @summary Test reserve/commit/uncommit/release of virtual memory and that we track it correctly
  * @key nmt jcmd
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build VirtualAllocCommitUncommitRecommit
--- a/test/runtime/NMT/VirtualAllocTestType.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/runtime/NMT/VirtualAllocTestType.java	Thu Oct 29 12:04:04 2015 -0700
@@ -25,7 +25,7 @@
  * @test
  * @summary Test Reserve/Commit/Uncommit/Release of virtual memory and that we track it correctly
  * @key nmt jcmd
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build VirtualAllocTestType
--- a/test/runtime/Safepoint/AssertSafepointCheckConsistency1.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/runtime/Safepoint/AssertSafepointCheckConsistency1.java	Thu Oct 29 12:04:04 2015 -0700
@@ -25,7 +25,7 @@
  * @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 /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build AssertSafepointCheckConsistency1
--- a/test/runtime/Safepoint/AssertSafepointCheckConsistency2.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/runtime/Safepoint/AssertSafepointCheckConsistency2.java	Thu Oct 29 12:04:04 2015 -0700
@@ -25,7 +25,7 @@
  * @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 /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build AssertSafepointCheckConsistency2
--- a/test/runtime/Safepoint/AssertSafepointCheckConsistency3.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/runtime/Safepoint/AssertSafepointCheckConsistency3.java	Thu Oct 29 12:04:04 2015 -0700
@@ -25,7 +25,7 @@
  * @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 /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build AssertSafepointCheckConsistency3
--- a/test/runtime/Safepoint/AssertSafepointCheckConsistency4.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/runtime/Safepoint/AssertSafepointCheckConsistency4.java	Thu Oct 29 12:04:04 2015 -0700
@@ -25,7 +25,7 @@
  * @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 /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build AssertSafepointCheckConsistency4
--- a/test/runtime/SharedArchiveFile/SharedStrings.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/runtime/SharedArchiveFile/SharedStrings.java	Thu Oct 29 12:04:04 2015 -0700
@@ -29,7 +29,7 @@
  * @requires (sun.arch.data.model != "32") & (os.family != "windows")
  * @requires (vm.opt.UseCompressedOops == null) | (vm.opt.UseCompressedOops == true)
  * @requires (vm.gc=="G1" | vm.gc=="null")
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build SharedStringsWb SharedStrings BasicJarBuilder sun.hotspot.WhiteBox
--- a/test/runtime/interned/SanityTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/runtime/interned/SanityTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -24,7 +24,7 @@
 /*
  * @test SanityTest
  * @summary Sanity check of String.intern() & GC
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @build SanityTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
--- a/test/runtime/memory/ReadFromNoaccessArea.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/runtime/memory/ReadFromNoaccessArea.java	Thu Oct 29 12:04:04 2015 -0700
@@ -24,7 +24,7 @@
 /*
  * @test
  * @summary Test that touching noaccess area in class ReservedHeapSpace results in SIGSEGV/ACCESS_VIOLATION
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build ReadFromNoaccessArea
--- a/test/runtime/memory/ReadVMPageSize.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/runtime/memory/ReadVMPageSize.java	Thu Oct 29 12:04:04 2015 -0700
@@ -24,7 +24,7 @@
 /*
  * @test
  * @summary Using WhiteBox to get VM page size
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @build ReadVMPageSize
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  * @run main/othervm  -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI  ReadVMPageSize
--- a/test/runtime/memory/ReserveMemory.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/runtime/memory/ReserveMemory.java	Thu Oct 29 12:04:04 2015 -0700
@@ -26,7 +26,7 @@
  * @key regression
  * @bug 8012015
  * @summary Make sure reserved (but uncommitted) memory is not accessible
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build ReserveMemory
--- a/test/runtime/memory/RunUnitTestsConcurrently.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/runtime/memory/RunUnitTestsConcurrently.java	Thu Oct 29 12:04:04 2015 -0700
@@ -24,7 +24,7 @@
 /*
  * @test
  * @summary Test launches unit tests inside vm concurrently
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build RunUnitTestsConcurrently
--- a/test/runtime/memory/StressVirtualSpaceResize.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/runtime/memory/StressVirtualSpaceResize.java	Thu Oct 29 12:04:04 2015 -0700
@@ -24,7 +24,7 @@
 /*
  * @test
  * @summary Stress test that expands/shrinks VirtualSpace
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @build StressVirtualSpaceResize
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
--- a/test/runtime/whitebox/WBStackSize.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/runtime/whitebox/WBStackSize.java	Thu Oct 29 12:04:04 2015 -0700
@@ -24,7 +24,7 @@
 /*
  * @test WBStackSize
  * @summary verify that whitebox functions getThreadFullStackSize() and getThreadRemainingStackSize are working
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @build WBStackSize
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
--- a/test/sanity/WBApi.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/sanity/WBApi.java	Thu Oct 29 12:04:04 2015 -0700
@@ -24,7 +24,7 @@
 /*
  * @test WBApi
  * @summary verify that whitebox functions can be linked and executed
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @build WBApi
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
--- a/test/serviceability/ParserTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/serviceability/ParserTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -24,7 +24,7 @@
 /*
  * @test
  * @summary Test that the diagnostic command arguemnt parser works
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @build ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.parser.*
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
--- a/test/serviceability/dcmd/gc/HeapDumpAllTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/serviceability/dcmd/gc/HeapDumpAllTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -25,7 +25,7 @@
  * @test
  * @summary Test of diagnostic command GC.heap_dump -all=true
  * @library /testlibrary
- * @library /../../test/lib/share/classes
+ * @library /test/lib/share/classes
  * @modules java.base/sun.misc
  *          java.compiler
  *          java.management
--- a/test/serviceability/dcmd/gc/HeapDumpTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/serviceability/dcmd/gc/HeapDumpTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -41,7 +41,7 @@
  * @test
  * @summary Test of diagnostic command GC.heap_dump
  * @library /testlibrary
- * @library /../../test/lib/share/classes
+ * @library /test/lib/share/classes
  * @modules java.base/sun.misc
  *          java.compiler
  *          java.management
--- a/test/serviceability/sa/DeadlockDetectionTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/serviceability/sa/DeadlockDetectionTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -38,7 +38,7 @@
 /*
  * @test
  * @summary Test deadlock detection
- * @library /../../test/lib/share/classes
+ * @library /test/lib/share/classes
  * @library /testlibrary
  * @modules java.management
  * @build jdk.test.lib.*
--- a/test/serviceability/sa/TestClassLoaderStats.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/serviceability/sa/TestClassLoaderStats.java	Thu Oct 29 12:04:04 2015 -0700
@@ -32,7 +32,7 @@
 
 /*
  * @test
- * @library /../../test/lib/share/classes
+ * @library /test/lib/share/classes
  * @library /testlibrary
  * @build jdk.test.lib.*
  * @build jdk.test.lib.apps.*
--- a/test/serviceability/sa/TestStackTrace.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/serviceability/sa/TestStackTrace.java	Thu Oct 29 12:04:04 2015 -0700
@@ -32,7 +32,7 @@
 
 /*
  * @test
- * @library /../../test/lib/share/classes
+ * @library /test/lib/share/classes
  * @library /testlibrary
  * @build jdk.test.lib.*
  * @build jdk.test.lib.apps.*
--- a/test/testlibrary_tests/TestPlatformIsTieredSupported.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/testlibrary_tests/TestPlatformIsTieredSupported.java	Thu Oct 29 12:04:04 2015 -0700
@@ -28,7 +28,7 @@
 /**
  * @test
  * @summary Verifies that Platform::isTieredSupported returns correct value.
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management
  * @build TestPlatformIsTieredSupported
--- a/test/testlibrary_tests/ctw/ClassesDirTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/testlibrary_tests/ctw/ClassesDirTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -24,7 +24,7 @@
 /*
  * @test
  * @bug 8012447
- * @library /testlibrary /../../test/lib /testlibrary/ctw/src
+ * @library /testlibrary /test/lib /testlibrary/ctw/src
  * @modules java.base/sun.misc
  *          java.base/sun.reflect
  *          java.management
--- a/test/testlibrary_tests/ctw/ClassesListTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/testlibrary_tests/ctw/ClassesListTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -24,7 +24,7 @@
 /*
  * @test
  * @bug 8012447
- * @library /testlibrary /../../test/lib /testlibrary/ctw/src
+ * @library /testlibrary /test/lib /testlibrary/ctw/src
  * @modules java.base/sun.misc
  *          java.base/sun.reflect
  *          java.management
--- a/test/testlibrary_tests/ctw/JarDirTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/testlibrary_tests/ctw/JarDirTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -24,7 +24,7 @@
 /*
  * @test
  * @bug 8012447
- * @library /testlibrary /../../test/lib /testlibrary/ctw/src
+ * @library /testlibrary /test/lib /testlibrary/ctw/src
  * @modules java.base/sun.misc
  *          java.base/sun.reflect
  *          java.compiler
--- a/test/testlibrary_tests/ctw/JarsTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/testlibrary_tests/ctw/JarsTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -24,7 +24,7 @@
 /*
  * @test
  * @bug 8012447
- * @library /testlibrary /../../test/lib /testlibrary/ctw/src
+ * @library /testlibrary /test/lib /testlibrary/ctw/src
  * @modules java.base/sun.misc
  *          java.base/sun.reflect
  *          java.compiler
--- a/test/testlibrary_tests/whitebox/BlobSanityTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/testlibrary_tests/whitebox/BlobSanityTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -24,7 +24,7 @@
 /*
  * @test BlobSanityTest
  * @bug 8132980
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.management/sun.management
  * @build BlobSanityTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/testlibrary_tests/whitebox/vm_flags/BooleanTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/testlibrary_tests/whitebox/vm_flags/BooleanTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -24,7 +24,7 @@
 /*
  * @test BooleanTest
  * @bug 8028756
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.compiler
  *          java.management/sun.management
--- a/test/testlibrary_tests/whitebox/vm_flags/DoubleTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/testlibrary_tests/whitebox/vm_flags/DoubleTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -24,7 +24,7 @@
 /*
  * @test DoubleTest
  * @bug 8028756
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.management/sun.management
  * @build DoubleTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/testlibrary_tests/whitebox/vm_flags/IntxTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/testlibrary_tests/whitebox/vm_flags/IntxTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -24,7 +24,7 @@
 /*
  * @test IntxTest
  * @bug 8028756
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.management/sun.management
  * @build IntxTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/testlibrary_tests/whitebox/vm_flags/SizeTTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/testlibrary_tests/whitebox/vm_flags/SizeTTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -24,7 +24,7 @@
 /*
  * @test SizeTTest
  * @bug 8054823
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management/sun.management
  * @build SizeTTest
--- a/test/testlibrary_tests/whitebox/vm_flags/StringTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/testlibrary_tests/whitebox/vm_flags/StringTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -24,7 +24,7 @@
 /*
  * @test StringTest
  * @bug 8028756
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.management/sun.management
  * @build StringTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/testlibrary_tests/whitebox/vm_flags/Uint64Test.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/testlibrary_tests/whitebox/vm_flags/Uint64Test.java	Thu Oct 29 12:04:04 2015 -0700
@@ -24,7 +24,7 @@
 /*
  * @test Uint64Test
  * @bug 8028756
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.management/sun.management
  * @build Uint64Test
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/testlibrary_tests/whitebox/vm_flags/UintxTest.java	Thu Oct 29 18:59:22 2015 -0400
+++ b/test/testlibrary_tests/whitebox/vm_flags/UintxTest.java	Thu Oct 29 12:04:04 2015 -0700
@@ -24,7 +24,7 @@
 /*
  * @test UintxTest
  * @bug 8028756
- * @library /testlibrary /../../test/lib
+ * @library /testlibrary /test/lib
  * @modules java.base/sun.misc
  *          java.management/sun.management
  * @build UintxTest