Merge

2016-01-20 00:04:04 +01:00 · 2016-01-20 00:04:04 +01:00 · ebc48ed118
commit ebc48ed118
parent 9220796efc 49abdf4346
2 changed files with 3 additions and 0 deletions
--- a/jdk/test/com/sun/management/HotSpotDiagnosticMXBean/CheckOrigin.java
+++ b/jdk/test/com/sun/management/HotSpotDiagnosticMXBean/CheckOrigin.java
@ -24,6 +24,8 @@
 /*
 * @test
 * @bug 8028994
+ * @ignore 8147477
+ * @ignore 8147494
 * @author Staffan Larsen
 * @library /lib/testlibrary
 * @modules jdk.attach/sun.tools.attach
--- a/jdk/test/tools/launcher/TooSmallStackSize.java
+++ b/jdk/test/tools/launcher/TooSmallStackSize.java
@ -24,6 +24,7 @@
 /*
 * @test
 * @bug 6762191
+ * @ignore 8146751
 * @summary Setting stack size to 16K causes segmentation fault
 * @compile TooSmallStackSize.java
 * @run main TooSmallStackSize