Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authorppunegov
Fri, 24 Jun 2016 17:12:50 +0000
changeset 40027 988686745240
parent 40025 aa3e10e809fb (current diff)
parent 40026 d10846ed8b6d (diff)
child 40029 e3cb31ed5e1b
Merge
--- a/hotspot/test/compiler/codecache/jmx/PeakUsageTest.java	Fri Jun 24 17:11:17 2016 +0000
+++ b/hotspot/test/compiler/codecache/jmx/PeakUsageTest.java	Fri Jun 24 17:12:50 2016 +0000
@@ -27,8 +27,8 @@
 
 /*
  * @test PeakUsageTest
+ * @library /testlibrary /test/lib
  * @ignore 8151345
- * @library /testlibrary /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build PeakUsageTest
--- a/hotspot/test/compiler/compilercontrol/jcmd/ClearDirectivesFileStackTest.java	Fri Jun 24 17:11:17 2016 +0000
+++ b/hotspot/test/compiler/compilercontrol/jcmd/ClearDirectivesFileStackTest.java	Fri Jun 24 17:12:50 2016 +0000
@@ -24,10 +24,10 @@
 /*
  * @test
  * @bug 8137167
- * @ignore 8140405
  * @summary Tests jcmd to be able to clear directives added via options
  * @modules java.base/jdk.internal.misc
  * @library /testlibrary /test/lib ../share /
+ * @ignore 8140405
  * @build compiler.compilercontrol.jcmd.ClearDirectivesFileStackTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
  *        compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
--- a/hotspot/test/compiler/jvmci/compilerToVM/GetResolvedJavaTypeTest.java	Fri Jun 24 17:11:17 2016 +0000
+++ b/hotspot/test/compiler/jvmci/compilerToVM/GetResolvedJavaTypeTest.java	Fri Jun 24 17:12:50 2016 +0000
@@ -24,10 +24,10 @@
 /*
  * @test
  * @bug 8136421
- * @ignore 8158860
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9" | os.simpleArch == "aarch64")
  * @library / /testlibrary /test/lib
  * @library ../common/patches
+ * @ignore 8158860
  * @modules java.base/jdk.internal.misc
  * @modules jdk.vm.ci/jdk.vm.ci.hotspot
  *          jdk.vm.ci/jdk.vm.ci.meta
--- a/hotspot/test/compiler/startup/SmallCodeCacheStartup.java	Fri Jun 24 17:11:17 2016 +0000
+++ b/hotspot/test/compiler/startup/SmallCodeCacheStartup.java	Fri Jun 24 17:12:50 2016 +0000
@@ -23,12 +23,12 @@
 
 /*
  * @test
- * @ignore 8134286
  * @bug 8023014
  * @summary Test ensures that there is no crash if there is not enough ReservedCodeCacheSize
  *          to initialize all compiler threads. The option -Xcomp gives the VM more time to
  *          trigger the old bug.
  * @library /testlibrary
+ * @ignore 8134286
  * @modules java.base/jdk.internal.misc
  *          java.management
  */
jdk-sandbox