Merge
authoramurillo
Sat, 02 May 2015 00:16:29 -0700
changeset 30314 3d55863a66ba
parent 30313 05608c16f6bf (current diff)
parent 30312 43a324d3e0ce (diff)
child 30315 7e56522cb687
child 30579 5208524ce05c
child 30587 751a7698b62e
child 30603 a8754858a7fc
Merge
--- a/hotspot/test/compiler/jsr292/CallSiteDepContextTest.java	Fri May 01 03:56:01 2015 -0700
+++ b/hotspot/test/compiler/jsr292/CallSiteDepContextTest.java	Sat May 02 00:16:29 2015 -0700
@@ -24,6 +24,7 @@
 /**
  * @test
  * @bug 8057967
+ * @ignore 8079205
  * @run main/bootclasspath -Xbatch java.lang.invoke.CallSiteDepContextTest
  */
 package java.lang.invoke;
--- a/hotspot/test/gc/g1/TestLargePageUseForAuxMemory.java	Fri May 01 03:56:01 2015 -0700
+++ b/hotspot/test/gc/g1/TestLargePageUseForAuxMemory.java	Sat May 02 00:16:29 2015 -0700
@@ -24,6 +24,7 @@
 /*
  * @test TestLargePageUseForAuxMemory.java
  * @bug 8058354
+ * @ignore 8079208
  * @key gc
  * @library /testlibrary /../../test/lib
  * @requires (vm.gc=="G1" | vm.gc=="null")