--- old/test/compiler/8010927/Test8010927.java	2014-05-13 14:30:08.680856207 +0400
+++ new/test/compiler/8010927/Test8010927.java	2014-05-13 14:30:08.592854659 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,8 +27,7 @@
  * @summary Kitchensink crashed with SIGSEGV, Problematic frame: v ~StubRoutines::checkcast_arraycopy
  * @library /testlibrary/whitebox /testlibrary
  * @build Test8010927
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. -Xmx64m -XX:NewSize=20971520 -XX:MaxNewSize=32m -XX:-UseTLAB -XX:-UseParNewGC -XX:-UseAdaptiveSizePolicy Test8010927
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -Xmx64m -XX:NewSize=20971520 -XX:MaxNewSize=32m -XX:-UseTLAB -XX:-UseParNewGC -XX:-UseAdaptiveSizePolicy Test8010927
  */
 
 import sun.hotspot.WhiteBox;
--- old/test/compiler/arguments/TestUseBMI1InstructionsOnSupportedCPU.java	2014-05-13 14:30:09.116863877 +0400
+++ new/test/compiler/arguments/TestUseBMI1InstructionsOnSupportedCPU.java	2014-05-13 14:30:09.036862469 +0400
@@ -29,8 +29,7 @@
  * @library /testlibrary /testlibrary/whitebox
  * @build TestUseBMI1InstructionsOnSupportedCPU
  *        BMISupportedCPUTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI TestUseBMI1InstructionsOnSupportedCPU
  */
 
--- old/test/compiler/arguments/TestUseBMI1InstructionsOnUnsupportedCPU.java	2014-05-13 14:30:09.572871899 +0400
+++ new/test/compiler/arguments/TestUseBMI1InstructionsOnUnsupportedCPU.java	2014-05-13 14:30:09.500870632 +0400
@@ -29,8 +29,7 @@
  * @library /testlibrary /testlibrary/whitebox
  * @build TestUseBMI1InstructionsOnUnsupportedCPU
  *        BMIUnsupportedCPUTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI TestUseBMI1InstructionsOnUnsupportedCPU
  */
 
--- old/test/compiler/arguments/TestUseCountLeadingZerosInstructionOnSupportedCPU.java	2014-05-13 14:30:10.136881821 +0400
+++ new/test/compiler/arguments/TestUseCountLeadingZerosInstructionOnSupportedCPU.java	2014-05-13 14:30:10.036880062 +0400
@@ -29,8 +29,7 @@
  * @library /testlibrary /testlibrary/whitebox
  * @build TestUseCountLeadingZerosInstructionOnSupportedCPU
  *        BMISupportedCPUTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI
  *                   TestUseCountLeadingZerosInstructionOnSupportedCPU
  */
--- old/test/compiler/arguments/TestUseCountLeadingZerosInstructionOnUnsupportedCPU.java	2014-05-13 14:30:10.672891250 +0400
+++ new/test/compiler/arguments/TestUseCountLeadingZerosInstructionOnUnsupportedCPU.java	2014-05-13 14:30:10.584889702 +0400
@@ -29,8 +29,7 @@
  * @library /testlibrary /testlibrary/whitebox
  * @build TestUseCountLeadingZerosInstructionOnUnsupportedCPU
  *        BMIUnsupportedCPUTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI
  *                   TestUseCountLeadingZerosInstructionOnUnsupportedCPU
  */
--- old/test/compiler/arguments/TestUseCountTrailingZerosInstructionOnSupportedCPU.java	2014-05-13 14:30:11.188900328 +0400
+++ new/test/compiler/arguments/TestUseCountTrailingZerosInstructionOnSupportedCPU.java	2014-05-13 14:30:11.104898851 +0400
@@ -29,8 +29,7 @@
  * @library /testlibrary /testlibrary/whitebox
  * @build TestUseCountTrailingZerosInstructionOnSupportedCPU
  *        BMISupportedCPUTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI
  *                   TestUseCountTrailingZerosInstructionOnSupportedCPU
  */
--- old/test/compiler/arguments/TestUseCountTrailingZerosInstructionOnUnsupportedCPU.java	2014-05-13 14:30:11.700909335 +0400
+++ new/test/compiler/arguments/TestUseCountTrailingZerosInstructionOnUnsupportedCPU.java	2014-05-13 14:30:11.600907576 +0400
@@ -29,8 +29,7 @@
  * @library /testlibrary /testlibrary/whitebox
  * @build TestUseCountTrailingZerosInstructionOnUnsupportedCPU
  *        BMIUnsupportedCPUTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI
  *                   TestUseCountTrailingZerosInstructionOnUnsupportedCPU
  */
--- old/test/compiler/intrinsics/bmi/TestAndnI.java	2014-05-13 14:30:12.192917991 +0400
+++ new/test/compiler/intrinsics/bmi/TestAndnI.java	2014-05-13 14:30:12.120916724 +0400
@@ -29,8 +29,7 @@
  *          and w/o usage of ANDN instruction
  * @library /testlibrary /testlibrary/whitebox
  * @build TestAndnI BMITestRunner Expr
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI TestAndnI
  */
 
--- old/test/compiler/intrinsics/bmi/TestAndnL.java	2014-05-13 14:30:12.692926787 +0400
+++ new/test/compiler/intrinsics/bmi/TestAndnL.java	2014-05-13 14:30:12.600925168 +0400
@@ -29,8 +29,7 @@
  *          and w/o usage of ANDN instruction
  * @library /testlibrary /testlibrary/whitebox
  * @build TestAndnL BMITestRunner Expr
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI TestAndnL
  */
 
--- old/test/compiler/intrinsics/bmi/TestBlsiI.java	2014-05-13 14:30:13.248936568 +0400
+++ new/test/compiler/intrinsics/bmi/TestBlsiI.java	2014-05-13 14:30:13.148934809 +0400
@@ -29,8 +29,7 @@
  *          and w/o usage of BLSI instruction
  * @library /testlibrary /testlibrary/whitebox
  * @build TestBlsiI BMITestRunner Expr
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI TestBlsiI
  */
 
--- old/test/compiler/intrinsics/bmi/TestBlsiL.java	2014-05-13 14:30:13.824946701 +0400
+++ new/test/compiler/intrinsics/bmi/TestBlsiL.java	2014-05-13 14:30:13.744945294 +0400
@@ -29,8 +29,7 @@
  *          and w/o usage of BLSI instruction
  * @library /testlibrary /testlibrary/whitebox
  * @build TestBlsiL BMITestRunner Expr
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI TestBlsiL
  */
 
--- old/test/compiler/intrinsics/bmi/TestBlsmskI.java	2014-05-13 14:30:14.324955498 +0400
+++ new/test/compiler/intrinsics/bmi/TestBlsmskI.java	2014-05-13 14:30:14.240954020 +0400
@@ -29,8 +29,7 @@
  *          and w/o usage of BLSMSK instruction
  * @library /testlibrary /testlibrary/whitebox
  * @build TestBlsmskI BMITestRunner Expr
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI TestBlsmskI
  */
 
--- old/test/compiler/intrinsics/bmi/TestBlsmskL.java	2014-05-13 14:30:14.844964645 +0400
+++ new/test/compiler/intrinsics/bmi/TestBlsmskL.java	2014-05-13 14:30:14.748962956 +0400
@@ -29,8 +29,7 @@
  *          and w/o usage of BLSMSK instruction
  * @library /testlibrary /testlibrary/whitebox
  * @build TestBlsmskL BMITestRunner Expr
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI TestBlsmskL
  */
 
--- old/test/compiler/intrinsics/bmi/TestBlsrI.java	2014-05-13 14:30:15.380974075 +0400
+++ new/test/compiler/intrinsics/bmi/TestBlsrI.java	2014-05-13 14:30:15.272972175 +0400
@@ -29,8 +29,7 @@
  *          and w/o usage of BLSR instruction
  * @library /testlibrary /testlibrary/whitebox
  * @build TestBlsrI BMITestRunner Expr
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI TestBlsrI
  */
 
--- old/test/compiler/intrinsics/bmi/TestBlsrL.java	2014-05-13 14:30:15.960984278 +0400
+++ new/test/compiler/intrinsics/bmi/TestBlsrL.java	2014-05-13 14:30:15.856982449 +0400
@@ -29,8 +29,7 @@
  *          and w/o usage of BLSR instruction
  * @library /testlibrary /testlibrary/whitebox
  * @build TestBlsrL BMITestRunner Expr
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI TestBlsrL
  */
 
--- old/test/compiler/intrinsics/bmi/TestLzcntI.java	2014-05-13 14:30:16.456993004 +0400
+++ new/test/compiler/intrinsics/bmi/TestLzcntI.java	2014-05-13 14:30:16.356991245 +0400
@@ -29,8 +29,7 @@
  *          and w/o usage of intrinsic
  * @library /testlibrary /testlibrary/whitebox
  * @build TestLzcntI BMITestRunner Expr
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI TestLzcntI
  */
 
--- old/test/compiler/intrinsics/bmi/TestLzcntL.java	2014-05-13 14:30:16.977002152 +0400
+++ new/test/compiler/intrinsics/bmi/TestLzcntL.java	2014-05-13 14:30:16.881000463 +0400
@@ -29,8 +29,7 @@
  *          and w/o usage of intrinsic
  * @library /testlibrary /testlibrary/whitebox
  * @build TestLzcntL BMITestRunner Expr
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI TestLzcntL
  */
 
--- old/test/compiler/intrinsics/bmi/TestTzcntI.java	2014-05-13 14:30:17.457010596 +0400
+++ new/test/compiler/intrinsics/bmi/TestTzcntI.java	2014-05-13 14:30:17.361008908 +0400
@@ -29,8 +29,7 @@
  *          and w/o usage of intrinsic
  * @library /testlibrary /testlibrary/whitebox
  * @build TestTzcntI BMITestRunner Expr
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI TestTzcntI
  */
 
--- old/test/compiler/intrinsics/bmi/TestTzcntL.java	2014-05-13 14:30:17.969019603 +0400
+++ new/test/compiler/intrinsics/bmi/TestTzcntL.java	2014-05-13 14:30:17.877017985 +0400
@@ -29,8 +29,7 @@
  *          and w/o usage of intrinsic
  * @library /testlibrary /testlibrary/whitebox
  * @build TestTzcntL BMITestRunner Expr
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI TestTzcntL
  */
 
--- old/test/compiler/intrinsics/bmi/verifycode/AddnTestI.java	2014-05-13 14:30:18.457028188 +0400
+++ new/test/compiler/intrinsics/bmi/verifycode/AddnTestI.java	2014-05-13 14:30:18.389026992 +0400
@@ -26,8 +26,7 @@
  * @bug 8031321
  * @library /testlibrary /testlibrary/whitebox /compiler/whitebox ..
  * @build AddnTestI
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
+ * @run main/othervm/bootclasspath -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+UseBMI1Instructions AddnTestI
  */
 
--- old/test/compiler/intrinsics/bmi/verifycode/AddnTestL.java	2014-05-13 14:30:18.969037196 +0400
+++ new/test/compiler/intrinsics/bmi/verifycode/AddnTestL.java	2014-05-13 14:30:18.857035226 +0400
@@ -26,8 +26,7 @@
  * @bug 8031321
  * @library /testlibrary /testlibrary/whitebox /compiler/whitebox ..
  * @build AddnTestL
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
+ * @run main/othervm/bootclasspath -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+UseBMI1Instructions AddnTestL
  */
 
--- old/test/compiler/intrinsics/bmi/verifycode/BlsiTestI.java	2014-05-13 14:30:19.477046133 +0400
+++ new/test/compiler/intrinsics/bmi/verifycode/BlsiTestI.java	2014-05-13 14:30:19.393044655 +0400
@@ -26,8 +26,7 @@
  * @bug 8031321
  * @library /testlibrary /testlibrary/whitebox /compiler/whitebox ..
  * @build BlsiTestI
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
+ * @run main/othervm/bootclasspath -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+UseBMI1Instructions BlsiTestI
  */
 
--- old/test/compiler/intrinsics/bmi/verifycode/BlsiTestL.java	2014-05-13 14:30:20.037055985 +0400
+++ new/test/compiler/intrinsics/bmi/verifycode/BlsiTestL.java	2014-05-13 14:30:19.945054366 +0400
@@ -26,8 +26,7 @@
  * @bug 8031321
  * @library /testlibrary /testlibrary/whitebox /compiler/whitebox ..
  * @build BlsiTestL
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
+ * @run main/othervm/bootclasspath -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+UseBMI1Instructions BlsiTestL
  */
 
--- old/test/compiler/intrinsics/bmi/verifycode/BlsmskTestI.java	2014-05-13 14:30:20.541064851 +0400
+++ new/test/compiler/intrinsics/bmi/verifycode/BlsmskTestI.java	2014-05-13 14:30:20.437063021 +0400
@@ -26,8 +26,7 @@
  * @bug 8031321
  * @library /testlibrary /testlibrary/whitebox /compiler/whitebox ..
  * @build BlsmskTestI
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
+ * @run main/othervm/bootclasspath -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+UseBMI1Instructions BlsmskTestI
  */
 
--- old/test/compiler/intrinsics/bmi/verifycode/BlsmskTestL.java	2014-05-13 14:30:21.065074069 +0400
+++ new/test/compiler/intrinsics/bmi/verifycode/BlsmskTestL.java	2014-05-13 14:30:20.953072099 +0400
@@ -26,8 +26,7 @@
  * @bug 8031321
  * @library /testlibrary /testlibrary/whitebox /compiler/whitebox ..
  * @build BlsmskTestL
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
+ * @run main/othervm/bootclasspath -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+UseBMI1Instructions BlsmskTestL
  */
 
--- old/test/compiler/intrinsics/bmi/verifycode/BlsrTestI.java	2014-05-13 14:30:21.605083569 +0400
+++ new/test/compiler/intrinsics/bmi/verifycode/BlsrTestI.java	2014-05-13 14:30:21.533082303 +0400
@@ -26,8 +26,7 @@
  * @bug 8031321
  * @library /testlibrary /testlibrary/whitebox /compiler/whitebox ..
  * @build BlsrTestI
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
+ * @run main/othervm/bootclasspath -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+UseBMI1Instructions BlsrTestI
  */
 
--- old/test/compiler/intrinsics/bmi/verifycode/BlsrTestL.java	2014-05-13 14:30:22.149093139 +0400
+++ new/test/compiler/intrinsics/bmi/verifycode/BlsrTestL.java	2014-05-13 14:30:22.037091169 +0400
@@ -26,8 +26,7 @@
  * @bug 8031321
  * @library /testlibrary /testlibrary/whitebox /compiler/whitebox ..
  * @build BlsrTestL
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
+ * @run main/othervm/bootclasspath -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+UseBMI1Instructions BlsrTestL
  */
 
--- old/test/compiler/intrinsics/bmi/verifycode/LZcntTestI.java	2014-05-13 14:30:22.669102287 +0400
+++ new/test/compiler/intrinsics/bmi/verifycode/LZcntTestI.java	2014-05-13 14:30:22.561100387 +0400
@@ -26,8 +26,7 @@
  * @bug 8031321
  * @library /testlibrary /testlibrary/whitebox /compiler/whitebox ..
  * @build LZcntTestI
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
+ * @run main/othervm/bootclasspath -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+UseCountLeadingZerosInstruction LZcntTestI
  */
 
--- old/test/compiler/intrinsics/bmi/verifycode/LZcntTestL.java	2014-05-13 14:30:23.209111787 +0400
+++ new/test/compiler/intrinsics/bmi/verifycode/LZcntTestL.java	2014-05-13 14:30:23.121110239 +0400
@@ -26,8 +26,7 @@
  * @bug 8031321
  * @library /testlibrary /testlibrary/whitebox /compiler/whitebox ..
  * @build LZcntTestL
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
+ * @run main/othervm/bootclasspath -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+UseCountLeadingZerosInstruction LZcntTestL
  */
 
--- old/test/compiler/intrinsics/bmi/verifycode/TZcntTestI.java	2014-05-13 14:30:23.721120794 +0400
+++ new/test/compiler/intrinsics/bmi/verifycode/TZcntTestI.java	2014-05-13 14:30:23.633119246 +0400
@@ -26,8 +26,7 @@
  * @bug 8031321
  * @library /testlibrary /testlibrary/whitebox /compiler/whitebox ..
  * @build TZcntTestI
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
+ * @run main/othervm/bootclasspath -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+UseCountTrailingZerosInstruction TZcntTestI
  */
 
--- old/test/compiler/intrinsics/bmi/verifycode/TZcntTestL.java	2014-05-13 14:30:24.257130223 +0400
+++ new/test/compiler/intrinsics/bmi/verifycode/TZcntTestL.java	2014-05-13 14:30:24.157128465 +0400
@@ -26,8 +26,7 @@
  * @bug 8031321
  * @library /testlibrary /testlibrary/whitebox /compiler/whitebox ..
  * @build TZcntTestL
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
+ * @run main/othervm/bootclasspath -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+UseCountTrailingZerosInstruction TZcntTestL
  */
 
--- old/test/compiler/intrinsics/mathexact/sanity/AddExactIntTest.java	2014-05-13 14:30:24.729138527 +0400
+++ new/test/compiler/intrinsics/mathexact/sanity/AddExactIntTest.java	2014-05-13 14:30:24.609136416 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,12 +25,11 @@
  * @test
  * @library /testlibrary /testlibrary/whitebox /compiler/whitebox
  * @build AddExactIntTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
  *                   -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
  *                   -XX:LogFile=hs_neg.log -XX:-UseMathExactIntrinsics AddExactIntTest
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
  *                   -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
  *                   -XX:LogFile=hs.log -XX:+UseMathExactIntrinsics AddExactIntTest
--- old/test/compiler/intrinsics/mathexact/sanity/AddExactLongTest.java	2014-05-13 14:30:25.265147956 +0400
+++ new/test/compiler/intrinsics/mathexact/sanity/AddExactLongTest.java	2014-05-13 14:30:25.177146408 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,12 +25,11 @@
  * @test
  * @library /testlibrary /testlibrary/whitebox /compiler/whitebox
  * @build AddExactLongTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
  *                   -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
  *                   -XX:LogFile=hs_neg.log -XX:-UseMathExactIntrinsics AddExactLongTest
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
  *                   -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
  *                   -XX:LogFile=hs.log -XX:+UseMathExactIntrinsics AddExactLongTest
--- old/test/compiler/intrinsics/mathexact/sanity/DecrementExactIntTest.java	2014-05-13 14:30:25.865158512 +0400
+++ new/test/compiler/intrinsics/mathexact/sanity/DecrementExactIntTest.java	2014-05-13 14:30:25.757156612 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,12 +25,11 @@
  * @test
  * @library /testlibrary /testlibrary/whitebox /compiler/whitebox
  * @build DecrementExactIntTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
  *                   -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
  *                   -XX:LogFile=hs_neg.log -XX:-UseMathExactIntrinsics DecrementExactIntTest
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
  *                   -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
  *                   -XX:LogFile=hs.log -XX:+UseMathExactIntrinsics DecrementExactIntTest
--- old/test/compiler/intrinsics/mathexact/sanity/DecrementExactLongTest.java	2014-05-13 14:30:26.433168504 +0400
+++ new/test/compiler/intrinsics/mathexact/sanity/DecrementExactLongTest.java	2014-05-13 14:30:26.321166534 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,12 +25,11 @@
  * @test
  * @library /testlibrary /testlibrary/whitebox /compiler/whitebox
  * @build DecrementExactLongTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
  *                   -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
  *                   -XX:LogFile=hs_neg.log -XX:-UseMathExactIntrinsics DecrementExactLongTest
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
  *                   -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
  *                   -XX:LogFile=hs.log -XX:+UseMathExactIntrinsics DecrementExactLongTest
--- old/test/compiler/intrinsics/mathexact/sanity/IncrementExactIntTest.java	2014-05-13 14:30:26.965177863 +0400
+++ new/test/compiler/intrinsics/mathexact/sanity/IncrementExactIntTest.java	2014-05-13 14:30:26.853175893 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,12 +25,11 @@
  * @test
  * @library /testlibrary /testlibrary/whitebox /compiler/whitebox
  * @build IncrementExactIntTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
  *                   -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
  *                   -XX:LogFile=hs_neg.log -XX:-UseMathExactIntrinsics IncrementExactIntTest
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
  *                   -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
  *                   -XX:LogFile=hs.log -XX:+UseMathExactIntrinsics IncrementExactIntTest
--- old/test/compiler/intrinsics/mathexact/sanity/IncrementExactLongTest.java	2014-05-13 14:30:27.493187152 +0400
+++ new/test/compiler/intrinsics/mathexact/sanity/IncrementExactLongTest.java	2014-05-13 14:30:27.389185322 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,12 +25,11 @@
  * @test
  * @library /testlibrary /testlibrary/whitebox /compiler/whitebox
  * @build IncrementExactLongTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
  *                   -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
  *                   -XX:LogFile=hs_neg.log -XX:-UseMathExactIntrinsics IncrementExactLongTest
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
  *                   -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
  *                   -XX:LogFile=hs.log -XX:+UseMathExactIntrinsics IncrementExactLongTest
--- old/test/compiler/intrinsics/mathexact/sanity/MultiplyExactIntTest.java	2014-05-13 14:30:28.021196441 +0400
+++ new/test/compiler/intrinsics/mathexact/sanity/MultiplyExactIntTest.java	2014-05-13 14:30:27.945195104 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,12 +25,11 @@
  * @test
  * @library /testlibrary /testlibrary/whitebox /compiler/whitebox
  * @build MultiplyExactIntTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
  *                   -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
  *                   -XX:LogFile=hs_neg.log -XX:-UseMathExactIntrinsics MultiplyExactIntTest
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
  *                   -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
  *                   -XX:LogFile=hs.log -XX:+UseMathExactIntrinsics MultiplyExactIntTest
--- old/test/compiler/intrinsics/mathexact/sanity/MultiplyExactLongTest.java	2014-05-13 14:30:28.561205941 +0400
+++ new/test/compiler/intrinsics/mathexact/sanity/MultiplyExactLongTest.java	2014-05-13 14:30:28.449203970 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,12 +25,11 @@
  * @test
  * @library /testlibrary /testlibrary/whitebox /compiler/whitebox
  * @build MultiplyExactLongTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
  *                   -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
  *                   -XX:LogFile=hs_neg.log -XX:-UseMathExactIntrinsics MultiplyExactLongTest
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
  *                   -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
  *                   -XX:LogFile=hs.log -XX:+UseMathExactIntrinsics MultiplyExactLongTest
--- old/test/compiler/intrinsics/mathexact/sanity/NegateExactIntTest.java	2014-05-13 14:30:29.105215511 +0400
+++ new/test/compiler/intrinsics/mathexact/sanity/NegateExactIntTest.java	2014-05-13 14:30:28.993213541 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,12 +25,11 @@
  * @test
  * @library /testlibrary /testlibrary/whitebox /compiler/whitebox
  * @build NegateExactIntTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
  *                   -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
  *                   -XX:LogFile=hs_neg.log -XX:-UseMathExactIntrinsics NegateExactIntTest
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
  *                   -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
  *                   -XX:LogFile=hs.log -XX:+UseMathExactIntrinsics NegateExactIntTest
--- old/test/compiler/intrinsics/mathexact/sanity/NegateExactLongTest.java	2014-05-13 14:30:29.665225363 +0400
+++ new/test/compiler/intrinsics/mathexact/sanity/NegateExactLongTest.java	2014-05-13 14:30:29.553223392 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,12 +25,11 @@
  * @test
  * @library /testlibrary /testlibrary/whitebox /compiler/whitebox
  * @build NegateExactLongTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
  *                   -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
  *                   -XX:LogFile=hs_neg.log -XX:-UseMathExactIntrinsics NegateExactLongTest
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
  *                   -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
  *                   -XX:LogFile=hs.log -XX:+UseMathExactIntrinsics NegateExactLongTest
--- old/test/compiler/intrinsics/mathexact/sanity/SubtractExactIntTest.java	2014-05-13 14:30:30.241235496 +0400
+++ new/test/compiler/intrinsics/mathexact/sanity/SubtractExactIntTest.java	2014-05-13 14:30:30.133233595 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,12 +25,11 @@
  * @test
  * @library /testlibrary /testlibrary/whitebox /compiler/whitebox
  * @build SubtractExactIntTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
  *                   -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
  *                   -XX:LogFile=hs_neg.log -XX:-UseMathExactIntrinsics SubtractExactIntTest
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
  *                   -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
  *                   -XX:LogFile=hs.log -XX:+UseMathExactIntrinsics SubtractExactIntTest
--- old/test/compiler/intrinsics/mathexact/sanity/SubtractExactLongTest.java	2014-05-13 14:30:30.789245136 +0400
+++ new/test/compiler/intrinsics/mathexact/sanity/SubtractExactLongTest.java	2014-05-13 14:30:30.701243588 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,12 +25,11 @@
  * @test
  * @library /testlibrary /testlibrary/whitebox /compiler/whitebox
  * @build SubtractExactLongTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
  *                   -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
  *                   -XX:LogFile=hs_neg.log -XX:-UseMathExactIntrinsics SubtractExactLongTest
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
  *                   -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
  *                   -XX:LogFile=hs.log -XX:+UseMathExactIntrinsics SubtractExactLongTest
--- old/test/compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsOptionOnSupportedConfig.java	2014-05-13 14:30:31.353255058 +0400
+++ new/test/compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsOptionOnSupportedConfig.java	2014-05-13 14:30:31.245253158 +0400
@@ -29,8 +29,7 @@
  *          rtm support and on VM with rtm locking support,
  * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary
  * @build TestPrintPreciseRTMLockingStatisticsOptionOnSupportedConfig
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI
  *                   TestPrintPreciseRTMLockingStatisticsOptionOnSupportedConfig
  */
--- old/test/compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsOptionOnUnsupportedConfig.java	2014-05-13 14:30:31.865264065 +0400
+++ new/test/compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsOptionOnUnsupportedConfig.java	2014-05-13 14:30:31.789262729 +0400
@@ -29,8 +29,7 @@
  *          rtm support and/or unsupported VM.
  * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary
  * @build TestPrintPreciseRTMLockingStatisticsOptionOnUnsupportedConfig
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI
  *                 TestPrintPreciseRTMLockingStatisticsOptionOnUnsupportedConfig
  */
--- old/test/compiler/rtm/cli/TestRTMAbortRatioOptionOnSupportedConfig.java	2014-05-13 14:30:32.413273706 +0400
+++ new/test/compiler/rtm/cli/TestRTMAbortRatioOptionOnSupportedConfig.java	2014-05-13 14:30:32.337272369 +0400
@@ -29,8 +29,7 @@
  *          support and on VM with rtm locking support.
  * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary
  * @build TestRTMAbortRatioOptionOnSupportedConfig
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI TestRTMAbortRatioOptionOnSupportedConfig
  */
 
--- old/test/compiler/rtm/cli/TestRTMAbortRatioOptionOnUnsupportedConfig.java	2014-05-13 14:30:32.949283135 +0400
+++ new/test/compiler/rtm/cli/TestRTMAbortRatioOptionOnUnsupportedConfig.java	2014-05-13 14:30:32.841281236 +0400
@@ -29,8 +29,7 @@
  *          support or on VM that does not support rtm locking.
  * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary
  * @build TestRTMAbortRatioOptionOnUnsupportedConfig
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI TestRTMAbortRatioOptionOnUnsupportedConfig
  */
 
--- old/test/compiler/rtm/cli/TestRTMTotalCountIncrRateOptionOnSupportedConfig.java	2014-05-13 14:30:33.557293831 +0400
+++ new/test/compiler/rtm/cli/TestRTMTotalCountIncrRateOptionOnSupportedConfig.java	2014-05-13 14:30:33.449291932 +0400
@@ -29,8 +29,7 @@
  *          rtm support and on VM with rtm locking support.
  * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary
  * @build TestRTMTotalCountIncrRateOptionOnSupportedConfig
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI
  *                   TestRTMTotalCountIncrRateOptionOnSupportedConfig
  */
--- old/test/compiler/rtm/cli/TestRTMTotalCountIncrRateOptionOnUnsupportedConfig.java	2014-05-13 14:30:34.017301924 +0400
+++ new/test/compiler/rtm/cli/TestRTMTotalCountIncrRateOptionOnUnsupportedConfig.java	2014-05-13 14:30:33.921300235 +0400
@@ -34,8 +34,7 @@
  *          rtm support and/or on VM without rtm locking support.
  * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary
  * @build TestRTMTotalCountIncrRateOptionOnUnsupportedConfig
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI
  *                   TestRTMTotalCountIncrRateOptionOnUnsupportedConfig
  */
--- old/test/compiler/rtm/cli/TestUseRTMDeoptOptionOnSupportedConfig.java	2014-05-13 14:30:34.565311564 +0400
+++ new/test/compiler/rtm/cli/TestUseRTMDeoptOptionOnSupportedConfig.java	2014-05-13 14:30:34.449309524 +0400
@@ -29,8 +29,7 @@
  *          when rtm locking is supported by VM.
  * @library /testlibrary /testlibrary/whitebox
  * @build TestUseRTMDeoptOptionOnSupportedConfig
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI TestUseRTMDeoptOptionOnSupportedConfig
  */
 
--- old/test/compiler/rtm/cli/TestUseRTMDeoptOptionOnUnsupportedConfig.java	2014-05-13 14:30:35.089320783 +0400
+++ new/test/compiler/rtm/cli/TestUseRTMDeoptOptionOnUnsupportedConfig.java	2014-05-13 14:30:35.001319235 +0400
@@ -29,8 +29,7 @@
  *          or on VMs without rtm locking support.
  * @library /testlibrary /testlibrary/whitebox
  * @build TestUseRTMDeoptOptionOnUnsupportedConfig
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI TestUseRTMDeoptOptionOnUnsupportedConfig
  */
 
--- old/test/compiler/rtm/cli/TestUseRTMForStackLocksOptionOnSupportedConfig.java	2014-05-13 14:30:35.629330283 +0400
+++ new/test/compiler/rtm/cli/TestUseRTMForStackLocksOptionOnSupportedConfig.java	2014-05-13 14:30:35.517328312 +0400
@@ -29,8 +29,7 @@
  *          rtm support when VM supports rtm locking.
  * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary
  * @build TestUseRTMForStackLocksOptionOnSupportedConfig
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI
  *                   TestUseRTMForStackLocksOptionOnSupportedConfig
  */
--- old/test/compiler/rtm/cli/TestUseRTMForStackLocksOptionOnUnsupportedConfig.java	2014-05-13 14:30:36.733349704 +0400
+++ new/test/compiler/rtm/cli/TestUseRTMForStackLocksOptionOnUnsupportedConfig.java	2014-05-13 14:30:36.661348438 +0400
@@ -29,8 +29,7 @@
  *          rtm support and/or on VMs without rtm locking support.
  * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary
  * @build TestUseRTMForStackLocksOptionOnUnsupportedConfig
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI
  *                    TestUseRTMForStackLocksOptionOnUnsupportedConfig
  */
--- old/test/compiler/rtm/cli/TestUseRTMLockingOptionOnSupportedConfig.java	2014-05-13 14:30:37.245358712 +0400
+++ new/test/compiler/rtm/cli/TestUseRTMLockingOptionOnSupportedConfig.java	2014-05-13 14:30:37.161357234 +0400
@@ -29,8 +29,7 @@
  *          on VM with rtm-locking support.
  * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary
  * @build TestUseRTMLockingOptionOnSupportedConfig
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI TestUseRTMLockingOptionOnSupportedConfig
  */
 
--- old/test/compiler/rtm/cli/TestUseRTMLockingOptionOnUnsupportedCPU.java	2014-05-13 14:30:37.721367085 +0400
+++ new/test/compiler/rtm/cli/TestUseRTMLockingOptionOnUnsupportedCPU.java	2014-05-13 14:30:37.645365748 +0400
@@ -29,8 +29,7 @@
  *          rtm support.
  * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary
  * @build TestUseRTMLockingOptionOnUnsupportedCPU
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI TestUseRTMLockingOptionOnUnsupportedCPU
  */
 
--- old/test/compiler/rtm/cli/TestUseRTMLockingOptionOnUnsupportedVM.java	2014-05-13 14:30:38.229376022 +0400
+++ new/test/compiler/rtm/cli/TestUseRTMLockingOptionOnUnsupportedVM.java	2014-05-13 14:30:38.149374615 +0400
@@ -29,8 +29,7 @@
  *          in case when VM should not support this option.
  * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary
  * @build TestUseRTMLockingOptionOnUnsupportedVM
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI TestUseRTMLockingOptionOnUnsupportedVM
  */
 
--- old/test/compiler/rtm/cli/TestUseRTMLockingOptionWithBiasedLocking.java	2014-05-13 14:30:38.833386648 +0400
+++ new/test/compiler/rtm/cli/TestUseRTMLockingOptionWithBiasedLocking.java	2014-05-13 14:30:38.729384818 +0400
@@ -29,8 +29,7 @@
  *          options combination on CPU and VM with rtm support.
  * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary
  * @build TestUseRTMLockingOptionWithBiasedLocking
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI TestUseRTMLockingOptionWithBiasedLocking
  */
 
--- old/test/compiler/rtm/locking/TestRTMAbortRatio.java	2014-05-13 14:30:39.425397063 +0400
+++ new/test/compiler/rtm/locking/TestRTMAbortRatio.java	2014-05-13 14:30:39.305394951 +0400
@@ -29,8 +29,7 @@
  *          deoptimization.
  * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary
  * @build TestRTMAbortRatio
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI TestRTMAbortRatio
  */
 
--- old/test/compiler/rtm/locking/TestRTMAbortThreshold.java	2014-05-13 14:30:39.997407126 +0400
+++ new/test/compiler/rtm/locking/TestRTMAbortThreshold.java	2014-05-13 14:30:39.893405296 +0400
@@ -29,8 +29,7 @@
  *          amount of aborts after which abort ratio is calculated.
  * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary
  * @build TestRTMAbortThreshold
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI TestRTMAbortThreshold
  */
 
--- old/test/compiler/rtm/locking/TestRTMAfterNonRTMDeopt.java	2014-05-13 14:30:40.613417962 +0400
+++ new/test/compiler/rtm/locking/TestRTMAfterNonRTMDeopt.java	2014-05-13 14:30:40.485415710 +0400
@@ -31,8 +31,7 @@
  *          RTM state remain the same after such deoptimization.
  * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary
  * @build TestRTMAfterNonRTMDeopt
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI TestRTMAfterNonRTMDeopt
  */
 
--- old/test/compiler/rtm/locking/TestRTMDeoptOnHighAbortRatio.java	2014-05-13 14:30:41.353430980 +0400
+++ new/test/compiler/rtm/locking/TestRTMDeoptOnHighAbortRatio.java	2014-05-13 14:30:41.237428940 +0400
@@ -29,8 +29,7 @@
  *          without rtm locking.
  * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary
  * @build TestRTMDeoptOnHighAbortRatio
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI TestRTMDeoptOnHighAbortRatio
  */
 
--- old/test/compiler/rtm/locking/TestRTMDeoptOnLowAbortRatio.java	2014-05-13 14:30:41.937441254 +0400
+++ new/test/compiler/rtm/locking/TestRTMDeoptOnLowAbortRatio.java	2014-05-13 14:30:41.841439566 +0400
@@ -28,8 +28,7 @@
  * @summary Verify that on low abort ratio method will be recompiled.
  * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary
  * @build TestRTMDeoptOnLowAbortRatio
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI TestRTMDeoptOnLowAbortRatio
  */
 
--- old/test/compiler/rtm/locking/TestRTMLockingCalculationDelay.java	2014-05-13 14:30:42.449450262 +0400
+++ new/test/compiler/rtm/locking/TestRTMLockingCalculationDelay.java	2014-05-13 14:30:42.361448713 +0400
@@ -29,8 +29,7 @@
  *          abort ratio calculation is started.
  * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary
  * @build TestRTMLockingCalculationDelay
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI TestRTMLockingCalculationDelay
  */
 
--- old/test/compiler/rtm/locking/TestRTMLockingThreshold.java	2014-05-13 14:30:42.993459832 +0400
+++ new/test/compiler/rtm/locking/TestRTMLockingThreshold.java	2014-05-13 14:30:42.897458143 +0400
@@ -29,8 +29,7 @@
  *          ProfileRTM => UseRTM.
  * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary
  * @build TestRTMLockingThreshold
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI TestRTMLockingThreshold
  */
 
--- old/test/compiler/rtm/locking/TestRTMRetryCount.java	2014-05-13 14:30:43.561469824 +0400
+++ new/test/compiler/rtm/locking/TestRTMRetryCount.java	2014-05-13 14:30:43.445467783 +0400
@@ -28,8 +28,7 @@
  * @summary Verify that RTMRetryCount affects actual amount of retries.
  * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary
  * @build TestRTMRetryCount
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI TestRTMRetryCount
  */
 
--- old/test/compiler/rtm/locking/TestRTMSpinLoopCount.java	2014-05-13 14:30:44.213481295 +0400
+++ new/test/compiler/rtm/locking/TestRTMSpinLoopCount.java	2014-05-13 14:30:44.093479184 +0400
@@ -29,8 +29,7 @@
  *          between locking attempts.
  * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary
  * @build TestRTMSpinLoopCount
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI TestRTMSpinLoopCount
  */
 
--- old/test/compiler/rtm/locking/TestRTMTotalCountIncrRate.java	2014-05-13 14:30:44.877492976 +0400
+++ new/test/compiler/rtm/locking/TestRTMTotalCountIncrRate.java	2014-05-13 14:30:44.797491568 +0400
@@ -29,8 +29,7 @@
  *          RTM locking statistics.
  * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary
  * @build TestRTMTotalCountIncrRate
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI TestRTMTotalCountIncrRate
  */
 
--- old/test/compiler/rtm/locking/TestUseRTMAfterLockInflation.java	2014-05-13 14:30:45.565505079 +0400
+++ new/test/compiler/rtm/locking/TestUseRTMAfterLockInflation.java	2014-05-13 14:30:45.453503109 +0400
@@ -29,8 +29,7 @@
  *          inflation and after it used for inflated locks.
  * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary
  * @build TestUseRTMAfterLockInflation
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI TestUseRTMAfterLockInflation
  */
 
--- old/test/compiler/rtm/locking/TestUseRTMDeopt.java	2014-05-13 14:30:46.225516690 +0400
+++ new/test/compiler/rtm/locking/TestUseRTMDeopt.java	2014-05-13 14:30:46.105514579 +0400
@@ -29,8 +29,7 @@
  *          copmpiled methods with synchronized block.
  * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary
  * @build TestUseRTMDeopt
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI TestUseRTMDeopt
  */
 
--- old/test/compiler/rtm/locking/TestUseRTMForInflatedLocks.java	2014-05-13 14:30:46.825527245 +0400
+++ new/test/compiler/rtm/locking/TestUseRTMForInflatedLocks.java	2014-05-13 14:30:46.717525346 +0400
@@ -28,8 +28,7 @@
  * @summary Verify that rtm locking is used for inflated locks.
  * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary
  * @build TestUseRTMForInflatedLocks
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI TestUseRTMForInflatedLocks
  */
 
--- old/test/compiler/rtm/locking/TestUseRTMForStackLocks.java	2014-05-13 14:30:47.461538434 +0400
+++ new/test/compiler/rtm/locking/TestUseRTMForStackLocks.java	2014-05-13 14:30:47.373536886 +0400
@@ -28,8 +28,7 @@
  * @summary Verify that rtm locking is used for stack locks.
  * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary
  * @build TestUseRTMForStackLocks
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI TestUseRTMForStackLocks
  */
 
--- old/test/compiler/rtm/locking/TestUseRTMXendForLockBusy.java	2014-05-13 14:30:47.977547512 +0400
+++ new/test/compiler/rtm/locking/TestUseRTMXendForLockBusy.java	2014-05-13 14:30:47.881545823 +0400
@@ -29,8 +29,7 @@
  *          method behaviour if lock is busy.
  * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary
  * @build TestUseRTMXendForLockBusy
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI TestUseRTMXendForLockBusy
  */
 
--- old/test/compiler/rtm/method_options/TestNoRTMLockElidingOption.java	2014-05-13 14:30:48.573557997 +0400
+++ new/test/compiler/rtm/method_options/TestNoRTMLockElidingOption.java	2014-05-13 14:30:48.477556308 +0400
@@ -29,8 +29,7 @@
  *          specified method and that such method will not use rtm.
  * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary
  * @build TestNoRTMLockElidingOption
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI TestNoRTMLockElidingOption
  */
 
--- old/test/compiler/rtm/method_options/TestUseRTMLockElidingOption.java	2014-05-13 14:30:49.201569044 +0400
+++ new/test/compiler/rtm/method_options/TestUseRTMLockElidingOption.java	2014-05-13 14:30:49.085567004 +0400
@@ -30,8 +30,7 @@
  *          on high abort ratio.
  * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary
  * @build TestUseRTMLockElidingOption
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI TestUseRTMLockElidingOption
  */
 
--- old/test/compiler/rtm/print/TestPrintPreciseRTMLockingStatistics.java	2014-05-13 14:30:49.741578544 +0400
+++ new/test/compiler/rtm/print/TestPrintPreciseRTMLockingStatistics.java	2014-05-13 14:30:49.625576504 +0400
@@ -31,8 +31,7 @@
  *          contain rtm locking statistics when it should not.
  * @library /testlibrary /testlibrary/whitebox /compiler/testlibrary
  * @build TestPrintPreciseRTMLockingStatistics
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI TestPrintPreciseRTMLockingStatistics
  */
 
--- old/test/compiler/tiered/NonTieredLevelsTest.java	2014-05-13 14:30:50.397590085 +0400
+++ new/test/compiler/tiered/NonTieredLevelsTest.java	2014-05-13 14:30:50.281588044 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,8 +27,7 @@
  * @test NonTieredLevelsTest
  * @library /testlibrary /testlibrary/whitebox /compiler/whitebox
  * @build NonTieredLevelsTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:-TieredCompilation
+ * @run main/othervm/bootclasspath -XX:-TieredCompilation
  *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *                   -XX:CompileCommand=compileonly,SimpleTestCase$Helper::*
  *                   NonTieredLevelsTest
--- old/test/compiler/tiered/TieredLevelsTest.java	2014-05-13 14:30:51.061601766 +0400
+++ new/test/compiler/tiered/TieredLevelsTest.java	2014-05-13 14:30:50.981600359 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,7 @@
  * @test TieredLevelsTest
  * @library /testlibrary /testlibrary/whitebox /compiler/whitebox
  * @build TieredLevelsTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+TieredCompilation
+ * @run main/othervm/bootclasspath -XX:+TieredCompilation
  *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *                   -XX:CompileCommand=compileonly,SimpleTestCase$Helper::*
  *                   TieredLevelsTest
--- old/test/compiler/types/correctness/CorrectnessTest.java	2014-05-13 14:30:51.637611899 +0400
+++ new/test/compiler/types/correctness/CorrectnessTest.java	2014-05-13 14:30:51.549610351 +0400
@@ -28,20 +28,19 @@
  * @compile execution/TypeConflict.java execution/TypeProfile.java
  *          execution/MethodHandleDelegate.java
  * @build CorrectnessTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockExperimentalVMOptions
+ * @run main/othervm/bootclasspath -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockExperimentalVMOptions
  *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *                   -XX:TypeProfileLevel=222 -XX:+UseTypeSpeculation
  *                   -XX:CompileCommand=exclude,execution/*::methodNotToCompile
  *                   -XX:CompileCommand=dontinline,scenarios/Scenario::collectReturnType
  *                   CorrectnessTest RETURN
- * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockExperimentalVMOptions
+ * @run main/othervm/bootclasspath -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockExperimentalVMOptions
  *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *                   -XX:TypeProfileLevel=222 -XX:+UseTypeSpeculation
  *                   -XX:CompileCommand=exclude,execution/*::methodNotToCompile
  *                   -XX:CompileCommand=dontinline,scenarios/Scenario::collectReturnType
  *                   CorrectnessTest PARAMETERS
- * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockExperimentalVMOptions
+ * @run main/othervm/bootclasspath -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockExperimentalVMOptions
  *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *                   -XX:TypeProfileLevel=222 -XX:+UseTypeSpeculation
  *                   -XX:CompileCommand=exclude,execution/*::methodNotToCompile
--- old/test/compiler/types/correctness/OffTest.java	2014-05-13 14:30:52.265622947 +0400
+++ new/test/compiler/types/correctness/OffTest.java	2014-05-13 14:30:52.153620977 +0400
@@ -29,7 +29,6 @@
  *          execution/MethodHandleDelegate.java
  * @build CorrectnessTest
  * @build OffTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
  * @run main/timeout=1200 OffTest
  */
 
@@ -41,7 +40,7 @@
 
 public class OffTest {
     private static final String[] OPTIONS = {
-            "-Xbootclasspath/a:.",
+            "-Xbootclasspath/a:" + System.getProperty("test.class.path"),
             "-XX:+IgnoreUnrecognizedVMOptions",
             "-XX:+UnlockExperimentalVMOptions",
             "-XX:+UnlockDiagnosticVMOptions",
--- old/test/compiler/whitebox/ClearMethodStateTest.java	2014-05-13 14:30:52.817632659 +0400
+++ new/test/compiler/whitebox/ClearMethodStateTest.java	2014-05-13 14:30:52.693630476 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,8 +28,7 @@
  * @bug 8006683 8007288 8022832
  * @library /testlibrary /testlibrary/whitebox
  * @build ClearMethodStateTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -Xmixed -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:CompileCommand=compileonly,SimpleTestCase$Helper::* ClearMethodStateTest
+ * @run main/othervm/bootclasspath -Xmixed -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:CompileCommand=compileonly,SimpleTestCase$Helper::* ClearMethodStateTest
  * @summary testing of WB::clearMethodState()
  * @author igor.ignatyev@oracle.com
  */
--- old/test/compiler/whitebox/DeoptimizeAllTest.java	2014-05-13 14:30:53.425643354 +0400
+++ new/test/compiler/whitebox/DeoptimizeAllTest.java	2014-05-13 14:30:53.313641384 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,8 +26,7 @@
  * @bug 8006683 8007288 8022832
  * @library /testlibrary /testlibrary/whitebox
  * @build DeoptimizeAllTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:CompileCommand=compileonly,SimpleTestCase$Helper::* DeoptimizeAllTest
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:CompileCommand=compileonly,SimpleTestCase$Helper::* DeoptimizeAllTest
  * @summary testing of WB::deoptimizeAll()
  * @author igor.ignatyev@oracle.com
  */
--- old/test/compiler/whitebox/DeoptimizeMethodTest.java	2014-05-13 14:30:54.073654754 +0400
+++ new/test/compiler/whitebox/DeoptimizeMethodTest.java	2014-05-13 14:30:53.965652854 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,8 +26,7 @@
  * @bug 8006683 8007288 8022832
  * @library /testlibrary /testlibrary/whitebox
  * @build DeoptimizeMethodTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:CompileCommand=compileonly,SimpleTestCase$Helper::* DeoptimizeMethodTest
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:CompileCommand=compileonly,SimpleTestCase$Helper::* DeoptimizeMethodTest
  * @summary testing of WB::deoptimizeMethod()
  * @author igor.ignatyev@oracle.com
  */
--- old/test/compiler/whitebox/EnqueueMethodForCompilationTest.java	2014-05-13 14:30:54.713666013 +0400
+++ new/test/compiler/whitebox/EnqueueMethodForCompilationTest.java	2014-05-13 14:30:54.609664184 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,8 +26,7 @@
  * @bug 8006683 8007288 8022832
  * @library /testlibrary /testlibrary/whitebox
  * @build EnqueueMethodForCompilationTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm/timeout=600 -Xbootclasspath/a:. -Xmixed -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:CompileCommand=compileonly,SimpleTestCase$Helper::* EnqueueMethodForCompilationTest
+ * @run main/othervm/bootclasspath/timeout=600 -Xmixed -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:CompileCommand=compileonly,SimpleTestCase$Helper::* EnqueueMethodForCompilationTest
  * @summary testing of WB::enqueueMethodForCompilation()
  * @author igor.ignatyev@oracle.com
  */
--- old/test/compiler/whitebox/GetNMethodTest.java	2014-05-13 14:30:55.369677553 +0400
+++ new/test/compiler/whitebox/GetNMethodTest.java	2014-05-13 14:30:55.265675724 +0400
@@ -29,8 +29,7 @@
  * @bug 8038240
  * @library /testlibrary /testlibrary/whitebox
  * @build GetNMethodTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -Xmixed -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:CompileCommand=compileonly,SimpleTestCase$Helper::* GetNMethodTest
+ * @run main/othervm/bootclasspath -Xmixed -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:CompileCommand=compileonly,SimpleTestCase$Helper::* GetNMethodTest
  * @summary testing of WB::getNMethod()
  * @author igor.ignatyev@oracle.com
  */
--- old/test/compiler/whitebox/IsMethodCompilableTest.java	2014-05-13 14:30:55.949687757 +0400
+++ new/test/compiler/whitebox/IsMethodCompilableTest.java	2014-05-13 14:30:55.833685716 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,9 +26,8 @@
  * @bug 8007270 8006683 8007288 8022832
  * @library /testlibrary /testlibrary/whitebox /testlibrary/com/oracle/java/testlibrary
  * @build IsMethodCompilableTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
  * @run main ClassFileInstaller com.oracle.java.testlibrary.Platform
- * @run main/othervm/timeout=2400 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:PerMethodRecompilationCutoff=3 -XX:CompileCommand=compileonly,SimpleTestCase$Helper::* IsMethodCompilableTest
+ * @run main/othervm/bootclasspath/timeout=2400 -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:PerMethodRecompilationCutoff=3 -XX:CompileCommand=compileonly,SimpleTestCase$Helper::* IsMethodCompilableTest
  * @summary testing of WB::isMethodCompilable()
  * @author igor.ignatyev@oracle.com
  */
--- old/test/compiler/whitebox/MakeMethodNotCompilableTest.java	2014-05-13 14:30:56.661700283 +0400
+++ new/test/compiler/whitebox/MakeMethodNotCompilableTest.java	2014-05-13 14:30:56.533698031 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,8 +26,7 @@
  * @bug 8012322 8006683 8007288 8022832
  * @library /testlibrary /testlibrary/whitebox
  * @build MakeMethodNotCompilableTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm/timeout=2400 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:CompileCommand=compileonly,SimpleTestCase$Helper::* MakeMethodNotCompilableTest
+ * @run main/othervm/bootclasspath/timeout=2400 -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:CompileCommand=compileonly,SimpleTestCase$Helper::* MakeMethodNotCompilableTest
  * @summary testing of WB::makeMethodNotCompilable()
  * @author igor.ignatyev@oracle.com
  */
--- old/test/compiler/whitebox/SetDontInlineMethodTest.java	2014-05-13 14:30:57.313711753 +0400
+++ new/test/compiler/whitebox/SetDontInlineMethodTest.java	2014-05-13 14:30:57.197709712 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,8 +26,7 @@
  * @bug 8006683 8007288 8022832
  * @library /testlibrary /testlibrary/whitebox
  * @build SetDontInlineMethodTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:CompileCommand=compileonly,SimpleTestCase$Helper::* SetDontInlineMethodTest
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:CompileCommand=compileonly,SimpleTestCase$Helper::* SetDontInlineMethodTest
  * @summary testing of WB::testSetDontInlineMethod()
  * @author igor.ignatyev@oracle.com
  */
--- old/test/compiler/whitebox/SetForceInlineMethodTest.java	2014-05-13 14:30:58.037724489 +0400
+++ new/test/compiler/whitebox/SetForceInlineMethodTest.java	2014-05-13 14:30:57.933722660 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,8 +26,7 @@
  * @bug 8006683 8007288 8022832
  * @library /testlibrary /testlibrary/whitebox
  * @build SetForceInlineMethodTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:CompileCommand=compileonly,SimpleTestCase$Helper::* SetForceInlineMethodTest
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:CompileCommand=compileonly,SimpleTestCase$Helper::* SetForceInlineMethodTest
  * @summary testing of WB::testSetForceInlineMethod()
  * @author igor.ignatyev@oracle.com
  */
--- old/test/gc/arguments/TestCMSHeapSizeFlags.java	2014-05-13 14:30:58.669735608 +0400
+++ new/test/gc/arguments/TestCMSHeapSizeFlags.java	2014-05-13 14:30:58.573733920 +0400
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@
  * @summary Tests argument processing for initial and maximum heap size for the CMS collector
  * @library /testlibrary /testlibrary/whitebox
  * @build TestCMSHeapSizeFlags TestMaxHeapSizeTools
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
  * @run main/othervm TestCMSHeapSizeFlags
  * @author thomas.schatzl@oracle.com
  */
--- old/test/gc/arguments/TestG1HeapSizeFlags.java	2014-05-13 14:30:59.241745670 +0400
+++ new/test/gc/arguments/TestG1HeapSizeFlags.java	2014-05-13 14:30:59.161744263 +0400
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@
  * @summary Tests argument processing for initial and maximum heap size for the G1 collector
  * @library /testlibrary /testlibrary/whitebox
  * @build TestG1HeapSizeFlags TestMaxHeapSizeTools
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
  * @run main/othervm TestG1HeapSizeFlags
  * @author thomas.schatzl@oracle.com
  */
--- old/test/gc/arguments/TestMaxHeapSizeTools.java	2014-05-13 14:30:59.797755452 +0400
+++ new/test/gc/arguments/TestMaxHeapSizeTools.java	2014-05-13 14:30:59.693753623 +0400
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@@ -154,7 +154,7 @@
     ArrayList<String> finalargs = new ArrayList<String>();
 
     String[] whiteboxOpts = new String[] {
-      "-Xbootclasspath/a:.",
+      "-Xbootclasspath/a:" + System.getProperty("test.classes"),
       "-XX:+UnlockDiagnosticVMOptions", "-XX:+WhiteBoxAPI",
       "-cp", System.getProperty("java.class.path"),
     };
--- old/test/gc/arguments/TestMinInitialErgonomics.java	2014-05-13 14:31:00.473767344 +0400
+++ new/test/gc/arguments/TestMinInitialErgonomics.java	2014-05-13 14:31:00.369765515 +0400
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@
  * @summary Test ergonomics decisions related to minimum and initial heap size.
  * @library /testlibrary /testlibrary/whitebox
  * @build TestMinInitialErgonomics TestMaxHeapSizeTools
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
  * @run main/othervm TestMinInitialErgonomics
  * @author thomas.schatzl@oracle.com
  */
--- old/test/gc/arguments/TestParallelHeapSizeFlags.java	2014-05-13 14:31:01.049777477 +0400
+++ new/test/gc/arguments/TestParallelHeapSizeFlags.java	2014-05-13 14:31:00.969776070 +0400
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,6 @@
  * parallel collectors.
  * @library /testlibrary /testlibrary/whitebox
  * @build TestParallelHeapSizeFlags TestMaxHeapSizeTools
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
  * @run main/othervm TestParallelHeapSizeFlags
  * @author thomas.schatzl@oracle.com
  */
--- old/test/gc/arguments/TestSerialHeapSizeFlags.java	2014-05-13 14:31:01.593787048 +0400
+++ new/test/gc/arguments/TestSerialHeapSizeFlags.java	2014-05-13 14:31:01.477785007 +0400
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@
  * @summary Tests argument processing for initial and maximum heap size for the Serial collector
  * @library /testlibrary /testlibrary/whitebox
  * @build TestSerialHeapSizeFlags TestMaxHeapSizeTools
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
  * @run main/othervm TestSerialHeapSizeFlags
  * @author thomas.schatzl@oracle.com
  */
--- old/test/gc/arguments/TestUseCompressedOopsErgo.java	2014-05-13 14:31:02.193797603 +0400
+++ new/test/gc/arguments/TestUseCompressedOopsErgo.java	2014-05-13 14:31:02.077795562 +0400
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@
  * @summary Tests ergonomics for UseCompressedOops.
  * @library /testlibrary /testlibrary/whitebox
  * @build TestUseCompressedOopsErgo TestUseCompressedOopsErgoTools
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
  * @run main/othervm TestUseCompressedOopsErgo -XX:+UseG1GC
  * @run main/othervm TestUseCompressedOopsErgo -XX:+UseParallelGC
  * @run main/othervm TestUseCompressedOopsErgo -XX:+UseParallelGC -XX:-UseParallelOldGC
--- old/test/gc/arguments/TestUseCompressedOopsErgoTools.java	2014-05-13 14:31:02.801808299 +0400
+++ new/test/gc/arguments/TestUseCompressedOopsErgoTools.java	2014-05-13 14:31:02.709806680 +0400
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@@ -80,7 +80,7 @@
     ArrayList<String> finalargs = new ArrayList<String>();
 
     String[] whiteboxOpts = new String[] {
-      "-Xbootclasspath/a:.",
+      "-Xbootclasspath/a:" + System.getProperty("test.classes"),
       "-XX:+UnlockDiagnosticVMOptions", "-XX:+WhiteBoxAPI",
       "-cp", System.getProperty("java.class.path"),
     };
--- old/test/gc/g1/TestHumongousCodeCacheRoots.java	2014-05-13 14:31:03.393818714 +0400
+++ new/test/gc/g1/TestHumongousCodeCacheRoots.java	2014-05-13 14:31:03.301817095 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@
  * @bug 8027756
  * @library /testlibrary /testlibrary/whitebox
  * @build TestHumongousCodeCacheRoots
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
  * @summary Humongous objects may have references from the code cache
  * @run main TestHumongousCodeCacheRoots
 */
@@ -93,7 +92,7 @@
     ArrayList<String> finalargs = new ArrayList<String>();
 
     String[] whiteboxOpts = new String[] {
-      "-Xbootclasspath/a:.",
+      "-Xbootclasspath/a:" + System.getProperty("test.classes"),
       "-XX:+UnlockDiagnosticVMOptions", "-XX:+WhiteBoxAPI",
       "-cp", System.getProperty("java.class.path"),
     };
--- old/test/runtime/ClassUnload/KeepAliveClass.java	2014-05-13 14:31:04.041830113 +0400
+++ new/test/runtime/ClassUnload/KeepAliveClass.java	2014-05-13 14:31:03.949828495 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,8 +28,7 @@
  * @library classes
  * @build KeepAliveClass test.Empty
  * @build ClassUnloadCommon
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -Xmn8m -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI KeepAliveClass
+ * @run main/othervm/bootclasspath -Xmn8m -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI KeepAliveClass
  */
 
 import java.lang.ref.SoftReference;
--- old/test/runtime/ClassUnload/KeepAliveClassLoader.java	2014-05-13 14:31:04.689841513 +0400
+++ new/test/runtime/ClassUnload/KeepAliveClassLoader.java	2014-05-13 14:31:04.573839473 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,8 +28,7 @@
  * @library classes
  * @build KeepAliveClassLoader test.Empty
  * @build ClassUnloadCommon
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -Xmn8m -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI KeepAliveClassLoader
+ * @run main/othervm/bootclasspath -Xmn8m -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI KeepAliveClassLoader
  */
 
 import sun.hotspot.WhiteBox;
--- old/test/runtime/ClassUnload/KeepAliveObject.java	2014-05-13 14:31:05.265851646 +0400
+++ new/test/runtime/ClassUnload/KeepAliveObject.java	2014-05-13 14:31:05.161849817 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,8 +28,7 @@
  * @library classes
  * @build KeepAliveObject test.Empty
  * @build ClassUnloadCommon
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -Xmn8m -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI KeepAliveObject
+ * @run main/othervm/bootclasspath -Xmn8m -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI KeepAliveObject
  */
 
 import sun.hotspot.WhiteBox;
--- old/test/runtime/ClassUnload/KeepAliveSoftReference.java	2014-05-13 14:31:05.857862061 +0400
+++ new/test/runtime/ClassUnload/KeepAliveSoftReference.java	2014-05-13 14:31:05.773860583 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,8 +28,7 @@
  * @library classes
  * @build KeepAliveSoftReference test.Empty
  * @build ClassUnloadCommon
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -Xmn8m -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI KeepAliveSoftReference
+ * @run main/othervm/bootclasspath -Xmn8m -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI KeepAliveSoftReference
  */
 
 import java.lang.ref.SoftReference;
--- old/test/runtime/ClassUnload/UnloadTest.java	2014-05-13 14:31:06.465872757 +0400
+++ new/test/runtime/ClassUnload/UnloadTest.java	2014-05-13 14:31:06.325870294 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,8 +27,7 @@
  * @library classes
  * @build ClassUnloadCommon test.Empty
  * @build UnloadTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -Xmn8m -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI UnloadTest
+ * @run main/othervm/bootclasspath -Xmn8m -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI UnloadTest
  */
 import sun.hotspot.WhiteBox;
 
--- old/test/runtime/NMT/MallocTestType.java	2014-05-13 14:31:07.145884720 +0400
+++ new/test/runtime/NMT/MallocTestType.java	2014-05-13 14:31:07.037882820 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,8 +27,7 @@
  * @key nmt jcmd
  * @library /testlibrary /testlibrary/whitebox
  * @build MallocTestType
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail MallocTestType
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail MallocTestType
  */
 
 import com.oracle.java.testlibrary.*;
--- old/test/runtime/NMT/PrintNMTStatistics.java	2014-05-13 14:31:07.717894782 +0400
+++ new/test/runtime/NMT/PrintNMTStatistics.java	2014-05-13 14:31:07.605892812 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@
  * @summary Make sure PrintNMTStatistics works on normal JVM exit
  * @library /testlibrary /testlibrary/whitebox
  * @build PrintNMTStatistics
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
  * @run main PrintNMTStatistics
  */
 
@@ -54,7 +53,7 @@
 
     ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
         "-XX:+UnlockDiagnosticVMOptions",
-        "-Xbootclasspath/a:.",
+        "-Xbootclasspath/a:" + System.getProperty("test.classes"),
         "-XX:+WhiteBoxAPI",
         "-XX:NativeMemoryTracking=summary",
         "-XX:+PrintNMTStatistics",
--- old/test/runtime/NMT/ReleaseCommittedMemory.java	2014-05-13 14:31:08.453907731 +0400
+++ new/test/runtime/NMT/ReleaseCommittedMemory.java	2014-05-13 14:31:08.333905619 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,8 +28,7 @@
  * @key nmt regression
  * @library /testlibrary /testlibrary/whitebox
  * @build ReleaseCommittedMemory
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail ReleaseCommittedMemory
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail ReleaseCommittedMemory
  */
 
 import sun.hotspot.WhiteBox;
--- old/test/runtime/NMT/SummarySanityCheck.java	2014-05-13 14:31:09.029917864 +0400
+++ new/test/runtime/NMT/SummarySanityCheck.java	2014-05-13 14:31:08.913915823 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,8 +27,7 @@
  * @summary Sanity check the output of NMT
  * @library /testlibrary /testlibrary/whitebox
  * @build SummarySanityCheck
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:NativeMemoryTracking=summary -XX:+WhiteBoxAPI SummarySanityCheck
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions -XX:NativeMemoryTracking=summary -XX:+WhiteBoxAPI SummarySanityCheck
  */
 
 import com.oracle.java.testlibrary.*;
--- old/test/runtime/NMT/ThreadedMallocTestType.java	2014-05-13 14:31:09.709929827 +0400
+++ new/test/runtime/NMT/ThreadedMallocTestType.java	2014-05-13 14:31:09.597927856 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,8 +26,7 @@
  * @key nmt jcmd
  * @library /testlibrary /testlibrary/whitebox
  * @build ThreadedMallocTestType
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail ThreadedMallocTestType
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail ThreadedMallocTestType
  */
 
 import com.oracle.java.testlibrary.*;
--- old/test/runtime/NMT/ThreadedVirtualAllocTestType.java	2014-05-13 14:31:10.389941789 +0400
+++ new/test/runtime/NMT/ThreadedVirtualAllocTestType.java	2014-05-13 14:31:10.249939327 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,8 +26,7 @@
  * @key nmt jcmd
  * @library /testlibrary /testlibrary/whitebox
  * @build ThreadedVirtualAllocTestType
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail ThreadedVirtualAllocTestType
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail ThreadedVirtualAllocTestType
  */
 
 import com.oracle.java.testlibrary.*;
--- old/test/runtime/NMT/VirtualAllocTestType.java	2014-05-13 14:31:12.085971626 +0400
+++ new/test/runtime/NMT/VirtualAllocTestType.java	2014-05-13 14:31:11.973969655 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,8 +27,7 @@
  * @key nmt jcmd
  * @library /testlibrary /testlibrary/whitebox
  * @build VirtualAllocTestType
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail VirtualAllocTestType
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail VirtualAllocTestType
  */
 
 import com.oracle.java.testlibrary.*;
--- old/test/runtime/interned/SanityTest.java	2014-05-13 14:31:12.733983025 +0400
+++ new/test/runtime/interned/SanityTest.java	2014-05-13 14:31:12.609980844 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,8 +26,7 @@
  * @summary Sanity check of String.intern() & GC
  * @library /testlibrary /testlibrary/whitebox
  * @build SanityTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI SanityTest
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI SanityTest
  */
 
 import java.util.*;
--- old/test/runtime/memory/ReadFromNoaccessArea.java	2014-05-13 14:31:13.405994847 +0400
+++ new/test/runtime/memory/ReadFromNoaccessArea.java	2014-05-13 14:31:13.289992807 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
  * @summary Test that touching noaccess area in class ReservedHeapSpace results in SIGSEGV/ACCESS_VIOLATION
  * @library /testlibrary /testlibrary/whitebox
  * @build ReadFromNoaccessArea
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
  * @run main ReadFromNoaccessArea
  */
 
@@ -42,7 +41,7 @@
     }
 
     ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
-          "-Xbootclasspath/a:.",
+          "-Xbootclasspath/a:" + System.getProperty("test.classes"),
           "-XX:+UnlockDiagnosticVMOptions",
           "-XX:+WhiteBoxAPI",
           "-XX:+UseCompressedOops",
--- old/test/runtime/memory/ReserveMemory.java	2014-05-13 14:31:13.970004769 +0400
+++ new/test/runtime/memory/ReserveMemory.java	2014-05-13 14:31:13.882003221 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@
  * @summary Make sure reserved (but uncommitted) memory is not accessible
  * @library /testlibrary /testlibrary/whitebox
  * @build ReserveMemory
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
  * @run main ReserveMemory
  */
 
@@ -53,7 +52,7 @@
     }
 
     ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
-          "-Xbootclasspath/a:.",
+          "-Xbootclasspath/a:" + System.getProperty("test.classes"),
           "-XX:+UnlockDiagnosticVMOptions",
           "-XX:+WhiteBoxAPI",
           "-XX:-TransmitErrorReport",
--- old/test/runtime/memory/RunUnitTestsConcurrently.java	2014-05-13 14:31:14.642016591 +0400
+++ new/test/runtime/memory/RunUnitTestsConcurrently.java	2014-05-13 14:31:14.554015043 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,8 +26,7 @@
  * @summary Test launches unit tests inside vm concurrently
  * @library /testlibrary /testlibrary/whitebox
  * @build RunUnitTestsConcurrently
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI RunUnitTestsConcurrently 30 15000
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI RunUnitTestsConcurrently 30 15000
  */
 
 import com.oracle.java.testlibrary.*;
--- old/test/runtime/memory/StressVirtualSpaceResize.java	2014-05-13 14:31:15.302028202 +0400
+++ new/test/runtime/memory/StressVirtualSpaceResize.java	2014-05-13 14:31:15.174025950 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,8 +26,7 @@
  * @summary Stress test that expands/shrinks VirtualSpace
  * @library /testlibrary /testlibrary/whitebox
  * @build StressVirtualSpaceResize
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI StressVirtualSpaceResize
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI StressVirtualSpaceResize
  */
 
 import sun.hotspot.WhiteBox;
--- old/test/sanity/WBApi.java	2014-05-13 14:31:16.146043050 +0400
+++ new/test/sanity/WBApi.java	2014-05-13 14:31:15.990040306 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,8 +26,7 @@
  * @summary verify that whitebox functions can be linked and executed
  * @library /testlibrary /testlibrary/whitebox
  * @build WBApi
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI WBApi
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI WBApi
  */
 
 import sun.hotspot.WhiteBox;
--- old/test/sanity/WhiteBox.java	2014-05-13 14:31:16.814054802 +0400
+++ new/test/sanity/WhiteBox.java	2014-05-13 14:31:16.702052831 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,8 +28,7 @@
  * @author igor.ignatyev@oracle.com
  * @library /testlibrary
  * @compile WhiteBox.java
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI sun.hotspot.WhiteBox
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI sun.hotspot.WhiteBox
  * @clean sun.hotspot.WhiteBox
  */
 
--- old/test/serviceability/ParserTest.java	2014-05-13 14:31:17.502066905 +0400
+++ new/test/serviceability/ParserTest.java	2014-05-13 14:31:17.366064513 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,8 +26,7 @@
  * @summary Test that the diagnostic command arguemnt parser works
  * @library /testlibrary /testlibrary/whitebox
  * @build ParserTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI ParserTest
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI ParserTest
  */
 
 import java.math.BigInteger;
--- old/test/testlibrary/ctw/test/ClassesDirTest.java	2014-05-13 14:31:18.270080416 +0400
+++ new/test/testlibrary/ctw/test/ClassesDirTest.java	2014-05-13 14:31:18.150078305 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,9 +26,9 @@
  * @bug 8012447
  * @library /testlibrary /testlibrary/whitebox /testlibrary/ctw/src
  * @build sun.hotspot.tools.ctw.CompileTheWorld sun.hotspot.WhiteBox ClassesDirTest Foo Bar
- * @run main ClassFileInstaller sun.hotspot.WhiteBox Foo Bar
+ * @run main ClassFileInstaller Foo Bar
  * @run main ClassesDirTest prepare
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Dsun.hotspot.tools.ctw.logfile=ctw.log sun.hotspot.tools.ctw.CompileTheWorld classes
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Dsun.hotspot.tools.ctw.logfile=ctw.log sun.hotspot.tools.ctw.CompileTheWorld classes
  * @run main ClassesDirTest check ctw.log
  * @summary testing of CompileTheWorld :: classes in directory
  * @author igor.ignatyev@oracle.com
--- old/test/testlibrary/ctw/test/ClassesListTest.java	2014-05-13 14:31:18.958092520 +0400
+++ new/test/testlibrary/ctw/test/ClassesListTest.java	2014-05-13 14:31:18.842090479 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,9 +26,9 @@
  * @bug 8012447
  * @library /testlibrary /testlibrary/whitebox /testlibrary/ctw/src
  * @build sun.hotspot.tools.ctw.CompileTheWorld sun.hotspot.WhiteBox ClassesListTest Foo Bar
- * @run main ClassFileInstaller sun.hotspot.WhiteBox Foo Bar
+ * @run main ClassFileInstaller Foo Bar
  * @run main ClassesListTest prepare
- * @run main/othervm/timeout=600 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Dsun.hotspot.tools.ctw.logfile=ctw.log sun.hotspot.tools.ctw.CompileTheWorld classes.lst
+ * @run main/othervm/bootclasspath/timeout=600 -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Dsun.hotspot.tools.ctw.logfile=ctw.log sun.hotspot.tools.ctw.CompileTheWorld classes.lst
  * @run main ClassesListTest check ctw.log
  * @summary testing of CompileTheWorld :: list of classes in file
  * @author igor.ignatyev@oracle.com
--- old/test/testlibrary/ctw/test/JarDirTest.java	2014-05-13 14:31:19.634104412 +0400
+++ new/test/testlibrary/ctw/test/JarDirTest.java	2014-05-13 14:31:19.542102794 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,9 +26,9 @@
  * @bug 8012447
  * @library /testlibrary /testlibrary/whitebox /testlibrary/ctw/src
  * @build sun.hotspot.tools.ctw.CompileTheWorld sun.hotspot.WhiteBox JarDirTest Foo Bar
- * @run main ClassFileInstaller sun.hotspot.WhiteBox Foo Bar
+ * @run main ClassFileInstaller Foo Bar
  * @run main JarDirTest prepare
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Dsun.hotspot.tools.ctw.logfile=ctw.log sun.hotspot.tools.ctw.CompileTheWorld jars/*
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Dsun.hotspot.tools.ctw.logfile=ctw.log sun.hotspot.tools.ctw.CompileTheWorld jars/*
  * @run main JarDirTest check ctw.log
  * @summary testing of CompileTheWorld :: jars in directory
  * @author igor.ignatyev@oracle.com
--- old/test/testlibrary/ctw/test/JarsTest.java	2014-05-13 14:31:20.270115600 +0400
+++ new/test/testlibrary/ctw/test/JarsTest.java	2014-05-13 14:31:20.146113419 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,9 +26,9 @@
  * @bug 8012447
  * @library /testlibrary /testlibrary/whitebox /testlibrary/ctw/src
  * @build sun.hotspot.tools.ctw.CompileTheWorld sun.hotspot.WhiteBox JarsTest Foo Bar
- * @run main ClassFileInstaller sun.hotspot.WhiteBox Foo Bar
+ * @run main ClassFileInstaller Foo Bar
  * @run main JarsTest prepare
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Dsun.hotspot.tools.ctw.logfile=ctw.log sun.hotspot.tools.ctw.CompileTheWorld foo.jar bar.jar
+ * @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Dsun.hotspot.tools.ctw.logfile=ctw.log sun.hotspot.tools.ctw.CompileTheWorld foo.jar bar.jar
  * @run main JarsTest check ctw.log
  * @summary testing of CompileTheWorld :: jars
  * @author igor.ignatyev@oracle.com