changeset 35834:24d3962500a4

Merge
author ppunegov
date Mon, 08 Feb 2016 18:52:03 +0100
parents 2207cea1d26d 4706e2a628a6
children 020a9af9151d
files
diffstat 6 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/hotspot/test/compiler/compilercontrol/commandfile/PrintTest.java	Mon Feb 08 16:44:09 2016 +0000
+++ b/hotspot/test/compiler/compilercontrol/commandfile/PrintTest.java	Mon Feb 08 18:52:03 2016 +0100
@@ -26,6 +26,7 @@
  * @bug 8137167
  * @summary Tests CompileCommand=print
  * @library /testlibrary /test/lib /compiler/testlibrary ../share /
+ * @ignore 8140354
  * @build compiler.compilercontrol.commandfile.PrintTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
  *        compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
--- a/hotspot/test/compiler/compilercontrol/commands/PrintTest.java	Mon Feb 08 16:44:09 2016 +0000
+++ b/hotspot/test/compiler/compilercontrol/commands/PrintTest.java	Mon Feb 08 18:52:03 2016 +0100
@@ -26,6 +26,7 @@
  * @bug 8137167
  * @summary Tests CompileCommand=print
  * @library /testlibrary /test/lib /compiler/testlibrary ../share /
+ * @ignore 8140354
  * @build compiler.compilercontrol.commands.PrintTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
  *        compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
--- a/hotspot/test/compiler/compilercontrol/directives/PrintTest.java	Mon Feb 08 16:44:09 2016 +0000
+++ b/hotspot/test/compiler/compilercontrol/directives/PrintTest.java	Mon Feb 08 18:52:03 2016 +0100
@@ -26,6 +26,7 @@
  * @bug 8137167
  * @summary Tests directives to be able to turn on print_assembly
  * @library /testlibrary /test/lib /compiler/testlibrary ../share /
+ * @ignore 8140354
  * @build compiler.compilercontrol.directives.PrintTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
  *        compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
--- a/hotspot/test/compiler/compilercontrol/jcmd/PrintDirectivesTest.java	Mon Feb 08 16:44:09 2016 +0000
+++ b/hotspot/test/compiler/compilercontrol/jcmd/PrintDirectivesTest.java	Mon Feb 08 18:52:03 2016 +0100
@@ -26,6 +26,7 @@
  * @bug 8137167
  * @summary Tests jcmd to be able to add a directive to compile only specified methods
  * @library /testlibrary /test/lib /compiler/testlibrary ../share /
+ * @ignore 8140354
  * @build compiler.compilercontrol.jcmd.PrintDirectivesTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
  *        compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
--- a/hotspot/test/compiler/compilercontrol/jcmd/StressAddMultiThreadedTest.java	Mon Feb 08 16:44:09 2016 +0000
+++ b/hotspot/test/compiler/compilercontrol/jcmd/StressAddMultiThreadedTest.java	Mon Feb 08 18:52:03 2016 +0100
@@ -27,6 +27,7 @@
  * @summary Tests jcmd to be able to add a lot of huge directive files with
  *          parallel executed jcmds until timeout has reached
  * @library /testlibrary /test/lib /compiler/testlibrary ../share /
+ * @ignore 8148563
  * @build compiler.compilercontrol.jcmd.StressAddMultiThreadedTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
  *        compiler.testlibrary.CompilerUtils
--- a/hotspot/test/compiler/compilercontrol/mixed/RandomValidCommandsTest.java	Mon Feb 08 16:44:09 2016 +0000
+++ b/hotspot/test/compiler/compilercontrol/mixed/RandomValidCommandsTest.java	Mon Feb 08 18:52:03 2016 +0100
@@ -26,6 +26,7 @@
  * @bug 8137167
  * @summary Randomly generates valid commands with random types
  * @library /testlibrary /test/lib /compiler/testlibrary ../share /
+ * @ignore 8140354
  * @build compiler.compilercontrol.mixed.RandomValidCommandsTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
  *        compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*