Merge

2015-05-02 00:16:29 -07:00 · 2015-05-02 00:16:29 -07:00 · 40dd1bad2c
commit 40dd1bad2c
parent d83bdb4157 4d62005c68
2 changed files with 2 additions and 0 deletions
--- a/hotspot/test/compiler/jsr292/CallSiteDepContextTest.java
+++ b/hotspot/test/compiler/jsr292/CallSiteDepContextTest.java
@ -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
+++ b/hotspot/test/gc/g1/TestLargePageUseForAuxMemory.java
@ -24,6 +24,7 @@
 /*
 * @test TestLargePageUseForAuxMemory.java
 * @bug 8058354
+ * @ignore 8079208
 * @key gc
 * @library /testlibrary /../../test/lib
 * @requires (vm.gc=="G1" | vm.gc=="null")