Merge
authorthartmann
Fri, 05 Feb 2016 15:38:21 +0100
changeset 35826 42778c648543
parent 35825 7c7652ee137b (current diff)
parent 35821 be4030e4a9a3 (diff)
child 35828 495df8a5e28a
Merge
--- a/hotspot/test/compiler/runtime/safepoints/TestRegisterRestoring.java	Fri Jan 22 15:25:40 2016 +0100
+++ b/hotspot/test/compiler/runtime/safepoints/TestRegisterRestoring.java	Fri Feb 05 15:38:21 2016 +0100
@@ -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 Jan 22 15:25:40 2016 +0100
+++ b/hotspot/test/testlibrary_tests/whitebox/vm_flags/IntxTest.java	Fri Feb 05 15:38:21 2016 +0100
@@ -24,6 +24,7 @@
 /*
  * @test IntxTest
  * @bug 8028756
+ * @ignore 8148758
  * @library /testlibrary /test/lib
  * @modules java.management/sun.management
  * @build IntxTest