8261752: Multiple GC test are missing memory requirements

Reviewed-by: tschatzl, sjohanss
openjdk · Feb 17, 2021 · 2e18b52 · 2e18b52 · openjdk-notifier · Feb 17, 2021
1 parent c7885eb
commit 2e18b52
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 5 deletions.
diff --git a/test/hotspot/jtreg/gc/epsilon/TestByteArrays.java b/test/hotspot/jtreg/gc/epsilon/TestByteArrays.java
@@ -26,7 +26,7 @@
 /**
  * @test TestByteArrays
  * @key randomness
- * @requires vm.gc.Epsilon
+ * @requires vm.gc.Epsilon & os.maxMemory > 1G
  * @summary Epsilon is able to allocate arrays, and does not corrupt their state
  * @library /test/lib
  *

diff --git a/test/hotspot/jtreg/gc/epsilon/TestElasticTLAB.java b/test/hotspot/jtreg/gc/epsilon/TestElasticTLAB.java
@@ -26,7 +26,7 @@
 /**
  * @test TestElasticTLAB
  * @key randomness
- * @requires vm.gc.Epsilon
+ * @requires vm.gc.Epsilon & os.maxMemory > 1G
  * @summary Epsilon is able to work with/without elastic TLABs
  * @library /test/lib
  *

diff --git a/test/hotspot/jtreg/gc/epsilon/TestElasticTLABDecay.java b/test/hotspot/jtreg/gc/epsilon/TestElasticTLABDecay.java
@@ -26,7 +26,7 @@
 /**
  * @test TestElasticTLABDecay
  * @key randomness
- * @requires vm.gc.Epsilon
+ * @requires vm.gc.Epsilon & os.maxMemory > 1G
  * @summary Epsilon is able to work with/without elastic TLABs
  * @library /test/lib
  *

diff --git a/test/hotspot/jtreg/gc/epsilon/TestMemoryPools.java b/test/hotspot/jtreg/gc/epsilon/TestMemoryPools.java
@@ -26,7 +26,7 @@
 
 /**
  * @test TestMemoryPools
- * @requires vm.gc.Epsilon
+ * @requires vm.gc.Epsilon & os.maxMemory >= 2G
  * @summary Test JMX memory pools
  * @modules java.base/jdk.internal.misc
  *          java.management

diff --git a/test/hotspot/jtreg/gc/g1/TestHumongousRemsetsMatch.java b/test/hotspot/jtreg/gc/g1/TestHumongousRemsetsMatch.java
@@ -27,7 +27,7 @@
  * @test TestHumongousRemSetsMatch
  * @bug 8205426
  * @summary Test to make sure that humongous object remset states are in sync
- * @requires vm.gc.G1
+ * @requires vm.gc.G1 & os.maxMemory >= 2G
  * @library /test/lib
  * @build sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox

diff --git a/test/hotspot/jtreg/gc/g1/ihop/TestIHOPStatic.java b/test/hotspot/jtreg/gc/g1/ihop/TestIHOPStatic.java
@@ -29,6 +29,7 @@
  * @requires !vm.flightRecorder
  * @requires vm.opt.ExplicitGCInvokesConcurrent != true
  * @requires !(vm.graal.enabled & vm.compMode == "Xcomp")
+ * @requires os.maxMemory > 1G
  * @library /test/lib /
  * @modules java.base/jdk.internal.misc
  * @modules java.management

diff --git a/test/hotspot/jtreg/gc/logging/TestMetaSpaceLog.java b/test/hotspot/jtreg/gc/logging/TestMetaSpaceLog.java
@@ -44,6 +44,7 @@
  *          java.management
  * @requires vm.gc != "Epsilon"
  * @requires vm.gc != "Z"
+ * @requires os.maxMemory >= 2G
  *
  * @compile TestMetaSpaceLog.java
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox