changeset 47515:362acacd939e condy-folding

Automatic merge with condy
author mcimadamore
date Tue, 24 Oct 2017 00:51:19 +0200
parents 31dc3ce9ed87 900785705fa1
children 297129af25ac
files
diffstat 12 files changed, 12 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/test/jdk/java/lang/invoke/condy/BootstrapMethodJumboArgsTest.java	Fri Oct 20 16:03:19 2017 -0500
+++ b/test/jdk/java/lang/invoke/condy/BootstrapMethodJumboArgsTest.java	Tue Oct 24 00:51:19 2017 +0200
@@ -28,6 +28,7 @@
  * @library /lib/testlibrary/bytecode /java/lang/invoke/common
  * @build jdk.experimental.bytecode.BasicClassBuilder test.java.lang.invoke.lib.InstructionHelper
  * @run testng BootstrapMethodJumboArgsTest
+ * @run testng/othervm -XX:+UnlockDiagnosticVMOptions -XX:UseBootstrapCallInfo=3 BootstrapMethodJumboArgsTest
  */
 
 import jdk.experimental.bytecode.PoolHelper;
--- a/test/jdk/java/lang/invoke/condy/CondyBSMException.java	Fri Oct 20 16:03:19 2017 -0500
+++ b/test/jdk/java/lang/invoke/condy/CondyBSMException.java	Tue Oct 24 00:51:19 2017 +0200
@@ -28,6 +28,7 @@
  * @library /lib/testlibrary/bytecode  /java/lang/invoke/common
  * @build jdk.experimental.bytecode.BasicClassBuilder test.java.lang.invoke.lib.InstructionHelper
  * @run testng CondyBSMException
+ * @run testng/othervm -XX:+UnlockDiagnosticVMOptions -XX:UseBootstrapCallInfo=3 CondyBSMException
  */
 
 import org.testng.Assert;
--- a/test/jdk/java/lang/invoke/condy/CondyBSMInvocation.java	Fri Oct 20 16:03:19 2017 -0500
+++ b/test/jdk/java/lang/invoke/condy/CondyBSMInvocation.java	Tue Oct 24 00:51:19 2017 +0200
@@ -28,6 +28,7 @@
  * @library /lib/testlibrary/bytecode /java/lang/invoke/common
  * @build jdk.experimental.bytecode.BasicClassBuilder test.java.lang.invoke.lib.InstructionHelper
  * @run testng CondyBSMInvocation
+ * @run testng/othervm -XX:+UnlockDiagnosticVMOptions -XX:UseBootstrapCallInfo=3 CondyBSMInvocation
  */
 
 
--- a/test/jdk/java/lang/invoke/condy/CondyBSMValidationTest.java	Fri Oct 20 16:03:19 2017 -0500
+++ b/test/jdk/java/lang/invoke/condy/CondyBSMValidationTest.java	Tue Oct 24 00:51:19 2017 +0200
@@ -28,6 +28,7 @@
  * @library /lib/testlibrary/bytecode /java/lang/invoke/common
  * @build jdk.experimental.bytecode.BasicClassBuilder test.java.lang.invoke.lib.InstructionHelper
  * @run testng CondyBSMValidationTest
+ * @run testng/othervm -XX:+UnlockDiagnosticVMOptions -XX:UseBootstrapCallInfo=3 CondyBSMValidationTest
  */
 
 import org.testng.annotations.DataProvider;
--- a/test/jdk/java/lang/invoke/condy/CondyNameValidationTest.java	Fri Oct 20 16:03:19 2017 -0500
+++ b/test/jdk/java/lang/invoke/condy/CondyNameValidationTest.java	Tue Oct 24 00:51:19 2017 +0200
@@ -28,6 +28,7 @@
  * @library /lib/testlibrary/bytecode /java/lang/invoke/common
  * @build jdk.experimental.bytecode.BasicClassBuilder test.java.lang.invoke.lib.InstructionHelper
  * @run testng CondyNameValidationTest
+ * @run testng/othervm -XX:+UnlockDiagnosticVMOptions -XX:UseBootstrapCallInfo=3 CondyNameValidationTest
  */
 
 import org.testng.annotations.DataProvider;
--- a/test/jdk/java/lang/invoke/condy/CondyNestedTest.java	Fri Oct 20 16:03:19 2017 -0500
+++ b/test/jdk/java/lang/invoke/condy/CondyNestedTest.java	Tue Oct 24 00:51:19 2017 +0200
@@ -28,6 +28,7 @@
  * @library /lib/testlibrary/bytecode
  * @build jdk.experimental.bytecode.BasicClassBuilder
  * @run testng CondyNestedTest
+ * @run testng/othervm -XX:+UnlockDiagnosticVMOptions -XX:UseBootstrapCallInfo=3 CondyNestedTest
  */
 
 import jdk.experimental.bytecode.BasicClassBuilder;
--- a/test/jdk/java/lang/invoke/condy/CondyRepeatFailedResolution.java	Fri Oct 20 16:03:19 2017 -0500
+++ b/test/jdk/java/lang/invoke/condy/CondyRepeatFailedResolution.java	Tue Oct 24 00:51:19 2017 +0200
@@ -28,6 +28,7 @@
  * @library /lib/testlibrary/bytecode /java/lang/invoke/common
  * @build jdk.experimental.bytecode.BasicClassBuilder
  * @run testng CondyRepeatFailedResolution
+ * @run testng/othervm -XX:+UnlockDiagnosticVMOptions -XX:UseBootstrapCallInfo=3 CondyRepeatFailedResolution
  */
 
 import jdk.experimental.bytecode.BasicClassBuilder;
--- a/test/jdk/java/lang/invoke/condy/CondyReturnPrimitiveTest.java	Fri Oct 20 16:03:19 2017 -0500
+++ b/test/jdk/java/lang/invoke/condy/CondyReturnPrimitiveTest.java	Tue Oct 24 00:51:19 2017 +0200
@@ -29,6 +29,7 @@
  * @library /lib/testlibrary/bytecode
  * @build jdk.experimental.bytecode.BasicClassBuilder
  * @run testng CondyReturnPrimitiveTest
+ * @run testng/othervm -XX:+UnlockDiagnosticVMOptions -XX:UseBootstrapCallInfo=3 CondyReturnPrimitiveTest
  */
 
 import jdk.experimental.bytecode.BasicClassBuilder;
--- a/test/jdk/java/lang/invoke/condy/CondyStaticArgumentsTest.java	Fri Oct 20 16:03:19 2017 -0500
+++ b/test/jdk/java/lang/invoke/condy/CondyStaticArgumentsTest.java	Tue Oct 24 00:51:19 2017 +0200
@@ -28,6 +28,7 @@
  * @library /lib/testlibrary/bytecode /java/lang/invoke/common
  * @build jdk.experimental.bytecode.BasicClassBuilder test.java.lang.invoke.lib.InstructionHelper
  * @run testng CondyStaticArgumentsTest
+ * @run testng/othervm -XX:+UnlockDiagnosticVMOptions -XX:UseBootstrapCallInfo=3 CondyStaticArgumentsTest
  */
 
 import jdk.experimental.bytecode.PoolHelper;
--- a/test/jdk/java/lang/invoke/condy/CondyTypeValidationTest.java	Fri Oct 20 16:03:19 2017 -0500
+++ b/test/jdk/java/lang/invoke/condy/CondyTypeValidationTest.java	Tue Oct 24 00:51:19 2017 +0200
@@ -27,7 +27,7 @@
  * @summary Test invalid name in name and type
  * @library /lib/testlibrary/bytecode /java/lang/invoke/common
  * @build jdk.experimental.bytecode.BasicClassBuilder test.java.lang.invoke.lib.InstructionHelper
- * @run testng CondyTypeValidationTest
+ * @run testng/othervm -XX:+UnlockDiagnosticVMOptions -XX:UseBootstrapCallInfo=3 CondyTypeValidationTest
  */
 
 import org.testng.annotations.DataProvider;
--- a/test/jdk/java/lang/invoke/condy/CondyWithGarbageTest.java	Fri Oct 20 16:03:19 2017 -0500
+++ b/test/jdk/java/lang/invoke/condy/CondyWithGarbageTest.java	Tue Oct 24 00:51:19 2017 +0200
@@ -28,6 +28,7 @@
  * @library /lib/testlibrary/bytecode /java/lang/invoke/common
  * @build jdk.experimental.bytecode.BasicClassBuilder test.java.lang.invoke.lib.InstructionHelper
  * @run testng CondyWithGarbageTest
+ * @run testng/othervm -XX:+UnlockDiagnosticVMOptions -XX:UseBootstrapCallInfo=3 CondyWithGarbageTest
  */
 
 
--- a/test/jdk/java/lang/invoke/condy/CondyWrongType.java	Fri Oct 20 16:03:19 2017 -0500
+++ b/test/jdk/java/lang/invoke/condy/CondyWrongType.java	Tue Oct 24 00:51:19 2017 +0200
@@ -29,6 +29,7 @@
  * @library /lib/testlibrary/bytecode /java/lang/invoke/common
  * @build jdk.experimental.bytecode.BasicClassBuilder test.java.lang.invoke.lib.InstructionHelper
  * @run testng CondyWrongType
+ * @run testng/othervm -XX:+UnlockDiagnosticVMOptions -XX:UseBootstrapCallInfo=3 CondyWrongType
  */
 
 import org.testng.Assert;