Merge
authorjwilhelm
Wed, 20 Jan 2016 00:04:04 +0100
changeset 35623 b4aad8ba78b6
parent 35621 229464e790eb (current diff)
parent 35622 9c7b90ccb14e (diff)
child 35624 f35f5ab4ab80
Merge
jdk/test/com/sun/management/HotSpotDiagnosticMXBean/CheckOrigin.java
--- a/jdk/test/com/sun/management/HotSpotDiagnosticMXBean/CheckOrigin.java	Tue Jan 19 16:20:01 2016 -0500
+++ b/jdk/test/com/sun/management/HotSpotDiagnosticMXBean/CheckOrigin.java	Wed Jan 20 00:04:04 2016 +0100
@@ -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	Tue Jan 19 16:20:01 2016 -0500
+++ b/jdk/test/tools/launcher/TooSmallStackSize.java	Wed Jan 20 00:04:04 2016 +0100
@@ -24,6 +24,7 @@
 /*
  * @test
  * @bug 6762191
+ * @ignore 8146751
  * @summary Setting stack size to 16K causes segmentation fault
  * @compile TooSmallStackSize.java
  * @run main TooSmallStackSize