changeset 11288:3c3f82513ffc

Merge
author dsamersoff
date Tue, 24 May 2016 12:00:15 +0000
parents e6cbd87926cb 3f2183f143b2
children d2e2a5306fed
files
diffstat 7 files changed, 7 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/test/gc/g1/TestShrinkAuxiliaryData00.java	Tue May 24 10:05:03 2016 +0200
+++ b/test/gc/g1/TestShrinkAuxiliaryData00.java	Tue May 24 12:00:15 2016 +0000
@@ -25,7 +25,6 @@
  * @test TestShrinkAuxiliaryData00
  * @bug 8038423 8061715
  * @summary Checks that decommitment occurs for JVM with different
- * @ignore 8155957
  * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values
  * @requires vm.gc=="G1" | vm.gc=="null"
  * @requires vm.opt.AggressiveOpts=="false" | vm.opt.AggressiveOpts=="null"
@@ -36,7 +35,7 @@
  *        TestShrinkAuxiliaryData TestShrinkAuxiliaryData00
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run driver/timeout=720 TestShrinkAuxiliaryData00
+ * @run main/timeout=720 TestShrinkAuxiliaryData00
  */
 public class TestShrinkAuxiliaryData00 {
 
--- a/test/gc/g1/TestShrinkAuxiliaryData05.java	Tue May 24 10:05:03 2016 +0200
+++ b/test/gc/g1/TestShrinkAuxiliaryData05.java	Tue May 24 12:00:15 2016 +0000
@@ -26,7 +26,6 @@
  * @bug 8038423 8061715 8078405
  * @summary Checks that decommitment occurs for JVM with different
  * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values
- * @ignore 8155957
  * @requires vm.gc=="G1" | vm.gc=="null"
  * @requires vm.opt.AggressiveOpts=="false" | vm.opt.AggressiveOpts=="null"
  * @library /testlibrary /test/lib
@@ -36,7 +35,7 @@
  *        TestShrinkAuxiliaryData TestShrinkAuxiliaryData05
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run driver/timeout=720 TestShrinkAuxiliaryData05
+ * @run main/timeout=720 TestShrinkAuxiliaryData05
  */
 public class TestShrinkAuxiliaryData05 {
 
--- a/test/gc/g1/TestShrinkAuxiliaryData10.java	Tue May 24 10:05:03 2016 +0200
+++ b/test/gc/g1/TestShrinkAuxiliaryData10.java	Tue May 24 12:00:15 2016 +0000
@@ -26,7 +26,6 @@
  * @bug 8038423 8061715 8078405
  * @summary Checks that decommitment occurs for JVM with different
  * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values
- * @ignore 8155957
  * @requires vm.gc=="G1" | vm.gc=="null"
  * @requires vm.opt.AggressiveOpts=="false" | vm.opt.AggressiveOpts=="null"
  * @library /testlibrary /test/lib
@@ -36,7 +35,7 @@
  * @build TestShrinkAuxiliaryData TestShrinkAuxiliaryData10
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run driver/timeout=720 TestShrinkAuxiliaryData10
+ * @run main/timeout=720 TestShrinkAuxiliaryData10
  */
 public class TestShrinkAuxiliaryData10 {
 
--- a/test/gc/g1/TestShrinkAuxiliaryData15.java	Tue May 24 10:05:03 2016 +0200
+++ b/test/gc/g1/TestShrinkAuxiliaryData15.java	Tue May 24 12:00:15 2016 +0000
@@ -26,7 +26,6 @@
  * @bug 8038423 8061715 8078405
  * @summary Checks that decommitment occurs for JVM with different
  * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values
- * @ignore 8155957
  * @requires vm.gc=="G1" | vm.gc=="null"
  * @requires vm.opt.AggressiveOpts=="false" | vm.opt.AggressiveOpts=="null"
  * @library /testlibrary /test/lib
@@ -36,7 +35,7 @@
  * @build TestShrinkAuxiliaryData TestShrinkAuxiliaryData15
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run driver/timeout=720 TestShrinkAuxiliaryData15
+ * @run main/timeout=720 TestShrinkAuxiliaryData15
  */
 public class TestShrinkAuxiliaryData15 {
 
--- a/test/gc/g1/TestShrinkAuxiliaryData20.java	Tue May 24 10:05:03 2016 +0200
+++ b/test/gc/g1/TestShrinkAuxiliaryData20.java	Tue May 24 12:00:15 2016 +0000
@@ -26,7 +26,6 @@
  * @bug 8038423 8061715 8078405
  * @summary Checks that decommitment occurs for JVM with different
  * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values
- * @ignore 8155957
  * @requires vm.gc=="G1" | vm.gc=="null"
  * @requires vm.opt.AggressiveOpts=="false" | vm.opt.AggressiveOpts=="null"
  * @library /testlibrary /test/lib
@@ -36,7 +35,7 @@
  * @build TestShrinkAuxiliaryData TestShrinkAuxiliaryData20
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run driver/timeout=720 TestShrinkAuxiliaryData20
+ * @run main/timeout=720 TestShrinkAuxiliaryData20
  */
 public class TestShrinkAuxiliaryData20 {
 
--- a/test/gc/g1/TestShrinkAuxiliaryData25.java	Tue May 24 10:05:03 2016 +0200
+++ b/test/gc/g1/TestShrinkAuxiliaryData25.java	Tue May 24 12:00:15 2016 +0000
@@ -26,7 +26,6 @@
  * @bug 8038423 8061715 8078405
  * @summary Checks that decommitment occurs for JVM with different
  * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values
- * @ignore 8155957
  * @requires vm.gc=="G1" | vm.gc=="null"
  * @requires vm.opt.AggressiveOpts=="false" | vm.opt.AggressiveOpts=="null"
  * @library /testlibrary /test/lib
@@ -36,7 +35,7 @@
  * @build TestShrinkAuxiliaryData TestShrinkAuxiliaryData25
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run driver/timeout=720 TestShrinkAuxiliaryData25
+ * @run main/timeout=720 TestShrinkAuxiliaryData25
  */
 public class TestShrinkAuxiliaryData25 {
 
--- a/test/gc/g1/TestShrinkAuxiliaryData30.java	Tue May 24 10:05:03 2016 +0200
+++ b/test/gc/g1/TestShrinkAuxiliaryData30.java	Tue May 24 12:00:15 2016 +0000
@@ -26,7 +26,6 @@
  * @bug 8038423 8061715 8078405
  * @summary Checks that decommitment occurs for JVM with different
  * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values
- * @ignore 8155957
  * @requires vm.gc=="G1" | vm.gc=="null"
  * @requires vm.opt.AggressiveOpts=="false" | vm.opt.AggressiveOpts=="null"
  * @library /testlibrary /test/lib
@@ -36,7 +35,7 @@
  * @build TestShrinkAuxiliaryData TestShrinkAuxiliaryData30
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run driver/timeout=720 TestShrinkAuxiliaryData30
+ * @run main/timeout=720 TestShrinkAuxiliaryData30
  */
 public class TestShrinkAuxiliaryData30 {