# HG changeset patch
# User neliasso
# Date 1460453348 -7200
# Node ID bedc2fbb94541c05bde308ad3e10e319cd619191
# Parent  e0b822facc037f542cde9434ea610ac170faa2eb
8153885: [TESTBUG] few regression tests failed after 8151880 changes
Summary: Test that uses compile() as missed in update
Reviewed-by: kvn

diff -r e0b822facc03 -r bedc2fbb9454 hotspot/test/compiler/tiered/ConstantGettersTransitionsTest.java
--- a/hotspot/test/compiler/tiered/ConstantGettersTransitionsTest.java	Wed Apr 06 18:51:03 2016 +0300
+++ b/hotspot/test/compiler/tiered/ConstantGettersTransitionsTest.java	Tue Apr 12 11:29:08 2016 +0200
@@ -31,9 +31,9 @@
  * @modules java.base/sun.misc
  *          java.management
  * @build TransitionsTestExecutor ConstantGettersTransitionsTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm/timeout=240 -Xmixed -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
- *                   -XX:+WhiteBoxAPI -XX:+TieredCompilation
+ *                   -XX:+WhiteBoxAPI -XX:+TieredCompilation -XX:-UseCounterDecay
  *                   -XX:CompileCommand=compileonly,ConstantGettersTestCase$TrivialMethods::*
  *                   TransitionsTestExecutor ConstantGettersTransitionsTest
  * @summary Test the correctness of compilation level transitions for constant getters methods
diff -r e0b822facc03 -r bedc2fbb9454 hotspot/test/compiler/tiered/LevelTransitionTest.java
--- a/hotspot/test/compiler/tiered/LevelTransitionTest.java	Wed Apr 06 18:51:03 2016 +0300
+++ b/hotspot/test/compiler/tiered/LevelTransitionTest.java	Tue Apr 12 11:29:08 2016 +0200
@@ -38,7 +38,7 @@
  * @run main ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm/timeout=240 -Xmixed -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI -XX:+TieredCompilation
- *                   -XX:CompileCommand=compileonly,compiler.whitebox.SimpleTestCase$Helper::*
+ *                   -XX:CompileCommand=compileonly,compiler.whitebox.SimpleTestCaseHelper::*
  *                   -XX:CompileCommand=compileonly,ExtendedTestCase$CompileMethodHolder::*
  *                   TransitionsTestExecutor LevelTransitionTest
  * @summary Test the correctness of compilation level transitions for different methods
@@ -80,7 +80,7 @@
     /**
      * Makes and verifies transitions between compilation levels
      */
-    protected void checkTransitions() {
+    protected void checkTransitions() throws Exception {
         checkNotCompiled();
         boolean finish = false;
         while (!finish) {
diff -r e0b822facc03 -r bedc2fbb9454 hotspot/test/compiler/tiered/NonTieredLevelsTest.java
--- a/hotspot/test/compiler/tiered/NonTieredLevelsTest.java	Wed Apr 06 18:51:03 2016 +0300
+++ b/hotspot/test/compiler/tiered/NonTieredLevelsTest.java	Tue Apr 12 11:29:08 2016 +0200
@@ -29,11 +29,11 @@
  * @library /testlibrary /test/lib /compiler/whitebox /
  * @modules java.management
  * @build NonTieredLevelsTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:-TieredCompilation
- *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
- *                   -XX:CompileCommand=compileonly,compiler.whitebox.SimpleTestCase$Helper::*
+ *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:-UseCounterDecay
+ *                   -XX:CompileCommand=compileonly,compiler.whitebox.SimpleTestCaseHelper::*
  *                   NonTieredLevelsTest
  * @summary Verify that only one level can be used
  * @author igor.ignatyev@oracle.com
diff -r e0b822facc03 -r bedc2fbb9454 hotspot/test/compiler/tiered/TieredLevelsTest.java
--- a/hotspot/test/compiler/tiered/TieredLevelsTest.java	Wed Apr 06 18:51:03 2016 +0300
+++ b/hotspot/test/compiler/tiered/TieredLevelsTest.java	Tue Apr 12 11:29:08 2016 +0200
@@ -28,11 +28,11 @@
  * @library /testlibrary /test/lib /compiler/whitebox /
  * @modules java.management
  * @build TieredLevelsTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+TieredCompilation
- *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
- *                   -XX:CompileCommand=compileonly,compiler.whitebox.SimpleTestCase$Helper::*
+ *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:-UseCounterDecay
+ *                   -XX:CompileCommand=compileonly,compiler.whitebox.SimpleTestCaseHelper::*
  *                   TieredLevelsTest
  * @summary Verify that all levels < 'TieredStopAtLevel' can be used
  * @author igor.ignatyev@oracle.com
diff -r e0b822facc03 -r bedc2fbb9454 hotspot/test/compiler/whitebox/LockCompilationTest.java
--- a/hotspot/test/compiler/whitebox/LockCompilationTest.java	Wed Apr 06 18:51:03 2016 +0300
+++ b/hotspot/test/compiler/whitebox/LockCompilationTest.java	Tue Apr 12 11:29:08 2016 +0200
@@ -47,7 +47,7 @@
         // This case waits for 5 seconds and verifies that the method hasn't been
         // compiled during that time. Only do that for one of the test cases.
 
-        // Only compile SimpleTestCase$Helper.method and exclude all other to ensure no
+        // Only compile SimpleTestCaseHelper.method and exclude all other to ensure no
         // contention on the compile queue causes problems.
         String directive =
                 "[{ match:\"*SimpleTestCaseHelper.method\", Exclude:false}, " +
diff -r e0b822facc03 -r bedc2fbb9454 hotspot/test/compiler/whitebox/SetDontInlineMethodTest.java
--- a/hotspot/test/compiler/whitebox/SetDontInlineMethodTest.java	Wed Apr 06 18:51:03 2016 +0300
+++ b/hotspot/test/compiler/whitebox/SetDontInlineMethodTest.java	Tue Apr 12 11:29:08 2016 +0200
@@ -31,7 +31,7 @@
  * @build SetDontInlineMethodTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:CompileCommand=compileonly,compiler.whitebox.SimpleTestCase$Helper::* SetDontInlineMethodTest
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:CompileCommand=compileonly,compiler.whitebox.SimpleTestCaseHelper::* SetDontInlineMethodTest
  * @summary testing of WB::testSetDontInlineMethod()
  * @author igor.ignatyev@oracle.com
  */
diff -r e0b822facc03 -r bedc2fbb9454 hotspot/test/compiler/whitebox/SetForceInlineMethodTest.java
--- a/hotspot/test/compiler/whitebox/SetForceInlineMethodTest.java	Wed Apr 06 18:51:03 2016 +0300
+++ b/hotspot/test/compiler/whitebox/SetForceInlineMethodTest.java	Tue Apr 12 11:29:08 2016 +0200
@@ -31,7 +31,7 @@
  * @build SetForceInlineMethodTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:CompileCommand=compileonly,compiler.whitebox.SimpleTestCase$Helper::* SetForceInlineMethodTest
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:CompileCommand=compileonly,compiler.whitebox.SimpleTestCaseHelper::* SetForceInlineMethodTest
  * @summary testing of WB::testSetForceInlineMethod()
  * @author igor.ignatyev@oracle.com
  */