Merge
authortwisti
Fri, 05 Feb 2016 18:24:41 +0000
changeset 35828 495df8a5e28a
parent 35826 42778c648543 (diff)
parent 35827 24e567453a33 (current diff)
child 35829 f80ccf2a14a5
child 35835 7fade08f69b2
Merge
--- a/hotspot/test/compiler/runtime/safepoints/TestRegisterRestoring.java	Fri Feb 05 11:33:27 2016 +0100
+++ b/hotspot/test/compiler/runtime/safepoints/TestRegisterRestoring.java	Fri Feb 05 18:24:41 2016 +0000
@@ -27,7 +27,7 @@
  * @test
  * @bug 8148490
  * @summary Test correct saving and restoring of vector registers at safepoints.
- * @run main/othervm -Xbatch -XX:-TieredCompilation -XX:CompileCommand=exclude,TestRegisterRestoring::main -XX:+SafepointALot TestRegisterRestoring
+ * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -Xbatch -XX:-TieredCompilation -XX:CompileCommand=exclude,TestRegisterRestoring::main -XX:+SafepointALot TestRegisterRestoring
  */
 public class TestRegisterRestoring {
   public static void main(String args[]) throws Exception {
--- a/hotspot/test/testlibrary_tests/whitebox/vm_flags/IntxTest.java	Fri Feb 05 11:33:27 2016 +0100
+++ b/hotspot/test/testlibrary_tests/whitebox/vm_flags/IntxTest.java	Fri Feb 05 18:24:41 2016 +0000
@@ -24,6 +24,7 @@
 /*
  * @test IntxTest
  * @bug 8028756
+ * @ignore 8148758
  * @library /testlibrary /test/lib
  * @modules java.management/sun.management
  * @build IntxTest