# HG changeset patch
# User fparain
# Date 1460104793 -7200
# Node ID 1d902bc02bc2f55806e18157f808b64ae220afc0
# Parent  303d15f45adf86681892a224952075c52009b170# Parent  e7aff5e5eff9da384e5bf6fcc1ff9e148a6ab490
Merge

diff -r e7aff5e5eff9 -r 1d902bc02bc2 hotspot/test/serviceability/tmtools/jstat/GcCapacityTest.java
--- a/hotspot/test/serviceability/tmtools/jstat/GcCapacityTest.java	Fri Apr 08 00:38:00 2016 -0700
+++ b/hotspot/test/serviceability/tmtools/jstat/GcCapacityTest.java	Fri Apr 08 10:39:53 2016 +0200
@@ -27,13 +27,13 @@
  * @test
  * @summary Test checks the consistency of the output
  * displayed with jstat -gccapacity.
- * @ignore 8149778
  * @library /test/lib/share/classes
  * @library ../share
  * @requires vm.opt.ExplicitGCInvokesConcurrent != true
  * @build common.*
  * @build utils.*
- * @run main/othervm -XX:+UsePerfData GcCapacityTest
+ * @ignore 8149778
+ * @run main/othervm -XX:+UsePerfData -Xmx128M GcCapacityTest
  */
 public class GcCapacityTest {
 
diff -r e7aff5e5eff9 -r 1d902bc02bc2 hotspot/test/serviceability/tmtools/jstat/GcCauseTest01.java
--- a/hotspot/test/serviceability/tmtools/jstat/GcCauseTest01.java	Fri Apr 08 00:38:00 2016 -0700
+++ b/hotspot/test/serviceability/tmtools/jstat/GcCauseTest01.java	Fri Apr 08 10:39:53 2016 +0200
@@ -34,7 +34,7 @@
  * @build common.*
  * @build utils.*
  *
- * @run main/othervm -XX:+UsePerfData GcCauseTest01
+ * @run main/othervm -XX:+UsePerfData -Xmx128M GcCauseTest01
  */
 import utils.*;
 
diff -r e7aff5e5eff9 -r 1d902bc02bc2 hotspot/test/serviceability/tmtools/jstat/GcCauseTest02.java
--- a/hotspot/test/serviceability/tmtools/jstat/GcCauseTest02.java	Fri Apr 08 00:38:00 2016 -0700
+++ b/hotspot/test/serviceability/tmtools/jstat/GcCauseTest02.java	Fri Apr 08 10:39:53 2016 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,7 @@
  * @build common.*
  * @build utils.*
  *
- * @run main/othervm  -XX:+UsePerfData -Xms128M -XX:MaxMetaspaceSize=128M GcCauseTest02
+ * @run main/othervm -XX:+UsePerfData -Xmx128M -XX:MaxMetaspaceSize=128M GcCauseTest02
  */
 import utils.*;
 
diff -r e7aff5e5eff9 -r 1d902bc02bc2 hotspot/test/serviceability/tmtools/jstat/GcCauseTest03.java
--- a/hotspot/test/serviceability/tmtools/jstat/GcCauseTest03.java	Fri Apr 08 00:38:00 2016 -0700
+++ b/hotspot/test/serviceability/tmtools/jstat/GcCauseTest03.java	Fri Apr 08 10:39:53 2016 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,7 @@
  * @build common.*
  * @build utils.*
  *
- * @run main/othervm  -XX:+UsePerfData -Xms128M -XX:MaxMetaspaceSize=128M GcCauseTest03
+ * @run main/othervm -XX:+UsePerfData -Xmx128M -XX:MaxMetaspaceSize=128M GcCauseTest03
  */
 import utils.*;
 
diff -r e7aff5e5eff9 -r 1d902bc02bc2 hotspot/test/serviceability/tmtools/jstat/GcNewTest.java
--- a/hotspot/test/serviceability/tmtools/jstat/GcNewTest.java	Fri Apr 08 00:38:00 2016 -0700
+++ b/hotspot/test/serviceability/tmtools/jstat/GcNewTest.java	Fri Apr 08 10:39:53 2016 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,7 @@
  * @library ../share
  * @build common.*
  * @build utils.*
- * @run main/othervm -XX:+UsePerfData GcNewTest
+ * @run main/othervm -XX:+UsePerfData -Xmx128M GcNewTest
  */
 
 public class GcNewTest {
diff -r e7aff5e5eff9 -r 1d902bc02bc2 hotspot/test/serviceability/tmtools/jstat/GcTest01.java
--- a/hotspot/test/serviceability/tmtools/jstat/GcTest01.java	Fri Apr 08 00:38:00 2016 -0700
+++ b/hotspot/test/serviceability/tmtools/jstat/GcTest01.java	Fri Apr 08 10:39:53 2016 +0200
@@ -37,7 +37,7 @@
  * @build common.*
  * @build utils.*
  *
- * @run main/othervm -XX:+UsePerfData GcTest01
+ * @run main/othervm -XX:+UsePerfData -Xmx128M GcTest01
  */
 import utils.*;
 
diff -r e7aff5e5eff9 -r 1d902bc02bc2 hotspot/test/serviceability/tmtools/jstat/GcTest02.java
--- a/hotspot/test/serviceability/tmtools/jstat/GcTest02.java	Fri Apr 08 00:38:00 2016 -0700
+++ b/hotspot/test/serviceability/tmtools/jstat/GcTest02.java	Fri Apr 08 10:39:53 2016 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,7 @@
  * @library ../share
  * @build common.*
  * @build utils.*
- * @run main/othervm -XX:+UsePerfData -Xms128M -XX:MaxMetaspaceSize=128M GcTest02
+ * @run main/othervm -XX:+UsePerfData -Xmx128M -XX:MaxMetaspaceSize=128M GcTest02
  */
 
 public class GcTest02 {
@@ -58,10 +58,4 @@
         // Assert that space has been utilized acordingly
         JstatResults.assertSpaceUtilization(measurement2, targetMemoryUsagePercent);
     }
-
-    private static void assertThat(boolean result, String message) {
-        if (!result) {
-            throw new RuntimeException(message);
-        };
-    }
 }