# HG changeset patch
# User iignatyev
# Date 1446116218 0
# Node ID 94a47fd618416c0710e06842f2b465635f982add
# Parent  e4cef6796874a3f75014a94f510a4aea8f0aaf8b# Parent  cef122ff96a1dce74eb0b5c17abf52ced27b3ef6
Merge

diff -r e4cef6796874 -r 94a47fd61841 hotspot/test/compiler/compilercontrol/jcmd/ClearDirectivesFileStackTest.java
--- a/hotspot/test/compiler/compilercontrol/jcmd/ClearDirectivesFileStackTest.java	Thu Oct 29 09:24:00 2015 +0100
+++ b/hotspot/test/compiler/compilercontrol/jcmd/ClearDirectivesFileStackTest.java	Thu Oct 29 10:56:58 2015 +0000
@@ -24,6 +24,7 @@
 /*
  * @test
  * @bug 8137167
+ * @ignore 8140405
  * @summary Tests jcmd to be able to clear directives added via options
  * @library /testlibrary /../../test/lib /compiler/testlibrary ../share /
  * @build ClearDirectivesFileStackTest pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
diff -r e4cef6796874 -r 94a47fd61841 hotspot/test/compiler/compilercontrol/mixed/RandomValidCommandsTest.java
--- a/hotspot/test/compiler/compilercontrol/mixed/RandomValidCommandsTest.java	Thu Oct 29 09:24:00 2015 +0100
+++ b/hotspot/test/compiler/compilercontrol/mixed/RandomValidCommandsTest.java	Thu Oct 29 10:56:58 2015 +0000
@@ -24,6 +24,7 @@
 /*
  * @test
  * @bug 8137167
+ * @ignore 8140667
  * @summary Randomly generates valid commands with random types
  * @library /testlibrary /../../test/lib /compiler/testlibrary ../share /
  * @build RandomValidCommandsTest pool.sub.* pool.subpack.* sun.hotspot.WhiteBox